fixIssue

src/pages/contractCreate/create-base-info.vue

@@ -430,7 +430,7 @@ export default {
   },
   watch: {
     $route (to, from) {
-      if(to.name === 'SalesInfo'){
+      if (to.name === 'SalesInfo' && from.name === 'CreateBaseInfo') {
         this.routeGoCustom()
       }
     },

src/pages/contractCreate/sales-info.vue

@@ -186,6 +186,12 @@ export default {
       },
       immediate: true,
     },
+    // '$route' (to, from) {
+    //   debugger
+    //   if (from.fullPath !== '/contract-create-list' && to.fullPath === '/sales-info') {
+    //     this.$router.go(0)
+    //   }
+    // },
   },
   activated () {
 
@@ -222,7 +228,8 @@ export default {
         }
         vm.businessQuery().then(res => {
           vm.agentQuery().then(res => {
-            vm.factoryQuery()
+            vm.factoryQuery().then(res => {
+            })
           })
         })
       } else if (from.name === 'CreateBaseInfo') {
@@ -327,7 +334,7 @@ export default {
         phone: window.localStorage.getItem('user_phone'),
       }
       vm.hlsPopup.showLoading('请稍候')
-      vm.hlsHttp.post(url, param).then(function (res) {
+      return vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         vm.factoty = res.lists
         if (res.result === 'S') {

src/pages/pay/pay-page.vue

@@ -62,7 +62,7 @@
         </div>
       </div>
       <div v-if="isShowpayInfo" class="box-wrap">
-       <!-- <div class="box-top">
+        <!-- <div class="box-top">
           <img src="@/assets/payment/bank-title.png" >
         </div>-->
         <div class="box-center">
@@ -71,7 +71,7 @@
               <div slot="name" class="name">订单编号</div>
               <div slot="content">{{ info.order_number }}</div>
             </item>
-           <!-- <item>
+            <!-- <item>
               <div slot="name" class="name">付款人</div>
               <div slot="content">{{ info.pay_amount_name }}</div>
             </item>
@@ -79,13 +79,13 @@
               <div slot="name" class="name">付款账号</div>
               <div slot="content">{{ info.pay_amount }}</div>
             </item>-->
-          <!--  <item>
+            <!--  <item>
               <div slot="name" class="name">交易金额</div>
               <div slot="content">{{ info.orderamount|currency }}</div>
             </item>-->
             <div class="orderamount-wrap">
               <span class="orderamount-item">交易金额</span>
-              <span class="orderamount-item font-color">￥ {{info.orderamount|currency}}</span>
+              <span class="orderamount-item font-color">￥ {{ info.orderamount|currency }}</span>
             </div>
             <item>
               <div slot="name" class="name">支付方式</div>
@@ -105,13 +105,13 @@
           <p>手机K码支付需要您开通我行消息服务。</p>
           <p>掌上银行支付需要您首先开通我行掌上银行,</p>
           <p>且支付账户已添加到掌上银行;</p>
-         <!-- <p>www.abchina. com</p>
+          <!-- <p>www.abchina. com</p>
           <p>全国24小时服务热线:95599</p>
           <p>中国农业银行版权所有</p>-->
         </div>
       </div>
     </h-content>
-   <!-- <bottom-tab>
+    <!-- <bottom-tab>
       <tab-button v-if="showpay" class="foot" @click.native="pay">立即支付</tab-button>
       <tab-button v-if="nextPay" class="foot" @click.native="pay">继续支付</tab-button>
       <tab-button v-if="showSelect" class="foot" @click.native="searchResult">查询支付结果</tab-button>
@@ -176,7 +176,7 @@ export default {
     pay (status) {
       let vm = this
       vm.nextPay = false
-      if(status === 'continue' && vm.payType === 'ABC_UNION'){   // 在银联模式下继续支付重新获取支付url,因为银联页面只能打开一次
+      if (status === 'continue' && vm.payType === 'ABC_UNION') { // 在银联模式下继续支付重新获取支付url,因为银联页面只能打开一次
         hlsPopup.showConfirm({
           title: '提示',
           content: '银联不支持二次支付，请重新发起支付订单',
@@ -188,16 +188,16 @@ export default {
             }
           },
         })
-      }else{
-         cordova.InAppBrowser.open(this.url, '_blank', 'location=yes')
-       // window.open(this.url)
+      } else {
+        cordova.InAppBrowser.open(this.url, '_blank', 'location=yes')
+        // window.open(this.url)
       }
       setTimeout(() => {
         vm.showSelect = true
         vm.showpay = false
       }, 3000)
     },
-    getPayUrl(){
+    getPayUrl () {
       let vm = this
       let url = process.env.basePath + 'merchant_payment'
       let param = {
@@ -209,7 +209,7 @@ export default {
           if (res.return_code !== '0000') {
             hlsPopup.showLongCenter(res.error_message)
           } else {
-             cordova.InAppBrowser.open(res.paymentURL, '_blank', 'location=yes')
+            cordova.InAppBrowser.open(res.paymentURL, '_blank', 'location=yes')
           }
         } else {
           hlsPopup.showLongCenter(res.message)