Browse Source

Merge branch 'iteration-create' into dev

lex 1 year ago
parent
commit
b6b2d15065
2 changed files with 12 additions and 2 deletions
  1. 1 1
      src/views/student-register/index.tsx
  2. 11 1
      src/views/student-register/order-detail.tsx

+ 1 - 1
src/views/student-register/index.tsx

@@ -453,7 +453,7 @@ export default defineComponent({
         </Popup>
 
         {/* 是否在微信中打开 */}
-        {/* <OWxTip /> */}
+        <OWxTip />
       </div>
     );
   }

+ 11 - 1
src/views/student-register/order-detail.tsx

@@ -210,6 +210,16 @@ export default defineComponent({
      */
     const buyVip = async (callback?: any) => {
       try {
+        if (!state.agreeStatus) {
+          showToast('请先阅读并同意《课堂乐器服务协议》');
+          return;
+        }
+        const users = baseState.user.data;
+        // 判断是否需要实名认证, 姓名,卡号
+        if (!users?.account.realName || !users?.account.idCardNo) {
+          state.authShow = true;
+          return;
+        }
         state.submitStatus = true;
         const { data } = await request.get(
           '/edu-app/userPaymentOrder/detail/' + state.orderNo,
@@ -247,7 +257,7 @@ export default defineComponent({
       }
 
       if (!state.agreeStatus) {
-        showToast('请先阅读并同意《管乐团平台服务协议》');
+        showToast('请先阅读并同意《课堂乐器服务协议》');
         return;
       }
       const users = baseState.user.data;