Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521

src/pages/activity/ActivityPlan.vue

@@ -396,4 +396,8 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style>
+.ivu-date-picker .ivu-select-dropdown {
+  left: 0 !important
+}
+</style>

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