Merge branch 'master' of http://git.cc-lotus.info/ball-competition-zs/admin

src/views/users/match/detail.vue

@@ -14,7 +14,7 @@
               <el-option v-for="i in typeList" :key="i.value" :label="i.label" :value="i.value"></el-option>
             </template>
             <template #icon>
-              <cUpload :model="`${'icon'}`" listType="picture" :limit="1" url="/files/ball/match/upload" :list="form.icon" @change="onUpload"></cUpload>
+              <cUpload :model="`${'icon'}`" listType="picture-card" :limit="1" url="/files/ball/match/upload" :list="form.icon" @change="onUpload"></cUpload>
             </template>
           </cForm>
         </el-col>
@@ -43,15 +43,16 @@ const loading: Ref<any> = ref(false);
 // 表单
 let form: Ref<any> = ref({});
 let fields: Ref<any[]> = ref([
+  // { label: '类别', model: 'type', type: 'select', options: { disabled: true } },
+  { label: '微信用户标识', model: 'openid', options: { disabled: true } },
   { label: '账号', model: 'account', options: { disabled: true } },
-  { label: '类别', model: 'type', type: 'select', options: { disabled: true } },
-  { label: '姓名', model: 'name' },
-  { label: '头像', model: 'icon', custom: true },
-  { label: '性别', model: 'gender', type: 'select' },
-  { label: '年龄', model: 'age' },
+  { label: '名称', model: 'name' },
   { label: '手机号', model: 'phone' },
   { label: '电子邮箱', model: 'email' },
-  { label: '工作单位', model: 'work' }
+  { label: '性别', model: 'gender', type: 'select' },
+  { label: '年龄', model: 'age' },
+  { label: '工作单位', model: 'work' },
+  { label: '头像', model: 'icon', custom: true }
 ]);
 const rules = reactive<FormRules>({});
 // 字典表

src/views/users/match/index.vue

@@ -47,6 +47,7 @@ let skip = 0;
 let limit: number = proxy.$limit;
 let fields: Ref<any[]> = ref([
   { label: '微信用户标识', model: 'openid' },
+  { label: '用户账号', model: 'account', isSearch: true },
   { label: '姓名', model: 'name', isSearch: true },
   { label: '性别', model: 'gender', format: (i: any) => getDict(i, 'gender') },
   { label: '年龄', model: 'age' },

src/views/users/team/detail.vue

@@ -14,7 +14,7 @@
               <el-option v-for="i in typeList" :key="i.value" :label="i.label" :value="i.value"></el-option>
             </template>
             <template #icon>
-              <cUpload :model="`${'icon'}`" listType="picture" :limit="1" url="/files/ball/match/upload" :list="form.icon" @change="onUpload"></cUpload>
+              <cUpload :model="`${'icon'}`" listType="picture-card" :limit="1" url="/files/ball/match/upload" :list="form.icon" @change="onUpload"></cUpload>
             </template>
           </cForm>
         </el-col>
@@ -43,15 +43,16 @@ const loading: Ref<any> = ref(false);
 // 表单
 let form: Ref<any> = ref({});
 let fields: Ref<any[]> = ref([
+  { label: '微信用户标识', model: 'openid', options: { disabled: true } },
   { label: '账号', model: 'account', options: { disabled: true } },
-  { label: '类别', model: 'type', type: 'select', options: { disabled: true } },
+  // { label: '类别', model: 'type', type: 'select', options: { disabled: true } },
   { label: '姓名', model: 'name' },
-  { label: '头像', model: 'icon', custom: true },
   { label: '性别', model: 'gender', type: 'select' },
   { label: '年龄', model: 'age' },
   { label: '手机号', model: 'phone' },
   { label: '电子邮箱', model: 'email' },
-  { label: '工作单位', model: 'work' }
+  { label: '工作单位', model: 'work' },
+  { label: '头像', model: 'icon', custom: true }
 ]);
 const rules = reactive<FormRules>({});
 // 字典表

src/views/users/team/index.vue

@@ -47,6 +47,7 @@ let skip = 0;
 let limit: number = proxy.$limit;
 let fields: Ref<any[]> = ref([
   { label: '微信用户标识', model: 'openid' },
+  { label: '用户账号', model: 'account', isSearch: true },
   { label: '姓名', model: 'name', isSearch: true },
   { label: '性别', model: 'gender', format: (i: any) => getDict(i, 'gender') },
   { label: '年龄', model: 'age' },

vite.config.ts

@@ -1,8 +1,8 @@
-import { fileURLToPath, URL } from 'node:url'
-import { defineConfig, loadEnv } from 'vite'
-import vue from '@vitejs/plugin-vue'
+import { fileURLToPath, URL } from 'node:url';
+import { defineConfig, loadEnv } from 'vite';
+import vue from '@vitejs/plugin-vue';
 export default defineConfig(({ mode }) => {
-  const env = loadEnv(mode, __dirname)
+  const env = loadEnv(mode, __dirname);
   return {
     // 静态路径
     base: env.VITE_BASE_URL,
@@ -18,7 +18,7 @@ export default defineConfig(({ mode }) => {
           target: 'https://broadcast.waityou24.cn'
         },
         '/ball/v1/api': {
-          target: 'http://192.168.1.113:13005',
+          target: 'http://192.168.1.113:13005', //http://169.254.16.148:13005  http://192.168.1.113:13005
           changeOrigin: true,
           ws: false
         }
@@ -30,5 +30,5 @@ export default defineConfig(({ mode }) => {
         '@': fileURLToPath(new URL('./src', import.meta.url))
       }
     }
-  }
-})
+  };
+});