Merge branch 'liuxin' into develop

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

@@ -46,7 +46,7 @@
       </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="footer" @click.native="pay">支&nbsp;&nbsp;付</tab-button>
+      <tab-button class="footer" @click.native="pay">提交订单</tab-button>
     </bottom-tab>
   </h-view>
 </template>

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

@@ -14,7 +14,7 @@
         <div class="down">
           <div class="top">
             <img src="@/assets/payment/back.png" @click="show=false" >
-            <span>支付方式</span>
+            <span>选择银行卡</span>
           </div>
           <scroll>
             <list-item :item-height="56" class="pay-way">
@@ -86,7 +86,7 @@
         <div class="down">
           <div class="top">
             <img src="@/assets/payment/back.png" @click="confirm=false" >
-            <span>确认付款</span>
+            <span>确认付款方式</span>
           </div>
           <div class="info">
             <div class="info-item">
@@ -100,26 +100,71 @@
               <span>手续费</span>
               <span>+¥{{ serviceCharge |currency }}</span>
             </div>
-            <div class="info-item" @click="show=true">
+            <div class="info-item" @click="wayShow=true">
               <span>付款方式</span>
               <span>
-                <img :src="checkType.img" >
-                <span>{{ checkType.bank_full_name }}</span>
-                <span v-if="sectctNong">({{ selectLast(checkType) }})</span>
+                <img :src="checkPayWay.img" >
+                <span>{{ checkPayWay.pay_type_name }}</span>
                 <img class="arrow" src="@/assets/payment/go.png" >
               </span>
             </div>
           </div>
           <bottom-tab>
-            <tab-button class="foot" @click.native="checkPay">立即支付</tab-button>
+            <tab-button class="foot" @click.native="checkPay">去支付</tab-button>
           </bottom-tab>
         </div>
       </div>
     </transition>
+    <transition name="trans">
+      <div v-show="wayShow" class="modal-show-payWay">
+        <div class="down">
+          <div class="top">
+            <img src="@/assets/payment/back.png" @click="wayShow=false" >
+            <span>选择支付方式</span>
+          </div>
+          <scroll>
+            <list-item :item-height="56" class="pay-way">
+              <item
+                v-for="(item,index) in notNongList"
+                :proportion="[7,1,1]"
+                :key="index"
+                @click.native="isSelect(`bind`);ischeckPay(item)"
+              >
+                <div slot="name" style="flex=3">
+                  <img src="@/assets/payment/bind.png" alt class="icon" >
+                  {{ item.pay_type_name }}
+                </div>
+                <section slot="content">
+                  <img v-show="select === `bind`" src="@/assets/payment/select.png" alt >
+                  <img v-show="select !== `bind`" src="@/assets/payment/unselect.png" alt >
+                </section>
+              </item>
+            </list-item>
+            <list-item :item-height="56" class="pay-way">
+              <item
+                v-for="(item,index) in nongPayList"
+                :proportion="[7,1,1]"
+                :key="index"
+                @click.native="isSelect(`pay${index}`);ischeckPay(item)"
+              >
+                <div slot="name" style="flex=3">
+                  <img src="@/assets/payment/ly.png" alt class="icon" >
+                  {{ item.pay_type_name }}
+                </div>
+                <section slot="content">
+                  <img v-show="select === `pay${index}`" src="@/assets/payment/select.png" alt >
+                  <img v-show="select !== `pay${index}`" src="@/assets/payment/unselect.png" alt >
+                </section>
+              </item>
+            </list-item>
+          </scroll>
+        </div>
+      </div>
+    </transition>
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
-        <span>支付中心</span>
+        <span>{{ title }}</span>
       </div>
     </h-header>
     <h-content class="entry-content">
@@ -140,7 +185,7 @@
           <span>+¥{{ serviceCharge }}</span>
         </div>
         <div class="info-item" @click="show=true">
-          <span>付款方式</span>
+          <span>银行卡</span>
           <span>
             <img :src="checkType.img" >
             <span>{{ checkType.bank_full_name }}</span>
@@ -151,7 +196,7 @@
       </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="foot" @click.native="affirm">确认支付</tab-button>
+      <tab-button class="foot" @click.native="affirm">确认订单</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -174,12 +219,14 @@ 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: {},
   data () {
     return {
       money: '',
+      wayShow: false,
       timer: null,
       select: 'three0',
       name: '',
@@ -191,6 +238,10 @@ export default {
         bank_full_name: '',
         bank_account_num: '',
       },
+      checkPayWay: {
+        img: '',
+        pay_type_name: '',
+      },
       confirm: false,
       show: false,
       showOutside: false,
@@ -200,9 +251,18 @@ export default {
       flag: false, // 用于判断是否有农业银行卡
       lists: [],
       nongBank: [], // 存农行卡
+      notNongList: [],
+      nongPayList: [],
     }
   },
   computed: {
+    title () {
+      if (this.confirm) {
+        return '支付中心'
+      } else {
+        return '确认订单'
+      }
+    },
     serviceCharge () {
       return (this.money * (this.rate / 100)).toFixed(2)
     },
@@ -244,6 +304,35 @@ export default {
     this.money = this.$route.params.money
   },
   methods: {
+    ischeckPay (way) {
+      this.checkPayWay.pay_type_name = way.pay_type_name
+      if (way.pay_type_name === '银联支付') {
+        this.checkPayWay.img = yinlian
+      } else {
+        debugger
+        this.checkPayWay.img = ny
+      }
+      this.sectctNong = true
+      this.wayShow = false
+    },
+    getPayType () {
+      let vm = this
+      let url = process.env.basePath + 'payment_type_query'
+      let param = {}
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.notNongList = res.lists.filter(i => {
+            return i.pay_type === 'ABC_UNION'
+          })
+          vm.nongPayList = res.lists.filter(i => {
+            return i.pay_type === 'ABC_KM' || i.pay_type === 'ABC_KL'
+          })
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     selectImg (e) {
       if (e.bank_full_name.indexOf('建设') !== -1) {
         return js
@@ -364,6 +453,7 @@ export default {
     affirm () {
       this.confirm = true
       this.confirmToPay()
+      this.getPayType()
     },
     changePage () {
       this.$router.push({
@@ -466,7 +556,7 @@ export default {
           width: 20px;
         }
         span {
-          margin-left: 38%;
+          margin-left: 30%;
           font-family: PingFangSC-Semibold;
           font-size: 16px;
           color: #656464;
@@ -479,6 +569,94 @@ export default {
       }
     }
   }
+  .modal-show-payWay{
+     width: 100%;
+    height: 100%;
+    position: absolute;
+    display: flex;
+    z-index: 910;
+    background-color: rgba(56, 63, 69, 0.3);
+    justify-content: center;
+    align-items: center;
+    .down {
+      height: 466px;
+      width: 100%;
+      position: relative;
+      top: 18%;
+      background: #fff;
+      border-radius: 12px 12px 0 0;
+      overflow: scroll;
+      display: flex;
+      align-items: center;
+      flex-direction: column;
+      .top {
+        left: 24px;
+        width: 330px;
+        height: 54px;
+        display: flex;
+        align-items: center;
+        background-color: #fff;
+        img {
+          width: 20px;
+        }
+        span {
+          margin-left: 38%;
+          font-family: PingFangSC-Semibold;
+          font-size: 16px;
+          color: #656464;
+          letter-spacing: 0.49px;
+          text-align: center;
+        }
+      }
+      .pay-way {
+        //width: 350px;
+        //margin: 0 auto;
+        width: 100%;
+        padding: 0 4% 0 4%;
+        background: #fff;
+        .hls-item {
+          padding-left: 12px;
+          .add-name {
+            flex: 3;
+            line-height: 56px;
+            font-family: PingFangSC-Regular;
+            font-size: 14px;
+            color: #656464;
+            div {
+              display: flex;
+              justify-content: center;
+              align-items: center;
+            }
+            .icon1 {
+              width: 34px;
+              height: 34px;
+              display: block;
+              float: left;
+              margin-top: 10px;
+              margin-right: 5px;
+            }
+            .icon2 {
+              width: 32px;
+              display: block;
+              float: left;
+              margin-top: 12px;
+              margin-right: 8px;
+            }
+            .icon {
+              width: 30px;
+              margin: 0 8px 0 3px;
+            }
+          }
+
+          .add-content {
+            img {
+              width: 21px;
+            }
+          }
+        }
+      }
+    }
+  }
   .modal-show-bank {
     width: 100%;
     height: 100%;

src/pages/userBindNew/np/invoice-info.vue

@@ -99,6 +99,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.invoiceInfo = {}
       if (from.name === 'NPBaseInfo' && window.localStorage.from) {
         vm.getInvoice()
       }
@@ -121,7 +122,7 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          Object.assign(vm.invoiceInfo, res.info)
+          vm.invoiceInfo = res.info
         } else {
           hlsPopup.showLongCenter(res.message)
         }