add

config/dev.env.js

@@ -8,9 +8,9 @@ module.exports = merge(prodEnv, {
   debug: true,
   isMobilePlatform: false,
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
   ocrPath: '"http://180.104.121.66:8088/r/api"',
   appId: '"com.xcmg.app.dev"',
   currentVersion: '"1.9.0"',

src/pages/contractInquire/contract-records.vue

@@ -284,6 +284,7 @@ export default {
       let param = {
         user_phone: window.localStorage.user_phone,
         searchInput: vm.searchInput,
+        bp_type: vm.bp_type,
         pagenum: vm.pageNum,
         pagesize: 10,
         contract_status_n: vm.contract_status_n,

src/pages/distributorSign/contract-details.vue

@@ -326,7 +326,8 @@ export default {
       if (res.result === 'S') {
         return true
       } else {
-        // vm.hlsPopup.showLongCenter(res.message)
+        vm.hlsPopup.showLongCenter(res.message)
+        return false
       }
     },
     goBodyCheck () { // 活体检测

src/pages/distributorSign/legal-person.vue

@@ -91,7 +91,7 @@
       </item>
       <item>
         <div slot="name" class="font-color">联系地址</div>
-        <input slot="content" v-model="baseInfo.living_address" readonly>
+        <span slot="content">{{ baseInfo.living_address }}</span>
       </item>
     </list-item>
   </div>

src/pages/myInfo/my-info.vue

@@ -226,7 +226,10 @@ export default {
         bp_type: this.user_bp_type,
         bp_type_n: this.bp_type_n,
       }
-      let arr = [...this.multiRoleList]
+      let arr = []
+      if (this.multiRoleList.length > 0) {
+        arr = [...this.multiRoleList]
+      }
       arr.push(obj)
       return arr
     },
@@ -299,10 +302,10 @@ export default {
       vm.confirmCount = '0'
       vm.productCount = '0'
       vm.carCount = '0'
+      vm.multiRoleList = []
       vm.multipleRole = window.localStorage.getItem('multipleRole')
       vm.userQuery()
       vm.numQuery()
-      vm.getMultipleRole()
     })
     next()
   },
@@ -325,7 +328,7 @@ export default {
       let param = {
         master: {
           source_type: 'HLS_APP_USER',
-          pkvalue: vm.bp_id,
+          pkvalue: vm.app_user_id,
         },
       }
       hlsPopup.showLoading('请稍候')
@@ -672,7 +675,7 @@ export default {
             : ['修改头像', '用户信息', '角色切换'],
         callback: index => {
           if (index === 0) {
-            this.imgUploadShow(vm.bp_id)
+            this.imgUploadShow(vm.app_user_id)
           } else if (index === 1) {
             this.changePageHead()
           } else if (index === 2) {
@@ -927,6 +930,7 @@ export default {
           vm.user_bp_class = res.info.user_bp_class
           vm.bp_id = res.info.user_bp_id
           vm.bp_identity = res.info.bp_identity
+          vm.app_user_id = res.info.app_user_id
           window.localStorage.removeItem('bp_id')
           window.localStorage.setItem('bp_id', res.info.user_bp_id)
           window.localStorage.setItem('user_bp_status', res.info.user_bp_status)
@@ -940,6 +944,7 @@ export default {
           vm.bp_type_n = res.info.user_bp_type_n
           vm.watchBpStatus()
           vm.getHead()
+          vm.getMultipleRole()
           if (vm.user_bp_type === 'AGENT') {
             vm.isAGENT = true
           } else {

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

@@ -119,7 +119,7 @@
             ref="myTestarea"
             v-model="baseInfo.address_on_resident_booklit"
             readonly
-            cols="22"
+            cols="30"
             rows="1"
             placeholder="上传身份证自动填充"
             class="auto"
@@ -194,7 +194,7 @@
             ref="myTestareaLive"
             v-model="baseInfo.living_address"
             rows="1"
-            cols="22"
+            cols="30"
             placeholder="请输入联系地址"
             @input="addRowsLive(baseInfo.living_address)"
           />
@@ -1340,21 +1340,23 @@ export default {
     addRows (e) {
       if (e) {
         let addNum = Math.ceil(e.length / 16)
-        if (addNum === 0) {
-          this.$refs.myTestarea.rows = 1
-        } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
-          this.$refs.myTestarea.rows = addNum + 1
-        }
+        // if (addNum === 0) {
+        //   this.$refs.myTestarea.rows = 1
+        // } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
+        //   this.$refs.myTestarea.rows = addNum + 1
+        // }
+        this.$refs.myTestarea.rows = addNum
       }
     },
     addRowsLive (e) {
       if (e) {
         let addNum = Math.ceil(e.length / 16)
-        if (addNum === 0) {
-          this.$refs.myTestareaLive.rows = 1
-        } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
-          this.$refs.myTestareaLive.rows = addNum + 1
-        }
+        // if (addNum === 0) {
+        //   this.$refs.myTestareaLive.rows = 1
+        // } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
+        //   this.$refs.myTestareaLive.rows = addNum + 1
+        // }
+        this.$refs.myTestareaLive.rows = addNum
       }
     },
     selectIdType () {

src/pages/userBindNew/org/baseInfo.vue

@@ -142,7 +142,7 @@
               slot="content"
               ref="myTestarea"
               v-model="baseInfo.registered_place"
-              cols="22"
+              cols="30"
               rows="1"
               readonly
               class="auto"
@@ -192,7 +192,7 @@
               slot="content"
               ref="myTestareaLive"
               v-model="baseInfo.business_address"
-              cols="22"
+              cols="30"
               rows="1"
               placeholder="请输入经营地址"
               @input="addRowsLive(baseInfo.business_address)"
@@ -901,7 +901,7 @@ export default {
         // if (addNum === 0) {
         //   this.$refs.address.rows = 1
         // } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
-        this.$refs.address.rows = addNum + 1
+        // this.$refs.address.rows = addNum + 1
         // }
         this.$refs.address.rows = addNum
       }