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

src/pages/pay/marginPay/first-pay.vue

@@ -53,7 +53,7 @@ export default {
   methods: {
     toPayEntry (money) {
       this.$router.push({
-        name: 'PayEntry',
+        name: 'MarginPayEntry',
         params: {
           money,
         },

src/pages/userBind/np/invoiceInfo.vue

@@ -95,7 +95,7 @@ export default {
   },
   methods: {
     addRows (e) {
-      let addNum = parseInt(e.length / 25)
+      let addNum = parseInt(e.length / 16)
       if (addNum === 0) {
         this.$refs.myTestarea.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
@@ -103,7 +103,7 @@ export default {
       }
     },
     addRowsLive (e) {
-      let addNum = parseInt(e.length / 25)
+      let addNum = parseInt(e.length / 16)
       if (addNum === 0) {
         this.$refs.myTestareaLive.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {

src/pages/userBind/np/naturePerson.vue

@@ -143,8 +143,8 @@
               slot="content"
               ref="myTestareaLive"
               v-model="baseInfo.living_address"
-              cols="34"
               rows="1"
+              cols="30"
               placeholder="请输入居住地址"
               @input="addRowsLive(baseInfo.living_address)"
             />
@@ -605,7 +605,7 @@ export default {
       })
     },
     addRows (e) {
-      let addNum = parseInt(e.length / 25)
+      let addNum = parseInt(e.length / 16)
       if (addNum === 0) {
         this.$refs.myTestarea.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
@@ -613,7 +613,8 @@ export default {
       }
     },
     addRowsLive (e) {
-      let addNum = parseInt(e.length / 25)
+      let addNum = parseInt(e.length / 16)
+      console.log(addNum)
       if (addNum === 0) {
         this.$refs.myTestareaLive.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {

src/pages/userBind/org/enterprise.vue

@@ -564,7 +564,7 @@ export default {
       })
     },
     addRows (e) {
-      let addNum = parseInt(e.length / 25)
+      let addNum = parseInt(e.length / 16)
       if (addNum === 0) {
         this.$refs.myTestarea.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
@@ -572,7 +572,7 @@ export default {
       }
     },
     addRowsLive (e) {
-      let addNum = parseInt(e.length / 25)
+      let addNum = parseInt(e.length / 16)
       if (addNum === 0) {
         this.$refs.myTestareaLive.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
@@ -580,7 +580,7 @@ export default {
       }
     },
     addAddressRows (e) {
-      let addNum = parseInt(e.length / 25)
+      let addNum = parseInt(e.length / 16)
       if (addNum === 0) {
         this.$refs.address.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {

src/pages/userBind/org/invoiceInfo.vue

@@ -139,7 +139,7 @@ export default {
       })
     },
     addRows (e) {
-      let addNum = parseInt(e.length / 25)
+      let addNum = parseInt(e.length / 16)
       if (addNum === 0) {
         this.$refs.myTestarea.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {
@@ -147,7 +147,8 @@ export default {
       }
     },
     addRowsLive (e) {
-      let addNum = parseInt(e.length / 25)
+      let addNum = parseInt(e.length / 16)
+      console.log(addNum)
       if (addNum === 0) {
         this.$refs.myTestareaLive.rows = 1
       } else if (addNum >= addNum - 1 && addNum < addNum + 1) {