Merge branch 'liuxin' into develop

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

@@ -340,7 +340,6 @@ export default {
       }
     },
     changePage () {
-      window.localStorage.setItem('contractReadonly', false)
       window.localStorage.setItem('formPage', 'sale')
       this.$router.push({
         name: 'SalesInfo',

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

@@ -25,14 +25,22 @@
       </div>
       <div class="userInfo">租赁产品</div>
       <list-item :item-height="44">
-        <item :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>
-        <item :showArrow="true" @click.native="getProduct">
+        <item v-if="isReadOnly">
+          <div slot="name">产品线</div>
+          <input slot="content" v-model="saveInfo.division_n" readonly>
+        </item>
+        <item v-if="!isReadOnly" :showArrow="true" @click.native="getProduct">
           <div slot="name">产品型号</div>
           <input slot="content" v-model="productInfo.product_id_n" readonly placeholder="请选择" >
         </item>
+        <item v-if="isReadOnly" :showArrow="true">
+          <div slot="name">产品型号</div>
+          <input slot="content" v-model="productInfo.product_id_n" readonly >
+        </item>
         <item>
           <div slot="name">产品数量</div>
           <input slot="content" v-model="productInfo.product_num" placeholder="请填写产品数量" >
@@ -277,6 +285,13 @@ export default {
     'finance_amount' () { // 融资金额
       return parseFloat(this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
     },
+    isReadOnly () {
+      if (window.localStorage.contractReadonly === 'true' && this.fromPage === 'list') {
+        return true
+      } else {
+        return false
+      }
+    },
   },
   watch: {
     policyKeyWord (newVal, oldVal) {
@@ -314,7 +329,7 @@ export default {
       vm.pagenumPolicy = 1
       if (vm.fromPage === 'sale') {
         vm.fromList = false
-      } else if (vm.status === 'list') {
+      } else if (vm.fromPage === 'list') {
         vm.fromList = true
         vm.rentInfoQuery()
       }

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

@@ -19,52 +19,14 @@
           <scroll>
             <list-item :item-height="56" class="pay-way">
               <item
-                v-for="(item,index) in nongBank"
-                :proportion="[7,1,1]"
-                :key="item.bank_account_num"
-                @click.native="isSelect(`nong${index}`);ischeck(item);confirmToPay(item)"
-              >
-                <div slot="name" style="flex=3">
-                  <img :src="selectImg(item)" alt class="icon" >
-                  {{ item.bank_full_name }}({{ selectLast(item) }})
-                  <img
-                    v-show="item.recommand"
-                    class="push"
-                    src="@/assets/payment/push.png"
-                  >
-                </div>
-                <section slot="content">
-                  <img v-show="select === `nong${index}`" src="@/assets/payment/select.png" alt >
-                  <img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt >
-                </section>
-              </item>
-              <!-- <item :proportion="[7,1,1]" @click.native="isSelect('one');ischeck('one')">
-                <div slot="name">
-                  <img src="@/assets/payment/alipay.png" alt class="icon1" > 支付宝
-                </div>
-                <section slot="content">
-                  <img v-show="select === 'one'" src="@/assets/payment/select.png" alt >
-                  <img v-show="select !== 'one'" src="@/assets/payment/unselect.png" alt >
-                </section>
-              </item>
-              <item :proportion="[7,1,1]" @click.native="isSelect('two');ischeck('two')">
-                <div slot="name">
-                  <img src="@/assets/payment/wx.png" alt class="icon2" > 微信
-                </div>
-                <section slot="content">
-                  <img v-show="select === 'two'" src="@/assets/payment/select.png" alt >
-                  <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt >
-                </section>
-              </item> -->
-              <item
-                v-for="(item,index) in newList"
+                v-for="(item,index) in payTypeList"
                 :proportion="[7,1,1]"
                 :key="index"
                 @click.native="isSelect(`three${index}`);ischeck(item);confirmToPay(item)"
               >
                 <div slot="name" style="flex=3">
                   <img :src="selectImg(item)" alt class="icon" >
-                  {{ item.bank_full_name }}({{ selectLast(item) }})
+                  {{ item.code_name }}
                   <img
                     v-show="item.recommand"
                     class="push"
@@ -100,22 +62,21 @@
               <span>手续费</span>
               <span>+¥{{ serviceCharge |currency }}</span>
             </div>
-            <!-- <div class="info-item" @click="show=true">
-              <span>银行卡</span>
+            <div class="info-item" @click="show=true">
+              <span>支付渠道</span>
               <span>
-                <img :src="checkType.img" >
-                <span>{{ checkType.bank_full_name }}</span>
-                <span v-if="sectctNong">({{ selectLast(checkType) }})</span>
+                <img :src="payTypeObj.img" >
+                <span>{{ payTypeObj.payType_n }}</span>
                 <img class="arrow" src="@/assets/payment/go.png" >
               </span>
-            </div> -->
-            <list-item :item-height="44">
+            </div>
+            <!-- <list-item :item-height="44">
               <item :showArrow="true" @click.native="selectPayType">
                 <div slot="name">支付渠道</div>
                 <input
                   slot="content" v-model="payTypeObj.payType_n" readonly>
               </item>
-            </list-item>
+            </list-item> -->
           </div>
           <bottom-tab>
             <tab-button class="foot" @click.native="checkPay">去支付</tab-button>
@@ -146,22 +107,21 @@
           <span>手续费</span>
           <span>+¥{{ serviceCharge }}</span>
         </div>
-        <list-item :item-height="44">
+        <!-- <list-item :item-height="44">
           <item :showArrow="true" @click.native="selectPayType">
             <div slot="name">支付渠道</div>
             <input
               slot="content" v-model="payTypeObj.payType_n" readonly>
           </item>
-        </list-item>
-        <!-- <div class="info-item" @click="show=true">
-          <span>银行卡</span>
+        </list-item> -->
+        <div class="info-item" @click="show=true">
+          <span>支付渠道</span>
           <span>
-            <img :src="checkType.img" >
-            <span>{{ checkType.bank_full_name }}</span>
-            <span v-if="sectctNong">({{ selectLast(checkType) }})</span>
+            <img :src="payTypeObj.img" >
+            <span>{{ payTypeObj.payType_n }}</span>
             <img class="arrow" src="@/assets/payment/go.png" >
           </span>
-        </div> -->
+        </div>
       </div>
     </h-content>
     <bottom-tab>
@@ -188,6 +148,7 @@ import zg from '@/assets/payment/zg.png'
 import zs from '@/assets/payment/zs.png'
 import zx from '@/assets/payment/zx.png'
 import bank from '@/assets/payment/bank.png'
+import yinlian from '@/assets/payment/bind.png'
 export default {
   name: 'PayEntry',
   components: {},
@@ -209,6 +170,7 @@ export default {
       },
       payTypeList: [],
       payTypeObj: {
+        img: ny,
         payType: 'ABC_PAY',
         payType_n: '农行支付',
       },
@@ -317,37 +279,11 @@ export default {
       })
     },
     selectImg (e) {
-      if (e.bank_full_name.indexOf('建设') !== -1) {
-        return js
-      } else if (e.bank_full_name.indexOf('农业') !== -1) {
+      if (e.code_name.indexOf('农行') !== -1) {
         e.recommand = true
         return ny
-      } else if (e.bank_full_name.indexOf('光大') !== -1) {
-        return gd
-      } else if (e.bank_full_name.indexOf('广发') !== -1) {
-        return gf
-      } else if (e.bank_full_name.indexOf('浦') !== -1) {
-        return pf
-      } else if (e.bank_full_name.indexOf('工商') !== -1) {
-        return gs
-      } else if (e.bank_full_name.indexOf('交通') !== -1) {
-        return jt
-      } else if (e.bank_full_name.indexOf('民生') !== -1) {
-        return ms
-      } else if (e.bank_full_name.indexOf('平安') !== -1) {
-        return pa
-      } else if (e.bank_full_name.indexOf('兴业') !== -1) {
-        return xy
-      } else if (e.bank_full_name.indexOf('邮') !== -1) {
-        return yzcx
-      } else if (e.bank_full_name.indexOf('中国') !== -1) {
-        return zg
-      } else if (e.bank_full_name.indexOf('招商') !== -1) {
-        return zs
-      } else if (e.bank_full_name.indexOf('中信') !== -1) {
-        return zx
-      } else {
-        return bank
+      } else if (e.code_name.indexOf('银联') !== -1) {
+        return yinlian
       }
     },
     selectLast (item) {
@@ -358,22 +294,10 @@ export default {
       this.select = way
     },
     ischeck (way) {
-      if (way === 'one') {
-        this.checkType.bank_full_name = '支付宝'
-        this.checkType.img = zfb
-        this.sectctNong = false
-      } else if (way === 'two') {
-        this.checkType.bank_full_name = '微信'
-        this.checkType.img = wx
-        this.sectctNong = false
-      } else {
-        this.checkType.bank_full_name = way.bank_full_name
-        this.checkType.bank_account_num = way.bank_account_num
-        this.checkType.img = this.selectImg(way)
-        this.sectctNong = true
-      }
+      this.payTypeObj.payType = way.code
+      this.payTypeObj.payType_n = way.code_name
+      this.payTypeObj.img = this.selectImg(way)
       this.show = false
-      this.showOutside = false
     },
     confirmToPay (e) {
       let vm = this
@@ -386,7 +310,7 @@ export default {
         info: {
           order_id: vm.$route.params.order_id,
           fee: vm.serviceCharge,
-          bank_account_id: vm.bank_account_id,
+          bank_account_id: '9099',
           pay_type: vm.payTypeObj.payType,
         },
       }

src/pages/pay/pay-page.vue

@@ -103,6 +103,7 @@
     </h-content>
     <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>
       <tab-button v-if="isGo" class="foot" @click.native="goMyInfo">返回个人中心</tab-button>
     </bottom-tab>
@@ -129,11 +130,13 @@ export default {
       isSuccess: false,
       isFaild: false,
       isGo: false,
+      nextPay: false,
     }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.showSelect = false
+      vm.nextPay = false
       vm.showpay = true
       vm.isSuccess = false
       vm.isFaild = false
@@ -147,10 +150,8 @@ export default {
   computed: {
     isShowpayInfo () {
       if (this.isSuccess ^ this.isFaild == 0) {
-        debugger
         return true
       } else if (this.isSuccess ^ this.isFaild == 1) {
-        debugger
         return false
       }
     },
@@ -202,7 +203,6 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.info, res.info)
-          vm.isGo = true
           vm.showSelect = false
         } else {
           hlsPopup.showLongCenter(res.message)
@@ -226,22 +226,28 @@ export default {
             hlsPopup.showLongCenter(res.error_message)
           } else {
             if (res.status === '01') {
+              vm.nextPay = true
               vm.isSuccess = false
               vm.isFaild = false
-              hlsPopup.showLongCenter('可再次提交')
+              hlsPopup.showLongCenter('支付未完成')
             } else if (res.status === '02') {
+              vm.nextPay = true
               vm.isSuccess = false
               vm.isFaild = false
-              hlsPopup.showLongCenter('正在支付...')
+              hlsPopup.showLongCenter('支付未完成')
             } else if (res.status === '03') {
+              vm.isGo = true
               vm.isSuccess = true
               vm.isFaild = false
               hlsPopup.showLongCenter('交易成功')
             } else if (res.status === '04') {
+              vm.isGo = true
               vm.isSuccess = true
               vm.isFaild = false
               hlsPopup.showLongCenter('交易完成')
             } else {
+              vm.isGo = true
+
               vm.isSuccess = false
               vm.isFaild = true
               hlsPopup.showLongCenter('交易失败')