From 3bc876371f8e1ee90863473cb2d6e45923f91fd7 Mon Sep 17 00:00:00 2001
From: yuankai <1250898904@qq.com>
Date: Tue, 26 May 2020 17:09:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/activity/ActivityPlan.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index 7c45367..ce99bfb 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -368,4 +368,8 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style>
+.ivu-date-picker .ivu-select-dropdown {
+  left: 0 !important
+}
+</style>

From 5c8a30f438ff197e646de868b95bbf6dfabe67c2 Mon Sep 17 00:00:00 2001
From: yuankai <1250898904@qq.com>
Date: Tue, 26 May 2020 17:19:27 +0800
Subject: [PATCH 2/2] test

---
 vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 3173828..d646141 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -31,8 +31,8 @@ module.exports = {
     // proxy: 'http://192.168.1.123:8312/'
     // proxy: 'http://192.168.31.177:8312/'
     // proxy: 'http://localhost:8312/'
-    // proxy: "http://111.231.218.44:8080/",
-    proxy: "http://localhost:8080/",
+    proxy: "http://111.231.218.44:8080/",
+    // proxy: "http://localhost:8080/",
     // proxy: 'http://jdxdev.vipgz4.idcfengye.com/'
   },
   chainWebpack: (config) => {