Merge branch '2023-8-23_上线' into online

src/views/attend-class/component/musicScore.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
     const origin = /(localhost|192)/.test(location.host)
       ? 'https://dev.kt.colexiu.com'
       : location.origin;
-    const src = `${origin}/instrument?platform=pc&zoom=1.2&modelType=practise&id=${props.music.content}&Authorization=${userStore.getToken}`;
+    const src = `${origin}/instrument?showGuide=true&platform=pc&zoom=1.2&modelType=practise&id=${props.music.content}&Authorization=${userStore.getToken}`;
     const checkView = () => {
       fetch(src)
         .then(() => {

src/views/setting/components/personInfo.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, onMounted, reactive, ref } from 'vue';
+import { defineComponent, nextTick, onMounted, reactive, ref } from 'vue';
 import styles from '../index.module.less';
 import {
   NImage,
@@ -53,7 +53,9 @@ export default defineComponent({
     const data = reactive({
       disabled: true,
       openChangePwd: false,
-      uploadShow: true
+      uploadShow: true,
+      loading: false,
+      oldTecherform: {} as any
     });
 
     const getAreaList = async () => {
@@ -213,7 +215,7 @@ export default defineComponent({
                     message: '请选择城区',
                     trigger: 'change'
                   }}>
-                  <NCascader
+                  {!data.loading && <NCascader
                     bordered={!data.disabled}
                     options={formOptions.areaList}
                     labelField="name"
@@ -235,7 +237,7 @@ export default defineComponent({
                       teacherForm.cityCode = pathValues[1]?.code;
                       teacherForm.regionCode = pathValues[2]?.code;
                     }}
-                  />
+                  />}
                 </NFormItem>
               </NGi>
             </NGrid>
@@ -252,7 +254,10 @@ export default defineComponent({
             <NButton
               class={styles.btn}
               color="#f24433"
-              onClick={() => (data.disabled = false)}>
+              onClick={() => {
+                data.oldTecherform = Object.assign({}, teacherForm);
+                data.disabled = false;
+              }}>
               修改信息
             </NButton>
           </NSpace>
@@ -261,8 +266,14 @@ export default defineComponent({
             <NButton
               class={styles.btn}
               onClick={() => {
-                data.disabled = true;
+                data.loading = true;
+                userStore.getInfo();
                 formRef.value?.restoreValidation();
+                data.disabled = true;
+                Object.assign(teacherForm, data.oldTecherform);
+                nextTick(() => {
+                  data.loading = false;
+                });
               }}>
               取消
             </NButton>

src/views/setting/components/schoolInfo/index.tsx

@@ -13,7 +13,7 @@ import {
   useDialog,
   useMessage
 } from 'naive-ui';
-import { defineComponent, onMounted, reactive, ref } from 'vue';
+import { defineComponent, nextTick, onMounted, reactive, ref } from 'vue';
 import styles from './index.module.less';
 import { useUserStore } from '/src/store/modules/users';
 import UploadFile from '/src/components/upload-file';
@@ -53,7 +53,9 @@ export default defineComponent({
       disabled: true,
 
       modal: false,
-      qrModal: false
+      qrModal: false,
+      oldTecherform: {} as any,
+      oldLoading: false
     });
     const showGuide = ref(false);
     const columns = (): DataTableColumn[] => {
@@ -278,7 +280,7 @@ export default defineComponent({
               />
             </NFormItem>
             <NFormItem label="城区">
-              <NCascader
+              {!data.oldLoading && <NCascader
                 placeholder="请选择城区"
                 bordered={!data.disabled}
                 options={formOptions.areaList}
@@ -297,7 +299,7 @@ export default defineComponent({
                   forms.cityCode = pathValues[1]?.code;
                   forms.regionCode = pathValues[2]?.code;
                 }}
-              />
+              />}
             </NFormItem>
             <NFormItem>
               {data.disabled ? (
@@ -305,7 +307,10 @@ export default defineComponent({
                   <NButton
                     class={styles.btn}
                     color="#f24433"
-                    onClick={() => (data.disabled = false)}>
+                    onClick={() => {
+                      data.oldTecherform = Object.assign({}, forms);
+                      data.disabled = false;
+                    }}>
                     修改信息
                   </NButton>
                 </NSpace>
@@ -313,7 +318,14 @@ export default defineComponent({
                 <NSpace class={styles.btnList} align="center" justify="end">
                   <NButton
                     class={styles.btn}
-                    onClick={() => (data.disabled = true)}>
+                    onClick={() => {
+                      Object.assign(forms, data.oldTecherform)
+                      data.disabled = true;
+                      data.oldLoading = true;
+                      nextTick(() => {
+                        data.oldLoading = false;
+                      })
+                    }}>
                     取消
                   </NButton>
                   <NButton