Merge branch 'liuin' into develop

config.xml

@@ -13,12 +13,15 @@
     <access launch-external="yes" origin="tel:*" />
     <allow-intent href="mailto:*" />
     <allow-intent href="tel:*" />
+    <allow-intent href="https://*/*" />
     <allow-navigation href="mailto:*" />
     <allow-navigation href="tel:*" />
     <allow-navigation href="http://wechat.hand-china.com/*" />
     <allow-navigation href="https://www.pgyer.com/*" />
+    <allow-navigation href="https://identity-test.qsign.cn/*" />
     <access launch-external="yes" origin="tel:*" />
     <access launch-external="yes" origin="sms:*" />
+    <access launch-external="yes" origin="https://identity-test.qsign.cn" />
     <preference name="ScrollEnabled" value="false" />
     <preference name="android-minSdkVersion" value="19" />
     <preference name="BackupWebStorage" value="none" />

src/pages/reimburseMyself/reimburse-detail.vue

@@ -57,7 +57,7 @@
               <list-item>
                 <item v-for="(item,index) in list.cf_lists" :key="index">
                   <div slot="name">{{ item.cf_item_name }}</div>
-                  <div slot="content">￥{{ parseFloat(item.received_amount).toFixed(2) | currency }}</div>
+                  <div slot="content">{{ parseFloat(item.received_amount).toFixed(2) | currency }}</div>
                 </item>
               </list-item>
             </div>

src/pages/userBindNew/np/base-info.vue

@@ -310,7 +310,7 @@
       </div>
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="verified">下一步</tab-button>
+      <tab-button class="save" @click.native="verified(false)">下一步</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -490,7 +490,7 @@ export default {
         vm.from = true
         window.localStorage.setItem('from', true)
         vm.basicInfoQuery()
-        vm.loadItemList() // 附件查询
+        vm.loadItemList(true) // 附件查询
         vm.getMultipleRole()// 获取第二角色
       } else if (from.name === 'UserBind') {
         vm.list = {}
@@ -669,16 +669,16 @@ export default {
         }
       })
     },
-    async verified () {
+    async verified (flag) {
       this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
       this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片
       let res = await this.saveWord()
       if (res) {
         // 查询资料清单
-        this.loadItemList()
+        this.loadItemList(flag)
       }
     },
-    loadItemList () {
+    loadItemList (flag) {//flag用来判断是否需要加载图片文件
       let vm = this
       let bpId = window.localStorage.getItem('bp_id')
       if (bpId === 'undefined') {
@@ -719,9 +719,13 @@ export default {
             }
           })
           // 查询图片
+          if(flag){
             listTemp.forEach((item, index) => {
+              if(item.cdd_item!=='HOUSE_CARD'||item.cdd_item!=='REAL_EST_CERTIFICATE'||item.cdd_item!=='CAR_CARD'||item.cdd_item!=='ASSETS_CARD'||item.cdd_item!=='FAMILY_REGISTER'||item.cdd_item!=='MARITAL STATUS'){
                 vm.load_picture(item.check_id, index, item.cdd_item)
+              }
             })
+          }
           if (vm.idCardFrontEditFlag) {
             vm.idCardFrontUrlFlag = true
             vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识别的图片
@@ -891,6 +895,7 @@ export default {
         })
         return res.bp_id
       } else {
+        hlsPopup.hideLoading()
         vm.hlsPopup.showLongCenter(res.message)
       }
     },

src/pages/userBindNew/org/bankInfo.vue

@@ -330,6 +330,8 @@ export default {
                     name: 'MyInfo',
                   })
                 }
+              } else {
+                    vm.hlsPopup.showLongCenter(res.message)
                 }
             })
           }

src/pages/userBindNew/org/baseInfo.vue

@@ -416,7 +416,7 @@
     </div></h-content>
     <bottom-tab class="footer-button">
       <!-- <tab-button class="put" @click.native="handSubmit">提交</tab-button> -->
-      <tab-button class="save" @click.native="verified">下一步</tab-button>
+      <tab-button class="save" @click.native="verified(false)">下一步</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -929,7 +929,7 @@ export default {
       }
     },
 
-    verified () {
+    verified (flag) {
       window.localStorage.setItem('authFlag', this.flag)
       if (!this.flag) { // 已授权
         this.baseInfo.auth_flag = 'Y'
@@ -1162,7 +1162,7 @@ export default {
             vm.bp_id = res.bp_id
             vm.bindCheck()
             // 查询资料清单
-            vm.loadItemList()
+            vm.loadItemList(flag)
           } else {
             vm.hlsPopup.showLongCenter(res.message)
           }
@@ -1410,7 +1410,7 @@ export default {
           } else if (vm.baseInfo.auth_flag === '否') {
             vm.flag = true
           }
-          vm.loadItemList()// 附件查询
+          vm.loadItemList(true)// 附件查询
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -1623,7 +1623,7 @@ export default {
       })
     },
     // 附件查询
-    loadItemList () {
+    loadItemList (flag) {
       let vm = this
       let bpId = vm.from ? vm.$route.params.bp_id : vm.bp_id
       if (bpId === 'undefined') {
@@ -1671,9 +1671,12 @@ export default {
             }
           })
           // 查询图片
+          if(flag){
               listTemp.forEach((item, index) => {
               vm.load_picture(item.check_id, index, item.cdd_item)
             })
+          }
+       
           if (vm.idCardFrontEditFlag) { // 法定代表人身份证正面图片已修改，重新上传
             vm.idCardFrontUrlFlag = true
             vm.delete_pic_to_ocr(vm.idCardFrontAttachmentId)// 先删除之前识别的图片