Merge branch 'master' of ssh://16.162.42.175:8013/guanli/ngds-backend-ele into feature/3368

.env.staging

@@ -3,19 +3,38 @@ NODE_ENV=production
 # just a flag
 ENV='staging'
 
+# PayStack支付key
+VUE_APP_BASE_PAY_STACK_PUBLIC_KEY='pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
+# 请求token前缀
+VUE_APP_ACCESS_TOKEN_PREFIX='Bearer '
+
+
+# mips
+# api请求地址
+#VUE_APP_BASE_API='http://16.163.228.151:8042'
+## 文件下载地址
+#VUE_APP_BASE_DO_API='http://16.163.228.151:8042'
+## CDN文件地址
+#VUE_APP_CDN_API='http://16.163.228.151:8042'
+## 区域js文件地址
+#VUE_APP_SYSTEM_JS='http://ng-upload.elken.com'
+## 结算页面地址
+#VUE_APP_BASE_WEBSITE='http://16.163.228.151:8042'
+## 会员页面地址
+#VUE_APP_FRONTEND_WEBSITE='http://16.163.228.151:8045'
+
+
+# test
 # api请求地址
-VUE_APP_BASE_API='http://16.163.228.151:8042'
+VUE_APP_BASE_API='http://16.163.228.151:8020'
 # 文件下载地址
-VUE_APP_BASE_DO_API='http://16.163.228.151:8042'
+VUE_APP_BASE_DO_API='http://16.163.228.151:8020'
 # CDN文件地址
-VUE_APP_CDN_API='http://16.163.228.151:8042'
+VUE_APP_CDN_API='http://16.163.228.151:8021'
 # 区域js文件地址
-VUE_APP_SYSTEM_JS='http://ng-upload.elken.com'
+VUE_APP_SYSTEM_JS='http://16.163.228.151:8021'
 # 结算页面地址
-VUE_APP_BASE_WEBSITE='http://16.163.228.151:8042'
+VUE_APP_BASE_WEBSITE='http://16.163.228.151:8019'
 # 会员页面地址
-VUE_APP_FRONTEND_WEBSITE='http://16.163.228.151:8045'
-# PayStack支付key
-VUE_APP_BASE_PAY_STACK_PUBLIC_KEY='pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
-# 请求token前缀
-VUE_APP_ACCESS_TOKEN_PREFIX='Bearer '
+VUE_APP_FRONTEND_WEBSITE='http://16.163.228.151:8017'
+

src/views/user/change-highest-emp-level.vue

@@ -91,7 +91,7 @@
       <el-form
         ref="form"
         :model="form"
-        label-width="170px"
+        label-width="180px"
         :label-position="labelPosition"
       >
         <el-form-item :label="$t('member.memberCode')" required>