Merge remote-tracking branch 'origin/v3' into v3

src/common/globalRouter.js

@@ -4,8 +4,8 @@ let routes = [
 	{
 		path: "/",
 		// redirect: "/home",
-		redirect: "/enforceHome",
+		// redirect: "/enforceHome",
-		// redirect: "/login",
+		redirect: "/login",
 		name: "App",
 	},
 	{

src/config/env.js

@@ -1,8 +1,8 @@
 //本地环境
 // let baseUrl="http://139.186.135.156:86";
 // let baseUrl="http://10.132.108.1:85";
-let baseUrl="http://jdm.szssfj.cn/jdmApi";
+// let baseUrl="http://jdm.szssfj.cn/jdmTestApi";
-// let baseUrl="http://127.0.0.1:85";
+let baseUrl="http://127.0.0.1:85";
 // let wsUrl='ws://10.76.108.1:9326';
 export {
     baseUrl,

src/views/enterprise/complaintDetailView.vue

@@ -117,10 +117,10 @@
                           :rules="[{ validator, message: '请输入正确内容' }]"
                   />
                   <div class="agree-box">
-                      <span class="remsty">是否授权</span>
+                      <span class="remsty" style="color: gray;">是否授权</span>
-                      <span class="accept-item"><input disabled="true" class="checksty" type="checkbox" name="" value=""
+                      <span class="accept-item" style="color: gray;"><input disabled="true" class="checksty" type="checkbox" name="" value=""
                                                        v-model="data.isCheckedon">同意</span>
-                      <span class="accept-item"><input disabled="true" class="checksty" type="checkbox" name="" value=""
+                      <span class="accept-item" style="color: gray;"><input disabled="true" class="checksty" type="checkbox" name="" value=""
                                                        v-model="data.isCheckedoff" >不同意</span>
                   </div>
                   <div class="agree-remark">
@@ -701,7 +701,7 @@
   .agree-box .remsty {
       margin: 0.5rem 0.5rem;
       padding-left: 0.85rem;
-      background: url("../../assets/images/icon_remind.png") no-repeat left center;
+      background: url("../../assets/images/icon_remind2.png") no-repeat left center;
       background-size: auto 100%;
       font-size: 0.5rem;
       font-weight: 600;

src/views/login.vue

@@ -44,8 +44,8 @@
         // userLogin(values,success=>{
         testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey}, success => {
             if (success.success) {
-                // router.push({ name: "Home" });
+                router.push({ name: "Home" });
-                router.push({name: "enforceHome"});
+                // router.push({name: "enforceHome"});
                 //设置全局变量
                 useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
                 useCommon.SET_USER_ID(success.data.userId);