更新基础修改

src/views/payment-result/index.module.less

@@ -44,9 +44,10 @@
     font-size: 12px;
     padding: 0 6px;
     border-radius: 4px;
-    background: linear-gradient(180deg, #FFD982 0%, #FFB45A 100%);
+    background: linear-gradient(180deg, #FFF5E6 0%, #FFF6E7 100%);
     border-radius: 4px;
-    border: 1px solid rgba(255, 123, 27, 0.17);
+    border: 1px solid #FFE9D9;
+    color: #BE7332;
   }
 
   :global {
@@ -154,4 +155,4 @@
 .phoneName {
   background: #f2f2f2;
   border-radius: 6px;
-}
+}

src/views/payment-result/index.tsx

@@ -116,7 +116,7 @@ export default defineComponent({
     });
     return () => (
       <div class={styles.paymentResult}>
-        <div class={styles.paymentTitle}>
+        <div class={[styles.paymentTitle]}>
           {browser().isApp && (
             <MHeader
               border={false}
@@ -184,7 +184,11 @@ export default defineComponent({
                 title: () => (
                   <div class={styles.buyContent}>
                     <p class={styles.goodsTitle}>{goods.goodsName}</p>
-                    <Tag class={styles.brandName}>{goods.brandName}</Tag>
+                    <Tag class={styles.brandName}>
+                      {state.orders.orderType === 'VIP'
+                        ? '12个月'
+                        : goods.brandName}
+                    </Tag>
                   </div>
                 ),
                 value: () => <span>x {goods.goodsNum}</span>

src/views/student-register/component/user-auth.module.less

@@ -8,6 +8,7 @@
     border-radius: 12px;
     overflow: hidden;
   }
+
   :global {
     .van-cell {
       flex-direction: column;
@@ -38,7 +39,7 @@
       /* margin: 290px 13px 14px; */
     }
 
-    .van-tag + .van-tag {
+    .van-tag+.van-tag {
       margin-left: 8px;
     }
   }
@@ -47,4 +48,16 @@
     padding: 0 14px;
     padding-bottom: 15px;
   }
-}
+
+  .otherBtn {
+    height: 40px;
+    border-radius: 12px;
+    border: 0;
+    padding: 0 40px;
+    font-size: 16px;
+    font-weight: 600;
+    background: linear-gradient(121deg, #FFD892 0%, #FFCB75 100%);
+    color: #5B2C03;
+
+  }
+}

src/views/student-register/component/user-auth.tsx

@@ -43,11 +43,8 @@ export default defineComponent({
             save: true
           }
         });
-        // showToast('实名成功')
         state.user.data.account.realName = this.form.realName;
         state.user.data.account.idCardNo = this.form.idCardNo;
-        // setTimeout(() => {
-        // }, 500)
         this.onSuccess();
       } catch {
         //
@@ -67,6 +64,7 @@ export default defineComponent({
             rules={[{ required: true, message: '请填写真实姓名' }]}
             name="realName"
             placeholder="请填写真实姓名"
+            autocomplete="off"
             maxlength="50"></Field>
 
           <Field
@@ -74,6 +72,7 @@ export default defineComponent({
             label="身份证号"
             v-model={this.form.idCardNo}
             maxlength={18}
+            autocomplete="off"
             rules={[
               { required: true, message: '请输入身份证号' },
               {
@@ -86,7 +85,12 @@ export default defineComponent({
         </CellGroup>
 
         <div class={['btnGroup']}>
-          <Button block round type="primary" native-type="submit">
+          <Button
+            block
+            round
+            type="primary"
+            native-type="submit"
+            class={styles.otherBtn}>
             确定
           </Button>
         </div>

src/views/student-register/index.module.less

@@ -358,6 +358,7 @@
     font-family: DINAlternate-Bold, DINAlternate;
     font-weight: bold;
     color: #FC1A19;
+    padding-right: 6px;
 
     span {
       font-size: 28px;
@@ -366,7 +367,7 @@
   }
 
   .allPrice {
-    padding-left: 6px;
+    display: inline-block;
     font-size: 14px;
     font-family: DINAlternate-Bold, DINAlternate;
     font-weight: bold;

src/views/student-register/index.tsx

@@ -114,11 +114,10 @@ export default defineComponent({
     // 删除商品
     const onGoodsRemove = (item: any) => {
       showConfirmDialog({
-        title: '标题',
+        // title: '标题',
         message: '是否删除该商品',
         confirmButtonColor: '#FF8633'
       }).then(() => {
-        // on confirm
         studentRegisterStore.deleteGoods(item.goodsId);
       });
     };
@@ -139,12 +138,16 @@ export default defineComponent({
         const goodsList = studentRegisterStore.getGoods;
 
         if (schoolInfo.data.hasBuyCourse && vipList.length > 0) {
-          showToast('您已购买数字化器乐学练工具，请勿重复购买');
+          setTimeout(() => {
+            showToast('您已购买数字化器乐学练工具，请勿重复购买');
+          }, 100);
           return;
         }
 
         if (vipList.length <= 0 && goodsList.length <= 0) {
-          showToast('请选择需要购买的商品');
+          setTimeout(() => {
+            showToast('请选择需要购买的商品');
+          }, 100);
           return;
         }
 
@@ -444,7 +447,6 @@ export default defineComponent({
                 } else {
                   onRegisterSubmit();
                 }
-                // router.push('/order-detail');
               }}>
               <Button
                 disabled={forms.submitLoading}

src/views/student-register/order-detail.module.less

@@ -348,11 +348,20 @@
 
 .submitBtn {
   height: 40px;
-  background: linear-gradient(121deg, #FFD892 0%, #FFCB75 100%);
   border-radius: 12px;
   border: 0;
   padding: 0 40px;
   font-size: 16px;
   font-weight: 600;
+
+
+  // &.vipBtn {
+  //   background: var(--van-primary);
+  //   color: #fff;
+  // }
+
+  // &.otherBtn {
+  background: linear-gradient(121deg, #FFD892 0%, #FFCB75 100%);
   color: #5B2C03;
-}
+  // }
+}

src/views/student-register/order-detail.tsx

@@ -251,12 +251,11 @@ export default defineComponent({
         return;
       }
       const users = baseState.user.data;
-      // console.group(users)
       // 判断是否需要实名认证, 姓名，卡号
-      // if (!users?.account.realName || !users?.account.idCardNo) {
-      //   state.authShow = true;
-      //   return;
-      // }
+      if (!users?.account.realName || !users?.account.idCardNo) {
+        state.authShow = true;
+        return;
+      }
 
       state.submitStatus = true;
       try {
@@ -423,7 +422,11 @@ export default defineComponent({
             <div class={styles.paymentBtn}>
               <Button
                 round
-                class={styles.submitBtn}
+                class={[
+                  styles.submitBtn
+                  // orderType.value === 'VIP' ? styles.vipBtn : '',
+                  // orderType.value === 'SCHOOL_REGISTER' ? styles.otherBtn : ''
+                ]}
                 onClick={onSubmit}
                 loading={state.submitStatus}
                 disabled={state.submitStatus}>