diff --git a/README.md b/README.md index 00afc33..29bfe2f 100644 --- a/README.md +++ b/README.md @@ -17,3 +17,11 @@ yarn build ### Customize configuration See [Configuration Reference](https://cli.vuejs.org/config/). + + +### 山海万象版本 +### 新增pages/pageHome/shwxLogin.vue +### request/interface.js里的401判断指向shwxLogin.vue +### 小程序版本要改回login.vue +### 隐藏my里面的退出登录 +### pages.json新增路由 diff --git a/public/index.html b/public/index.html index ba6f516..7218428 100644 --- a/public/index.html +++ b/public/index.html @@ -14,6 +14,7 @@ var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) document.write('') + @@ -24,5 +25,45 @@
+ + \ No newline at end of file diff --git a/src/manifest.json b/src/manifest.json index a6797ba..ce70319 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -96,7 +96,7 @@ // 与vue中的proxyTable配置大致上一致,此处我同时代理了两个 "/pre" : { // 预发布 - "target" : "http://192.168.1.4:8080/h5/api", // 目标接口域名 + "target" : "http://192.168.1.22:8080/h5/api", // 目标接口域名 // "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名 "changeOrigin" : true, // 是否跨域 diff --git a/src/pages.json b/src/pages.json index c4875a2..903b803 100644 --- a/src/pages.json +++ b/src/pages.json @@ -10,6 +10,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/pageHome/shwxLogin", + "style": { + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, { "path": "pages/pageHome/pdfView", "style": { diff --git a/src/pages/pageHome/shwxLogin.vue b/src/pages/pageHome/shwxLogin.vue new file mode 100644 index 0000000..cd5ada0 --- /dev/null +++ b/src/pages/pageHome/shwxLogin.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/src/pagesA/my/My.vue b/src/pagesA/my/My.vue index 298d449..1190808 100644 --- a/src/pagesA/my/My.vue +++ b/src/pagesA/my/My.vue @@ -119,12 +119,12 @@ - + diff --git a/src/request/interface.js b/src/request/interface.js index 41be3bc..4b8f615 100644 --- a/src/request/interface.js +++ b/src/request/interface.js @@ -5,10 +5,10 @@ export default { config: { - // baseUrl: "http://192.168.1.4:8080/h5/api", //俞燕红-小程序不能配跨域 + // baseUrl: "http://192.168.1.22:8080/h5/api", //俞燕红-小程序不能配跨域 // baseUrl: "/pre", //俞燕红-跨域 - // baseUrl: "https://yxx.ydool.net/h5/api", //线上 - baseUrl: "/h5/api", //h5 + baseUrl: "https://yxx.ydool.net/h5/api", //线上 + // baseUrl: "/h5/api", //h5 header: { 'Content-Type': 'application/json;charset=UTF-8', // 'Content-Type':'application/x-www-form-urlencoded' @@ -105,6 +105,7 @@ export default { setTimeout(() => { uni.navigateTo({ url: '/pagesC/Login/Login' + // url: '/pages/pageHome/shwxLogin' }) }, 1200) diff --git a/src/static/jumpImg.png b/src/static/jumpImg.png new file mode 100644 index 0000000..f3d300d Binary files /dev/null and b/src/static/jumpImg.png differ