修改bug

package-lock.json

@@ -11,6 +11,7 @@
       "dependencies": {
         "@amap/amap-jsapi-loader": "^1.0.1",
         "@vant/use": "^1.5.1",
+        "@vueuse/core": "^10.1.2",
         "clean-deep": "^3.4.0",
         "dayjs": "^1.11.7",
         "echarts": "^5.4.2",
@@ -2346,6 +2347,11 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.17",
+      "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.17.tgz",
+      "integrity": "sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA=="
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.59.1",
       "resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz",
@@ -2928,6 +2934,30 @@
       "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.47.tgz",
       "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="
     },
+    "node_modules/@vueuse/core": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-10.1.2.tgz",
+      "integrity": "sha512-roNn8WuerI56A5uiTyF/TEYX0Y+VKlhZAF94unUfdhbDUI+NfwQMn4FUnUscIRUhv3344qvAghopU4bzLPNFlA==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.17",
+        "@vueuse/metadata": "10.1.2",
+        "@vueuse/shared": "10.1.2",
+        "vue-demi": ">=0.14.0"
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-10.1.2.tgz",
+      "integrity": "sha512-3mc5BqN9aU2SqBeBuWE7ne4OtXHoHKggNgxZR2K+zIW4YLsy6xoZ4/9vErQs6tvoKDX6QAqm3lvsrv0mczAwIQ=="
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-10.1.2.tgz",
+      "integrity": "sha512-1uoUTPBlgyscK9v6ScGeVYDDzlPSFXBlxuK7SfrDGyUTBiznb3mNceqhwvZHjtDRELZEN79V5uWPTF1VDV8svA==",
+      "dependencies": {
+        "vue-demi": ">=0.14.0"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.8.2",
       "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.2.tgz",
@@ -7673,6 +7703,28 @@
         "@vue/shared": "3.2.47"
       }
     },
+    "node_modules/vue-demi": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.5.tgz",
+      "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/vue-eslint-parser": {
       "version": "9.1.1",
       "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-9.1.1.tgz",
@@ -9697,6 +9749,11 @@
         "@types/node": "*"
       }
     },
+    "@types/web-bluetooth": {
+      "version": "0.0.17",
+      "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.17.tgz",
+      "integrity": "sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA=="
+    },
     "@typescript-eslint/eslint-plugin": {
       "version": "5.59.1",
       "resolved": "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.1.tgz",
@@ -10149,6 +10206,30 @@
       "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.47.tgz",
       "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="
     },
+    "@vueuse/core": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-10.1.2.tgz",
+      "integrity": "sha512-roNn8WuerI56A5uiTyF/TEYX0Y+VKlhZAF94unUfdhbDUI+NfwQMn4FUnUscIRUhv3344qvAghopU4bzLPNFlA==",
+      "requires": {
+        "@types/web-bluetooth": "^0.0.17",
+        "@vueuse/metadata": "10.1.2",
+        "@vueuse/shared": "10.1.2",
+        "vue-demi": ">=0.14.0"
+      }
+    },
+    "@vueuse/metadata": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-10.1.2.tgz",
+      "integrity": "sha512-3mc5BqN9aU2SqBeBuWE7ne4OtXHoHKggNgxZR2K+zIW4YLsy6xoZ4/9vErQs6tvoKDX6QAqm3lvsrv0mczAwIQ=="
+    },
+    "@vueuse/shared": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-10.1.2.tgz",
+      "integrity": "sha512-1uoUTPBlgyscK9v6ScGeVYDDzlPSFXBlxuK7SfrDGyUTBiznb3mNceqhwvZHjtDRELZEN79V5uWPTF1VDV8svA==",
+      "requires": {
+        "vue-demi": ">=0.14.0"
+      }
+    },
     "acorn": {
       "version": "8.8.2",
       "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.2.tgz",
@@ -13877,6 +13958,11 @@
         "@vue/shared": "3.2.47"
       }
     },
+    "vue-demi": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.5.tgz",
+      "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA=="
+    },
     "vue-eslint-parser": {
       "version": "9.1.1",
       "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-9.1.1.tgz",

package.json

@@ -24,6 +24,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@vant/use": "^1.5.1",
+    "@vueuse/core": "^10.1.2",
     "clean-deep": "^3.4.0",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.2",

src/components/m-uploader/index.tsx

@@ -94,6 +94,7 @@ export default defineComponent({
         (res: any) => {
           console.log(res, 'fileUrl');
           // 判断是否是多选
+          const files = res.fileUrl;
           if (this.maxCount > 1) {
             this.$emit('update:modelValue', [...this.modelValue, res.fileUrl]);
             this.$emit('uploadChange', [...this.modelValue, res.fileUrl]);

src/views/activity-record/operation.tsx

@@ -288,7 +288,7 @@ export default defineComponent({
 
     const checkForms = () => {
       if (!forms.name) {
-        showToast('请填写活动活动名称');
+        showToast('请填写活动名称');
         return false;
       }
       if (forms.name.length < 3 || forms.name.length > 25) {
@@ -303,7 +303,7 @@ export default defineComponent({
       for (let i = 0, j = forms.detail.length; i < j; i++) {
         const tDetail = forms.detail[i];
         if (!tDetail.name) {
-          showToast('节目名称不能为空');
+          showToast('请输入节目名称不能为空');
           return false;
         }
         if (!tDetail.type) {
@@ -479,6 +479,10 @@ export default defineComponent({
               clearable={false}
               v-model={item.musicGroupName}
               onClick={() => {
+                if (forms.orchestraColumns.length <= 0) {
+                  showToast('暂无乐团');
+                  return;
+                }
                 forms.orchestraStatus = true;
                 forms.selectOrchestra = [];
                 forms.selectOrchestra = item;

src/views/school-register/index.tsx

@@ -31,6 +31,7 @@ export default defineComponent({
       imgCodeStatus: false,
       type: (route.query.type || '') as string,
       username: '',
+      nameReg: /^[\u4E00-\u9FA5]+$/,
       phone: '',
       isAgree: false,
       smsCode: '',
@@ -64,6 +65,10 @@ export default defineComponent({
         showToast('请输入真实姓名');
         return;
       }
+      if (!forms.nameReg.test(forms.username)) {
+        showToast('姓名必须为中文');
+        return;
+      }
       if (!checkPhone(forms.phone)) {
         showToast('请输入正确的手机号');
         return;
@@ -88,7 +93,7 @@ export default defineComponent({
         if (res.code === 999) {
           setTimeout(() => {
             showToast('您已注册');
-            router.push('/download');
+            // router.push('/download');
           }, 100);
         } else {
           forms.registerStatus = true;
@@ -235,7 +240,7 @@ export default defineComponent({
             <img src={bannerPopup} class={styles.bannerPopup} />
             <h3>注册成功</h3>
             <div class={styles.popupContent}>
-              恭喜您注册成功为武昌区中山路小学
+              恭喜您在{forms.schoolDetail?.cooperation?.name}成功注册为
               <span>【{EShoolStaffType[forms.type]}】</span>
               ，请下载管乐迷学校端App进行乐团管理吧～
             </div>

src/views/site-management/index.tsx

@@ -23,7 +23,6 @@ import MEmpty from '@/components/m-empty';
 import MFullRefresh from '@/components/m-full-refresh';
 import { useRouter } from 'vue-router';
 import request from '@/helpers/request';
-import KActionSheet from '@/component-ui/k-action-sheet';
 import dayjs from 'dayjs';
 
 export default defineComponent({