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

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

@@ -206,35 +206,54 @@
               </item>
               <item>
                 <div slot="name">坐落</div>
-                <input slot="content" v-model="propertyInfo.house_located" placeholder="识别不动产权证自动填充" >
+                <textarea
+                  slot="content" v-model="propertyInfo.house_located" cols="25" rows="2"
+                  contenteditable="true"
+                  placeholder="识别不动产权证自动填充"
+                  @input="addRow" />
               </item>
               <item>
                 <div slot="name">不动产单元号</div>
-                <input slot="content" v-model="propertyInfo.real_unit_number" placeholder="识别不动产权证自动填充" >
+                <textarea
+                  slot="content" v-model="propertyInfo.real_unit_number" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充"
+                  @input="addRow"/>
               </item>
               <item>
                 <div slot="name">权利类型</div>
-                <input slot="content" v-model="propertyInfo.right_type" placeholder="识别不动产权证自动填充" >
+                <textarea
+                  slot="content" v-model="propertyInfo.right_type" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
                 <div slot="name">权利性质</div>
-                <input slot="content" v-model="propertyInfo.right_property" placeholder="识别不动产权证自动填充" >
+                <textarea
+                  slot="content" v-model="propertyInfo.right_property" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
                 <div slot="name">用途</div>
-                <input slot="content" v-model="propertyInfo.house_purpose" placeholder="识别不动产权证自动填充" >
+                <textarea
+                  slot="content" v-model="propertyInfo.house_purpose" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
                 <div slot="name">面积</div>
-                <input slot="content" v-model="propertyInfo.house_area" placeholder="识别不动产权证自动填充" >
+                <textarea
+                  slot="content" v-model="propertyInfo.house_area" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
-                <div slot="name">使用期限	</div>
-                <input slot="content" v-model="propertyInfo.land_use_limit" placeholder="识别不动产权证自动填充" >
+                <div slot="name">使用期限</div>
+                <textarea
+                  slot="content" v-model="propertyInfo.land_use_limit" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
               <item>
                 <div slot="name">权利其他状况</div>
-                <input slot="content" v-model="propertyInfo.right_others" placeholder="识别不动产权证自动填充" >
+                <textarea
+                  slot="content" v-model="propertyInfo.right_others" cols="25" rows="2"
+                  placeholder="识别不动产权证自动填充" @input="addRow"/>
               </item>
             </list-item>
           </div>
@@ -332,7 +351,23 @@ export default {
       }
     })
   },
+  updated () {
+    let vm = this
+    let myArea = document.querySelectorAll('textarea')
+    myArea.forEach(i => {
+      let num = Math.round((i.scrollHeight - 42) / 20)
+      if (num > 0) {
+        i.rows = num + 2
+      }
+    })
+  },
   methods: {
+    addRow (el) {
+      let num = Math.round((el.target.scrollHeight - 42) / 20)
+      if (num > 0) {
+        el.target.rows = num + 2
+      }
+    },
     async saveEstateInfo () {
       let vm = this
       let url = process.env.basePath + 'bp_real_estate_save'
@@ -585,7 +620,7 @@ export default {
       hlsUtil.baiduOcr(fileUrl, url, function (res) {
         hlsPopup.hideLoading()
         let result = res.result.data
-        vm.propertyInfo.right_person = result.right_property.word
+        vm.propertyInfo.right_person = result.right_person.word
         vm.propertyInfo.public_situation = result.public_situation.word
         vm.propertyInfo.house_located = result.house_located.word
         vm.propertyInfo.real_unit_number = result.real_unit_number.word

src/pages/userBindNew/org/bankInfo.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 21:29:35
- * @LastEditTime: 2019-12-16 17:53:17
+ * @LastEditTime: 2019-12-18 14:25:13
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -247,7 +247,7 @@ export default {
       })
     },
     // 提交
-    handSubmit () {
+    async handSubmit () {
       this.hlsPopup.showConfirm({
         title: '提示',
         content: '您确认提交吗？',
@@ -261,24 +261,48 @@ export default {
               },
             }
             let vm = this
-            this.hlsHttp.post(url, param).then(function (res) {
+            vm.hlsHttp.post(url, param).then(function (res) {
               if (res.result === 'S') {
                 vm.hlsPopup.showSuccess('提交成功')
-                if (vm.certification_status === 'Y') {
-                  vm.$router.push({
-                    name: 'MyInfo',
-                  })
-                } else {
-                  vm.$router.push({
-                    name: 'ElectronicSign',
-                  })
-                }
+                // if (vm.certification_status === 'Y') {
+                vm.$router.push({
+                  name: 'MyInfo',
+                })
+                // } else {
+                // vm.getOrgCertificationUrl()
+                // console.log(authUrl)
+                // if (authUrl) {
+
+                // }
+                // vm.$router.push({
+                //   name: 'ElectronicSign',
+                // })
+                // }
               }
             })
           }
         },
       })
     },
+    // 获取企业认证url
+    getOrgCertificationUrl () {
+      let vm = this
+      let url = $config.basePath + 'auth_company_sign'
+      let param = {
+        phone: window.localStorage.user_phone,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        hlsPopup.hideLoading()
+        console.log(res)
+        // if (res.info.code === 0) {
+        //   return res.info.data.authUrl
+        // } else {
+        //   hlsPopup.showLongCenter(res.info.msg)
+        //   return null
+        // }
+      })
+    },
     // ocr识别入口
     ocrShow (ocrType, type) {
       let vm = this