样式调整

package-lock.json

@@ -1133,9 +1133,9 @@
       "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
     },
     "@qg/cherry-ui": {
-      "version": "2.21.3",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.3.tgz",
-      "integrity": "sha512-Ft46F+cT/eGD8q3Uc0DgaP2eQlEivEezIEIZlm4usKGLzh7yt11YHvc7FDBJbZcwgX1pQRZI0JTspBgtO1EMag==",
+      "version": "2.21.5",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.5.tgz",
+      "integrity": "sha512-R1pgB0Dt3ZnahA9Qd7RIeafaPh5qyHR0JotRmGtqk4q1K0tc2flluL6inREaVsi/tYCdYT/u/OgJ+FO1t01M6A==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",

package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@better-scroll/core": "^2.0.0-beta.6",
-    "@qg/cherry-ui": "^2.21.3",
+    "@qg/cherry-ui": "^2.21.5",
     "@qg/js-bridge": "^1.1.9",
     "@qg/qg-scroll": "^1.4.2",
     "@qg/ui-request": "0.0.20",

src/App.vue

@@ -53,7 +53,7 @@ export default {
 };
 </script>
 <style lang="less">
-@import './style/var.less';
+@import './style/index.less';
 .app {
   user-select: none;
   height: 100%;

src/api/pay.api.js

@@ -67,6 +67,10 @@ const kaGetNextUrl = function() {
   return request.get(`${talosHost}/api/kdsp/ka/process/get-next-url`);
 };
 
+const reissueContract = function(params) {
+  return request.post(`${talosHost}/open/checkout/payReissueContract`, params);
+};
+
 export {
   pay,
   prepay,
@@ -78,5 +82,6 @@ export {
   queryPayInfo,
   getGoodsList,
   kaGetNextUrl,
-  queryPayStatus
+  queryPayStatus,
+  reissueContract
 };

src/views/home/components/RechargeInput.vue

@@ -111,6 +111,10 @@ export default {
     position: relative;
     z-index: 9;
     border-bottom: @border-width-base solid @gray-2;
+    font-size: 24px;
+    input::placeholder {
+      font-size: 20px;
+    }
     .cr-field:not(:last-child)::after {
       display: none;
     }

src/views/home/components/RechargeList.vue

@@ -34,7 +34,8 @@ export default {
       rechargeType: 'recharge',
       tabItemStyle: {
         width: '75px',
-        flex: 'none'
+        flex: 'none',
+        fontWeight: 'bold'
       },
       selectedRechargeInfo: {},
       rechargeList: {
@@ -77,5 +78,10 @@ export default {
   height: 282px;
   margin-top: @padding-xs;
   margin-bottom: @padding-xs;
+  .cr-tabs__item--active {
+    .cr-tabs__text {
+      font-weight: bold;
+    }
+  }
 }
 </style>

src/views/home/components/RechargeTop.vue

@@ -88,8 +88,9 @@ export default {
   padding: 10px;
   background-size: 100%;
   box-sizing: border-box;
-  background-repeat: no-repeat;
   background: url('~@/assets/images/ellipse.png');
+  background-size: 100%;
+  background-repeat: no-repeat;
 
   .recharge {
     width: 55px;
@@ -105,11 +106,24 @@ export default {
     text-align: right;
     &-title {
       .text-14();
-      width: 64px;
+      display: inline-block;
       color: @white;
+      box-sizing: border-box;
       padding: 0 @padding-xs;
+      text-align: center;
       &-first {
-        border-right: 1px solid @white;
+        position: relative;
+      }
+      &-first::after {
+        position: absolute;
+        content: '';
+        display: inline-block;
+        right: 0;
+        width: 1px;
+        height: 10px;
+        background: @white;
+        top: 50%;
+        transform: translateY(-50%);
       }
     }
   }

src/views/home/index.less

@@ -20,7 +20,10 @@
       background-color: @white;
       z-index: 9;
       .button{
-        .text-18();
+        .text-16();
+        span{
+          font-weight: bold;
+        }
       }
     }
   }

src/views/home/index.vue

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

src/views/pay/components/PayCard.vue

 <template>
   <div class="pay-type-list">
-    <p class="type-title b-b">{{ value.title }}</p>
+    <p class="type-title">{{ value.title }}</p>
     <payGroupItem
       v-if="value.isGroupPay"
       v-model="payList"
@@ -71,6 +71,7 @@ export default {
   .type-title {
     height: 48px;
     .text-16;
+    font-weight: bold;
     padding-left: @padding-md;
     position: relative;
     line-height: 48px;

src/views/pay/components/PayCardItem.vue

 <template>
   <div class="payCardItem">
-    <div :class="['type-item', { 'b-t': !isGroupPay }]" @click="changePayType(value)">
+    <div
+      :class="['type-item', { 'b-t': !isGroupPay || value.payType === 1 }]"
+      @click="changePayType(value)"
+    >
       <div class="type-item-content">
         <div class="type-item-content-info">
           <cr-image :src="value.icon" class="icon" mode="aspectFit" width="39" height="39" />

src/views/pay/components/PayGroupCard.vue

@@ -13,6 +13,12 @@
       </div>
       <div class="dashed">
         <p class="dashed-line" />
+        <cr-image
+          src="../../../assets//images/addicon.png"
+          width="24px"
+          height="24px"
+          class="dashed-icon"
+        />
         <cr-checkbox
           v-model="thirdPayInfo.isCheck"
           shape="round"
@@ -128,6 +134,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  position: relative;
   &-line {
     width: 310px;
     border-bottom: 1px dashed #dcdcdc;
@@ -135,6 +142,11 @@ export default {
   &-checkbox {
     width: 18px;
   }
+  &-icon {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+  }
 }
 
 .more-title {

src/views/pay/extends.js

@@ -10,11 +10,13 @@ export const goUrlExtends = {
         });
       }
       const returnUrl = this.getReturnUrl();
+      setTimeout(() => {
         if (returnUrl) {
           window.location.replace(`${returnUrl}`);
           return;
         }
         this.$router.replace({ name: 'home' });
+      }, 500);
     },
     goOrderList(payStatus) {
       if (payStatus) {
@@ -24,11 +26,13 @@ export const goUrlExtends = {
         });
       }
       const returnUrl = this.getReturnUrl();
+      setTimeout(() => {
         if (returnUrl) {
           window.location.replace(`${returnUrl}/orderList`);
           return;
         }
         this.$router.replace({ name: 'orderList' });
+      }, 500);
     },
     goOrderDetail() {
       const returnUrl = this.getReturnUrl();

src/views/pay/index.less

+@import url('../../style/mixins');
 .pay {
   // width: 100%;
   padding: @padding-xs;
@@ -16,6 +17,7 @@
   .price{
     .text-30;
     color: @font-color-red;
+    font-weight: bold;
     margin-top: @padding-xs;
     &:before{
       content: '￥';
@@ -38,7 +40,10 @@
   bottom: 0;
   left:0;
   background-color:@white;
+  .iphonex-fix-margin;
   button{
+    font-weight: bold;
+    .text-16;
     width: 100%;
     color: @white;
     font-size: @line-height-sm;

src/views/pay/index.vue

@@ -20,7 +20,9 @@
       :show-coupon="showCoupon"
       :coupon-info="selectedCoupon"
       :has-pwd="creditPayInfo.hasPwd"
-      :pay-coupon-could-be-used="displayInfo.payCouponInfo.payCouponCouldBeUsed"
+      :pay-coupon-could-be-used="
+        displayInfo.payCouponInfo && displayInfo.payCouponInfo.payCouponCouldBeUsed
+      "
       @changePayType="changePayType"
     />
 
@@ -34,7 +36,9 @@
       :show-coupon="showCoupon"
       :coupon-info="selectedCoupon"
       :has-pwd="creditPayInfo.hasPwd"
-      :pay-coupon-could-be-used="displayInfo.payCouponInfo.payCouponCouldBeUsed"
+      :pay-coupon-could-be-used="
+        displayInfo && displayInfo.payCouponInfo && displayInfo.payCouponInfo.payCouponCouldBeUsed
+      "
       @changePayType="changePayType"
     />
 
@@ -99,7 +103,6 @@ import localStorage from '@/service/localStorage.service';
 import { throttle } from '@/service/utils.service';
 import { goUrlExtends } from './extends';
 import cookies from '@/service/cookieStorage.service';
-import { getTokenFromNative } from '@/service/utils.service';
 import {
   codeArr,
   payTypeE,
@@ -125,7 +128,8 @@ import {
   h5AppyUrl,
   ocrFaceId,
   queryPayInfo,
-  kaGetNextUrl
+  kaGetNextUrl,
+  reissueContract
 } from '@/api/pay.api.js';
 const VCC_CHANNEL = localStorage.get('vccChannel');
 let Current_Url = null;
@@ -392,6 +396,13 @@ export default {
         vcc_state: !IS_THIRD_PAY(this.payType) ? this.creditPayInfo?.accountStatus : '',
         buttons_name: this.accountS.text
       });
+      if (this.isShowProtocol) {
+        if (!this.isCheckAgreement) {
+          this.$toast('请仔细阅读并同意相关协议');
+          return;
+        }
+        this.reissueContract();
+      }
       this.accountS.fn();
     }, 1000),
     /* 预支付 */
@@ -402,10 +413,6 @@ export default {
         return;
       }
       this.error = '';
-      if (this.isShowProtocol && !this.isCheckAgreement) {
-        this.$toast('请仔细阅读并同意相关协议');
-        return;
-      }
       this.setAmount();
       if (!params && !this.isDetention && IS_THIRD_PAY(this.payType) && !isOcr) {
         this.isDetention = true;
@@ -607,6 +614,11 @@ export default {
           ? this.selectedCoupon?.faceValue || '0.00'
           : '0.00';
       cookies.set('amount', { finalAmt, freeAmount });
+    },
+    async reissueContract() {
+      await reissueContract({
+        templateIdList: this.payContractInfo.contractInfos.map(item => item.contractId)
+      });
     }
   }
 };

src/views/vipLife/components/AccountInput.vue

 <template>
   <div class="Vl__account">
-    <cr-field v-model="accountMask" :placeholder="`请输入${info.name || ''}账号`" clearable>
+    <cr-field
+      v-model="accountMask"
+      :placeholder="`请输入${info.name || ''}账号`"
+      clearable
+      class="Vl__account__field"
+      :type="info.type === 101 ? 'text' : 'number'"
+    >
       <template #button>
         <cr-image
           v-if="info.icon"
@@ -78,6 +84,9 @@ export default {
     position: relative;
     @{deep} .cr-field {
       padding: @padding-xs + 2 0;
+      input::placeholder {
+        font-size: 20px !important;
+      }
       &--control-in {
         .text-24();
       }