Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue

@@ -478,7 +478,7 @@ export default {
         size: this.rightSize,
         matterName: `%${this.rightSearchVal}%`,
         siteId: this.siteId,
-        deptCode: this.leftDept,
+        deptCode: this.deptSearch,
         ...search,
       });
       let { pageInfo, data } = res.data.data;

portal-manager-ui/admin/src/components/image/thumbImage.vue

@@ -24,7 +24,8 @@ export default {
         index:{
             type:Number,
             default:0
-        }
+        },
+        type:[String]
     },
     data(){
         return{
@@ -63,7 +64,7 @@ export default {
             if(src.search(/http/ig)>-1){
                 return `${src}`
             }else{
-                return `${process.env.VUE_APP_API_BASE_URL}/${src}`
+                return this.type=='php'?`${process.env.VUE_APP_API_PHP_URL}/${src}`:`${process.env.VUE_APP_API_BASE_URL}/${src}`
             }
             
         },

portal-manager-ui/admin/src/views/dataAdmin/components/microOfficialWebsite/components/FormDetails.vue

@@ -47,14 +47,14 @@
             <div class="infoBox">
               <span class="infoTitle imgBox">身份证人像面：</span>
               <span class="infoContent">
-                <thumbImage v-if="userInfo.z_img" :src="userInfo.z_img" fileType="img" />
+                <thumbImage type="php" v-if="userInfo.z_img" :src="userInfo.z_img" fileType="img" />
                 <span v-else>--</span>
               </span>
             </div>
             <div class="infoBox">
               <span class="infoTitle imgBox">身份证国徽面：</span>
               <span class="infoContent">
-                <thumbImage v-if="userInfo.b_img" :src="userInfo.b_img" fileType="img" />
+                <thumbImage type="php" v-if="userInfo.b_img" :src="userInfo.b_img" fileType="img" />
                 <span v-else>--</span>
               </span>
             </div>

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue

@@ -24,6 +24,9 @@
           </a-select>
           <a-select v-model="searchForm.id">
             <a-select-option value=""> 全部设备 </a-select-option>
+            <a-select-option :value="0">
+              小程序
+            </a-select-option>
             <a-select-option v-for="item in deviceData" :key="item.id" :value="item.id">
               {{ item.name }}
             </a-select-option>