Merge branch 'master' into jenkins

src/components/o-guide/guide/components/andoird-guide.module.less

@@ -43,7 +43,7 @@
       font-weight: bold;
     }
     .red {
-      color: #ff0000;
+      color: #EA6868;
     }
   }
 }

src/student/music-group/pre-apply/component/apply.tsx

@@ -93,15 +93,16 @@ export default defineComponent({
         forms.username = detail.username
         forms.sex = detail.sex ? 1 : 0
         forms.currentGrade = detail.currentGrade
-        forms.currentGradeTxt = grade.text
+        forms.currentGradeTxt = grade ? grade.text : ''
         forms.currentClass = detail.currentClass
         forms.currentClassTxt = cls.text
         forms.registerSubjectId = detail.registerSubjectId
-        forms.registerSubjectTxt = subjects.text
+        forms.registerSubjectTxt = subjects ? subjects.text : ''
         forms.parentName = detail.parentName
         forms.phone = detail.phone
-      } catch {
+      } catch (e) {
         //
+        console.log(e)
       }
     }
 

src/student/music-group/pre-apply/order-detail.tsx

@@ -45,7 +45,8 @@ export default defineComponent({
       selectGoodsId: null as any,
       currentPrice: 0,
       dialogStatus: false,
-      dialogMessage: ''
+      dialogMessage: '',
+      submitStatus: false
     })
 
     const orderType = computed(() => {
@@ -253,9 +254,16 @@ export default defineComponent({
 
     const buyVip = async (callback?: any) => {
       try {
-        const { data } = await request.get('/api-student/userPaymentOrder/detail/' + state.orderNo)
+        state.submitStatus = true
+        const { data } = await request.get(
+          '/api-student/userPaymentOrder/detail/' + state.orderNo,
+          {
+            hideLoading: false
+          }
+        )
         console.log(data)
         state.pay_channel = data.paymentChannel
+        state.submitStatus = false
         if (data.status !== 'WAIT_PAY' && data.status !== 'PAYING') {
           router.replace({
             path: '/payment-result',
@@ -268,6 +276,7 @@ export default defineComponent({
         }
       } catch {
         //
+        state.submitStatus = false
       }
     }
 
@@ -283,15 +292,17 @@ export default defineComponent({
         return
       }
       const users = baseState.user.data
-      console.group(users)
+      // console.group(users)
       // 判断是否需要实名认证, 姓名，卡号
       if (!users?.account.realName || !users?.account.idCardNo) {
         state.authShow = true
         return
       }
 
+      state.submitStatus = true
       try {
         const { data } = await request.post('/api-student/userPaymentOrder/updateReceiveAddress', {
+          hideLoading: false,
           data: {
             orderNo: state.orderNo,
             orderType: 'ORCHESTRA',
@@ -300,6 +311,7 @@ export default defineComponent({
         })
         console.log(data)
         state.pay_channel = data.paymentChannel
+        state.submitStatus = false
         if (data.status !== 'WAIT_PAY' && data.status !== 'PAYING') {
           checkOrderTypeJump()
         } else {
@@ -307,6 +319,7 @@ export default defineComponent({
         }
       } catch {
         //
+        state.submitStatus = false
       }
     }
 
@@ -461,6 +474,8 @@ export default defineComponent({
                 color="linear-gradient(135deg, #FF8C4A 0%, #FF531C 100%)"
                 round
                 onClick={onSubmit}
+                loading={state.submitStatus}
+                disabled={state.submitStatus}
               >
                 立即购买
               </Button>