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

src/pages/home/location.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-10-11 09:39:51
- * @LastEditTime: 2019-10-14 14:05:34
+ * @LastEditTime: 2019-10-15 10:26:04
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -13,7 +13,7 @@
         <span>选择地区</span>
       </div>
     </h-header>
-    <h-content>
+    <section>
       <div class="current-location">
         <div class="img-box">
           <img src="@/assets/homePage/location.png" alt="">
@@ -42,21 +42,30 @@
         <p :class="{styles:!flag}" @click="changeStyle(1)">{{ province }}</p>
         <p :class="{styles:flag}" @click="changeStyle(2)">{{ city }}</p>
       </div>
+    </section>
+    <section>
 
       <!-- 省份 -->
-      <list-item v-if="province_flag" :item-height="40">
-        <item v-for="(item,index) in lists" :key="index" :proportion="[5,2]">
-          <section slot="name" @click="selectProvince(item)">{{ item.province_name }}</section>
-        </item>
-      </list-item>
+      <scroll v-show="province_flag" :pullUp="false" class="content-scroll">
+
+        <list-item :item-height="40">
+          <item v-for="(item,index) in lists" :key="index" :proportion="[5,2]">
+            <section slot="name" @click="selectProvince(item)">{{ item.province_name }}</section>
+          </item>
+        </list-item>
+      </scroll>
 
       <!-- 城市 -->
-      <list-item v-if="!province_flag" :item-height="40">
-        <item v-for="(item,index) in cityList" :key="index" :proportion="[5,2]">
-          <section slot="name" @click="selectCity(item.city_name)">{{ item.city_name }}</section>
-        </item>
-      </list-item>
-    </h-content>
+      <scroll v-show="!province_flag" :pullUp="false" class="content-scroll">
+
+        <list-item :item-height="40">
+          <item v-for="(item,index) in cityList" :key="index" :proportion="[5,2]">
+            <section slot="name" @click="selectCity(item.city_name)">{{ item.city_name }}</section>
+          </item>
+        </list-item>
+      </scroll>
+
+    </section>
   </h-view>
 </template>
 <script>
@@ -97,6 +106,10 @@ export default {
          window.localStorage.setItem('province', res.address.province)
          window.localStorage.setItem('city', res.address.city)
          vm.places = window.localStorage.getItem('province') + '-' + window.localStorage.getItem('city')
+         vm.province = '请选择省'
+         vm.city = '请选择市'
+         vm.flag = false
+         vm.province_flag = true
        }
      }, {enableHighAccuracy: true})
    },

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)"
             />
@@ -600,7 +600,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) {
@@ -608,7 +608,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) {