Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

config/uat.env.js

@@ -10,5 +10,5 @@ module.exports = {
   filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   appId: '"com.xcmg.app"',
-  currentVersion: '"1.0.3"'
+  currentVersion: '"1.0.6"'
 }

src/pages/myInfo/my-info.vue

@@ -108,6 +108,11 @@
             <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
             <div slot="name">检查更新</div>
           </item>
+          <item>
+            <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
+            <div slot="name">当前版本</div>
+            <div slot="content">{{currentVersion}}</div>
+          </item>
           <item @click.native="logOut">
             <img slot="left-icon" src="@/assets/myInfo/exit.png" class="left-icon" >
             <div slot="name">退出登录</div>
@@ -129,6 +134,7 @@ export default {
   },
   data () {
     return {
+      currentVersion: process.env.currentVersion,
       flag: true,
       isAGENT: false,
       elecStatusDesceibe: '',

src/pages/userBind/np/naturePerson.vue

@@ -149,7 +149,7 @@
             <input slot="content" v-model="baseInfo.cell_phone" readonly placeholder="请输入手机号码" >
           </item>
           <item :showArrow="true">
-            <div slot="name" class="required">省份</div>
+            <div slot="name" class="required">业务办理省</div>
             <input
               slot="content"
               v-model="baseInfo.province_name"
@@ -161,7 +161,7 @@
             >
           </item>
           <item :showArrow="true">
-            <div slot="name" class="required">城市</div>
+            <div slot="name" class="required">业务办理市</div>
             <input
               slot="content"
               v-model="baseInfo.city_name"
@@ -173,7 +173,7 @@
             >
           </item>
           <item :showArrow="true">
-            <div slot="name" class="required">区县</div>
+            <div slot="name" class="required">业务办理区/县</div>
             <input
               slot="content"
               v-model="baseInfo.district_name"
@@ -686,6 +686,7 @@ export default {
               vm.idCardFrontAttachmentId = res.lists[0].attachment_id
               break
             case 'NP_ID_CARD_B': // 承租人身份证背面
+              alert('背面 '+res.lists[0].url)
               vm.idCardBack = res.lists[0].url
               vm.idCardBackAttachmentId = res.lists[0].attachment_id
               break
@@ -754,10 +755,10 @@ export default {
                 vm.cddItemList.push(item)
             }
           })
-          // 查询图片
+        /*  // 查询图片
           listTemp.forEach((item, index) => {
             vm.load_picture(item.check_id, index, item.cdd_item)
-          })
+          })*/
           if (vm.idCardFrontEditFlag) {
             vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识别的图片
             // 身份证正面图片已修改，重新上传
@@ -830,6 +831,10 @@ export default {
             vm.save_picture(list)
             vm.idCardBackSpEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
           }
+          // 查询图片
+          listTemp.forEach((item, index) => {
+            vm.load_picture(item.check_id, index, item.cdd_item)
+          })
         }
       })
     },

src/pages/userBind/org/enterprise.vue

@@ -134,7 +134,7 @@
             />
           </item>
           <item :showArrow="true">
-            <div slot="name" class="required">省份</div>
+            <div slot="name" class="required">业务办理省</div>
             <input
               slot="content"
               v-model="baseInfo.province_name"
@@ -146,7 +146,7 @@
             >
           </item>
           <item :showArrow="true">
-            <div slot="name" class="required">城市</div>
+            <div slot="name" class="required">业务办理市</div>
             <input
               slot="content"
               v-model="baseInfo.city_name"
@@ -158,7 +158,7 @@
             >
           </item>
           <item :showArrow="true">
-            <div slot="name" class="required">区县</div>
+            <div slot="name" class="required">业务办理区/县</div>
             <input
               slot="content"
               v-model="baseInfo.district_name"
@@ -1611,10 +1611,10 @@ export default {
                 vm.cddItemList.push(item)
             }
           })
-          // 查询图片
+          /*// 查询图片
           listTemp.forEach((item, index) => {
             vm.load_picture(item.check_id, index, item.cdd_item)
-          })
+          })*/
           if (vm.idCardFrontEditFlag) { // 法定代表人身份证正面图片已修改，重新上传
             vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识别的图片
             var list = []
@@ -1717,6 +1717,10 @@ export default {
             vm.save_picture(list)
             vm.LaEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
           }
+          // 查询图片
+          listTemp.forEach((item, index) => {
+            vm.load_picture(item.check_id, index, item.cdd_item)
+          })
         }
       })
     },

src/pages/videoSign/video-list.vue

@@ -3,7 +3,7 @@
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
-        <span>视屏面签</span>
+        <span>视频面签</span>
       </div>
     </h-header>
     <Tab :fatherTabNum="tabNum" @getTabNum="getTabNum" />
@@ -34,15 +34,15 @@
                   <span>{{ item.division_n }}</span>
                 </li>
                 <li>
-                  预约面试时间
+                  预约面签时间
                   <span class="number">{{ item.total_price }}</span>
                 </li>
                 <li>
                   <p v-if="item.leases_status ==='N'" class="to-unSign" @click="toSign">
-                    <img src="@/assets/videoSign/unSign.png" >&nbsp;视屏面签
+                    <img src="@/assets/videoSign/unSign.png" >&nbsp;视频面签
                   </p>
                   <p v-if="item.leases_status ==='Y'" class="to-sign" @click="toWatch">
-                    <img src="@/assets/videoSign/sign.png" >&nbsp;视屏回放
+                    <img src="@/assets/videoSign/sign.png" >&nbsp;视频回放
                   </p>
                 </li>
               </ul>