Merge branch 'master' into feature/activity

package-lock.json

@@ -5563,6 +5563,11 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "fastclick": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
+      "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
+    },
     "faye-websocket": {
       "version": "0.10.0",
       "resolved": "http://npmprivate.quantgroups.com/faye-websocket/-/faye-websocket-0.10.0.tgz",

package.json

@@ -18,6 +18,7 @@
     "clipboard": "^2.0.8",
     "core-js": "^3.6.5",
     "crypto-js": "^3.3.0",
+    "fastclick": "^1.0.6",
     "js-cookie": "^2.2.1",
     "node-forge": "^0.10.0",
     "raven-js": "^3.27.2",

src/main.js

@@ -13,6 +13,9 @@ import RavenVue from 'raven-js/plugins/vue';
 import { release } from '../.sentryclirc';
 import fontResize from './directives/fontResize';
 import cfg from './config';
+import FastClick from 'fastclick';
+FastClick.attach(document.body, { tapDelay: 1 });
+
 if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV === 'production') {
   Raven.config('//7fc2cea5ef8244fd9b4cf13051e408d8@sentry.quantgroups.com/73', {
     release,

src/router/routes.js

 export default [
   {
     path: '/',
-    redirect: '/vipLife'
+    redirect: '/home'
   },
   {
     path: '/home',

src/views/home/index.vue

@@ -20,7 +20,7 @@
           :disabled="!disabled"
           @click="goOrder"
         >
-          {{ selectedRechargeInfo.price ? `¥${selectedRechargeInfo.price}` : '' }} 立即充值
+          {{ selectedRechargeInfo.salePrice ? `¥${selectedRechargeInfo.salePrice}` : '' }} 立即充值
         </cr-button>
       </div>
     </div>
@@ -81,13 +81,13 @@ export default {
       this.selectedRechargeInfo = rechargeInfo;
     },
     async goOrderApi() {
-      const { skuNo, price } = this.selectedRechargeInfo;
+      const { skuNo, price, salePrice } = this.selectedRechargeInfo;
       this.$track.registeredEvents('h5_RechargeCenterPagePhoneBillClick', {
         recharge_type: this.phoneRecharge[`${this.rechargeType}Type`] === 601 ? '快充' : '慢充',
         cost_value: price
       });
       const [res, error] = await orderApi.orderCreate({
-        totalFee: price,
+        totalFee: salePrice,
         terminal: 'H5',
         account: this.rechargePhoneInfo?.phoneNo,
         registrationLocation: this.rechargePhoneInfo?.phoneNoHome,

src/views/pay/components/PayCardItem.vue

@@ -23,7 +23,7 @@
         <div v-if="showCoupon && value.payType === 1" class="coupon">
           <p class="couponDes" :class="{ disable: couponDisabled }" @click.stop="openCouponModal">
             <span v-if="couponInfo.pickupId">
-              {{ `满${couponInfo.limitAmount}减${couponInfo.faceValue}元` }}
+              {{ `满${couponInfo.limitAmountNew}减${couponInfo.faceValueNew}元` }}
             </span>
             <span v-else>
               未选择优惠券

src/views/pay/index.vue

@@ -191,9 +191,9 @@ export default {
       return this.isRiskLimit();
     },
     amount() {
-      return IS_THIRD_PAY(this.payType) || !this.selectedCoupon.faceValue
+      return IS_THIRD_PAY(this.payType) || !this.selectedCoupon.faceValueNew
         ? this.displayInfo.orderAmt
-        : (this.displayInfo.orderAmt - this.selectedCoupon.faceValue).toFixed(2);
+        : (this.displayInfo.orderAmt - this.selectedCoupon.faceValueNew).toFixed(2);
     },
     isShowProtocol() {
       return (
@@ -204,7 +204,7 @@ export default {
     },
     canUseAmount() {
       return (
-        ((this.selectedCoupon?.faceValue && +this.selectedCoupon.faceValue) || 0) +
+        ((this.selectedCoupon?.faceValueNew && +this.selectedCoupon.faceValueNew) || 0) +
         ((this.displayInfo?.creditPayInfo?.canAmt && +this.displayInfo.creditPayInfo.canAmt) || 0) -
         ((this.displayInfo?.orderAmt && +this.displayInfo.orderAmt) || 0)
       );
@@ -334,7 +334,7 @@ export default {
       const { accountStatus, riskManagementAmt } = this.creditPayInfo;
       const { orderAmt } = this.displayInfo;
       if (accountStatus === ACCOUNT_APPLY_SUCCESS) {
-        const coupon = +this.selectedCoupon.faceValue || 0;
+        const coupon = +this.selectedCoupon.faceValueNew || 0;
         return +riskManagementAmt + coupon < +orderAmt;
       } else {
         return false;
@@ -363,7 +363,7 @@ export default {
           };
         } else if (accountStatus === ACCOUNT_APPLY_SUCCESS) {
           const finalCount = this.showCoupon
-            ? (this.displayInfo.orderAmt - (this.selectedCoupon.faceValue || 0)).toFixed(2)
+            ? (this.displayInfo.orderAmt - (this.selectedCoupon.faceValueNew || 0)).toFixed(2)
             : this.displayInfo.orderAmt;
           const txt = `实际支付${finalCount || '0.00'}`;
           this.accountS = {
@@ -544,6 +544,12 @@ export default {
         coupon_id: id
       });
       this.selectedCoupon = selectedCoupon || {};
+      if (!('faceValueNew' in this.selectedCoupon) && 'faceValue' in this.selectedCoupon) {
+        this.selectedCoupon.faceValueNew = this.selectedCoupon.faceValue;
+      }
+      if (!('limitAmountNew' in this.selectedCoupon) && 'limitAmount' in this.selectedCoupon) {
+        this.selectedCoupon.limitAmountNew = this.selectedCoupon.limitAmount;
+      }
       this.getBtnStatus(this.isRiskLimit());
       this.couponPopup = false;
     },
@@ -606,7 +612,7 @@ export default {
       return Object.keys(obj);
     },
     setAmount() {
-      const faceValue = +this.selectedCoupon?.faceValue || 0;
+      const faceValue = +this.selectedCoupon?.faceValueNew || 0;
       const orderAmt = +this.displayInfo?.orderAmt || 0;
       const finalAmt =
         IS_THIRD_PAY(this.payType) || !this.showCoupon

src/views/vipLife/components/AccountInput.vue

@@ -5,7 +5,7 @@
       :placeholder="`请输入${info.name || ''}账号`"
       clearable
       class="Vl__account__field"
-      :type="info.type === 101 ? 'text' : 'number'"
+      type="tel"
       @input="checkPhone"
     >
       <template #button>