lex 2 years ago
parent
commit
978ac6a31c

+ 1 - 1
public/project/preRegister.html

@@ -302,7 +302,7 @@
       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>
+        <p class="submit-tips">您已完成乐团报名</p>
         <div @click="onLinkUrl" class="submit-btn"></div>
       </div>
     </van-popup>

+ 7 - 0
src/router/routes-common.ts

@@ -257,6 +257,13 @@ export const rootRouter = [
     }
   },
   {
+    path: '/transfer',
+    component: () => import('@/student/download/transfer'),
+    meta: {
+      title: '管乐团'
+    }
+  },
+  {
     path: '/:pathMatch(.*)*',
     component: () => import('@/views/404'),
     meta: {

+ 1 - 8
src/router/routes-student.ts

@@ -22,14 +22,7 @@ const noLoginRouter = [
     meta: {
       title: '下载管乐团学生端'
     }
-  },
-  {
-    path: '/transfer',
-    component: () => import('@/student/download/transfer'),
-    meta: {
-      title: '管乐团'
-    }
-  },
+  }
 ]
 
 export default [

+ 1 - 0
src/student/download/index.module.less

@@ -4,6 +4,7 @@
   background-size: cover;
   min-height: 100vh;
   padding: 0 42px 0;
+  text-align: center;
   :global {
     .van-image {
       margin-top: 40px;

+ 12 - 1
src/student/download/transfer.tsx

@@ -6,6 +6,8 @@ import wxBg from './images/wx_bg.png'
 import qs from 'query-string'
 import OSticky from '@/components/o-sticky'
 import student from './images/student-center.png'
+import teacher from './images/teacher-center.png'
+import manage from './images/manage-center.png'
 
 export default defineComponent({
   name: 'download-transfer',
@@ -24,14 +26,20 @@ export default defineComponent({
     let beforeAndroid = 'orchestrastudent://html:8888/SplashActivity?url='
 
     if (pn === 's') {
+      this.type = 'student'
+      this.buttonText = '下载管乐团学生端'
       tempPathname = '/orchestra-student/'
       beforeIos = 'BandMusicTeam://linkUrl='
       beforeAndroid = 'orchestrastudent://html:8888/SplashActivity?url='
     } else if (pn === 't') {
+      this.type = 'teacher'
+      this.buttonText = '下载管乐团伴学端'
       tempPathname = '/orchestra-teacher/'
       beforeIos = 'BandMusicTeamTeacher://linkUrl='
       beforeAndroid = 'orchestrateacher://html:8888/SplashActivity?url='
     } else if (pn === 'm') {
+      this.type = 'manage'
+      this.buttonText = '下载管乐团管理端'
       tempPathname = '/orchestra-school/'
       beforeIos = 'BandMusicTeamManager://linkUrl='
       beforeAndroid = 'orchestramanager://html:8888/SplashActivity?url='
@@ -94,7 +102,10 @@ export default defineComponent({
   render() {
     return (
       <div class={[styles.downloadContainer]}>
-        <Image src={student} />
+        {/* <Image src={student} /> */}
+        {this.type !== 'teacher' && this.type !== 'manage' && <Image src={student} />}
+        {this.type === 'teacher' && <Image src={teacher} />}
+        {this.type === 'manage' && <Image src={manage} />}
 
         <div class={styles.buttonGroup}>
           <Button round size="large" color="#FF8057" class={styles.btn} onClick={this.onDownload}>

+ 4 - 4
src/student/music-group/pre-apply/component/user-auth.tsx

@@ -45,12 +45,12 @@ export default defineComponent({
             save: true
           }
         })
-        showToast('实名成功')
+        // showToast('实名成功')
         state.user.data.account.realName = this.form.realName
         state.user.data.account.idCardNo = this.form.idCardNo
-        setTimeout(() => {
-          this.onSuccess()
-        }, 500)
+        // setTimeout(() => {
+        // }, 500)
+        this.onSuccess()
       } catch {
         //
       }

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

@@ -130,7 +130,7 @@ export default defineComponent({
           />
           <Field
             label="所在地区"
-            placeholder="省/市/区/街道"
+            placeholder="省/市/区"
             readonly
             isLink
             modelValue={state.pcrStr}
@@ -140,7 +140,7 @@ export default defineComponent({
           />
           <Field
             label="详细地址"
-            placeholder="小区楼栋/乡村名称"
+            placeholder="街道/小区楼栋/乡村名称"
             type="textarea"
             rows={3}
             v-model={state.detailAddress}