Merge branch 'iteration-create' of http://git.dayaedu.com/liushengqiang/classroom-app into iteration-create

index.html

@@ -35,7 +35,7 @@
   <!-- windows phone 点击无高光 -->
   <meta name="msapplication-tap-highlight" content="no" />
   <meta name="referrer" content="no-referrer" />
-  <title>学生端</title>
+  <title>音乐数字课堂</title>
   <script src="/flexible.js" charset="UTF-8"></script>
 </head>
 

src/views/knowledge-library/error-question-mode/index.tsx

@@ -143,6 +143,8 @@ export default defineComponent({
         });
         state.visiableInfo.graspItem.grasp = true;
 
+        eventUnit.emit('unitAudioStop');
+
         // 只有一道题
         if (state.questionList.length === 1) {
           onAfter();
@@ -304,7 +306,8 @@ export default defineComponent({
         router.back();
       } else if (state.visiableInfo.operationType === 'BACK') {
         state.visiableInfo.show = false;
-        onAfter();
+        window.history.pushState(null, '', document.URL);
+        window.addEventListener('popstate', onBack, false);
       } else if (state.visiableInfo.operationType === 'CONTINUE') {
         onResultPopup();
       } else if (state.visiableInfo.operationType === 'GRASP') {
@@ -316,8 +319,7 @@ export default defineComponent({
       if (operationType === 'RESULT') {
       } else if (operationType === 'BACK') {
         state.visiableInfo.show = false;
-        window.history.pushState(null, '', document.URL);
-        window.addEventListener('popstate', onBack, false);
+        onAfter();
       } else if (operationType === 'CONTINUE' || operationType === 'GRASP') {
         state.visiableInfo.show = false;
       }

src/views/knowledge-library/model/result-finish/index.module.less

@@ -19,6 +19,8 @@
   font-weight: bold;
   color: #0F75BB;
   line-height: 24px;
+  max-width: 286px;
+  margin: 0 auto;
 
   span {
     position: relative;
@@ -47,6 +49,8 @@
   font-size: 14px;
   color: #333333;
   line-height: 20px;
+  max-width: 286px;
+  margin: 0 auto;
 }
 
 .finishFail {

src/views/school-register/index.tsx

@@ -344,7 +344,7 @@ export default defineComponent({
                   </Field>
                   <div style={{ padding: '10px 16px' }}>
                     <div class={styles.tips}>
-                      负责人即为该学校酷乐秀课堂乐器老师端管理员，手机号即为酷乐秀课堂乐器老师端账号，默认密码为：ktyq+手机号后四位
+                      负责人即为该学校音乐数字课堂老师端管理员，手机号即为音乐数字课堂老师端账号，默认密码为：yyszkt+手机号后四位
                     </div>
                   </div>
                 </CellGroup>

src/views/student-register/index.tsx

@@ -512,7 +512,7 @@ export default defineComponent({
         />
 
         {/* 是否在微信中打开 */}
-        {/* <OWxTip /> */}
+        <OWxTip />
       </div>
     );
   }

src/views/student-register/register-modal/index.tsx

@@ -190,9 +190,7 @@ export default defineComponent({
               label: () => (
                 <div>
                   联系方式（直接监护人）
-                  <p class={styles.tips}>
-                    手机号是数字化器乐学练工具的唯一登录账户
-                  </p>
+                  <p class={styles.tips}>手机号是音乐数字课堂的唯一登录账户</p>
                 </div>
               )
             }}

src/views/teaher-register/index.tsx

@@ -207,7 +207,7 @@ export default defineComponent({
                   v-model={forms.phone}
                 />
                 <div class={styles.tips}>
-                  该手机号码即为酷乐秀课堂乐器老师端登录账号
+                  该手机号码即为音乐数字课堂老师端登录账号
                 </div>
                 <Field
                   class={styles.inputCode}
@@ -248,7 +248,7 @@ export default defineComponent({
                     )
                   }}
                 </Field>
-                <div class={styles.xieyiWrap}>
+                {/* <div class={styles.xieyiWrap}>
                   <Checkbox v-model={data.checked}>
                     <div class={styles.xieyi}>
                       <span>我已阅读并同意</span>
@@ -270,7 +270,7 @@ export default defineComponent({
                       <span>注册协议</span>
                     </div>
                   </Checkbox>
-                </div>
+                </div> */}
                 <div class={styles.submit}>
                   <Button block native-type="submit">
                     注册