Merge branch 'pay' into feat/vipLife

# Conflicts:
#	src/views/vipLife/index.vue

src/service/pay.js

@@ -77,12 +77,12 @@ function payByWeixinH5(info) {
  * @return:
  */
 function payByALIH5(info) {
-  if (!info.order_string) return;
-  console.log('ali:', info.order_string);
+  if (!info.url) return;
+  console.log('ali:', info.url);
   const aliWrap = document.createElement('div');
   aliWrap.id = 'ALIWEB_WRAP';
   aliWrap.setAttribute('id', 'ALIWEB_WRAP');
-  aliWrap.innerHTML = info.order_string;
+  aliWrap.innerHTML = info.url;
   document.body.appendChild(aliWrap);
   document.forms[0].submit();
 

src/service/utils.service.js

@@ -418,7 +418,6 @@ export const APP_DOWN_URL = 'https://misc.lkbang.net/download/yxm.html';
 
 export function throttle(fn, wait) {
   let flag = true;
-  console.log(fn);
   return function() {
     if (flag) {
       fn.apply(this, arguments);

src/views/home/components/RechargeInput.vue

@@ -10,17 +10,17 @@
       class="center-phone-field"
       placeholder="请输入手机号码"
       @input="changeTelFormat"
-      @blur="searchPhoneNoHome"
+      @blur="searchPhoneNo(rechargeTel)"
+      @focus="inputBlur = true"
     />
     <div class="center-phone__list" :class="{ show: inputBlur }">
       <div
         v-for="(item, index) in list"
         :key="index"
         class="center-phone__list-item"
-        @click="searchPhoneNoHome(item)"
+        @click="selectPhone(item)"
       >
-        <span class="phone">{{ phoneFormat(item.phone) }}</span>
-        <span class="phone-home">{{ item.home }}</span>
+        <span class="phone">{{ phoneFormat(item) }}</span>
         <span v-if="index === 0" class="current">上次充值</span>
       </div>
     </div>
@@ -65,18 +65,29 @@ export default {
         this.queryhome();
       }
     },
-    async searchPhoneNoHome() {
+    async searchPhoneNo() {
       if (!this.phoneNo) return;
       if (!checkPhoneFormat(this.phoneNo)) {
         this.$toast.fail('请您输入正确的手机号');
-        this.$emit('input', { phoneNo: '', phoneNoHome: this.phoneNoHome });
+        this.input();
         return;
       }
-      this.$emit('input', { phoneNo: this.phoneNo, phoneNoHome: this.phoneNoHome });
+      !this.phoneHome && this.queryhome();
+      this.input();
+    },
+    selectPhone(phone) {
+      this.inputBlur = false;
+      if (phone) {
+        this.rechargeTel = phoneFormat(phone);
+      }
+      this.searchPhoneNo();
     },
     async queryhome() {
       const [data] = await getPhoneHome(this.phoneNo);
       this.phoneNoHome = data?.phoneHome;
+      this.input();
+    },
+    input() {
       this.$emit('input', { phoneNo: this.phoneNo, phoneNoHome: this.phoneNoHome });
     }
   }
@@ -87,6 +98,9 @@ export default {
   position: relative;
   &-phone {
     border-bottom: @border-width-base solid @gray-2;
+    .cr-field:not(:last-child)::after {
+      display: none;
+    }
     .cr-cell__title {
       display: none;
     }
@@ -103,9 +117,11 @@ export default {
       text-indent: -2px;
     }
     &__list {
-      // display: none;
+      display: none;
       position: absolute;
-      top: 50px;
+      top: 100px;
+      width: 100%;
+      margin: auto;
       left: -@padding-lg;
       right: -@padding-lg;
       z-index: 3;

src/views/home/components/RechargeList.vue

@@ -51,7 +51,7 @@ export default {
   methods: {
     async changeRechargeType(name) {
       const [data] = await getSkuList(
-        this.phoneRecharge[`${name}SpuNo`],
+        this.phoneRecharge[`${name}SpuNos`],
         this.phoneRecharge[`${name}Type`]
       );
       this.$emit('changeRechargetype', name);

src/views/home/index.vue

@@ -50,7 +50,7 @@ export default {
       phoneRecharge: {},
       userPhoneInfo: {},
       rechargeType: 'recharge',
-      historyRecordList: [{}, {}],
+      historyRecordList: ['17611682272', '222222222'],
       rechargePhoneInfo: {},
       selectedRechargeInfo: {}
     };
@@ -67,10 +67,10 @@ export default {
     const [data] = await getSpuList();
     if (data) {
       this.vipLife = data.vipLife || [];
-      this.phoneRecharge = data.phoneRecharge || {};
-      this.userPhoneInfo = data.userPhoneInfo || {};
-      this.rechargePhoneInfo = data.userPhoneInfo || {};
-      localStorage.set('phoneNo', data.userPhoneInfo.phoneNo);
+      this.phoneRecharge = data?.phoneRecharge || {};
+      this.userPhoneInfo = data?.userPhoneInfo || {};
+      this.rechargePhoneInfo = data?.userPhoneInfo || {};
+      localStorage.set('phoneNo', data?.userPhoneInfo?.phoneNo);
     }
   },
   methods: {
@@ -80,7 +80,7 @@ export default {
     },
     async goOrderApi() {
       /* 需要加防抖 */
-      const { skuNo, salePrice } = this.selectedRechargeInfo;
+      const { skuNos, salePrice } = this.selectedRechargeInfo;
       const token = localStorage.get('vccToken');
       if (!token) {
         await getTokenFromNative();
@@ -88,12 +88,12 @@ export default {
       const [res] = await orderApi.orderCreate({
         totalFee: salePrice,
         terminal: 'H5',
-        account: this.rechargePhoneInfo.phoneNo,
-        registrationLocation: this.rechargePhoneInfo.phoneNoHome,
+        account: this.rechargePhoneInfo?.phoneNo,
+        registrationLocation: this.rechargePhoneInfo?.phoneNoHome,
         virtualRechargeType: this.phoneRecharge[`${this.rechargeType}Type`],
         skuList: [
           {
-            skuNo,
+            skuNo: skuNos,
             count: 1
           }
         ]

src/views/orderDetail/index.vue

@@ -188,7 +188,8 @@ export default {
       this.showCancelPopup = true;
     },
     toPay() {
-      this.$router.push({ path: '/pay', query: { orderNo: this.currentOrder.orderNo } });
+      console.log(this.currentOrder.orderNo);
+      this.$router.push({ path: '/pay', query: { orderNo: this.orderNo } });
     },
     toGoods() {
       this.$router.push({

src/views/pay/components/PayCardItem.vue

@@ -10,10 +10,8 @@
                 <p class="content-info-tit">{{ value.name }}</p>
                 <p v-if="value.tagName" class="content-info-tit_tag">{{ value.tagName }}</p>
               </div>
-              <p v-if="isGroupPay && value.mergePayPretreatmentInfo" class="content-info-amount">
-                {{
-                  value.mergePayPretreatmentInfo && value.mergePayPretreatmentInfo.creditPayAmt
-                }}.00
+              <p v-if="isGroupPay && value.payAmt" class="content-info-amount">
+                {{ value.payAmt }}
               </p>
             </div>
             <p>{{ value.accountStatusDesc }}</p>
@@ -65,12 +63,12 @@ export default {
     couponDisabled: Boolean
   },
   methods: {
-    changePayType({ payType }) {
+    changePayType({ payType, mergePayPretreatmentInfo }) {
       if (this.disabled || this.value.disabled) {
         return;
       }
       this.$emit('click');
-      this.pay.changePayType(payType);
+      this.pay.changePayType(payType, mergePayPretreatmentInfo);
     },
     openCouponModal() {
       if (this.couponDisabled) return;

src/views/pay/components/PayGroupCard.vue

@@ -20,7 +20,6 @@
         @click.native="changePayType(thirdPayInfo)"
       />
     </div>
-    <!-- <PayCardItem :is-group-pay="true" :value="thirdPayInfo" /> -->
     <div class="groupCard">
       <PayCardItem :is-group-pay="true" :value="thirdPayInfo" />
     </div>
@@ -69,7 +68,13 @@ export default {
       let temp = {};
       for (const key in this.value) {
         if (this.value[key].isRecommend || this.value[key].isCheck) {
-          temp = { ...this.value[key] };
+          const mergePayPretreatmentInfo = this.value[key]?.mergePayPretreatmentInfo || {};
+          temp = {
+            ...this.value[key],
+            payAmt: mergePayPretreatmentInfo?.otherPayAmt
+          };
+          // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+          this.creditPayInfo.payAmt = mergePayPretreatmentInfo.creditPayAmt;
         }
       }
       return temp;
@@ -84,6 +89,7 @@ export default {
   },
   methods: {
     changePayType({ payType, mergePayPretreatmentInfo }) {
+      console.log(mergePayPretreatmentInfo, 'mergePayPretreatmentInfo');
       if (this.disabled || this.creditPayInfo.disabled) {
         return;
       }

src/views/pay/index.vue

@@ -106,7 +106,6 @@ import {
   payTypeE,
   CREDIT_PAY,
   WECHAT_PAY,
-  ALIPAY_PAY,
   PAY_SUCCESS,
   creditStatus,
   IS_THIRD_PAY,
@@ -227,6 +226,7 @@ export default {
       }
       if (displayInfo.payCouponInfo && displayInfo.payCouponInfo.optimalPayCoupon) {
         this.selectedCoupon = displayInfo.payCouponInfo.optimalPayCoupon;
+        this.selectedCoupon.id = this.selectedCoupon.pickupId;
         this.showCoupon = displayInfo.payCouponInfo.optimalType === 3;
       }
       this.payContractInfo = displayInfo.payContractInfo || {};
@@ -259,6 +259,9 @@ export default {
               displayInfo[key].disabled = true;
             }
             this.creditPayList.isGroupPay = IS_GROUP_PAY(p.method);
+            if (p.isDefault) {
+              this.mergePayPretreatmentInfo = p.mergePayPretreatmentInfo;
+            }
             this.$set(this.creditPayList.payList, key, {
               ...displayInfo[key],
               ...p,
@@ -267,10 +270,18 @@ export default {
               isCheck: p.isDefault || false,
               isGroupPay: IS_GROUP_PAY(p.method)
             });
+            if (!('creditPayInfo' in this.creditPayList.payList)) {
+              this.$set(this.creditPayList.payList, 'creditPayInfo', {
+                ...displayInfo['creditPayInfo'],
+                show: true,
+                isCheck: false
+              });
+            }
             break;
           }
         }
       }
+
       if (this.payType === CREDIT_PAY && displayInfo.creditPayInfo.disabled) {
         this.payType = null;
       }
@@ -350,13 +361,16 @@ export default {
     /* 获取优惠券信息 */
     async getCouponList(orderNo) {
       const [data] = await getCoupon({ orderNo: orderNo });
+      this.payCouponList = [];
       if (data && data.coupons) {
-        this.payCouponList = data.coupons.filter(item => {
+        data.coupons.forEach(item => {
           if (item.couponCategory === 21) {
-            return {
+            this.payCouponList.push({
               ...item,
-              id: item.pickupId
-            };
+              id: item.pickupId,
+              pickupAble: 1, // 需要判断是否可用
+              limitAmount: item.limitDesc
+            });
           }
         });
       }
@@ -376,10 +390,10 @@ export default {
       this.isDetention = false;
       /* 设置密码 */
       if (this.payType === CREDIT_PAY && !this.creditPayInfo.hasPwd) {
-        const url = `${this.creditPayInfo.pwdSetJumpUrl}&vccChannel=${VCC_CHANNEL}`;
-        this.goH5(url);
+        this.retrieveLink();
         return;
       }
+      localStorage.set('orderNo', { orderNo: this.orderNo });
       const paramsData = {
         ...params,
         quitUrl: `${window.location.origin}/payWaiting`,
@@ -396,45 +410,38 @@ export default {
       /* 支付失败 */
       if (error) {
         if (codeArr.indexOf(error.response.businessCode) < 0) {
-          this.payResult('Fail', error.msg);
+          this.payResult('Fail', error.message);
           return;
         }
-        this.error = error.msg;
+        this.error = error.message;
         return;
       }
-      const { creditPayInfo = {}, wxPayInfo, flowOrderNo, aliPayInfo } = data;
+      const { creditPayInfo = {}, wxPayInfo = {}, flowOrderNo, aliPayInfo = {} } = data;
       const creditPayStatus = creditPayInfo.creditPayStatus;
       this.flowOrderNo = flowOrderNo;
-
-      if (!params && this.payType === WECHAT_PAY) {
+      if (wxPayInfo.mwebUrl) {
         /* 微信支付 */
         payByWay(this.tradeType, { ...wxPayInfo, url: wxPayInfo.mwebUrl });
         return;
-      }
-      if (!params && this.payType === ALIPAY_PAY) {
+      } else if (aliPayInfo.order_string) {
         /* 支付宝支付 */
-        payByWay('ALIWEB', aliPayInfo);
+        payByWay('ALIWEB', { ...aliPayInfo, url: aliPayInfo.order_string });
         return;
-      }
-      if (creditPayStatus === PAY_SUCCESS) {
-        if (IS_GROUP_PAY(this.payType)) {
-          //组合支付成功后跳转支付中
-          this.payResult('Waiting');
-          return;
-        }
-        /*  支付成功 */
+      } else if (creditPayStatus === PAY_SUCCESS) {
+        /*  信用支付成功 */
         this.close();
         this.payResult('Success');
         return;
-      }
-      if (creditPayStatus === PAYMENT_CODE_PAY || creditPayStatus === SMS_VERIFICATION_CODE_PAY) {
+      } else if (
+        creditPayStatus === PAYMENT_CODE_PAY ||
+        creditPayStatus === SMS_VERIFICATION_CODE_PAY
+      ) {
         /* 密码或者短信鉴权 */
         this.close();
         this[`${creditPayStatusType[creditPayStatus]}Modal`] = true;
         return;
-      }
-      /* 人脸鉴权 */
-      if (creditPayStatus === FACE_VERIFICATION_CODE_PAY) {
+      } else if (creditPayStatus === FACE_VERIFICATION_CODE_PAY) {
+        /* 人脸鉴权 */
         this.goOcr();
       }
     },
@@ -473,7 +480,6 @@ export default {
       console.log(id, selectedCoupon);
       registeredEvents('PD_YXMMACP_UserClickCouponPopupWindowComfirmBtn');
       this.selectedCoupon = selectedCoupon || {};
-      console.log(this.selectedCoupon);
       const status = this.checkStatus(this.creditPayInfo, this.displayInfo);
       if (status) {
         this.displayInfo.creditPayInfo.disabled = true;

src/views/pay/payResult.vue

@@ -53,12 +53,12 @@ export default {
     return {
       money: '00.00',
       orderNo: null,
-      isSuccess: null,
-      freeAmount: null
+      isSuccess: false,
+      freeAmount: 0
     };
   },
   created() {
-    const { amount, orderNo, freeAmount, reason } = this.$route.query;
+    const { amount = null, orderNo, freeAmount = null, reason } = this.$route.query;
     const { success } = this.$route.meta;
     this.money = amount;
     this.orderNo = orderNo;

src/views/pay/payWaiting.vue

@@ -23,8 +23,8 @@
   </div>
 </template>
 <script>
-import { registeredEvents } from '@/service/sa.service';
 import { queryPayStatus } from '@/api/pay.api';
+import localStorage from '@/service/localStorage.service';
 export default {
   components: {},
   data() {
@@ -35,19 +35,14 @@ export default {
     };
   },
   created() {
-    const { orderNo } = this.$route.query;
-    this.orderNo = orderNo;
+    this.orderNo = this.$route.query.orderNo || localStorage.get('orderNo')?.orderNo;
   },
   mounted() {
     // eslint-disable-next-line space-before-function-paren
     this.timer = setInterval(async () => {
       this.time -= 1;
       if (this.time % 2 === 0) {
-        const [data] = await queryPayStatus({ orderNo: this.orderNo });
-        if (data.payStatus === 3) {
-          this.goPay();
-        }
-        // 结果处理，如果未支付弹窗提示是否支付成功，跳转支付中页面
+        this.query();
       }
       if (this.time < 1) {
         clearInterval(this.timer);
@@ -59,18 +54,42 @@ export default {
   },
   methods: {
     goHome() {
-      // 去页面
+      // 去首页
       this.$router.replace({ name: 'home' });
     },
+    goSuccess() {
+      // 支付成功
+      this.$router.replace({ name: 'paySuccess' });
+    },
     goOrderDetail() {
-      this.$router.replace({ name: 'orderDetail', query: { order: this.orderNo } });
+      this.$router.replace({ name: 'orderDetail', query: { orderNo: this.orderNo } });
       // 去订单详情页面
     },
-    goPay() {
-      registeredEvents('PD_YXMMAEC_UserClickCashierPaymentAgainBtn', {
-        order_id: this.orderNo
-      });
-      this.$router.replace({ name: 'pay', query: { order: this.orderNo } });
+    async query() {
+      const [data, error] = await queryPayStatus({ orderNo: this.orderNo });
+      console.log(this.orderNo);
+      if (error) {
+        this.$router.replace({
+          name: 'payFail',
+          query: { reason: error.message, orderNo: this.orderNo }
+        });
+        return;
+      }
+      if (+data?.payStatus === 3) {
+        this.goSuccess();
+      }
+      //  else if (+data?.payStatus === 1) {
+      //   this.$dialog({
+      //     message: '是否支付成功？',
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     confirmButtonColor: '#EC1500',
+      //     onCancel: () => {},
+      //     onConfirm: () => {
+      //       this.query();
+      //     }
+      //   });
+      // }
     }
   }
 };