添加页面

dist/project/css/companionTeacher.css

@@ -1,376 +0,0 @@
-html,
-body,
-p,
-div,
-span {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-.m-toast {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  justify-content: center;
-  box-sizing: content-box;
-  width: 88px;
-  max-width: 70%;
-  min-height: 88px;
-  padding: 16px;
-  color: #fff;
-  font-size: 14px;
-  line-height: 20px;
-  white-space: pre-wrap;
-  text-align: center;
-  word-wrap: break-word;
-  background-color: rgba(50, 50, 51, 0.88);
-  border-radius: 4px;
-  -webkit-transform: translate3d(-50%, -50%, 0);
-  transform: translate3d(-50%, -50%, 0);
-  z-index: 2002
-}
-
-.m-loading {
-  position: relative;
-  color: #fff;
-  font-size: 0;
-  vertical-align: middle;
-  padding: 4px
-}
-
-.m-loading__spinner {
-  position: relative;
-  display: inline-block;
-  width: 30px;
-  max-width: 100%;
-  height: 30px;
-  max-height: 100%;
-  vertical-align: middle;
-  -webkit-animation: m-rotate .8s linear infinite;
-  animation: m-rotate .8s linear infinite
-}
-
-.m-loading__spinner--circular {
-  -webkit-animation-duration: 2s;
-  animation-duration: 2s
-}
-
-.m-loading__circular {
-  display: block;
-  width: 100%;
-  height: 100%
-}
-
-.m-loading__circular circle {
-  -webkit-animation: m-circular 1.5s ease-in-out infinite;
-  animation: m-circular 1.5s ease-in-out infinite;
-  stroke: currentColor;
-  stroke-width: 3;
-  stroke-linecap: round
-}
-
-.m-loading__text {
-  display: inline-block;
-  margin-left: 8px;
-  color: #969799;
-  font-size: 14px;
-  vertical-align: middle
-}
-
-.m-loading--vertical {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center
-}
-
-.m-loading--vertical .m-loading__text {
-  margin: 8px 0 0
-}
-
-@-webkit-keyframes m-circular {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0
-  }
-
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40
-  }
-
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120
-  }
-}
-
-@keyframes m-circular {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0
-  }
-
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40
-  }
-
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120
-  }
-}
-
-.m-toast__text {
-  margin-top: 8px
-}
-
-.van-field--error .van-field__control,
-.van-field--error .van-field__control::placeholder {
-  color: #c8c9cc;
-  -webkit-text-fill-color: currentColor;
-}
-
-#app {
-  background: url('../images/manageTeacher/banner1.png') no-repeat top center #F8F8F8;
-  background-size: contain;
-  max-width: 750px;
-  margin: 0 auto;
-  min-height: 100vh;
-  overflow: hidden;
-}
-
-.banner,
-.banner img {
-  width: 100%;
-  font-size: 0;
-}
-
-.van-cell {
-  flex-direction: column;
-  font-size: 16px;
-  padding: 14px 13px;
-}
-
-.van-field__label {
-  width: 100%;
-  margin-right: 0;
-  color: #333;
-  font-size: 16px;
-  font-weight: 500;
-}
-
-.van-cell--required::before {
-  left: 15px;
-}
-
-.van-field__body {
-  margin-top: 10px;
-}
-
-.btn-submit {
-  width: 90%;
-  margin: 20px auto;
-}
-
-.system h2 {
-  font-size: 18px;
-  font-weight: 500;
-  margin: 10px 24px;
-  color: #444444;
-}
-
-.system .van-cell--required::before {
-  left: 25px;
-}
-
-.cell-group {
-  margin: 0 13px 14px;
-  border-radius: 10px;
-  padding-bottom: 10px;
-}
-
-.van-form {
-  margin-top: 194px;
-  /* background: #F8F8F8; */
-  overflow: hidden;
-  /* margin: 290px 13px 14px; */
-}
-
-.top-tips {
-  margin: 30px 13px 20px;
-  padding: 9px 7px;
-  background: #FFFFFF;
-  border-radius: 10px;
-  border: 5px solid #BE93FF;
-  font-size: 14px;
-  font-weight: 500;
-  color: #724DA9;
-  line-height: 20px;
-}
-
-.title {
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 115px 24px 0;
-  width: 57%;
-  /* height: 154px; */
-  font-size: 28px;
-  font-weight: 600;
-  color: #FFFFFF;
-  line-height: 34px;
-  letter-spacing: 1px;
-  /* text-shadow: 0px 2px 3px rgba(0, 75, 255, 0.5); */
-}
-
-.tips {
-  font-size: 16px;
-  font-weight: 500;
-  color: #FFFFFF;
-  line-height: 22px;
-  text-shadow: 0px 1px 5px #FF5E20;
-  display: flex;
-  align-items: center;
-}
-
-.tips img {
-  margin-right: 8px;
-  width: 18px;
-  height: 18px;
-}
-
-
-.radioSection {
-  position: relative;
-}
-
-.radioItem {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  opacity: 0;
-}
-
-.radioSection+.radioSection {
-  margin-left: 12px;
-}
-
-.van-picker__confirm {
-  color: #F67146 !important;
-}
-
-/* 弹窗 */
-.stautsS {
-  position: relative;
-}
-
-.submit-container {
-  padding: 20px 26px 26px;
-
-  text-align: center;
-}
-
-.icon-close {
-  position: absolute;
-  width: 26px;
-  height: 26px;
-  top: 12px;
-  right: 12px;
-}
-
-.submit-img {
-  width: 100%;
-}
-
-.submit-title {
-  font-size: 18px;
-  font-weight: 500;
-  color: #333333;
-  line-height: 25px;
-}
-
-.submit-o {
-  padding-top: 10px;
-  font-size: 15px;
-  font-weight: 500;
-  color: #333333;
-  line-height: 21px;
-}
-
-.submit-o span {
-  color: #F67146;
-}
-
-.submit-tips {
-  font-size: 14px;
-  color: #777777;
-  line-height: 20px;
-  padding-top: 5px;
-  padding-bottom: 20px;
-}
-
-.submit-container .van-button {
-  font-size: 18px;
-  font-weight: 500;
-}
-
-.cell_title {
-  margin: 0 13px 8px;
-  display: inline-block;
-  padding: 2px 6px 3px;
-  background: #64A9FF;
-  border-radius: 6px;
-  font-size: 15px;
-  font-weight: 600;
-  color: #FFFFFF;
-}
-
-.van-tag+.van-tag {
-  margin-left: 8px;
-}
-
-.protocol {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 12px;
-  color: #AAAAAA;
-  line-height: 17px;
-}
-
-.protocol .c {
-  color: #F67146;
-}
-
-
-.phoneTips {
-  margin: 12px 12px 3px;
-  background: #FFEBDD;
-  border-radius: 6px;
-  font-size: 13px;
-  color: #F67146;
-  padding: 9px 10px;
-}

dist/project/css/initiation.css

@@ -104,6 +104,8 @@ span {
 
 .radioSection {
   position: relative;
+  min-width: 32px;
+    justify-content: center;
 }
 
 .radioItem {

dist/project/css/manageTeacher.css

@@ -1,372 +0,0 @@
-html,
-body,
-p,
-div,
-span {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-.m-toast {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  justify-content: center;
-  box-sizing: content-box;
-  width: 88px;
-  max-width: 70%;
-  min-height: 88px;
-  padding: 16px;
-  color: #fff;
-  font-size: 14px;
-  line-height: 20px;
-  white-space: pre-wrap;
-  text-align: center;
-  word-wrap: break-word;
-  background-color: rgba(50, 50, 51, 0.88);
-  border-radius: 4px;
-  -webkit-transform: translate3d(-50%, -50%, 0);
-  transform: translate3d(-50%, -50%, 0);
-  z-index: 2002
-}
-
-.m-loading {
-  position: relative;
-  color: #fff;
-  font-size: 0;
-  vertical-align: middle;
-  padding: 4px
-}
-
-.m-loading__spinner {
-  position: relative;
-  display: inline-block;
-  width: 30px;
-  max-width: 100%;
-  height: 30px;
-  max-height: 100%;
-  vertical-align: middle;
-  -webkit-animation: m-rotate .8s linear infinite;
-  animation: m-rotate .8s linear infinite
-}
-
-.m-loading__spinner--circular {
-  -webkit-animation-duration: 2s;
-  animation-duration: 2s
-}
-
-.m-loading__circular {
-  display: block;
-  width: 100%;
-  height: 100%
-}
-
-.m-loading__circular circle {
-  -webkit-animation: m-circular 1.5s ease-in-out infinite;
-  animation: m-circular 1.5s ease-in-out infinite;
-  stroke: currentColor;
-  stroke-width: 3;
-  stroke-linecap: round
-}
-
-.m-loading__text {
-  display: inline-block;
-  margin-left: 8px;
-  color: #969799;
-  font-size: 14px;
-  vertical-align: middle
-}
-
-.m-loading--vertical {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center
-}
-
-.m-loading--vertical .m-loading__text {
-  margin: 8px 0 0
-}
-
-@-webkit-keyframes m-circular {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0
-  }
-
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40
-  }
-
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120
-  }
-}
-
-@keyframes m-circular {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0
-  }
-
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40
-  }
-
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120
-  }
-}
-
-.m-toast__text {
-  margin-top: 8px
-}
-
-.van-field--error .van-field__control,
-.van-field--error .van-field__control::placeholder {
-  color: #c8c9cc;
-  -webkit-text-fill-color: currentColor;
-}
-
-#app {
-  background: url('../images/manageTeacher/banner.png') no-repeat top center #F8F8F8;
-  background-size: contain;
-  max-width: 750px;
-  margin: 0 auto;
-  min-height: 100vh;
-  overflow: hidden;
-}
-
-.banner,
-.banner img {
-  width: 100%;
-  font-size: 0;
-}
-
-.van-cell {
-  flex-direction: column;
-  font-size: 16px;
-  padding: 14px 13px;
-}
-
-.van-field__label {
-  width: 100%;
-  margin-right: 0;
-  color: #333;
-  font-size: 16px;
-  font-weight: 500;
-}
-
-.van-cell--required::before {
-  left: 15px;
-}
-
-.van-field__body {
-  margin-top: 10px;
-}
-
-.btn-submit {
-  width: 90%;
-  margin: 20px auto;
-}
-
-.system h2 {
-  font-size: 18px;
-  font-weight: 500;
-  margin: 10px 24px;
-  color: #444444;
-}
-
-.system .van-cell--required::before {
-  left: 25px;
-}
-
-.cell-group {
-  margin: 0 13px 14px;
-  border-radius: 10px;
-  padding-bottom: 20px;
-}
-
-.van-form {
-  margin-top: 194px;
-  /* background: #F8F8F8; */
-  overflow: hidden;
-  /* margin: 290px 13px 14px; */
-}
-
-.top-tips {
-  margin: 30px 13px 20px;
-  padding: 9px 7px;
-  background: #FFFFFF;
-  border-radius: 10px;
-  border: 5px solid #BE93FF;
-  font-size: 14px;
-  font-weight: 500;
-  color: #724DA9;
-  line-height: 20px;
-}
-
-.title {
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 115px 24px 0;
-  width: 57%;
-  /* height: 154px; */
-  font-size: 28px;
-  font-weight: 600;
-  color: #FFFFFF;
-  line-height: 34px;
-  letter-spacing: 1px;
-  /* text-shadow: 0px 2px 3px rgba(0, 75, 255, 0.5); */
-}
-
-.tips {
-  font-size: 16px;
-  font-weight: 500;
-  color: #FFFFFF;
-  line-height: 22px;
-  text-shadow: 0px 1px 5px #2F92FF;
-  display: flex;
-  align-items: center;
-}
-
-.tips img {
-  margin-right: 8px;
-  width: 18px;
-  height: 18px;
-}
-
-
-.radioSection {
-  position: relative;
-}
-
-.radioItem {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  opacity: 0;
-}
-
-.radioSection+.radioSection {
-  margin-left: 12px;
-}
-
-.van-picker__confirm {
-  color: #64A9FF !important;
-}
-
-/* 弹窗 */
-.stautsS {
-  position: relative;
-}
-
-.submit-container {
-  padding: 20px 26px 26px;
-
-  text-align: center;
-}
-
-.icon-close {
-  position: absolute;
-  width: 26px;
-  height: 26px;
-  top: 12px;
-  right: 12px;
-}
-
-.submit-img {
-  width: 100%;
-}
-
-.submit-title {
-  font-size: 18px;
-  font-weight: 500;
-  color: #333333;
-  line-height: 25px;
-}
-
-.submit-o {
-  padding-top: 10px;
-  font-size: 15px;
-  font-weight: 500;
-  color: #333333;
-  line-height: 21px;
-}
-
-.submit-o span {
-  color: #64A9FF;
-}
-
-.submit-tips {
-  font-size: 14px;
-  color: #777777;
-  line-height: 20px;
-  padding-top: 5px;
-  padding-bottom: 20px;
-}
-
-.submit-container .van-button {
-  font-size: 18px;
-  font-weight: 500;
-}
-
-.cell_title {
-  margin: 0 13px 8px;
-  display: inline-block;
-  padding: 2px 6px 3px;
-  background: #64A9FF;
-  border-radius: 6px;
-  font-size: 15px;
-  font-weight: 600;
-  color: #FFFFFF;
-}
-
-.protocol {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 12px;
-  color: #AAAAAA;
-  line-height: 17px;
-}
-
-.protocol .c {
-  color: #F67146;
-}
-
-
-.phoneTips {
-  margin: 12px;
-  background: #FFEBDD;
-  border-radius: 6px;
-  font-size: 13px;
-  color: #F67146;
-  padding: 9px 10px;
-}

dist/project/css/preRegister.css

@@ -104,6 +104,8 @@ span {
 
 .radioSection {
   position: relative;
+  min-width: 32px;
+    justify-content: center;
 }
 
 .radioItem {

dist/project/css/schoolRegister.css

@@ -255,6 +255,8 @@ span {
 
 .radioSection {
   position: relative;
+  min-width: 32px;
+    justify-content: center;
 }
 
 .radioItem {

public/project/companionTeacher.html

@@ -1,334 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="format-detection" content="telephone=no">
-  <meta name="mobile-web-app-capable" content="yes">
-  <meta name="msapplication-tap-highlight" content="no">
-  <meta name="fragment" content="!">
-  <meta name="viewport"
-    content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, viewport-fit=cover">
-  <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-  <meta http-equiv="Pragma" content="no-cache" />
-  <meta http-equiv="Expires" content="0" />
-  <meta http-equiv="Cache" content="no-cache">
-  <meta name="description" content="">
-
-  <link rel="icon" href="../favicon.ico">
-  <title>乐团伴学指导注册</title>
-  <!-- 引入样式文件 -->
-  <link rel="stylesheet" href="./js/vant-index.css" />
-  <link rel="stylesheet" href="./css/companionTeacher.css">
-  <script src="./js/flexible.js"></script>
-</head>
-
-<body>
-  <style>
-  </style>
-  <div id="m_loading" class="m-toast m-toast--middle m-toast--loading" style="z-index: 2001;">
-    <div class="m-loading m-loading--circular m-toast__loading"><span
-        class="m-loading__spinner m-loading__spinner--circular"><svg viewBox="25 25 50 50" class="m-loading__circular">
-          <circle cx="50" cy="50" r="20" fill="none"></circle>
-        </svg></span></div>
-    <div class="m-toast__text">加载中...</div>
-  </div>
-  <div id="app">
-    <div class="title">
-      <!-- 欢迎使用管乐团双师训练系统
-      <p class="tips">办乐团就用管乐团！</p> -->
-      <p class="tips">
-        <img src="./images/manageTeacher/school-logo.png" />
-        <span v-html="decodeURI(name)"></span>
-      </p>
-    </div>
-    <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
-      <van-cell-group inset class="cell-group">
-        <van-field required label="真实姓名" v-model="forms.realName" :rules="[{ required: true, message: '请填写真实姓名' }]"
-          name="realName" placeholder="请填写真实姓名" maxlength="50">
-        </van-field>
-
-        <van-field required label="手机号码" v-model="forms.phone" type="tel" maxlength="11" minlength="11"
-          :rules="[{ required: true, message: '请输入手机号码' },{ pattern, message: '输入手机号有误' }]" name="phone"
-          placeholder="请输入学校手机号码">
-        </van-field>
-        <div class="phoneTips">
-          <van-icon name="warning" size="16" />
-          提示：手机号码将成为您管乐团管理端登录账
-        </div>
-
-        <van-field required label="身份证号码" v-model="forms.idCardNo" :rules="[
-                { required: true, message: '请输入身份证号' },
-                {
-                  pattern:
-                    /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-                  message: '请输入正确的身份证号'
-                }
-              ]" name="idCardNo" placeholder="请输入身份证号码">
-        </van-field>
-
-        <van-field required label="性别" name="gender" :rules="[{ required: true, message: '请选择性别' }]">
-          <template #input>
-            <van-radio-group checked-color="#FF8057" v-model="forms.gender" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#FF8057" class="radioSection"
-                round>
-                <van-radio class="radioItem" :name="1"></van-radio>男
-              </van-tag>
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#FF8057" class="radioSection"
-                round>
-                <van-radio class="radioItem" :name="0"></van-radio>女
-              </van-tag>
-            </van-radio-group>
-          </template>
-        </van-field>
-
-        <van-field required label="所在城市" v-model="forms.cityCodeName" readonly name="cityCodeName"
-          @click="showPicker = true" :rules="[{ required: true, message: '请选择所在城市', trigger: 'onChange' }]"
-          placeholder="请选择所在城市">
-          <template #right-icon>
-            <van-icon name="arrow" :color="checkPhone ? '#aaa' : '#323233'" size="16"></van-icon>
-          </template>
-        </van-field>
-
-        <van-field required label="声部（可多选）" v-model="forms.showSubjectIds" readonly name="showSubjectIds"
-          @click="showSubject = true" :rules="[{ required: true, message: '请选择声部', trigger: 'onChange' }]"
-          placeholder="请选择声部">
-          <template #right-icon>
-            <van-icon name="arrow" :color="checkPhone ? '#aaa' : '#323233'" size="16"></van-icon>
-          </template>
-          <template #input>
-            <div class="subjectPlaceholder" style="color:#c8c9cc" v-if="forms.subjectIds.length <= 0">请选择声部</div>
-            <div v-else>
-              <van-tag closeable size="medium" color="#FF8057" v-for="(item, index) in selectSubjects"
-                @close="onSubjectRemove(item, index)">{{ item.text }}</van-tag>
-            </div>
-          </template>
-        </van-field>
-        <van-field required label="验证码" v-model="forms.smsValidCode" name="smsValidCode"
-          :rules="[{ required: true, message: '请输入验证码', trigger: 'onChange' }]" placeholder="请输入验证码">
-          <template #button>
-            <van-button type="primary" round size="small" color="#ff8057">发送验证码</van-button>
-          </template>
-        </van-field>
-      </van-cell-group>
-
-      <div class="protocol">
-        <van-checkbox v-model="checked" icon-size="16" style="margin-right: 6px" checked-color="#FF8057"></van-checkbox>
-        <span @click="() => { checked = !checked }">请认真阅读并勾选</span><span class="c">《乐团伴学指导注册协议》</span>
-      </div>
-
-      <van-button size="large" block round class="btn-submit" color="#FF8057" :loading="btnLoading"
-        native-type="submit">完成</van-button>
-    </van-form>
-
-    <van-popup v-model:show="showPicker" position="bottom" round>
-      <van-picker show-toolbar :columns="columns" @cancel="showPicker = false" @confirm="onConfirm"
-        :columns-field-names="{ text: 'name', value: 'code', children: 'areas' }" />
-    </van-popup>
-
-    <van-popup v-model:show="showSubject" position="bottom" round>
-      <van-picker show-toolbar :columns="columnSubject" @cancel="showSubject = false" @confirm="onConfirmSubject" />
-    </van-popup>
-
-    <van-popup v-model:show="submitStatus" round style="width: 75%" :close-on-click-overlay="false">
-      <div class="stautsS">
-        <img class="icon-close" src="./images/initiation/icon-close.png" @click="submitStatus = false" />
-        <img src="./images/manageTeacher/top-banner1.png" class="submit-img" />
-        <div class="submit-container">
-          <p class="submit-title">恭喜您已成功登记为</p>
-          <p class="submit-o">{{ decodeURI(name) }} <span>【伴学指导】</span></p>
-          <p class="submit-tips">请下载管乐团老师端APP进行授课</p>
-          <van-button type="primary" color="#FF8057" block round @click="submitStatus = false">立即下载</van-button>
-        </div>
-      </div>
-    </van-popup>
-  </div>
-
-  <!-- 引入 Vue 和 Vant 的 JS 文件 -->
-  <script src="./js/vue.global.min.js"></script>
-  <script src="./js/vant.min.js"></script>
-  <script src="./js/axios.js"></script>
-  <script type="text/javascript" src="./js/utils.js"></script>
-  <script type="text/javascript" src="./js/area.js"></script>
-  <script>
-    var app = Vue.createApp({
-      data() {
-        return {
-          showPicker: false,
-          showSubject: false,
-          submitStatus: false,
-          id: getQueryVariable('id'),
-          name: getQueryVariable('name'),
-          pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
-          columns: [],
-          pickerType: null, // 下拉类型
-          selectSubjects: [], // 选中的声部
-          forms: {
-            realName: '',
-            phone: null,
-            gender: 1,
-            idCardNo: null,
-            cityCode: null,
-            cityCodeName: '',
-            provinceCode: null,
-            showSubjectIds: '',
-            subjectIds: [],
-            smsValidCode: '',
-          },
-          btnLoading: false,
-          checkPhone: false,
-          checked: true,
-          columnSubject: []
-        }
-      },
-      async mounted() {
-        if (document.querySelector('#m_loading')) {
-          document.querySelector('#m_loading').remove()
-        }
-        if (!this.id) {
-          vant.showToast('信息获取失败，请联系老师')
-        }
-        try {
-          this.setLoading(true)
-          const tempareas = []
-          areas.forEach(item => {
-            const temp = {
-              name: item.name,
-              code: item.code,
-              areas: []
-            }
-            if (item.areas && item.areas.length > 0) {
-              item.areas.forEach(child => {
-                temp.areas.push({
-                  name: child.name,
-                  code: child.code,
-                })
-              })
-            }
-            tempareas.push(temp)
-          })
-          this.columns = tempareas || []
-
-          var res = await axios.post('/api-school/open/subject/page', {
-            page: 1,
-            rows: 50
-          })
-          if (res.data.code === 200) {
-            var rows = res.data.data.rows || []
-            var tempSubjects = []
-            rows.forEach(item => {
-              tempSubjects.push({
-                text: item.name,
-                value: item.id
-              })
-            })
-            this.columnSubject = tempSubjects
-          } else {
-            vant.showToast(res.data.message)
-          }
-        } catch {
-          vant.showDialog({
-            message: '信息获取失败，请联系老师',
-            theme: 'round-button',
-            confirmButtonColor: '#64A9FF'
-          })
-        }
-        this.setLoading(false)
-      },
-      methods: {
-        async onSubmit() {
-          if (!this.checked) {
-            vant.showToast('请阅读并同意协议')
-            return
-          }
-          this.btnLoading = true
-          try {
-            var forms = this.forms
-            var res = await axios.post('/api-school/open/schoolTeacherStudent/registerTeacher', {
-              ...forms,
-              subjectIds: forms.subjectIds.join(','),
-              smsValidCode: 666666,
-              schoolId: this.id,
-            })
-            if (res.data.code === 200) {
-              this.submitStatus = true
-            } else {
-              vant.showToast(res.data.message)
-            }
-          } catch {
-            vant.showToast('保存失败，请重试')
-          }
-          this.btnLoading = false
-        },
-        setLoading(status) {
-          if (status) {
-            vant.showLoadingToast({
-              duration: 0, // 持续展示 toast
-              message: '加载中...',
-              forbidClick: true,
-              loadingType: 'spinner',
-            })
-          } else {
-            vant.closeToast()
-          }
-        },
-        onConfirm(val) {
-          const selectedOptions = val.selectedOptions[1]
-          this.forms.cityCode = selectedOptions.code
-          this.forms.cityCodeName = selectedOptions.name
-          const selectedFirst = val.selectedOptions[0]
-          this.forms.provinceCode = selectedFirst.code
-          this.showPicker = false
-        },
-        onSubjectRemove(item, index) {
-          vant.showDialog({
-            title: '提示',
-            message: '您是否删除选中的声部',
-            confirmButtonColor: '#ff8057',
-            showCancelButton: true,
-          }).then(() => {
-            this.selectSubjects.splice(index, 1)
-            var tempSubjectIds = []
-            this.selectSubjects.forEach(subject => {
-              tempSubjectIds.push(subject.value)
-            })
-            this.forms.subjectIds = tempSubjectIds
-            this.forms.showSubjectIds = tempSubjectIds.join(',')
-          })
-        },
-        // 选择声部
-        onConfirmSubject(val) {
-          // console.log(val, 'val', val.selectedOptions[0])
-          var selected = val.selectedOptions[0]
-          var isCheck = false
-          this.selectSubjects.forEach(subject => {
-            if (subject.value === selected.value) {
-              isCheck = true
-            }
-          })
-          // 判断是否有选择一样的数据
-          if (isCheck) {
-            this.showSubject = false
-            return
-          }
-
-          this.selectSubjects.push(val.selectedOptions[0])
-          var tempSubjectIds = []
-          this.selectSubjects.forEach(subject => {
-            tempSubjectIds.push(subject.value)
-          })
-          this.forms.subjectIds = tempSubjectIds
-          this.forms.showSubjectIds = tempSubjectIds.join(',')
-          this.showSubject = false
-        }
-      }
-    })
-    app.use(vant)
-    app.mount('#app')
-  </script>
-</body>
-
-</html>

public/project/css/companionTeacher.css

@@ -1,377 +0,0 @@
-html,
-body,
-p,
-div,
-span {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-.m-toast {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  justify-content: center;
-  box-sizing: content-box;
-  width: 88px;
-  max-width: 70%;
-  min-height: 88px;
-  padding: 16px;
-  color: #fff;
-  font-size: 14px;
-  line-height: 20px;
-  white-space: pre-wrap;
-  text-align: center;
-  word-wrap: break-word;
-  background-color: rgba(50, 50, 51, 0.88);
-  border-radius: 4px;
-  -webkit-transform: translate3d(-50%, -50%, 0);
-  transform: translate3d(-50%, -50%, 0);
-  z-index: 2002
-}
-
-.m-loading {
-  position: relative;
-  color: #fff;
-  font-size: 0;
-  vertical-align: middle;
-  padding: 4px
-}
-
-.m-loading__spinner {
-  position: relative;
-  display: inline-block;
-  width: 30px;
-  max-width: 100%;
-  height: 30px;
-  max-height: 100%;
-  vertical-align: middle;
-  -webkit-animation: m-rotate .8s linear infinite;
-  animation: m-rotate .8s linear infinite
-}
-
-.m-loading__spinner--circular {
-  -webkit-animation-duration: 2s;
-  animation-duration: 2s
-}
-
-.m-loading__circular {
-  display: block;
-  width: 100%;
-  height: 100%
-}
-
-.m-loading__circular circle {
-  -webkit-animation: m-circular 1.5s ease-in-out infinite;
-  animation: m-circular 1.5s ease-in-out infinite;
-  stroke: currentColor;
-  stroke-width: 3;
-  stroke-linecap: round
-}
-
-.m-loading__text {
-  display: inline-block;
-  margin-left: 8px;
-  color: #969799;
-  font-size: 14px;
-  vertical-align: middle
-}
-
-.m-loading--vertical {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center
-}
-
-.m-loading--vertical .m-loading__text {
-  margin: 8px 0 0
-}
-
-@-webkit-keyframes m-circular {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0
-  }
-
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40
-  }
-
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120
-  }
-}
-
-@keyframes m-circular {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0
-  }
-
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40
-  }
-
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120
-  }
-}
-
-.m-toast__text {
-  margin-top: 8px
-}
-
-.van-field--error .van-field__control,
-.van-field--error .van-field__control::placeholder {
-  color: #c8c9cc;
-  -webkit-text-fill-color: currentColor;
-}
-
-#app {
-  background: url('../images/manageTeacher/banner1.png') no-repeat top center #F8F8F8;
-  background-size: contain;
-  max-width: 750px;
-  margin: 0 auto;
-  min-height: 100vh;
-  overflow: hidden;
-  position: relative;
-}
-
-.banner,
-.banner img {
-  width: 100%;
-  font-size: 0;
-}
-
-.van-cell {
-  flex-direction: column;
-  font-size: 16px;
-  padding: 14px 13px;
-}
-
-.van-field__label {
-  width: 100%;
-  margin-right: 0;
-  color: #333;
-  font-size: 16px;
-  font-weight: 500;
-}
-
-.van-cell--required::before {
-  left: 15px;
-}
-
-.van-field__body {
-  margin-top: 10px;
-}
-
-.btn-submit {
-  width: 90%;
-  margin: 20px auto;
-}
-
-.system h2 {
-  font-size: 18px;
-  font-weight: 500;
-  margin: 10px 24px;
-  color: #444444;
-}
-
-.system .van-cell--required::before {
-  left: 25px;
-}
-
-.cell-group {
-  margin: 0 13px 14px;
-  border-radius: 10px;
-  padding-bottom: 10px;
-}
-
-.van-form {
-  margin-top: 194px;
-  /* background: #F8F8F8; */
-  overflow: hidden;
-  /* margin: 290px 13px 14px; */
-}
-
-.top-tips {
-  margin: 30px 13px 20px;
-  padding: 9px 7px;
-  background: #FFFFFF;
-  border-radius: 10px;
-  border: 5px solid #BE93FF;
-  font-size: 14px;
-  font-weight: 500;
-  color: #724DA9;
-  line-height: 20px;
-}
-
-.title {
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 115px 24px 0;
-  width: 57%;
-  /* height: 154px; */
-  font-size: 28px;
-  font-weight: 600;
-  color: #FFFFFF;
-  line-height: 34px;
-  letter-spacing: 1px;
-  /* text-shadow: 0px 2px 3px rgba(0, 75, 255, 0.5); */
-}
-
-.tips {
-  font-size: 16px;
-  font-weight: 500;
-  color: #FFFFFF;
-  line-height: 22px;
-  text-shadow: 0px 1px 5px #FF5E20;
-  display: flex;
-  align-items: center;
-}
-
-.tips img {
-  margin-right: 8px;
-  width: 18px;
-  height: 18px;
-}
-
-
-.radioSection {
-  position: relative;
-}
-
-.radioItem {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  opacity: 0;
-}
-
-.radioSection+.radioSection {
-  margin-left: 12px;
-}
-
-.van-picker__confirm {
-  color: #F67146 !important;
-}
-
-/* 弹窗 */
-.stautsS {
-  position: relative;
-}
-
-.submit-container {
-  padding: 20px 26px 26px;
-
-  text-align: center;
-}
-
-.icon-close {
-  position: absolute;
-  width: 26px;
-  height: 26px;
-  top: 12px;
-  right: 12px;
-}
-
-.submit-img {
-  width: 100%;
-}
-
-.submit-title {
-  font-size: 18px;
-  font-weight: 500;
-  color: #333333;
-  line-height: 25px;
-}
-
-.submit-o {
-  padding-top: 10px;
-  font-size: 15px;
-  font-weight: 500;
-  color: #333333;
-  line-height: 21px;
-}
-
-.submit-o span {
-  color: #F67146;
-}
-
-.submit-tips {
-  font-size: 14px;
-  color: #777777;
-  line-height: 20px;
-  padding-top: 5px;
-  padding-bottom: 20px;
-}
-
-.submit-container .van-button {
-  font-size: 18px;
-  font-weight: 500;
-}
-
-.cell_title {
-  margin: 0 13px 8px;
-  display: inline-block;
-  padding: 2px 6px 3px;
-  background: #64A9FF;
-  border-radius: 6px;
-  font-size: 15px;
-  font-weight: 600;
-  color: #FFFFFF;
-}
-
-.van-tag+.van-tag {
-  margin-left: 8px;
-}
-
-.protocol {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 12px;
-  color: #AAAAAA;
-  line-height: 17px;
-}
-
-.protocol .c {
-  color: #F67146;
-}
-
-
-.phoneTips {
-  margin: 12px 12px 3px;
-  background: #FFEBDD;
-  border-radius: 6px;
-  font-size: 13px;
-  color: #F67146;
-  padding: 9px 10px;
-}

public/project/css/initiation.css

@@ -105,6 +105,8 @@ span {
 
 .radioSection {
   position: relative;
+  min-width: 32px;
+    justify-content: center;
 }
 
 .radioItem {

public/project/css/manageTeacher.css

@@ -1,373 +0,0 @@
-html,
-body,
-p,
-div,
-span {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-.m-toast {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  justify-content: center;
-  box-sizing: content-box;
-  width: 88px;
-  max-width: 70%;
-  min-height: 88px;
-  padding: 16px;
-  color: #fff;
-  font-size: 14px;
-  line-height: 20px;
-  white-space: pre-wrap;
-  text-align: center;
-  word-wrap: break-word;
-  background-color: rgba(50, 50, 51, 0.88);
-  border-radius: 4px;
-  -webkit-transform: translate3d(-50%, -50%, 0);
-  transform: translate3d(-50%, -50%, 0);
-  z-index: 2002
-}
-
-.m-loading {
-  position: relative;
-  color: #fff;
-  font-size: 0;
-  vertical-align: middle;
-  padding: 4px
-}
-
-.m-loading__spinner {
-  position: relative;
-  display: inline-block;
-  width: 30px;
-  max-width: 100%;
-  height: 30px;
-  max-height: 100%;
-  vertical-align: middle;
-  -webkit-animation: m-rotate .8s linear infinite;
-  animation: m-rotate .8s linear infinite
-}
-
-.m-loading__spinner--circular {
-  -webkit-animation-duration: 2s;
-  animation-duration: 2s
-}
-
-.m-loading__circular {
-  display: block;
-  width: 100%;
-  height: 100%
-}
-
-.m-loading__circular circle {
-  -webkit-animation: m-circular 1.5s ease-in-out infinite;
-  animation: m-circular 1.5s ease-in-out infinite;
-  stroke: currentColor;
-  stroke-width: 3;
-  stroke-linecap: round
-}
-
-.m-loading__text {
-  display: inline-block;
-  margin-left: 8px;
-  color: #969799;
-  font-size: 14px;
-  vertical-align: middle
-}
-
-.m-loading--vertical {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -webkit-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-  align-items: center
-}
-
-.m-loading--vertical .m-loading__text {
-  margin: 8px 0 0
-}
-
-@-webkit-keyframes m-circular {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0
-  }
-
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40
-  }
-
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120
-  }
-}
-
-@keyframes m-circular {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0
-  }
-
-  50% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -40
-  }
-
-  100% {
-    stroke-dasharray: 90, 150;
-    stroke-dashoffset: -120
-  }
-}
-
-.m-toast__text {
-  margin-top: 8px
-}
-
-.van-field--error .van-field__control,
-.van-field--error .van-field__control::placeholder {
-  color: #c8c9cc;
-  -webkit-text-fill-color: currentColor;
-}
-
-#app {
-  background: url('../images/manageTeacher/banner.png') no-repeat top center #F8F8F8;
-  background-size: contain;
-  max-width: 750px;
-  margin: 0 auto;
-  min-height: 100vh;
-  overflow: hidden;
-  position: relative;
-}
-
-.banner,
-.banner img {
-  width: 100%;
-  font-size: 0;
-}
-
-.van-cell {
-  flex-direction: column;
-  font-size: 16px;
-  padding: 14px 13px;
-}
-
-.van-field__label {
-  width: 100%;
-  margin-right: 0;
-  color: #333;
-  font-size: 16px;
-  font-weight: 500;
-}
-
-.van-cell--required::before {
-  left: 15px;
-}
-
-.van-field__body {
-  margin-top: 10px;
-}
-
-.btn-submit {
-  width: 90%;
-  margin: 20px auto;
-}
-
-.system h2 {
-  font-size: 18px;
-  font-weight: 500;
-  margin: 10px 24px;
-  color: #444444;
-}
-
-.system .van-cell--required::before {
-  left: 25px;
-}
-
-.cell-group {
-  margin: 0 13px 14px;
-  border-radius: 10px;
-  padding-bottom: 20px;
-}
-
-.van-form {
-  margin-top: 194px;
-  /* background: #F8F8F8; */
-  overflow: hidden;
-  /* margin: 290px 13px 14px; */
-}
-
-.top-tips {
-  margin: 30px 13px 20px;
-  padding: 9px 7px;
-  background: #FFFFFF;
-  border-radius: 10px;
-  border: 5px solid #BE93FF;
-  font-size: 14px;
-  font-weight: 500;
-  color: #724DA9;
-  line-height: 20px;
-}
-
-.title {
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 115px 24px 0;
-  width: 57%;
-  /* height: 154px; */
-  font-size: 28px;
-  font-weight: 600;
-  color: #FFFFFF;
-  line-height: 34px;
-  letter-spacing: 1px;
-  /* text-shadow: 0px 2px 3px rgba(0, 75, 255, 0.5); */
-}
-
-.tips {
-  font-size: 16px;
-  font-weight: 500;
-  color: #FFFFFF;
-  line-height: 22px;
-  text-shadow: 0px 1px 5px #2F92FF;
-  display: flex;
-  align-items: center;
-}
-
-.tips img {
-  margin-right: 8px;
-  width: 18px;
-  height: 18px;
-}
-
-
-.radioSection {
-  position: relative;
-}
-
-.radioItem {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  opacity: 0;
-}
-
-.radioSection+.radioSection {
-  margin-left: 12px;
-}
-
-.van-picker__confirm {
-  color: #64A9FF !important;
-}
-
-/* 弹窗 */
-.stautsS {
-  position: relative;
-}
-
-.submit-container {
-  padding: 20px 26px 26px;
-
-  text-align: center;
-}
-
-.icon-close {
-  position: absolute;
-  width: 26px;
-  height: 26px;
-  top: 12px;
-  right: 12px;
-}
-
-.submit-img {
-  width: 100%;
-}
-
-.submit-title {
-  font-size: 18px;
-  font-weight: 500;
-  color: #333333;
-  line-height: 25px;
-}
-
-.submit-o {
-  padding-top: 10px;
-  font-size: 15px;
-  font-weight: 500;
-  color: #333333;
-  line-height: 21px;
-}
-
-.submit-o span {
-  color: #64A9FF;
-}
-
-.submit-tips {
-  font-size: 14px;
-  color: #777777;
-  line-height: 20px;
-  padding-top: 5px;
-  padding-bottom: 20px;
-}
-
-.submit-container .van-button {
-  font-size: 18px;
-  font-weight: 500;
-}
-
-.cell_title {
-  margin: 0 13px 8px;
-  display: inline-block;
-  padding: 2px 6px 3px;
-  background: #64A9FF;
-  border-radius: 6px;
-  font-size: 15px;
-  font-weight: 600;
-  color: #FFFFFF;
-}
-
-.protocol {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 12px;
-  color: #AAAAAA;
-  line-height: 17px;
-}
-
-.protocol .c {
-  color: #F67146;
-}
-
-
-.phoneTips {
-  margin: 12px;
-  background: #FFEBDD;
-  border-radius: 6px;
-  font-size: 13px;
-  color: #F67146;
-  padding: 9px 10px;
-}

public/project/css/preRegister.css

@@ -105,6 +105,8 @@ span {
 
 .radioSection {
   position: relative;
+  min-width: 32px;
+    justify-content: center;
 }
 
 .radioItem {

public/project/css/schoolRegister.css

@@ -256,6 +256,8 @@ span {
 
 .radioSection {
   position: relative;
+  min-width: 32px;
+    justify-content: center;
 }
 
 .radioItem {

public/project/manageTeacher.html

@@ -1,213 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="format-detection" content="telephone=no">
-  <meta name="mobile-web-app-capable" content="yes">
-  <meta name="msapplication-tap-highlight" content="no">
-  <meta name="fragment" content="!">
-  <meta name="viewport"
-    content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, viewport-fit=cover">
-  <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-  <meta http-equiv="Pragma" content="no-cache" />
-  <meta http-equiv="Expires" content="0" />
-  <meta http-equiv="Cache" content="no-cache">
-  <meta name="description" content="">
-
-  <link rel="icon" href="../favicon.ico">
-  <title>乐团管理老师注册</title>
-  <!-- 引入样式文件 -->
-  <link rel="stylesheet" href="./js/vant-index.css" />
-  <link rel="stylesheet" href="./css/manageTeacher.css">
-  <script src="./js/flexible.js"></script>
-</head>
-
-<body>
-  <style>
-  </style>
-  <div id="m_loading" class="m-toast m-toast--middle m-toast--loading" style="z-index: 2001;">
-    <div class="m-loading m-loading--circular m-toast__loading"><span
-        class="m-loading__spinner m-loading__spinner--circular"><svg viewBox="25 25 50 50" class="m-loading__circular">
-          <circle cx="50" cy="50" r="20" fill="none"></circle>
-        </svg></span></div>
-    <div class="m-toast__text">加载中...</div>
-  </div>
-  <div id="app">
-    <div class="title">
-      <!-- 欢迎使用管乐团双师训练系统
-      <p class="tips">办乐团就用管乐团！</p> -->
-      <p class="tips">
-        <img src="./images/manageTeacher/school-logo.png" />
-        <span v-html="decodeURI(name)"></span>
-      </p>
-    </div>
-    <van-form validate-first scroll-to-error @submit="onSubmit" ref='form' class="form">
-      <van-cell-group inset class="cell-group">
-        <van-field required label="真实姓名" v-model="forms.realName" :rules="[{ required: true, message: '请填写真实姓名' }]"
-          name="realName" placeholder="请填写真实姓名" maxlength="50">
-        </van-field>
-
-        <div class="phoneTips">
-          <van-icon name="warning" size="16" />
-          提示：手机号码将成为您管乐团登录账
-        </div>
-        <van-field required label="手机号码" v-model="forms.phone" type="tel" maxlength="11" minlength="11"
-          :rules="[{ required: true, message: '请输入手机号码' },{ pattern, message: '输入手机号有误' }]" name="phone"
-          placeholder="请输入学校手机号码">
-        </van-field>
-
-        <van-field required label="身份证号码" v-model="forms.idCardNo" :rules="[
-                { required: true, message: '请输入身份证号' },
-                {
-                  pattern:
-                    /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-                  message: '请输入正确的身份证号'
-                }
-              ]" name="idCardNo" placeholder="请输入身份证号码">
-        </van-field>
-
-        <van-field required label="性别" name="gender" :rules="[{ required: true, message: '请选择性别' }]">
-          <template #input>
-            <van-radio-group checked-color="#64A9FF" v-model="forms.gender" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#64A9FF" class="radioSection"
-                round>
-                <van-radio class="radioItem" :name="1"></van-radio>男
-              </van-tag>
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#64A9FF" class="radioSection"
-                round>
-                <van-radio class="radioItem" :name="0"></van-radio>女
-              </van-tag>
-            </van-radio-group>
-          </template>
-        </van-field>
-      </van-cell-group>
-
-      <div class="protocol">
-        <van-checkbox v-model="checked" icon-size="16" style="margin-right: 6px"></van-checkbox>
-        <span @click="() => { checked = !checked }">请认真阅读并勾选</span><span class="c">《乐团伴学指导注册协议》</span>
-      </div>
-
-      <van-button size="large" block round class="btn-submit" color="#64A9FF" :loading="btnLoading"
-        native-type="submit">完成</van-button>
-    </van-form>
-
-    <van-popup v-model:show="showPicker" position="bottom" round>
-      <van-picker show-toolbar :columns="columns" @cancel="showPicker = false" @confirm="onConfirm"
-        :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">
-      <div class="stautsS">
-        <img class="icon-close" src="./images/initiation/icon-close.png" @click="submitStatus = false" />
-        <img src="./images/manageTeacher/top-banner.png" class="submit-img" />
-        <div class="submit-container">
-          <p class="submit-title">恭喜您已成功登记为</p>
-          <p class="submit-o">{{ decodeURI(name) }} <span>【管理老师】</span></p>
-          <p class="submit-tips">请下载管乐团管理端APP</p>
-          <van-button type="primary" color="#64A9FF" block round @click="submitStatus = false">立即下载</van-button>
-        </div>
-      </div>
-    </van-popup>
-  </div>
-
-  <!-- 引入 Vue 和 Vant 的 JS 文件 -->
-  <script src="./js/vue.global.min.js"></script>
-  <script src="./js/vant.min.js"></script>
-  <script src="./js/axios.js"></script>
-  <script type="text/javascript" src="./js/utils.js"></script>
-  <script>
-    var app = Vue.createApp({
-      data() {
-        return {
-          showPicker: false,
-          submitStatus: false,
-          id: getQueryVariable('id'),
-          name: getQueryVariable('name'),
-          pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
-          columns: [],
-          pickerType: null, // 下拉类型
-          forms: {
-            realName: '',
-            phone: null,
-            gender: 1,
-            idCardNo: null,
-          },
-          btnLoading: false,
-          checkPhone: false,
-          checked: true
-        }
-      },
-      async mounted() {
-        if (document.querySelector('#m_loading')) {
-          document.querySelector('#m_loading').remove()
-        }
-        if (!this.id) {
-          vant.showToast('信息获取失败，请联系老师')
-        }
-        try {
-          this.setLoading(true)
-        } catch {
-          vant.showDialog({
-            message: '信息获取失败，请联系老师',
-            theme: 'round-button',
-            confirmButtonColor: '#64A9FF'
-          })
-        }
-        this.setLoading(false)
-      },
-      methods: {
-        async onSubmit() {
-          if (!this.checked) {
-            vant.showToast('请阅读并同意协议')
-            return
-          }
-          this.btnLoading = true
-          try {
-            var forms = this.forms
-            var res = await axios.post('/api-school/open/schoolStaff/registerTeacher', {
-              ...forms,
-              schoolId: this.id,
-            })
-            if (res.data.code === 200) {
-              this.submitStatus = true
-            } else {
-              vant.showToast(res.data.message)
-            }
-          } catch {
-            vant.showToast('保存失败，请重试')
-          }
-          this.btnLoading = false
-        },
-        setLoading(status) {
-          if (status) {
-            vant.showLoadingToast({
-              duration: 0, // 持续展示 toast
-              message: '加载中...',
-              forbidClick: true,
-              loadingType: 'spinner',
-            })
-          } else {
-            vant.closeToast()
-          }
-        },
-        onSelectCity() {
-          this.showPicker = true
-        },
-        onConfirm(val) {
-          const selectedOptions = val.selectedOptions[1]
-          this.forms.cityCode = selectedOptions.code
-          this.forms.cityCodeName = selectedOptions.name
-          this.showPicker = false
-        }
-      }
-    })
-    app.use(vant)
-    app.mount('#app')
-  </script>
-</body>
-
-</html>

public/project/schoolRegister.html

@@ -173,6 +173,7 @@
           pickerType: null, // 下拉类型
           forms: {
             name: null,
+            regionCode: null,
             cityCode: null,
             cityCodeName: '',
             provinceCode: null,
@@ -216,7 +217,7 @@
           // })
           // this.columns = tempareas || []
 
-          var res = await axios.get('/api-school/open/school/city')
+          var res = await axios.get('/api-school/open/sysArea/queryAllProvince')
           if (res.data.code === 200) {
             this.columns = res.data.data || []
           }
@@ -269,9 +270,16 @@
         onConfirm(val) {
           const selectedOptions = val.selectedOptions[1]
           this.forms.cityCode = selectedOptions.code
-          this.forms.cityCodeName = selectedOptions.name
           const selectedFirst = val.selectedOptions[0]
           this.forms.provinceCode = selectedFirst.code
+          this.forms.cityCodeName = selectedFirst.name + '/' + selectedOptions.name
+          const selectTwo = val.selectedOptions[2]
+          if (selectTwo) {
+            this.forms.regionCode = selectTwo.code
+            this.forms.cityCodeName += '/' + selectTwo.name
+          }
+
+
           this.showPicker = false
         }
       }

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

@@ -28,6 +28,7 @@ import topBanner1 from './images/top-banner1.png'
 import { checkPhone } from '@/helpers/validate'
 import OUpload from '@/components/o-upload'
 import router from '@/router'
+import dayjs from 'dayjs'
 
 export default defineComponent({
   name: 'companion-teacher-register',
@@ -41,6 +42,8 @@ export default defineComponent({
       showEducation: false,
       id: route.query.id,
       name: route.query.name,
+      t: route.query.t as any, // 过期时间
+      qrCodeStatus: false, // 二维码是否失效
       pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
       columns: [] as any,
       pickerType: null, // 下拉类型
@@ -72,6 +75,15 @@ export default defineComponent({
     })
 
     const onSubmit = async () => {
+      if (state.qrCodeStatus) {
+        showDialog({
+          title: '提示',
+          message: '二维码已失效',
+          theme: 'round-button',
+          confirmButtonColor: '#ff8057'
+        })
+        return
+      }
       if (!state.checked) {
         showToast('请阅读并同意协议')
         return
@@ -177,6 +189,32 @@ export default defineComponent({
       if (!state.id) {
         showToast('信息获取失败，请联系老师')
       }
+
+      // t: route.query.t, // 过期时间
+      try {
+        if (state.t) {
+          const { data } = await request.get('/api-school/open/paramConfig/queryByParamName', {
+            requestType: 'form',
+            params: {
+              paramName: 'qr_code_expire_hours'
+            }
+          })
+          if (dayjs(Number(state.t)).isBefore(dayjs().add(data.paramValue, 'hour'))) {
+            showDialog({
+              title: '提示',
+              message: '二维码已失效',
+              theme: 'round-button',
+              confirmButtonColor: '#ff8057'
+            })
+            state.qrCodeStatus = true
+          } else {
+            state.qrCodeStatus = false
+          }
+        }
+      } catch {
+        //
+      }
+
       try {
         const tempareas: any = []
         areas.forEach((item) => {
@@ -217,7 +255,7 @@ export default defineComponent({
         showDialog({
           message: '信息获取失败，请联系老师',
           theme: 'round-button',
-          confirmButtonColor: '#64A9FF'
+          confirmButtonColor: '#ff8057'
         })
       }
     })

src/school/companion-teacher/index.tsx

@@ -100,7 +100,9 @@ export default defineComponent({
           '/orchestra-school/#/companion-teacher-register?id=' +
           res.data.schoolId +
           '&name=' +
-          res.data.schoolName
+          res.data.schoolName +
+          '&t=' +
+          +new Date()
 
         console.log(form.url)
       } catch {

src/school/manage-teacher/index.tsx

@@ -68,7 +68,9 @@ export default defineComponent({
           '/orchestra-school/#/manage-teacher-register?id=' +
           res.data.schoolId +
           '&name=' +
-          res.data.schoolName
+          res.data.schoolName +
+          '&t=' +
+          +new Date()
       } catch {
         //
       }

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

@@ -131,6 +131,8 @@ span {
 
 .radioSection {
   position: relative;
+  min-width: 32px;
+  justify-content: center;
 }
 
 .radioItem {

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

@@ -26,6 +26,7 @@ import schoolLogo from './images/school-logo.png'
 import iconClose from './images/icon-close.png'
 import topBanner1 from './images/top-banner.png'
 import { checkPhone } from '@/helpers/validate'
+import dayjs from 'dayjs'
 
 export default defineComponent({
   name: 'companion-teacher-register',
@@ -38,6 +39,8 @@ export default defineComponent({
       submitStatus: false,
       id: route.query.id,
       name: route.query.name,
+      t: route.query.t as any, // 过期时间
+      qrCodeStatus: false, // 二维码是否失效
       pattern: /^1(3|4|5|6|7|8|9)\d{9}$/,
       columns: [] as any,
       pickerType: null, // 下拉类型
@@ -59,6 +62,15 @@ export default defineComponent({
     })
 
     const onSubmit = async () => {
+      if (state.qrCodeStatus) {
+        showDialog({
+          title: '提示',
+          message: '二维码已失效',
+          theme: 'round-button',
+          confirmButtonColor: '#64A9FF'
+        })
+        return
+      }
       if (!state.checked) {
         showToast('请阅读并同意协议')
         return
@@ -106,6 +118,30 @@ export default defineComponent({
       if (!state.id) {
         showToast('信息获取失败，请联系老师')
       }
+
+      try {
+        if (state.t) {
+          const { data } = await request.get('/api-school/open/paramConfig/queryByParamName', {
+            requestType: 'form',
+            params: {
+              paramName: 'qr_code_expire_hours'
+            }
+          })
+          if (dayjs(Number(state.t)).isBefore(dayjs().add(data.paramValue, 'hour'))) {
+            showDialog({
+              title: '提示',
+              message: '二维码已失效',
+              theme: 'round-button',
+              confirmButtonColor: '#64A9FF'
+            })
+            state.qrCodeStatus = true
+          } else {
+            state.qrCodeStatus = false
+          }
+        }
+      } catch {
+        //
+      }
       try {
         const tempareas: any = []
         areas.forEach((item) => {

src/student/home/index.tsx

@@ -9,7 +9,7 @@ export default defineComponent({
     return (
       <>
         <div class={styles.title}>标题</div>
-        <Button>首页</Button>
+        {/* <Button>首页</Button> */}
       </>
     )
   }

src/student/music-group/layout/index.module.less

@@ -33,7 +33,8 @@
 
 .login {
   min-height: 100vh;
-  background: url('../../../views/layout/images/top_bg.png') no-repeat top center;
+  background: url('../../../views/layout/images/top_bg.png') no-repeat top center,
+    url('../../../views/layout/images/bottom_student_bg.png') no-repeat bottom center;
   background-color: #fff;
   background-size: 100%;
 

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

@@ -282,7 +282,8 @@ export default defineComponent({
                 }
 
                 // 切换订单时判断是否有支付中和已支付的订单，并且已注册过
-                if (props.registerInfo?.orderNumber > 0 && props.registerInfo?.register) {
+                // 判断学生所在乐团状态，如果在读则不允许更换声部（只能退团重新报名）
+                if (props.registerInfo?.registerStatus === 'LEARNING') {
                   state.subjectChangeStatus = true
                   return
                 }
@@ -375,7 +376,7 @@ export default defineComponent({
         <Dialog
           v-model:show={state.subjectChangeStatus}
           message={'您已报名，不能更换声部'}
-          messageAlign="left"
+          messageAlign="center"
           confirmButtonText="确定"
         >
           {{

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

@@ -163,18 +163,18 @@ export default defineComponent({
             console.error(countUpRef.needPrice.error)
           }
         }
-        if (countUpRef.originalPrice) {
-          countUpRef.originalPrice.update(state.orderInfo.originalPrice)
-        } else {
-          countUpRef.originalPrice = new CountUp('originalPrice', state.orderInfo.originalPrice, {
-            decimalPlaces: 2
-          })
-          if (!countUpRef.originalPrice.error) {
-            countUpRef.originalPrice.start()
-          } else {
-            console.error(countUpRef.originalPrice.error)
-          }
-        }
+        // if (countUpRef.originalPrice) {
+        //   countUpRef.originalPrice.update(state.orderInfo.originalPrice)
+        // } else {
+        //   countUpRef.originalPrice = new CountUp('originalPrice', state.orderInfo.originalPrice, {
+        //     decimalPlaces: 2
+        //   })
+        //   if (!countUpRef.originalPrice.error) {
+        //     countUpRef.originalPrice.start()
+        //   } else {
+        //     console.error(countUpRef.originalPrice.error)
+        //   }
+        // }
       })
     }
 
@@ -491,9 +491,7 @@ export default defineComponent({
               </p>
               <p class={styles.allPrice}>
                 总原价：
-                <del>
-                  ¥<i style="font-style: normal" id="originalPrice"></i>
-                </del>
+                <del>¥{moneyFormat(state.orderInfo.originalPrice)}</del>
               </p>
             </div>
             <div class={styles.paymentBtn}>

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

@@ -92,6 +92,8 @@
 
 .radioSection {
   position: relative;
+  min-width: 32px;
+  justify-content: center;
 
   .radioItem {
     position: absolute;
@@ -130,6 +132,7 @@
   align-items: center;
   justify-content: space-between;
   font-size: 14px;
+  padding: 15px 12px calc(15px + env(safe-area-inset-bottom)) 12px;
   .needPrice {
     display: flex;
     align-items: center;

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

@@ -34,6 +34,8 @@ export default defineComponent({
 
       nextTick(() => {
         state.tabValue = name
+
+        window.scrollTo(0, 0)
       })
     }
 
@@ -150,6 +152,9 @@ export default defineComponent({
           //
         }
       }
+
+      // document.getElementById('app')?.scrollTo(0, 0)
+      window.scrollTo(0, 0)
     }
 
     const goAuth = (wxAppId: string) => {

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

@@ -255,16 +255,22 @@ export default defineComponent({
         console.log(data)
         state.pay_channel = data.paymentChannel
         if (data.status === 'PAID') {
-          showConfirmDialog({
-            message: '该订单已支付成功',
-            showCancelButton: false
-          }).then(() => {
-            router.replace({
-              path: '/payment-result',
-              query: {
-                orderNo: state.orderNo
-              }
-            })
+          // showConfirmDialog({
+          //   message: '该订单已支付成功',
+          //   showCancelButton: false
+          // }).then(() => {
+          //   router.replace({
+          //     path: '/payment-result',
+          //     query: {
+          //       orderNo: state.orderNo
+          //     }
+          //   })
+          // })
+          router.replace({
+            path: '/payment-result',
+            query: {
+              orderNo: state.orderNo
+            }
           })
         } else {
           callback && callback()
@@ -304,16 +310,22 @@ export default defineComponent({
         console.log(data)
         state.pay_channel = data.paymentChannel
         if (data.status === 'PAID') {
-          showConfirmDialog({
-            message: '该订单已支付成功',
-            showCancelButton: false
-          }).then(() => {
-            router.replace({
-              path: '/payment-result',
-              query: {
-                orderNo: state.orderNo
-              }
-            })
+          // showConfirmDialog({
+          //   message: '该订单已支付成功',
+          //   showCancelButton: false
+          // }).then(() => {
+          //   router.replace({
+          //     path: '/payment-result',
+          //     query: {
+          //       orderNo: state.orderNo
+          //     }
+          //   })
+          // })
+          router.replace({
+            path: '/payment-result',
+            query: {
+              orderNo: state.orderNo
+            }
           })
         } else {
           callback && callback()

src/views/layout/login.module.less

@@ -1,9 +1,23 @@
 .login {
   min-height: 100vh;
-  background: url('./images/top_bg.png') no-repeat top center;
+  background: url('./images/top_bg.png') no-repeat top center,
+    url('./images/bottom_student_bg.png') no-repeat bottom center;
   background-color: #fff;
   background-size: 100%;
 
+  &.TEACHER {
+    background: url('./images/top_bg.png') no-repeat top center,
+      url('./images/bottom_teacher_bg.png') no-repeat bottom center;
+    background-color: #fff;
+    background-size: 100%;
+  }
+  &.SCHOOL {
+    background: url('./images/top_bg.png') no-repeat top center,
+      url('./images/bottom_manage_bg.png') no-repeat bottom center;
+    background-color: #fff;
+    background-size: 100%;
+  }
+
   .loginTitle {
     padding-top: 100px;
     font-size: 26px;

src/views/layout/login.tsx

@@ -126,7 +126,7 @@ export default defineComponent({
   },
   render() {
     return (
-      <div class={styles.login}>
+      <div class={[styles.login, styles[state.platformType]]}>
         <div class={styles.loginTitle}>
           您好，
           <br /> 欢迎使用管乐团{this.appName}

src/views/unit-test/model/error-mode/index.module.less

@@ -0,0 +1,49 @@
+.popupResult {
+  padding: 20px 20px 25px;
+  color: #333333;
+  font-size: 15px;
+
+  .resultTitle {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+    .titleImg {
+      width: 18px;
+      height: 18px;
+      margin-right: 6px;
+    }
+  }
+
+  .result {
+    margin-top: 20px;
+    padding: 12px;
+    background: #f6f6f6;
+    border-radius: 4px;
+    font-size: 16px;
+    font-weight: 500;
+    color: #333333;
+
+    .yes {
+      color: #4593f4;
+      margin-right: 20px;
+    }
+    .no {
+      color: #f44541;
+    }
+  }
+
+  .resultContent {
+    padding: 20px 0 30px;
+    font-size: 15px;
+    color: #333333;
+    text-align: justify;
+    line-height: 23px;
+    span {
+      font-weight: 600;
+    }
+  }
+}

src/views/unit-test/model/error-mode/index.tsx

@@ -0,0 +1,42 @@
+import { defineComponent } from 'vue'
+import { Image, Button } from 'vant'
+import iconError from '../../images/icon-error.png'
+import styles from './index.module.less'
+
+export default defineComponent({
+  name: 'result-mode',
+  emits: ['close', 'conform'],
+  setup(props, { emit }) {
+    return () => (
+      <div class={styles.popupResult}>
+        <div class={styles.resultTitle}>
+          <Image src={iconError} class={styles.titleImg} />
+          回答错误！
+        </div>
+
+        <div class={styles.result}>
+          正确答案: <span class={styles.yes}>A</span>
+          您选择: <span class={styles.no}>B</span>
+        </div>
+
+        <div class={styles.resultContent}>
+          <span>答案解析：</span>
+          八分音符，从拍号中可以了解这一段乐谱为4/4拍，每小节4拍，红框小节中共有8个音符共同组成4拍，每个音符半拍，所以是八分音符。
+        </div>
+
+        <Button
+          type="primary"
+          round
+          class={styles.btn}
+          block
+          onClick={() => {
+            emit('conform')
+            emit('close')
+          }}
+        >
+          我知道啦
+        </Button>
+      </div>
+    )
+  }
+})

src/views/unit-test/model/result-finish/index.module.less

@@ -0,0 +1,74 @@
+.finishResult {
+  color: #333333;
+  font-size: 15px;
+
+  .finishContainer {
+    background: url('../../images/exam-pass-bg.png') no-repeat top center;
+    background-size: contain;
+    height: 413px;
+  }
+
+  .finishContent {
+    padding-top: 180px;
+    text-align: center;
+
+    .scoreNums {
+      line-height: 70px;
+      font-size: 60px;
+      font-weight: bold;
+      color: #f67146;
+      span {
+        font-size: 20px;
+        padding-left: 10px;
+      }
+    }
+
+    .scoreName {
+      font-size: 20px;
+      font-weight: 600;
+      color: #191919;
+      padding: 10px 0 20px;
+      max-width: 80%;
+      margin-left: 10%;
+      line-height: 28px;
+    }
+    .scoreResult {
+      font-size: 16px;
+      font-weight: 500;
+      color: #f44541;
+    }
+  }
+}
+.finishFail {
+  .finishContainer {
+    background: url('../../images/exam-fail-bg.png') no-repeat top center;
+    background-size: contain;
+    height: 413px;
+  }
+}
+
+.finishBtnGroup {
+  margin-top: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .finishLeft,
+  .finishRight {
+    text-align: center;
+    height: 50px;
+    line-height: 46px;
+    width: 100%;
+    font-size: 18px;
+    font-weight: 500;
+  }
+  .finishLeft {
+    color: #703a17;
+    background: url('../../images/exam-right-bg.png') no-repeat center center;
+    background-size: contain;
+  }
+  .finishRight {
+    color: #722b0f;
+    background: url('../../images/exam-left-btn.png') no-repeat center center;
+    background-size: contain;
+  }
+}

src/views/unit-test/model/result-finish/index.tsx

@@ -0,0 +1,51 @@
+import { defineComponent, PropType } from 'vue'
+import { Image, Button } from 'vant'
+import iconError from '../../images/icon-error.png'
+import styles from './index.module.less'
+
+export default defineComponent({
+  name: 'result-mode',
+  props: {
+    confirmButtonText: {
+      type: String,
+      default: '去练习'
+    },
+    cancelButtonText: {
+      type: String,
+      default: '我知道了'
+    },
+    status: {
+      type: String as PropType<'SUCCESS' | 'FAIL'>,
+      default: 'SUCCESS'
+    },
+    resultString: {
+      type: String,
+      default: '恭喜你，测验通过！'
+    }
+  },
+  emits: ['close', 'conform'],
+  setup(props, { emit }) {
+    return () => (
+      <div class={[styles.finishResult, props.status === 'FAIL' && styles.finishFail]}>
+        <div class={styles.finishContainer}>
+          <div class={styles.finishContent}>
+            <div class={styles.scoreNums}>
+              98<span>分</span>
+            </div>
+            <div class={styles.scoreName}>《长笛level上册测验一》</div>
+            <div class={styles.scoreResult}>{props.resultString}</div>
+          </div>
+        </div>
+
+        <div class={styles.finishBtnGroup}>
+          <div class={styles.finishLeft} onClick={() => emit('conform')}>
+            {props.confirmButtonText}
+          </div>
+          <div class={styles.finishRight} onClick={() => emit('close')}>
+            {props.cancelButtonText}
+          </div>
+        </div>
+      </div>
+    )
+  }
+})

src/views/unit-test/practice-mode/index.tsx

@@ -12,11 +12,11 @@ import {
 } from 'vant'
 import { defineComponent, onMounted, reactive, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import NoticeStart from '../model/notice-start'
 import styles from './index.module.less'
 import iconQuestionNums from '../images/icon-question-nums.png'
 import iconCountDown from '../images/icon-count-down.png'
 import iconButtonList from '../images/icon-button-list.png'
+
 import OSticky from '@/components/o-sticky'
 import ChoiceQuestion from '../model/choice-question'
 import AnswerList from '../model/answer-list'
@@ -24,6 +24,8 @@ import ODialog from '@/components/o-dialog'
 import DragQuestion from '../model/drag-question'
 import KeepLookQuestion from '../model/keep-look-question'
 import PlayQuestion from '../model/play-question'
+import ErrorMode from '../model/error-mode'
+import ResultFinish from '../model/result-finish'
 
 export default defineComponent({
   name: 'unit-detail',
@@ -33,10 +35,11 @@ export default defineComponent({
     const countDownRef = ref()
     const swipeRef = ref()
     const state = reactive({
-      visiableNotice: false,
+      visiableError: false,
       visiableAnswer: false,
+      visiableResult: false,
       currentIndex: 0,
-      questionList: [5],
+      questionList: [1, 2, 3, 4, 5],
       answerList: {},
       time: 30 * 60 * 1000,
       visiableSure: false,
@@ -122,15 +125,15 @@ export default defineComponent({
               round
               type="primary"
               onClick={() => {
-                // if (state.questionList.length - 1 === state.currentIndex) {
-                //   state.visiableSure = true
-                // } else {
-                swipeRef.value?.next()
-                // }
+                if (state.questionList.length - 1 === state.currentIndex) {
+                  state.visiableSure = true
+                } else {
+                  // swipeRef.value?.next()
+                  state.visiableError = true
+                }
               }}
             >
-              下一题
-              {/* {state.questionList.length === state.currentIndex + 1 ? '测试完成' : '下一题'} */}
+              {state.questionList.length - 1 === state.currentIndex ? '测验完成' : '下一题'}
             </Button>
             <Image
               src={iconButtonList}
@@ -144,6 +147,16 @@ export default defineComponent({
         <ActionSheet v-model:show={state.visiableAnswer} title="题目列表" safeAreaInsetBottom>
           <AnswerList
             value={[1, 3, 4]}
+            statusList={[
+              {
+                text: '答对',
+                color: '#71B0FF'
+              },
+              {
+                text: '答错',
+                color: '#FF8486'
+              }
+            ]}
             onSelect={(item: any) => {
               // 跳转，并且跳过动画
               swipeRef.value?.swipeTo(item, {
@@ -154,22 +167,33 @@ export default defineComponent({
           />
         </ActionSheet>
 
-        {/* 测验须知 */}
         <Popup
-          v-model:show={state.visiableNotice}
-          round
+          v-model:show={state.visiableError}
           style={{ width: '90%' }}
+          round
           closeOnClickOverlay={false}
         >
-          <NoticeStart
-            onClose={() => {
-              state.visiableNotice = false
-              router.back()
+          <ErrorMode
+            onClose={() => (state.visiableError = false)}
+            onConform={() => {
+              swipeRef.value?.next()
             }}
-            onConfirm={() => {
-              console.log('start')
-              countDownRef.value.start()
-              state.visiableNotice = false
+          />
+        </Popup>
+
+        <Popup
+          v-model:show={state.visiableResult}
+          closeOnClickOverlay={false}
+          style={{ background: 'transparent', width: '96%' }}
+        >
+          <ResultFinish
+            // status="FAIL"
+            confirmButtonText="继续练习本考点"
+            cancelButtonText="下一个考点"
+            onClose={() => (state.visiableResult = false)}
+            onConform={() => {
+              console.log('Success')
+              state.visiableResult = false
             }}
           />
         </Popup>
@@ -182,6 +206,9 @@ export default defineComponent({
           showCancelButton
           cancelButtonText="再等等"
           confirmButtonText="确认完成"
+          onConfirm={() => {
+            state.visiableResult = true
+          }}
         />
       </div>
     )

src/views/unit-test/test-exercise/index.module.less

@@ -1,46 +1,86 @@
 .unitDetail {
   overflow: hidden;
+
+  .cellGroup {
+    margin: 12px 13px;
+
+    .cellTitle {
+      padding: 8px 0 12px;
+      font-size: 16px;
+      font-weight: 500;
+      color: #333333;
+      i {
+        display: inline-block;
+        margin-right: 6px;
+        width: 4px;
+        height: 12px;
+        background: #ff8057;
+        border-radius: 2px;
+      }
+    }
+
+    :global {
+      .van-cell {
+        font-size: 16px;
+        font-weight: 500;
+        color: #333333;
+        border-radius: 10px;
+        overflow: hidden;
+        padding: 18px 15px;
+        margin-bottom: 10px;
+      }
+      .van-cell__title,
+      .van-cell__value {
+        flex: 1 auto;
+      }
+
+      .van-cell__value {
+        flex-shrink: 0;
+        margin-left: 12px;
+        color: #f67146;
+      }
+      .van-cell__right-icon {
+        color: #f67146;
+      }
+    }
+
+    .img {
+      width: 18px;
+      height: 18px;
+      margin-right: 6px;
+      flex-shrink: 0;
+    }
+  }
 }
 
 .unitSection {
-  margin: 12px 13px;
-  padding: 13px 15px;
+  margin: 12px 13px 0;
+  padding: 15px;
   width: auto;
   overflow: hidden;
   border-radius: 10px;
 
   .unitTitle {
+    display: table;
     font-size: 16px;
     font-weight: 500;
     color: #333333;
+    :global {
+      .van-tag {
+        margin-left: 10px;
+        vertical-align: middle;
+        margin-top: -3px;
+      }
+    }
   }
 
-  .unitCount {
-    padding-top: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .qNums {
-    display: flex;
-    align-items: center;
+  .examSite {
+    padding-top: 15px;
     font-size: 14px;
     color: #333333;
-    line-height: 20px;
-    .num {
-      color: #f67146;
+
+    p {
+      margin-bottom: 10px;
     }
   }
-  .icon {
-    width: 14px;
-    height: 14px;
-    margin-right: 4px;
-  }
-}
-
-.wapList {
-  width: 44px;
-  height: 44px;
-  flex-shrink: 0;
-  margin-left: 18px;
 }

src/views/unit-test/test-exercise/index.tsx

@@ -1,188 +1,57 @@
-import {
-  ActionSheet,
-  Button,
-  Cell,
-  CountDown,
-  Icon,
-  Image,
-  Popup,
-  Swipe,
-  SwipeItem,
-  Tag
-} from 'vant'
+import { Cell, CellGroup, Image, Tag } from 'vant'
 import { defineComponent, onMounted, reactive, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import NoticeStart from '../model/notice-start'
 import styles from './index.module.less'
-import iconQuestionNums from '../images/icon-question-nums.png'
-import iconCountDown from '../images/icon-count-down.png'
-import iconButtonList from '../images/icon-button-list.png'
-import OSticky from '@/components/o-sticky'
-import ChoiceQuestion from '../model/choice-question'
-import AnswerList from '../model/answer-list'
-import ODialog from '@/components/o-dialog'
-import DragQuestion from '../model/drag-question'
-import KeepLookQuestion from '../model/keep-look-question'
-import PlayQuestion from '../model/play-question'
+import iconTag from '../images/icon-tag.png'
 
 export default defineComponent({
   name: 'unit-detail',
   setup() {
     const route = useRoute()
     const router = useRouter()
-    const countDownRef = ref()
-    const swipeRef = ref()
     const state = reactive({
-      visiableNotice: false,
-      visiableAnswer: false,
-      currentIndex: 0,
-      questionList: [5],
-      answerList: {},
-      time: 30 * 60 * 1000,
-      visiableSure: false,
-      childs: [
-        { name: 'John', id: 0 },
-        { name: 'Joao', id: 1 },
-        { name: 'Jean', id: 2 }
-      ]
+      visiableNotice: false
     })
 
+    const onDetail = (item: any) => {
+      router.push({
+        path: '/practice-mode'
+      })
+    }
+
     return () => (
       <div class={styles.unitDetail}>
         <Cell center class={styles.unitSection}>
           {{
-            title: () => <div class={styles.unitTitle}>长笛level1上册测验一</div>,
+            title: () => (
+              <div class={styles.unitTitle}>
+                长笛level1上册测验一长笛level1上册测验一册测验一
+                <Tag type="primary">长笛单技课</Tag>
+              </div>
+            ),
             label: () => (
-              <div class={styles.unitCount}>
-                <div class={styles.qNums}>
-                  <Icon class={styles.icon} name={iconQuestionNums} />
-                  题目数量 <span class={styles.num}>1</span>/4
-                </div>
-                <div class={styles.qNums}>
-                  <Icon class={styles.icon} name={iconCountDown} />
-                  剩余时长：
-                  <CountDown
-                    ref={countDownRef}
-                    time={state.time}
-                    format={'mm:ss'}
-                    autoStart={false}
-                  />
-                </div>
+              <div class={styles.examSite}>
+                <p>1、在练习模式中可以对本次测验相关考点进行反复练习;</p>
+                <p>2、为了测验达到理想成绩，充分练习后再进行正式测验吧！</p>
               </div>
             )
           }}
         </Cell>
 
-        <Swipe
-          loop={false}
-          showIndicators={false}
-          ref={swipeRef}
-          duration={300}
-          touchable={false}
-          lazyRender
-          // initialSwipe={state.currentIndex}
-          onChange={(index: number) => {
-            state.currentIndex = index
-          }}
-        >
-          <SwipeItem>
-            <ChoiceQuestion v-model:value={state.answerList[0]} type="checkbox" />
-          </SwipeItem>
-          <SwipeItem>
-            <ChoiceQuestion v-model:value={state.answerList[1]} type="radio" />
-          </SwipeItem>
-          <SwipeItem>
-            <DragQuestion />
-          </SwipeItem>
-          <SwipeItem>
-            <KeepLookQuestion />
-          </SwipeItem>
-          <SwipeItem>
-            <PlayQuestion />
-          </SwipeItem>
-        </Swipe>
-
-        <OSticky position="bottom" background="white">
-          <div class={['btnGroup btnMore']}>
-            {state.currentIndex > 0 && (
-              <Button
-                round
-                block
-                type="primary"
-                plain
-                onClick={() => {
-                  swipeRef.value?.prev()
-                }}
-              >
-                上一题
-              </Button>
-            )}
-            <Button
-              block
-              round
-              type="primary"
-              onClick={() => {
-                // if (state.questionList.length - 1 === state.currentIndex) {
-                //   state.visiableSure = true
-                // } else {
-                swipeRef.value?.next()
-                // }
-              }}
-            >
-              下一题
-              {/* {state.questionList.length === state.currentIndex + 1 ? '测试完成' : '下一题'} */}
-            </Button>
-            <Image
-              src={iconButtonList}
-              class={[styles.wapList, 'van-haptics-feedback']}
-              onClick={() => (state.visiableAnswer = true)}
-            />
+        <div class={styles.cellGroup}>
+          <div class={styles.cellTitle}>
+            <i></i>考点
           </div>
-        </OSticky>
-
-        {/* 题目集合 */}
-        <ActionSheet v-model:show={state.visiableAnswer} title="题目列表" safeAreaInsetBottom>
-          <AnswerList
-            value={[1, 3, 4]}
-            onSelect={(item: any) => {
-              // 跳转，并且跳过动画
-              swipeRef.value?.swipeTo(item, {
-                immediate: true
-              })
-              state.visiableAnswer = false
-            }}
-          />
-        </ActionSheet>
-
-        {/* 测验须知 */}
-        <Popup
-          v-model:show={state.visiableNotice}
-          round
-          style={{ width: '90%' }}
-          closeOnClickOverlay={false}
-        >
-          <NoticeStart
-            onClose={() => {
-              state.visiableNotice = false
-              router.back()
-            }}
-            onConfirm={() => {
-              console.log('start')
-              countDownRef.value.start()
-              state.visiableNotice = false
-            }}
-          />
-        </Popup>
-
-        <ODialog
-          v-model:show={state.visiableSure}
-          title="测验完成"
-          message="确认本次测验的题目都完成了吗？\n提交后不可修改哦"
-          messageAlign="left"
-          showCancelButton
-          cancelButtonText="再等等"
-          confirmButtonText="确认完成"
-        />
+          {[1, 2, 3, 44, 5, 6, 7, 8].map((item: any) => (
+            <Cell center isLink titleClass={['van-ellipsis']} onClick={() => onDetail(item)}>
+              {{
+                icon: () => <Image src={iconTag} class={styles.img} />,
+                title: () => <>乐理知识乐理知识乐理知识乐理知识乐理知识乐理知识-音符</>,
+                value: () => <span>去练习</span>
+              }}
+            </Cell>
+          ))}
+        </div>
       </div>
     )
   }