更新注册消息

src/router/router-root.ts

@@ -5,7 +5,7 @@ export default [
     name: 'student-register',
     component: () => import('@/views/student-register/index'),
     meta: {
-      title: '学生注册'
+      title: '学生登记'
     }
   },
   {

src/router/routes-common.ts

@@ -20,6 +20,7 @@ export default [
       },
       {
         path: '/order-detail',
+        name: 'order-detail',
         component: () => import('@/views/student-register/order-detail'),
         meta: {
           title: '订单详情'

src/views/member-center/index.tsx

@@ -28,15 +28,6 @@ export default defineComponent({
   computed: {
     userInfo() {
       const users: any = this.users;
-      console.log(this.users, {
-        username: users?.nickname || '',
-        phone: users?.phone || '',
-        avatar: users?.avatar,
-        id: users?.id,
-        isVip: users?.vipMember,
-        membershipDays: users?.membershipDays,
-        membershipEndTime: users?.membershipEndTime
-      });
       return {
         username: users?.nickname || '',
         phone: users?.phone || '',

src/views/student-register/index.tsx

@@ -122,7 +122,7 @@ export default defineComponent({
       });
     };
 
-    // 注册成功之后购买
+    // 登记成功之后购买
     const onRegisterSubmit = async () => {
       try {
         forms.submitLoading = true;
@@ -185,8 +185,8 @@ export default defineComponent({
               paymentCashAmount: calcPrice.value.amount || 0,
               paymentCouponAmount: 0,
               goodsInfos: params,
-              orderName: '学生注册',
-              orderDesc: '学生注册'
+              orderName: '学生登记',
+              orderDesc: '学生登记'
             }
           }
         );

src/views/student-register/layout/auth.tsx

@@ -51,7 +51,6 @@ export default defineComponent({
           });
           setLogin(res.data);
         } catch (e: any) {
-          console.log(e, 'e');
           const message = e.message;
           if (
             message.indexOf('5000') === -1 &&

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

@@ -140,19 +140,19 @@ export default defineComponent({
       // const orderNo = state.orderNo
       const orderTimer = setInterval(async () => {
         // 判断是否在当前路由，如果不是则清除定时器
-        if (route.name != 'orderDetail') {
+        if (route.name != 'order-detail') {
           clearInterval(orderTimer);
           return;
         }
         state.orderTimer = orderTimer;
         try {
           const { data } = await request.post(
-            '/api-student/open/userOrder/paymentStatus/' + state.orderNo,
+            '/edu-app/open/userOrder/paymentStatus/' + state.orderNo,
             {
               hideLoading: true
             }
           );
-          // console.log(data)
+
           if (data.status !== 'WAIT_PAY' && data.status !== 'PAYING') {
             // 默认关闭支付二维码弹窗
             state.showQrcode = false;
@@ -236,7 +236,7 @@ export default defineComponent({
     };
 
     /**
-     * @description 学生注册 - 汇付
+     * @description 学生登记 - 汇付
      * @param callback 回调方式
      */
     const buyOrchestra = async (callback: any) => {
@@ -270,7 +270,6 @@ export default defineComponent({
             }
           }
         );
-        // console.log(data)
         state.pay_channel = data.paymentChannel;
         if (data.status !== 'WAIT_PAY' && data.status !== 'PAYING') {
           checkOrderTypeJump();
@@ -452,8 +451,9 @@ export default defineComponent({
           />
         </Popup>
 
-        <OPopup
-          v-model:modelValue={state.showQrcode}
+        <Popup
+          v-model:show={state.showQrcode}
+          round
           onClose={() => {
             // 二维码关闭时清除定时器
             clearInterval(state.orderTimer);
@@ -463,7 +463,7 @@ export default defineComponent({
             pay_channel={state.pay_channel}
             orderType={orderType.value}
           />
-        </OPopup>
+        </Popup>
 
         <OPopup v-model:modelValue={state.authShow}>
           <UserAuth onSuccess={onAuthSuccess} hideHeader={!browser().isApp} />

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

@@ -1,31 +1,26 @@
 .saveShareImage {
   position: relative;
-  min-height: 100vh;
   overflow: hidden;
 
-  &::before {
-    content: ' ';
-    background: linear-gradient(134deg, #ff906c 0%, #ff602d 100%);
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    z-index: -1;
-  }
-}
+  .tips {
+    margin: 25px 22px 12px;
+    padding: 20px 0 15px;
+    text-align: left;
+    border-top: 1px dashed #C8C8C8;
 
-.btnHeader {
-  display: flex;
-  align-items: center;
-  height: var(--van-nav-bar-height);
+    .tipsTitle {
+      font-size: 15px;
+      font-weight: 500;
+      color: #F96A33;
+      line-height: 21px;
+    }
 
-  .iconBack {
-    position: relative;
-    padding-left: var(--van-padding-md);
-    font-size: 20px;
-    color: #fff;
-    z-index: 9;
+    .tipsContent {
+      padding-top: 7px;
+      font-size: 13px;
+      color: #333333;
+      line-height: 20px;
+    }
   }
 }
 
@@ -47,83 +42,33 @@
 
 .shareContaienr {
   position: relative;
-  margin: 212px 22px 0;
-  padding-top: 50px;
-  padding-bottom: 23px;
+  margin: 0 22px;
+  padding: 20px 20px 0;
   background: #ffffff;
   border-radius: 18px;
   text-align: center;
 
-  &.orchestraContainer {
-    margin-top: 168px;
-    padding-top: 20px;
-
-    .schoolName {
-      font-size: 20px;
-      font-weight: 500;
-      color: #f67146;
-      line-height: 28px;
-    }
-  }
-
-  &.tips {
-    margin-top: 15px;
-    margin-bottom: 12px;
-    padding: 12px 22px 15px;
-    text-align: left;
-
-    .tipsTitle {
-      font-size: 15px;
-      font-weight: 500;
-      color: #f16437;
-      line-height: 21px;
-    }
-
-    .tipsContent {
-      padding-top: 7px;
-      font-size: 13px;
-      color: #333333;
-      line-height: 20px;
-    }
-  }
-
-  .schoolLogo {
-    position: absolute;
-    left: 50%;
-    top: 0;
-    // transform: translate(-50%, -50%);
-    margin-top: -38px;
-    margin-left: -38px;
-    width: 76px;
-    height: 76px;
-    border-radius: 50%;
-    overflow: hidden;
-    border: 3px solid #fff;
-    background-color: #fff;
-  }
-
   .schoolName {
-    font-size: 17px;
+    font-size: 20px;
     font-weight: 500;
     color: #000000;
-    line-height: 24px;
-    padding: 0 30px 0;
+    line-height: 28px;
   }
 
   .shareType {
     font-size: 15px;
-    padding: 8px 0 20px;
+    padding: 8px 0 26px;
     color: #000000;
     line-height: 21px;
 
     span {
-      color: #f67146;
+      color: #F96A33;
     }
   }
 
   .qrcodeSection {
-    width: 150px;
-    height: 150px;
+    width: 158px;
+    height: 158px;
     background: url('@/common/images/icon-qrcode-bg.png') no-repeat center center;
     background-size: contain;
     margin: 0 auto;
@@ -132,24 +77,14 @@
 
   .memo {
     display: inline-block;
-    margin: 17px 0 11px;
-    background: linear-gradient(135deg, #ff9c63 0%, #ff7144 100%);
+    margin: 20px 0 0;
+    background: linear-gradient(121deg, #FFD892 0%, #FFCB75 100%);
     border-radius: 18px;
     font-size: 16px;
-    font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #ffffff;
     line-height: 22px;
-    padding: 6px 16px;
+    padding: 7px 17px;
+    color: #5B2C03;
   }
-
-  .endTime {
-    font-size: 13px;
-    color: #666666;
-    line-height: 18px;
-
-    span {
-      color: #ff8057;
-    }
-  }
-}
+}

src/views/student-register/qrcode-payment/index.tsx

@@ -1,13 +1,6 @@
-import { defineComponent, reactive } from 'vue';
-import { Icon, Image } from 'vant';
+import { defineComponent } from 'vue';
 import styles from './index.module.less';
-import orchestraTopBg from '@/views/student-register/images/orchestra-top_bg.png';
 import OQrcode from '@/components/m-qrcode';
-import { browser } from '@/helpers/utils';
-import { useRouter } from 'vue-router';
-import OHeader from '@/components/m-header';
-import OSticky from '@/components/m-sticky';
-import { postMessage } from '@/helpers/native-message';
 
 export default defineComponent({
   name: 'qrcode-payment',
@@ -26,29 +19,9 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const router = useRouter();
-    const state = reactive({
-      height: 0
-    });
-    const onBack = () => {
-      if (browser().isApp) {
-        postMessage({ api: 'goBack' });
-      } else {
-        router.back();
-      }
-    };
     return () => (
       <div class={[styles.saveShareImage]}>
-        {browser().isApp && (
-          <OSticky position="top">
-            <OHeader
-              title={props.orderType === 'VIP' ? '会员购买' : '报名缴费'}
-            />
-          </OSticky>
-        )}
-
-        <Image src={orchestraTopBg} class={styles.topImage} />
-        <div class={[styles.shareContaienr, styles.orchestraContainer]}>
+        <div class={[styles.shareContaienr]}>
           <div class={styles.schoolName}>
             {props.orderType === 'VIP' ? '会员购买' : '报名缴费'}
           </div>
@@ -66,7 +39,7 @@ export default defineComponent({
           <div class={styles.memo}>请在30分钟内扫码支付</div>
         </div>
 
-        <div class={[styles.shareContaienr, styles.tips]}>
+        <div class={[styles.tips]}>
           <div class={styles.tipsTitle}>使用说明：</div>
           <div class={styles.tipsContent}>
             1.打开{props.pay_channel === 'wx_pub' ? '微信' : '支付宝'}扫一扫