修改判断

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

@@ -9,7 +9,7 @@ import { useRoute, useRouter } from 'vue-router'
 import qs from 'query-string'
 import { goWechatAuth, setLogout } from '@/state'
 import request from '@/helpers/request'
-import { browser, getUrlCode } from '@/helpers/utils'
+import { browser, getUrlCode, removeAuth } from '@/helpers/utils'
 import ODialog from '@/components/o-dialog'
 
 export default defineComponent({
@@ -184,13 +184,14 @@ export default defineComponent({
 
     const onLoutout = () => {
       setLogout()
+      removeAuth()
       const query = {
         returnUrl: route.path,
         ...route.query
       } as any
 
-      // window.location.href =
-      //   window.location.origin + window.location.pathname + '#/loginMusic?' + qs.stringify(query)
+      window.location.href =
+        window.location.origin + window.location.pathname + '#/loginMusic?' + qs.stringify(query)
 
       router.replace({
         path: '/loginMusic',

src/student/music-group/pre-apply/order-detail.module.less

@@ -82,6 +82,9 @@
       height: 40px;
       line-height: 40px;
       min-width: 112px;
+      font-size: 16px;
+      font-weight: 600;
+
     }
   }
 }
@@ -135,7 +138,7 @@
     .goodsPrice {
       padding-top: 4px;
       display: flex;
-      align-items: center;
+      align-items: flex-start;
       justify-content: space-between;
 
       .free {

src/student/music-group/pre-goods-apply/index.module.less

@@ -445,8 +445,8 @@
 
   .inspectCell {
     margin: 0 12px 0;
-    padding: 8px 12px;
-    background: #f4f4f4;
+    padding: 8px 14px;
+    background: #FFF3EA;
     border-radius: 6px;
     width: auto;
   }

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

@@ -26,7 +26,7 @@ import {
   Popup
 } from 'vant'
 import OSticky from '@/components/o-sticky'
-import { browser, getUrlCode, moneyFormat } from '@/helpers/utils'
+import { browser, getUrlCode, moneyFormat, removeAuth } from '@/helpers/utils'
 import request from '@/helpers/request'
 import { useRoute, useRouter } from 'vue-router'
 import { goWechatAuth, setLogout } from '@/state'
@@ -64,7 +64,7 @@ export default defineComponent({
         { text: '九年级', value: 9 }
       ], // 年级数组列表
       classList: classList,
-      subjectList: [] as any, // 声部列表
+      subjectList: [] as any, // 选报声部列表
       instrumentsInspectionDescribe: '', // 配置信息
       inspectPopupStatus: false, // 查看说明
       gradeStatus: false,
@@ -102,7 +102,7 @@ export default defineComponent({
       currentClass: '', // 班级
       currentClassTxt: null, // 年级编号
       registerSubjectId: '',
-      registerSubjectTxt: null, // 所在声部
+      registerSubjectTxt: null, // 所在选报声部
       parentName: null,
       groupBuyType: '' as any,
       phone: null as any,
@@ -147,7 +147,7 @@ export default defineComponent({
       }
     }
 
-    // 获取声部信息
+    // 获取选报声部信息
     const getSubjects = async () => {
       try {
         const subjects = await request.post(
@@ -438,18 +438,19 @@ export default defineComponent({
 
     const onLoutout = () => {
       setLogout()
+      removeAuth()
       const query = {
         returnUrl: route.path,
         ...route.query
       } as any
 
-      // window.location.href =
-      //   window.location.origin + window.location.pathname + '#/loginMusic?' + qs.stringify(query)
+      window.location.href =
+        window.location.origin + window.location.pathname + '#/loginMusic?' + qs.stringify(query)
 
-      router.replace({
-        path: '/loginMusic',
-        query: query
-      })
+      // router.replace({
+      //   path: '/loginMusic',
+      //   query: query
+      // })
     }
 
     onMounted(async () => {
@@ -592,21 +593,21 @@ export default defineComponent({
             />
             <Field
               required
-              label="声部"
+              label="选报声部"
               inputAlign="right"
               readonly
               isLink
               clickable={false}
-              placeholder="请选择声部"
+              placeholder="请选择选报声部"
               v-model={forms.registerSubjectTxt}
               onClick={() => {
                 if (state.subjectList.length <= 0) {
-                  showToast('暂无报名声部')
+                  showToast('暂无报名选报声部')
                   return
                 }
                 state.subjectStatus = true
               }}
-              rules={[{ required: true, message: '请选择声部' }]}
+              rules={[{ required: true, message: '请选择选报声部' }]}
             />
           </CellGroup>
 
@@ -683,7 +684,7 @@ export default defineComponent({
                         disabled={forms.registerSubjectId ? false : true}
                         onClick={() => {
                           if (!forms.registerSubjectId) {
-                            showToast('请选择声部')
+                            showToast('请选择选报声部')
                             return
                           }
                         }}
@@ -779,7 +780,10 @@ export default defineComponent({
                   }}
                 </Cell>
 
-                <Cell class={styles.inspectCell}>
+                <Cell
+                  class={styles.inspectCell}
+                  style={{ backgroundColor: state.inspectStatus ? '#FFF3EA' : '#f4f4f4' }}
+                >
                   {{
                     icon: () => (
                       <img
@@ -953,7 +957,7 @@ export default defineComponent({
             }}
           />
         </Popup>
-        {/* 声部 */}
+        {/* 选报声部 */}
         <Popup
           v-model:show={state.subjectStatus}
           position="bottom"
@@ -978,7 +982,7 @@ export default defineComponent({
           />
         </Popup>
 
-        {/* 声部 */}
+        {/* 选报声部 */}
         <Popup v-model:show={state.inspectPopupStatus} round closeable class={styles.inspectPopup}>
           <InspectModal describe={state.instrumentsInspectionDescribe} />
         </Popup>