Merge branch 'liuxin' into develop

src/pages/contractCreate/contract-create-list.vue

@@ -29,7 +29,7 @@
     >
       <div class="wrap">
         <div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
-          <div class="pro-code" @click="changeBase">
+          <div class="pro-code" @click="changeBase(item)">
             <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
             <p>
               <span>合同号</span>
@@ -345,7 +345,7 @@ export default {
         name: 'SalesInfo',
       })
     },
-    changeBase () {
+    changeBase (item) {
       if (this.num === 1) {
         window.localStorage.setItem('contractReadonly', false)
         window.localStorage.setItem('formPage', 'list')
@@ -355,6 +355,9 @@ export default {
       }
       this.$router.push({
         name: 'CreateBaseInfo',
+        params: {
+          bp_id: item.bp_id,
+        },
       })
     },
     goDetails () {

src/pages/contractCreate/creat-rent-info.vue

@@ -25,7 +25,7 @@
       </div>
       <div class="userInfo">租赁产品</div>
       <list-item :item-height="44">
-        <item v-if="!isReadOnly"> :showArrow="true" @click.native="selectProductLine">
+        <item v-if="!isReadOnly":showArrow="true" @click.native="selectProductLine">
           <div slot="name">产品线</div>
           <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择" >
         </item>
@@ -330,6 +330,7 @@ export default {
       if (vm.fromPage === 'sale') {
         vm.fromList = false
       } else if (vm.fromPage === 'list') {
+        debugger
         vm.fromList = true
         vm.rentInfoQuery()
       }

src/pages/pay/firstPay/pay-entry.vue

@@ -301,7 +301,9 @@ export default {
     },
     confirmToPay (e) {
       let vm = this
-      let url = process.env.basePath + 'update_order_info'
+      let randomString = Math.floor(Math.random() * 21)
+      let url = process.env.basePath + 'update_order_info' + '&index' +
+        `'${randomString}'`
       if (e) {
         vm.pay_type = e.pay_type
         vm.bank_account_id = e.bank_account_id
@@ -316,8 +318,8 @@ export default {
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          vm.hlsPopup.hideLoading()
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/pay/payment/pay-entry.vue

@@ -264,7 +264,9 @@ export default {
     },
     confirmToPay (e) {
       let vm = this
-      let url = process.env.basePath + 'update_order_info'
+      let randomString = Math.floor(Math.random() * 21)
+      let url = process.env.basePath + 'update_order_info' + '&index' +
+        `'${randomString}'`
       if (e) {
         vm.pay_type = e.pay_type
         vm.bank_account_id = e.bank_account_id
@@ -279,8 +281,8 @@ export default {
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          vm.hlsPopup.hideLoading()
         } else {
           hlsPopup.showLongCenter(res.message)
         }