Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-22 13:33:30
+ * @LastEditTime: 2019-10-22 17:22:03
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -149,7 +149,7 @@
         </item>
       </list-item>
     </h-content>
-    <bottom-tab v-show="num === 1">
+    <bottom-tab v-show="num === 1 && confirm_status === 'SUBMIT'">
       <tab-button class="footer" @click.native="inSure">
         确认签约
       </tab-button>
@@ -177,6 +177,7 @@ export default {
       check2: Check2,
       uncheck1: unCheck1,
       uncheck2: unCheck2,
+      confirm_status: this.$route.params.confirm_status,
     }
   },
   computed: {},
@@ -389,7 +390,7 @@ export default {
       }
 
       .in-all{
-        width: 96px;
+        //width: 96px;
         display: flex;
 
         img{

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-21 11:09:20
+ * @LastEditTime: 2019-10-22 16:43:01
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -31,7 +31,7 @@
           <p class="incoming-num">进件号</p>
           <p class="code">{{ item.project_number }}</p>
         </div>
-        <div class="details" @click="goDetails(item.project_id)">
+        <div class="details" @click="goDetails(item.project_id,item.confirm_status)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
@@ -125,11 +125,13 @@ export default {
         }
       })
     },
-    goDetails (val) {
+    // val: project_id, status: confirm_status
+    goDetails (val, status) {
       this.$router.push({
         name: 'ContractDetail',
         params: {
           project_id: val,
+          confirm_status: status,
         },
       })
     },

src/pages/contractSigning/entry-info.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-09-29 10:02:11
+ * @LastEditTime: 2019-10-22 20:03:19
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: /c:\Users\slice\Desktop\xg\new-pro\hls-xcmg-vue-app\src\pages\contractSigning\entry-info.vue
+ -->
 <template>
   <h-view id="entry-info" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -12,25 +20,28 @@
         <div class="info-header">
           <p>请上传银行卡照片</p>
           <div class="bank-pic">
-            <img src="@/assets/constractSigning/bank.png" alt="">
+            <img v-if="!bankImg" src="@/assets/constractSigning/bank.png" alt="" @click="ocrShow('bankCard', '')">
+            <img v-if="bankImg" :src="bankImg" alt="" @click="ocrShow('bankCard', '')">
           </div>
         </div>
         <list-item :item-height="44" class="info-center">
           <item>
             <div slot="name" >银行卡卡号</div>
-            <section slot="content">上传银行卡自动填充</section>
+            <input
+              slot="content" v-model="bank_lists.bank_account_num" type="text" placeholder="上传银行卡自动填充"
+              readonly>
           </item>
           <item>
             <div slot="name" >账户名称</div>
-            <input slot="content" type="number" placeholder="请输入账户名称">
+            <input slot="content" type="text" placeholder="请输入账户名称">
           </item>
           <item>
             <div slot="name" >银行名称</div>
-            <input slot="content" type="number" placeholder="请输入银行名称">
+            <input slot="content" v-model="bank_lists.bank_full_name" type="text" placeholder="请输入银行名称">
           </item>
           <item>
             <div slot="name" >支行名称</div>
-            <input slot="content" type="number" placeholder="请输入支行名称">
+            <input slot="content" type="text" placeholder="请输入支行名称">
           </item>
 
         </list-item>
@@ -58,12 +69,17 @@ export default {
   data () {
     return {
       num: 1,
+      bankImg: '', // 银行卡图片
       check1: Check1,
       check2: Check2,
       uncheck1: unCheck1,
       uncheck2: unCheck2,
       res: '',
       name: '',
+      bank_lists: {
+        bank_full_name: '', // 银行名称
+        bank_account_num: '', // 卡号
+      },
     }
   },
   computed: {},
@@ -72,7 +88,79 @@ export default {
     this.name = this.$route.params.name
   },
   methods: {
-
+    // ocr识别入口
+    ocrShow (ocrType, type) {
+      let vm = this
+      hlsPopup.showActionSheet({
+        titleText: '请选择照片',
+        buttonArray: ['拍照', '从相册取'],
+        callback: index => {
+          if (index === 0) {
+            vm.openCamera(ocrType, type)
+          } else {
+            vm.takePicture(ocrType, type)
+          }
+        },
+      })
+    },
+    openCamera (ocrType, type) {
+      let vm = this
+      let cameraoptions = {
+        quality: 60,
+        width: 1843,
+        height: 1382,
+      }
+      let success = function (imgdata) {
+        if (!imgdata) {
+          hlsPopup.showLongCenter('请拍照')
+        } else {
+          if (ocrType === 'bankCard') {
+            vm.bankImg = imgdata
+            vm.bankCardIdentify(imgdata)
+          }
+        }
+      }
+      let error = function () {
+        hlsPopup.showLongCenter(error)
+      }
+      hlsUtil.openCamera(cameraoptions, success, error)
+    },
+    takePicture (ocrType, type) {
+      let vm = this
+      var cameraoptions = {
+        quality: 70,
+        width: 1843,
+        height: 1382,
+        maxCount: 1,
+      }
+      let success = function (imgUrl) {
+        if (imgUrl.length === 0) {
+          hlsPopup.showLongCenter('请选择一张图片')
+        } else {
+          if (ocrType === 'bankCard') {
+            vm.bankImg = imgUrl[0]
+            vm.bankCardIdentify(imgUrl[0])
+          }
+        }
+      }
+      let error = function () {
+        hlsPopup.showLongCenter(error)
+      }
+      vm.hlsUtil.takePicture(cameraoptions, success, error)
+    },
+    // 银行卡识别
+    bankCardIdentify (fileUrl) {
+      let vm = this
+      hlsPopup.showLoading('正在识别')
+      let url = process.env.ocrPath + '/baidu/ocr/bankCard'
+      hlsUtil.baiduOcr(fileUrl, url, function (res) {
+        hlsPopup.hideLoading()
+        let result = res.result.result
+        vm.bank_lists.bank_account_num = result.bank_card_number.replace(/\s*/g, '') // 卡号
+        vm.bank_lists.bank_full_name = result.bank_name // 银行名称
+        // vm.bank_lists.bank_card_type = result.bank_card_type
+      })
+    },
   },
 }
 </script>

src/pages/distributorSign/financ-details.vue

@@ -135,7 +135,7 @@ export default {
         params: {
           isConfirm: true,
           hasButtom: confirmStatus,
-          confirm_status: this.confirm_status
+          confirm_status: this.confirm_status,
         },
       })
       this.$router.go(-1)

src/pages/productQuery/product-list.vue

@@ -55,16 +55,15 @@ export default {
   },
   computed: {},
   watch: {},
-  beforeRouteEnter (to, from, next) {
-    if (from.name === 'QueryHome') {
-      next(vm => {
-        // vm.proQuery()
-        // vm.division = vm.$route.params.division
-      })
-    }
-    // this.proQuery()
-    next()
-  },
+  // beforeRouteEnter (to, from, next) {
+  //   if (from.name === 'QueryHome') {
+  //     next(vm => {
+  //       // vm.proQuery()
+  //       // vm.division = vm.$route.params.division
+  //     })
+  //   }
+  //   next()
+  // },
   activated () {
     this.proQuery()
   },