浏览代码

修改兼容过去会议数据bug

lisy 5 月之前
父节点
当前提交
1a6cac744e
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      src/views/training/meeting-add/index.vue
  2. 2 2
      vite.config.ts

+ 1 - 1
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) => {

+ 2 - 2
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,