Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

.env.development

@@ -1,5 +1,9 @@
+OUT_PUT_DIR=dist/jp-housekeeper-portal
+
 #VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
 VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
+#VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
+
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
 #手机校园版

.env.production

@@ -1,13 +1,18 @@
-VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
-VUE_APP_IMAGE_URL=http://wisdomhouseadmin.sudaonline.net
-#VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
+OUT_PUT_DIR=dist/xpgj-admin
+
+VUE_APP_BACKEND_URL=https://xpgjapi.xiaoxinda.com/
+
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
+
 #手机校园版
 VUE_APP_COMPANY_HEALTH_WECHAT_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd.html
+
 #大屏企业版
 VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
+
 #大屏校园版
 VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html
+
 #打卡点二维码地址
 VUE_APP_PUNCHLOCATION_URL=http://yktwechat.xiaoxinda.com/#/health/codeScene

.env.test

@@ -1,3 +1,5 @@
+OUT_PUT_DIR=dist/jp-housekeeper-portal
+
 #VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
 VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
 

src/App.vue

@@ -35,4 +35,13 @@ body{
 .sticky-bg{
   background-color:#fff;
 }
+
+.el-table__header thead tr th{
+  background: #f1f6fa !important;
+  padding: 10px 0px 10px 0px;
+}
+
+.el-table{
+  margin-top:5px;
+}
 </style>

vue.config.js

@@ -7,7 +7,7 @@ module.exports = {
     // 选项...
     publicPath:"./",
     // 输出文件目录
-    outputDir: 'dist',
+	outputDir: process.env.OUT_PUT_DIR,
     // eslint-loader 是否在保存的时候检查
     lintOnSave: true,
     devServer:{