更新弹窗与下载样式

public/project/css/initiation.css

@@ -128,30 +128,35 @@ span {
 
 /* 弹窗 */
 .submit-container {
-  padding: 44px 26px 26px;
+  /* padding: 44px 26px 26px; */
   position: relative;
   text-align: center;
+  margin: 0 auto;
+  background: url('../images/initiation/i-popup-banner.png') no-repeat top center;
+  background-size: cover;
+  width: 8rem;
+  height: 9.38rem;
+}
+.submit-title {
+  padding-top: 5.7rem;
+  padding-bottom: 10px;
+  font-size: 18px;
+  font-weight: 500;
+  color: #000000;
 }
-
-.icon-close {
-  position: absolute;
-  width: 26px;
-  height: 26px;
-  top: 12px;
-  right: 12px;
-}
-
-.submit-img {
-  width: 134px;
-}
-
 .submit-tips {
-  font-size: 14px;
+  font-size: 15px;
   color: #777777;
   line-height: 20px;
-  padding-top: 5px;
   padding-bottom: 20px;
 }
+.submit-btn {
+  background: url('../images/initiation/i-popup-btn.png') no-repeat center center;
+  background-size: contain;
+  width: 3.547rem;
+  height: 1rem;
+  margin: 0 auto;
+}
 
 .submit-container .van-button {
   font-size: 18px;

public/project/css/preRegister.css

@@ -128,30 +128,35 @@ span {
 
 /* 弹窗 */
 .submit-container {
-  padding: 44px 26px 26px;
+  /* padding: 44px 26px 26px; */
   position: relative;
   text-align: center;
+  margin: 0 auto;
+  background: url('../images/initiation/p-popup-banner.png') no-repeat top center;
+  background-size: cover;
+  width: 8rem;
+  height: 9.38rem;
+}
+.submit-title {
+  padding-top: 5.7rem;
+  padding-bottom: 10px;
+  font-size: 18px;
+  font-weight: 500;
+  color: #000000;
 }
-
-.icon-close {
-  position: absolute;
-  width: 26px;
-  height: 26px;
-  top: 12px;
-  right: 12px;
-}
-
-.submit-img {
-  width: 134px;
-}
-
 .submit-tips {
-  font-size: 14px;
+  font-size: 15px;
   color: #777777;
   line-height: 20px;
-  padding-top: 5px;
   padding-bottom: 20px;
 }
+.submit-btn {
+  background: url('../images/initiation/p-popup-btn.png') no-repeat center center;
+  background-size: contain;
+  width: 3.547rem;
+  height: 1rem;
+  margin: 0 auto;
+}
 
 .submit-container .van-button {
   font-size: 18px;

public/project/css/schoolRegister.css

@@ -279,30 +279,35 @@ span {
 
 /* 弹窗 */
 .submit-container {
-  padding: 44px 26px 26px;
+  /* padding: 44px 26px 26px; */
   position: relative;
   text-align: center;
+  margin: 0 auto;
+  background: url('../images/initiation/s-popup-banner.png') no-repeat top center;
+  background-size: cover;
+  width: 8rem;
+  height: 9.38rem;
+}
+.submit-title {
+  padding-top: 5.7rem;
+  padding-bottom: 10px;
+  font-size: 18px;
+  font-weight: 500;
+  color: #000000;
 }
-
-.icon-close {
-  position: absolute;
-  width: 26px;
-  height: 26px;
-  top: 12px;
-  right: 12px;
-}
-
-.submit-img {
-  width: 134px;
-}
-
 .submit-tips {
-  font-size: 14px;
+  font-size: 15px;
   color: #777777;
   line-height: 20px;
-  padding-top: 5px;
   padding-bottom: 20px;
 }
+.submit-btn {
+  background: url('../images/initiation/s-popup-btn.png') no-repeat center center;
+  background-size: contain;
+  width: 3.547rem;
+  height: 1rem;
+  margin: 0 auto;
+}
 
 .submit-container .van-button {
   font-size: 18px;

public/project/initiation.html

@@ -276,12 +276,12 @@
       <van-picker show-toolbar :columns="classList" @cancel="classPicker = false" @confirm="onConfirmClass" />
     </van-popup>
 
-    <van-popup v-model:show="submitStatus" round style="width: 75%" :close-on-click-overlay="false">
+    <van-popup v-model:show="submitStatus" round style="width: 100%;background-color: transparent;"
+      :close-on-click-overlay="false">
       <div class="submit-container">
-        <!-- <img class="icon-close" src="./images/initiation/icon-close.png" @click="onLinkUrl" /> -->
-        <img src="./images/initiation/popup-submit.png" class="submit-img" />
-        <p class="submit-tips">提交成功，感谢您的参与！</p>
-        <van-button type="primary" color="#FF8057" block round @click="onLinkUrl">确认</van-button>
+        <p class="submit-title">提交成功</p>
+        <p class="submit-tips">您已完成乐团启蒙调查</p>
+        <div @click="onLinkUrl" class="submit-btn"></div>
       </div>
     </van-popup>
   </div>

public/project/preRegister.html

@@ -284,12 +284,12 @@
       <van-picker show-toolbar :columns="subjectList" @cancel="subjectPicker = false" @confirm="onConfirmSubject" />
     </van-popup>
 
-    <van-popup v-model:show="submitStatus" round style="width: 75%" :close-on-click-overlay="false">
+    <van-popup v-model:show="submitStatus" round style="width: 100%;background-color: transparent;"
+      :close-on-click-overlay="false">
       <div class="submit-container">
-        <!-- <img class="icon-close" src="./images/initiation/icon-close.png" @click="onLinkUrl" /> -->
-        <img src="./images/initiation/popup-submit.png" class="submit-img" />
-        <p class="submit-tips">提交成功，感谢您的参与！</p>
-        <van-button type="primary" color="#9A64FF" block round @click="onLinkUrl">确认</van-button>
+        <p class="submit-title">提交成功</p>
+        <p class="submit-tips">您已完成乐团报名</p>
+        <div @click="onLinkUrl" class="submit-btn"></div>
       </div>
     </van-popup>
   </div>

public/project/schoolRegister.html

@@ -139,12 +139,12 @@
         :columns-field-names="{ text: 'name', value: 'code', children: 'areas' }" />
     </van-popup>
 
-    <van-popup v-model:show="submitStatus" round style="width: 75%" :close-on-click-overlay="false">
+    <van-popup v-model:show="submitStatus" round style="width: 100%;background-color: transparent;"
+      :close-on-click-overlay="false">
       <div class="submit-container">
-        <!-- <img class="icon-close" src="./images/initiation/icon-close.png" @click="onLinkUrl" /> -->
-        <img src="./images/initiation/popup-submit.png" class="submit-img" />
-        <p class="submit-tips">提交成功，感谢您的参与！</p>
-        <van-button type="primary" color="#64A9FF" block round @click="onLinkUrl">确认</van-button>
+        <p class="submit-title">提交成功</p>
+        <p class="submit-tips">感谢您的参与！</p>
+        <div @click="onLinkUrl" class="submit-btn"></div>
       </div>
     </van-popup>
   </div>

src/student/download/index.module.less

@@ -1,29 +1,22 @@
-.student {
-  background: url('./images/student_bg.png') no-repeat top center;
-  min-height: 100vh;
+.downloadContainer {
+  overflow: hidden;
+  background: url('./images/download_bg.png') no-repeat top center;
   background-size: cover;
-}
-
-.teacher {
-  background: url('./images/teacher_bg.png') no-repeat top center;
   min-height: 100vh;
-  background-size: cover;
-}
-
-.manage {
-  background: url('./images/manage_bg.png') no-repeat top center;
-  min-height: 100vh;
-  background-size: cover;
+  padding: 0 42px 0;
+  :global {
+    .van-image {
+      margin-top: 40px;
+    }
+  }
 }
 
 .buttonGroup {
   text-align: center;
+  margin-top: 35px;
+  margin-bottom: 35px;
 }
 .btn {
-  // position: absolute;
-  // bottom: 53px;
-  // left: 50%;
-  // margin-left: -98px;
   width: 194px;
   height: 44px;
   line-height: 44px;

src/student/download/index.tsx

@@ -4,9 +4,9 @@ import { useRoute } from 'vue-router'
 import styles from './index.module.less'
 import wxBg from './images/wx_bg.png'
 import { browser } from '@/helpers/utils'
-import student from './images/student_bg.png'
-import teacher from './images/teacher_bg.png'
-import manage from './images/manage_bg.png'
+import student from './images/student-center.png'
+import teacher from './images/teacher-center.png'
+import manage from './images/manage-center.png'
 import OSticky from '@/components/o-sticky'
 
 // 唤起前缀
@@ -79,24 +79,16 @@ export default defineComponent({
       document.title = state.buttonText
     })
     return () => (
-      <div
-        class={[
-          styles.student,
-          state.type === 'teacher' && styles.teacher,
-          state.type === 'manage' && styles.manage
-        ]}
-      >
-        {/* {state.type !== 'teacher' && state.type !== 'manage' && <Image src={student} />}
+      <div class={[styles.downloadContainer]}>
+        {state.type !== 'teacher' && state.type !== 'manage' && <Image src={student} />}
         {state.type === 'teacher' && <Image src={teacher} />}
-        {state.type === 'manage' && <Image src={manage} />} */}
+        {state.type === 'manage' && <Image src={manage} />}
 
-        <OSticky background="white" position="bottom">
-          <div class={[styles.buttonGroup, 'btnGroup']}>
-            <Button round size="large" color="#FF8057" class={styles.btn} onClick={onDownload}>
-              {state.buttonText}
-            </Button>
-          </div>
-        </OSticky>
+        <div class={styles.buttonGroup}>
+          <Button round size="large" color="#FF8057" class={styles.btn} onClick={onDownload}>
+            {state.buttonText}
+          </Button>
+        </div>
 
         {state.wxStatus && (
           <div

src/student/download/transfer.tsx

@@ -1,10 +1,11 @@
 import { browser } from '@/helpers/utils'
-import { Button, showToast } from 'vant'
+import { Button, showToast, Image } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './index.module.less'
 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'
 
 export default defineComponent({
   name: 'download-transfer',
@@ -92,14 +93,15 @@ export default defineComponent({
   },
   render() {
     return (
-      <div class={[styles.student]}>
-        <OSticky background="white" position="bottom">
-          <div class={[styles.buttonGroup, 'btnGroup']}>
-            <Button round size="large" color="#FF8057" class={styles.btn} onClick={this.onDownload}>
-              {this.buttonText}
-            </Button>
-          </div>
-        </OSticky>
+      <div class={[styles.downloadContainer]}>
+        <Image src={student} />
+
+        <div class={styles.buttonGroup}>
+          <Button round size="large" color="#FF8057" class={styles.btn} onClick={this.onDownload}>
+            {this.buttonText}
+          </Button>
+        </div>
+
         {this.wxStatus && (
           <div
             class={styles.wxpopup}