diff --git a/src/assets/images/icon_remind2.png b/src/assets/images/icon_remind2.png new file mode 100644 index 0000000..bd2136e Binary files /dev/null and b/src/assets/images/icon_remind2.png differ diff --git a/src/common/globalRouter.js b/src/common/globalRouter.js index 2c2792f..308fca6 100644 --- a/src/common/globalRouter.js +++ b/src/common/globalRouter.js @@ -4,8 +4,8 @@ let routes = [ { path: "/", // redirect: "/home", - redirect: "/enforceHome", - // redirect: "/login", + // redirect: "/enforceHome", + redirect: "/login", name: "App", }, { diff --git a/src/config/env.js b/src/config/env.js index 42b5306..9af2296 100644 --- a/src/config/env.js +++ b/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://127.0.0.1:85"; +// let baseUrl="http://jdm.szssfj.cn/jdmTestApi"; +let baseUrl="http://127.0.0.1:85"; // let wsUrl='ws://10.76.108.1:9326'; export { baseUrl, diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue index 9402352..6226a37 100644 --- a/src/views/enterprise/complaintDetailView.vue +++ b/src/views/enterprise/complaintDetailView.vue @@ -117,10 +117,10 @@ :rules="[{ validator, message: '请输入正确内容' }]" />
- 是否授权 - 是否授权 + 同意 - 不同意
@@ -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; diff --git a/src/views/login.vue b/src/views/login.vue index c69ab2c..9385751 100644 --- a/src/views/login.vue +++ b/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: "enforceHome"}); + router.push({ name: "Home" }); + // router.push({name: "enforceHome"}); //设置全局变量 useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); useCommon.SET_USER_ID(success.data.userId);