Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front

src/views/training/meeting-add/index.vue

@@ -527,7 +527,7 @@ const getMeetingDetail = async () => {
             ...res.data,
             trainingTime: res.data?.trainingStart && res.data?.trainingEnd ? [res.data.trainingStart, res.data.trainingEnd] : undefined,
             signupsTime: res.data?.signupStart && res.data?.signupEnd ? [res.data.signupStart, res.data.signupEnd] : undefined,
-            conditions: res.data?.conditions || form.value.conditions
+            conditions: (res.data?.conditions?.typeCheck == null) ? form.value.conditions : (res.data?.conditions || form.value.conditions)
         };
         fields.value = res.data.questions
         form.value?.conditions?.typeCheck?.forEach((i) => {

src/views/training/models/meeting-detail-attend.vue

@@ -68,7 +68,7 @@
                         <el-option v-for="item in temp_join_type" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="所在地区" label-width="70" prop="name">
+                <el-form-item label="所在地区" label-width="70" prop="adcode">
                     <AreaCascader v-model="queryParams.adcode" :zlevel="2" checkStrictly @change="handleQuery"></AreaCascader>
                 </el-form-item>
                 <el-form-item>

vite.config.ts

@@ -25,8 +25,8 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
             open: true,
             proxy: {
                 [env.VITE_APP_BASE_API]: {
-                    target: 'https://www.shuziyunyao.com/dm-api',
-                    // target: 'http://dm.yujin.shuziyunyao.com/api',
+                    // target: 'https://www.shuziyunyao.com/dm-api',
+                    target: 'http://dm.yujin.shuziyunyao.com/api',
                     // target: 'http://192.168.1.68:8080',
                     changeOrigin: true,
                     ws: true,