From 3f9bd3aac03d45b3757d167c03cb3958abb957d7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 26 Sep 2021 18:02:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=89=93=E5=8C=85=E5=91=BD=E4=BB=A4=E5=8F=8A?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=20dev=EF=BC=8Ctest=EF=BC=8Cprod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .env.production | 3 ++- .env.test | 13 +++++++++++++ package.json | 10 ++++------ 4 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 .env.test diff --git a/.env.development b/.env.development index 9113d2c..fe2591b 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 问卷调查测试环境 +VUE_APP_TITLE = 问卷调查开发环境 # 接口请求地址,会设置到 axios 的 baseURL 参数上 VUE_APP_API_ROOT_TDUCK = /tduck-api -#VUE_APP_API_ROOT = http://localhost:8080/api +#VUE_APP_API_ROOT = http://localhost:8116/ VUE_APP_API_ROOT = http://192.168.1.140/api # 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空 VUE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 5db4a72..788b2bd 100644 --- a/.env.production +++ b/.env.production @@ -8,5 +8,6 @@ VUE_APP_DEBUG_TOOL = VUE_APP_MAP_KEY = f2200337d0d08538e78729572749882d # 微信功能开关 开启设置 ON,关闭设置 OFF VUE_APP_WX = ON -#项目根路径 +#项目根路径˚ VUE_APP_PUBLIC_PATH=questionnaire +˚ diff --git a/.env.test b/.env.test new file mode 100644 index 0000000..85a0c96 --- /dev/null +++ b/.env.test @@ -0,0 +1,13 @@ +# 页面标题 +VUE_APP_TITLE = 问卷调查测试环境 +# 接口请求地址,会设置到 axios 的 baseURL 参数上 +VUE_APP_API_ROOT_TDUCK = /tduck-api +VUE_APP_API_ROOT = https://epmet-dev.elinkservice.cn/api +# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空 +VUE_APP_DEBUG_TOOL = +# 高德地图key 暂时没有用到 +VUE_APP_MAP_KEY = f2200337d0d08538e78729572749882d +# 微信功能开关 开启设置 ON,关闭设置 OFF +VUE_APP_WX = OFF +#项目根路径 +VUE_APP_PUBLIC_PATH=questionnaire diff --git a/package.json b/package.json index f95f1fa..772d5f3 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,10 @@ "scripts": { "dev": "vue-cli-service serve", "serve": "vue-cli-service serve", - "build-dev": "vue-cli-service build --mode development --dest questionnaire", + "build:dev": "vue-cli-service build --mode development --dest questionnaire", + "build:test": "vue-cli-service build --mode test --dest questionnaire", "preview": "node build/index.js --preview", - "build": "vue-cli-service build", + "build:prod": "vue-cli-service build --mode production --dest questionnaire", "lint": "vue-cli-service lint", "svgo": "svgo -f src/assets/icons" }, @@ -64,9 +65,7 @@ "last 2 versions", "not ie <= 8" ], - "lint-staged": { - - }, + "lint-staged": {}, "husky": { "hooks": { "pre-commit": "lint-staged" @@ -85,5 +84,4 @@ "parser": "babel-eslint" } } - } From b62800f7a4b2483a8e23ba186337375647f184e1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 26 Sep 2021 18:02:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=9A=E4=BA=86=E4=B8=AA=E5=8F=A5?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.production b/.env.production index 788b2bd..daa642e 100644 --- a/.env.production +++ b/.env.production @@ -10,4 +10,3 @@ VUE_APP_MAP_KEY = f2200337d0d08538e78729572749882d VUE_APP_WX = ON #项目根路径˚ VUE_APP_PUBLIC_PATH=questionnaire -˚ From 6968a2fbf8a96c5b8d714e2678c25cb66c7955d5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 27 Sep 2021 14:26:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 6 +- src/router/modules/root.js | 12 +- src/views/official/DataPay.vue | 213 -------- src/views/official/PayService.vue | 85 --- src/views/official/header.vue | 99 ---- src/views/official/index.vue | 871 ------------------------------ src/views/official/indexbak.vue | 508 ----------------- 7 files changed, 4 insertions(+), 1790 deletions(-) delete mode 100644 src/views/official/DataPay.vue delete mode 100644 src/views/official/PayService.vue delete mode 100644 src/views/official/header.vue delete mode 100644 src/views/official/index.vue delete mode 100644 src/views/official/indexbak.vue diff --git a/public/index.html b/public/index.html index feca0bd..7a911d0 100644 --- a/public/index.html +++ b/public/index.html @@ -17,13 +17,13 @@ <% } %> diff --git a/src/router/modules/root.js b/src/router/modules/root.js index 741c6ef..ee03224 100644 --- a/src/router/modules/root.js +++ b/src/router/modules/root.js @@ -22,17 +22,7 @@ export default [ { path: '/', meta: {requireLogin: false}, - component: () => import(/* webpackChunkName: 'root' */ '@/views/official/index.vue') - }, - { - path: '/tduck-front', - meta: {requireLogin: false}, - component: () => import(/* webpackChunkName: 'root' */ '@/views/official/index.vue') - }, - { - path: '/payService', - meta: {requireLogin: false}, - component: () => import(/* webpackChunkName: 'root' */ '@/views/official/PayService') + component: () => import(/* webpackChunkName: 'root' */ '@/views/home') }, { path: '/login', diff --git a/src/views/official/DataPay.vue b/src/views/official/DataPay.vue deleted file mode 100644 index 1518ee3..0000000 --- a/src/views/official/DataPay.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - - - diff --git a/src/views/official/PayService.vue b/src/views/official/PayService.vue deleted file mode 100644 index 363d15f..0000000 --- a/src/views/official/PayService.vue +++ /dev/null @@ -1,85 +0,0 @@ - - - - diff --git a/src/views/official/header.vue b/src/views/official/header.vue deleted file mode 100644 index 0b0f46e..0000000 --- a/src/views/official/header.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - diff --git a/src/views/official/index.vue b/src/views/official/index.vue deleted file mode 100644 index 1618df6..0000000 --- a/src/views/official/index.vue +++ /dev/null @@ -1,871 +0,0 @@ - - - - - - diff --git a/src/views/official/indexbak.vue b/src/views/official/indexbak.vue deleted file mode 100644 index 18012a4..0000000 --- a/src/views/official/indexbak.vue +++ /dev/null @@ -1,508 +0,0 @@ - - - - - From 71cbd933c77c364102d85f80e2123a1dfc801bea Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 27 Sep 2021 15:57:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/form/preview/ProjectForm.vue | 2 +- src/views/form/theme/index.vue | 86 ++++++++++++++++++++++---- 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/src/views/form/preview/ProjectForm.vue b/src/views/form/preview/ProjectForm.vue index 0e565a4..231714c 100644 --- a/src/views/form/preview/ProjectForm.vue +++ b/src/views/form/preview/ProjectForm.vue @@ -295,7 +295,7 @@ export default { @import "@/assets/styles/elementui-mobile.scss"; .project-form { margin: 15px auto; - width: 800px; + width: 100%; padding: 15px; background-repeat: repeat; background-color: rgba(229, 239, 247, 0.87); diff --git a/src/views/form/theme/index.vue b/src/views/form/theme/index.vue index db1a4fa..fa96b6b 100644 --- a/src/views/form/theme/index.vue +++ b/src/views/form/theme/index.vue @@ -3,23 +3,41 @@

外观主题

- - +
+
风格
+
+
+ {{ item.label }}
+
+
+ +
+
颜色
+
+
全部
+
+
+
+