diff --git a/config.js b/config.js index edd6d72..caa9e91 100644 --- a/config.js +++ b/config.js @@ -11,6 +11,7 @@ module.exports = { // apiUrl: "http://10.24.4.156/api/", // product env // apiUrl: "http://10.24.4.14:80/", + // apiUrl: "http://10.24.4.156/", apiUrl: "./kk/", /** diff --git a/pages.json b/pages.json index 8b40ddd..4a2fa1b 100644 --- a/pages.json +++ b/pages.json @@ -249,6 +249,14 @@ "navigationBarTitleText" : "", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/findpass/findpass", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } } ], "globalStyle": { diff --git a/pages/findpass/findpass.vue b/pages/findpass/findpass.vue new file mode 100644 index 0000000..8183fd0 --- /dev/null +++ b/pages/findpass/findpass.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/pages/login/components/main.vue b/pages/login/components/main.vue index 1f739e7..120dacb 100644 --- a/pages/login/components/main.vue +++ b/pages/login/components/main.vue @@ -220,7 +220,20 @@ */ gotopage(str){ this.$toast(str) - } + }, + /** + * 跳转到注册 + */ + register(){ + this.$navTo("pages/reg/reg") + }, + + /** + * + */ + findpass(){ + this.$navTo("page/findpass/findpass") + }, } } @@ -313,9 +326,11 @@ padding-right: 32rpx; text{ - display: block; + // display: block; + display: flex; float: left; width: 46%; + line-height: 1.4; } .findpass{