更新样式

public/project/css/initiation.css

@@ -138,11 +138,13 @@ span {
   margin: 0 auto;
   background: url('../images/initiation/i-popup-banner.png') no-repeat top center;
   background-size: cover;
-  width: 8rem;
-  height: 9.38rem;
+  /* width: 8rem;
+  height: 9.38rem; */
+  width: 7.5rem;
+  height: 8.82rem;
 }
 .submit-title {
-  padding-top: 5.7rem;
+  padding-top: 5.2rem;
   padding-bottom: 10px;
   font-size: 18px;
   font-weight: 500;

public/project/css/preRegister.css

@@ -139,11 +139,13 @@ span {
   margin: 0 auto;
   background: url('../images/initiation/p-popup-banner.png') no-repeat top center;
   background-size: cover;
-  width: 8rem;
-  height: 9.38rem;
+  /* width: 8rem;
+  height: 9.38rem; */
+  width: 7.5rem;
+  height: 8.87rem;
 }
 .submit-title {
-  padding-top: 5.7rem;
+  padding-top: 5.2rem;
   padding-bottom: 10px;
   font-size: 18px;
   font-weight: 500;

public/project/css/schoolRegister.css

@@ -285,11 +285,13 @@ span {
   margin: 0 auto;
   background: url('../images/initiation/s-popup-banner.png') no-repeat top center;
   background-size: cover;
-  width: 8rem;
-  height: 9.38rem;
+  /* width: 8rem;
+  height: 9.38rem; */
+  width: 7.5rem;
+  height: 8.7rem;
 }
 .submit-title {
-  padding-top: 5.7rem;
+  padding-top: 5.2rem;
   padding-bottom: 10px;
   font-size: 18px;
   font-weight: 500;

public/project/initiation.html

@@ -273,8 +273,8 @@
       <van-picker show-toolbar :columns="classList" @cancel="classPicker = false" @confirm="onConfirmClass" />
     </van-popup>
 
-    <van-popup v-model:show="submitStatus" round style="width: 100%;background-color: transparent;"
-      :close-on-click-overlay="false">
+    <van-popup v-model:show="submitStatus" round
+      style="width: 100%;background-color: transparent;transform: translateY(-60%);" :close-on-click-overlay="false">
       <div class="submit-container">
         <p class="submit-title">提交成功</p>
         <p class="submit-tips">您已完成乐团启蒙调查</p>
@@ -495,9 +495,9 @@
             })
             console.log(res)
             if (res.data.code === 200) {
-              // this.submitStatus = true
-              window.location.href =
-                'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
+              this.submitStatus = true
+              // window.location.href =
+              //   'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
             } else {
               vant.showToast(res.data.message)
             }

public/project/preRegister.html

@@ -298,8 +298,8 @@
       <van-picker show-toolbar :columns="subjectList" @cancel="subjectPicker2 = false" @confirm="onConfirmSubject2" />
     </van-popup>
 
-    <van-popup v-model:show="submitStatus" round style="width: 100%;background-color: transparent;"
-      :close-on-click-overlay="false">
+    <van-popup v-model:show="submitStatus" round
+      style="width: 100%;background-color: transparent;transform: translateY(-60%);" :close-on-click-overlay="false">
       <div class="submit-container">
         <p class="submit-title">提交成功</p>
         <p class="submit-tips">您已完成乐团报名</p>
@@ -567,9 +567,9 @@
               code: this.code
             })
             if (res.data.code === 200) {
-              // this.submitStatus = true
-              window.location.href =
-                'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
+              this.submitStatus = true
+              // window.location.href =
+              //   'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
             } else {
               vant.showToast(res.data.message)
             }

public/project/schoolRegister.html

@@ -141,8 +141,8 @@
         :columns-field-names="{ text: 'name', value: 'code', children: 'areas' }" />
     </van-popup>
 
-    <van-popup v-model:show="submitStatus" round style="width: 100%;background-color: transparent;"
-      :close-on-click-overlay="false">
+    <van-popup v-model:show="submitStatus" round
+      style="width: 100%;background-color: transparent;transform: translateY(-60%);" :close-on-click-overlay="false">
       <div class="submit-container">
         <p class="submit-title">提交成功</p>
         <p class="submit-tips">感谢您的参与!</p>

src/school/approval-manage/subsidy/details.tsx

@@ -77,7 +77,7 @@ export default defineComponent({
                 center
                 class={styles.listItem}
                 title="补助标准"
-                value={`${state.record.standardSalary}元/天`}
+                value={`${state.record.standardSalary || 0}元/天`}
               />
               <Cell
                 border={false}
@@ -102,7 +102,7 @@ export default defineComponent({
                 center
                 class={styles.listItem}
                 title="实际补助金额"
-                value={`${state.record.actualSalary}元`}
+                value={`${state.record.actualSalary || 0}元`}
               />
             </div>
 

src/school/companion-teacher/companion-teacher-register.module.less

@@ -246,6 +246,13 @@ span {
   font-size: 13px;
   color: #f67146;
   padding: 9px 10px;
+  display: flex;
+  align-items: center;
+  :global {
+    .van-icon {
+      margin-right: 5px;
+    }
+  }
 }
 
 .wxPopupDialog {

src/school/companion-teacher/companion-teacher-register.tsx

@@ -200,28 +200,28 @@ export default defineComponent({
       }
 
       // 判断是否是微信，只能微信中打开
-      // if (!browser().weixin) {
-      //   state.showPopup = true
-      //   return
-      // } else {
-      //   //授权
-      //   const code = getUrlCode()
-      //   if (!code) {
-      //     const newUrl =
-      //       window.location.origin +
-      //       window.location.pathname +
-      //       '#' +
-      //       route.path +
-      //       '?' +
-      //       qs.stringify({
-      //         ...route.query
-      //       })
-      //     getAppIdAndCode(newUrl)
-      //     return
-      //   } else {
-      //     state.code = code
-      //   }
-      // }
+      if (!browser().weixin) {
+        state.showPopup = true
+        return
+      } else {
+        //授权
+        const code = getUrlCode()
+        if (!code) {
+          const newUrl =
+            window.location.origin +
+            window.location.pathname +
+            '#' +
+            route.path +
+            '?' +
+            qs.stringify({
+              ...route.query
+            })
+          getAppIdAndCode(newUrl)
+          return
+        } else {
+          state.code = code
+        }
+      }
 
       // t: route.query.t, // 过期时间
       try {
@@ -433,7 +433,7 @@ export default defineComponent({
             ></Field>
             <div class={styles.phoneTips}>
               <Icon name="warning" size="16" />
-              提示：手机号将成为您管乐团伴学指导端登录账号
+              提示：手机号将成为您管乐团伴学端登录账号
             </div>
             <Field
               label="真实姓名"

src/school/manage-teacher/manage-teacher-register.module.less

@@ -245,8 +245,16 @@ span {
   background: #ffebdd;
   border-radius: 6px;
   font-size: 13px;
+  line-height: 16px;
   color: #f67146;
   padding: 9px 10px;
+  display: flex;
+  align-items: center;
+  :global {
+    .van-icon {
+      margin-right: 5px;
+    }
+  }
 }
 
 .wxPopupDialog {

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

@@ -159,6 +159,7 @@ export default defineComponent({
           params.id = state.detail.id
         }
         await request.post('/api-student/orchestraRegister/save', {
+          hideLoading: false,
           data: {
             ...params,
             code: props.code

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

@@ -230,6 +230,7 @@ export default defineComponent({
         })
         // 创建订单
         const { data } = await request.post('/api-student/userPaymentOrder/executeOrder', {
+          hideLoading: false,
           data: {
             bizId: route.query.id, // 乐团编号
             orderType: 'ORCHESTRA',

src/student/music-group/shop-address/address-operation.tsx

@@ -69,6 +69,7 @@ export default defineComponent({
         }
         if (route.query.id) {
           await request.post('/api-student/userReceiveAddress/update', {
+            hideLoading: false,
             data: {
               id: route.query.id,
               ...params
@@ -76,6 +77,7 @@ export default defineComponent({
           })
         } else {
           await request.post('/api-student/userReceiveAddress/save', {
+            hideLoading: false,
             data: {
               ...params
             }

src/student/payment-result/index.tsx

@@ -69,7 +69,9 @@ export default defineComponent({
         message: '您是否确定撤销退费?'
       }).then(async () => {
         try {
-          await request.post('/api-student/userPaymentOrder/cancelRefund/' + route.query.orderNo)
+          await request.post('/api-student/userPaymentOrder/cancelRefund/' + route.query.orderNo, {
+            hideLoading: false
+          })
           getDetails()
         } catch {
           //
@@ -145,6 +147,7 @@ export default defineComponent({
         const refundReason = form.resionList.find((item: any) => item.value === form.checked)
 
         await request.post('/api-student/userPaymentOrder/refundPayment', {
+          hideLoading: false,
           data: {
             merOrderNo: route.query.orderNo,
             refundReason: form.checked === 999 ? form.resion : refundReason.text

src/student/trade-record/component/paid-list.tsx

@@ -79,7 +79,7 @@ export default defineComponent({
         if (form.isClick) return
         form.isClick = true
         const res = await request.post('/api-student/userPaymentOrder/page', {
-          hideLoading: hideLoading,
+          // hideLoading: hideLoading,
           data: {
             ...form.params,
             orderType: form.currentType === 'ALL' ? null : form.currentType,

src/student/trade-record/component/refund-list.tsx

@@ -47,7 +47,7 @@ export default defineComponent({
         if (form.isClick) return
         form.isClick = true
         const res = await request.post('/api-student/userPaymentOrder/page', {
-          hideLoading: hideLoading,
+          // hideLoading: hideLoading,
           data: {
             ...form.params,
             orderType: form.currentType === 'ALL' ? null : form.currentType,

src/student/trade-record/component/wait-pay.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
         if (form.isClick) return
         form.isClick = true
         const res = await request.post('/api-student/userPaymentOrder/page', {
-          hideLoading: hideLoading,
+          // hideLoading: hideLoading,
           data: {
             ...form.params,
             orderType: form.currentType === 'ALL' ? null : form.currentType,
@@ -112,7 +112,9 @@ export default defineComponent({
         confirmButtonText: '确定'
       }).then(async () => {
         try {
-          await request.post('/api-student/userPaymentOrder/cancelPayment/' + item.orderNo)
+          await request.post('/api-student/userPaymentOrder/cancelPayment/' + item.orderNo, {
+            hideLoading: false
+          })
           onSearch()
         } catch {
           //
@@ -123,6 +125,7 @@ export default defineComponent({
     const onConfirmOrder = async (item: any) => {
       try {
         const { data } = await request.get('/api-student/userPaymentOrder/unpaid', {
+          hideLoading: false,
           params: {
             orderNo: item.orderNo,
             paymentType: item.orderType