添加样式

src/components/o-protocol/index.module.less

@@ -31,4 +31,11 @@
       line-height: 15px;
     }
   }
+
+  .protocolContent {
+    font-size: 14px;
+    padding: 12px;
+    color: #333;
+    line-height: 1.4;
+  }
 }

src/components/o-protocol/index.tsx

@@ -75,7 +75,9 @@ export default defineComponent({
           this.protocolHTML = data.contractTemplateContent
         }
         this.onPopupClose()
-      } catch {}
+      } catch {
+        //
+      }
     },
     onHash() {
       this.popupStatus = false
@@ -133,7 +135,7 @@ export default defineComponent({
         >
           {this.showHeader && <ColHeader title="管乐团平台服务协议" />}
           {this.popupStatus && (
-            <div class={styles.protocolContent} id="mProtocol">
+            <div id="mProtocol">
               <div class={styles.protocolContent} v-html={this.protocolHTML}></div>
             </div>
           )}

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

@@ -29,6 +29,10 @@ export default defineComponent({
     schoolSystem: {
       type: String,
       default: 'sixYearSystem' // 默认为六年制
+    },
+    registerInfo: {
+      type: Object,
+      defualt: {}
     }
   },
   emits: ['next'],
@@ -252,6 +256,12 @@ export default defineComponent({
                   showToast('暂无报名声部')
                   return
                 }
+
+                // 切换订单时判断是否有支付中和已支付的订单，并且已注册过
+                if (props.registerInfo?.orderNumber > 0 && props.registerInfo?.register) {
+                  state.subjectChangeStatus = true
+                  return
+                }
                 state.subjectStatus = true
               }}
               rules={[{ required: true, message: '请选择声部' }]}
@@ -346,14 +356,14 @@ export default defineComponent({
           cancelButtonText="选错了"
           showCancelButton
           onConfirm={() => {
-            console.log('223')
+            emit('next', 'order')
           }}
         >
           {{
             title: () => (
               <div class={styles.dialogTitle}>
                 <i></i>
-                课程冲突
+                修改声部
               </div>
             )
           }}

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

@@ -87,6 +87,20 @@ export default defineComponent({
       }
     }
 
+    const getRegisterInfo = async (val: string) => {
+      // 重新查询状态
+      if (val === 'apply') {
+        try {
+          const { data } = await request.get(
+            '/api-student/orchestraRegister/registerStatus/' + route.query.id
+          )
+          state.registerInfo = data || {}
+        } catch {
+          //
+        }
+      }
+    }
+
     // 先请求接口
     getRegisterStatus()
 
@@ -103,7 +117,12 @@ export default defineComponent({
           </span>
         </div>
         <Sticky position="top">
-          <Tabs lineWidth={20} lineHeight={4} v-model:active={state.tabValue}>
+          <Tabs
+            lineWidth={20}
+            lineHeight={4}
+            v-model:active={state.tabValue}
+            onChange={(val: any) => getRegisterInfo(val)}
+          >
             <Tab title="报名信息" name="apply" disabled={state.purchase}></Tab>
             <Tab title="缴费信息" name="payment" disabled={state.purchase || !state.register}></Tab>
             <Tab title="我的订单" name="order" disabled={!state.register}></Tab>
@@ -111,7 +130,11 @@ export default defineComponent({
         </Sticky>
 
         {state.tabValue === 'apply' && (
-          <Apply onNext={onNext} schoolSystem={state.registerInfo.schoolSystem} />
+          <Apply
+            onNext={onNext}
+            registerInfo={state.registerInfo}
+            schoolSystem={state.registerInfo.schoolSystem}
+          />
         )}
         {state.tabValue === 'payment' && <Payment onNext={onNext} />}
         {state.tabValue === 'order' && <Order onNext={onNext} />}

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

@@ -28,8 +28,8 @@ export default defineComponent({
       config: route.query.config ? JSON.parse(route.query.config as any) : {},
       hasFreight: route.query.hf ? false : true, // 是否显示
       freight: '', // 运费
-
-      agreeStatus: true //是否勾选协议
+      agreeStatus: true, //是否勾选协议
+      showHeader: false
     })
 
     const orderType = computed(() => {
@@ -155,8 +155,8 @@ export default defineComponent({
               hideLoading: true
             }
           )
-          console.log(data)
-          if (data.status !== 'WAIT_PAY') {
+          // console.log(data)
+          if (data.status !== 'WAIT_PAY' && data.status !== 'PAYING') {
             clearInterval(orderTimer)
             window.location.replace(
               window.location.origin +
@@ -290,6 +290,12 @@ export default defineComponent({
     }
 
     onMounted(() => {
+      if (browser().isApp) {
+        state.showHeader = true
+      } else {
+        state.showHeader = false
+      }
+
       // 获取收货地址
       let details = sessionStorage.getItem('addressDetails')
       details = details ? JSON.parse(details) : {}
@@ -339,7 +345,7 @@ export default defineComponent({
           <div class={styles.protocol}>
             <OProtocol
               v-model:modelValue={state.agreeStatus}
-              showHeader
+              showHeader={state.showHeader}
               style={{ paddingLeft: 0, paddingRight: 0 }}
             />
           </div>