diff --git a/pages.json b/pages.json index 6afe178ebe26112f55e264df697dcf369e120538..dc3cc928b4a24f979f731b770c9098f76eb91e0f 100644 --- a/pages.json +++ b/pages.json @@ -37,7 +37,7 @@ // "navigationBarTitleText": "", // "navigationBarBackgroundColor": "#FFFFFF", }, { - "path": "pages/search/search", + "path": "pages/list/search/search", "style": { "navigationStyle": "custom" } @@ -72,7 +72,7 @@ "navigationBarTitleText": "问题反馈" } }, { - "path": "pages/about/about", + "path": "pages/ucenter/about/about", "style": { "navigationBarTitleText": "关于" } @@ -111,7 +111,7 @@ } } }, { - "path": "pages/settings/settings", + "path": "pages/ucenter/settings/settings", "style": { "navigationBarTitleText": "设置" } @@ -173,7 +173,7 @@ } }, { - "path": "pages/ucenter/help", + "path": "pages/ucenter/help/help", "style": { "navigationBarTitleText": "帮助", "enablePullDownRefresh": false diff --git a/pages/grid/grid.vue b/pages/grid/grid.vue index 46fbcd3d02bac708fe2100a9d3b8dc3d38f824e1..035042fd875b57592d003b380bea2fbeea73941f 100644 --- a/pages/grid/grid.vue +++ b/pages/grid/grid.vue @@ -137,7 +137,7 @@ searchClick() { uni.hideKeyboard(); uni.navigateTo({ - url: '/pages/search/search', + url: '/pages/list/search/search', animationType: 'fade-in' }); }, diff --git a/pages/list/detail.vue b/pages/list/detail.vue index 2a0a761c589d4df80be4376cdbb2591b1752cc73..28b4e5e016f9b2464cac51ff4fb13f8622547186 100644 --- a/pages/list/detail.vue +++ b/pages/list/detail.vue @@ -218,6 +218,12 @@ .uni-note { color: #999; font-size: 12px; + + /* #ifndef APP-NVUE */ + display: flex; + /* #endif */ + flex-direction: row; + align-items: center; } .footer { diff --git a/pages/list/news-list.vue b/pages/list/news-list.vue index 96dbcdbefd6ae45e8c95a920f2fcecca5ad2bbc5..c359c1401ea30203335eb64f6fdc7f4bdc642b89 100644 --- a/pages/list/news-list.vue +++ b/pages/list/news-list.vue @@ -142,7 +142,7 @@ if(this.canSearch){ uni.navigateTo({ - url: '/pages/search/search', + url: '/pages/list/search/search', animationType: 'fade-in' }); }else { diff --git a/pages/search/search.nvue b/pages/list/search/search.nvue similarity index 99% rename from pages/search/search.nvue rename to pages/list/search/search.nvue index a80d350fac47cbe4337527ae469c972687997b1c..f65b472b06414db44f58fa29f93ff5ab12b0a26a 100644 --- a/pages/search/search.nvue +++ b/pages/list/search/search.nvue @@ -295,7 +295,7 @@ loadList(text = '') { getApp().globalData.searchText = text; uni.navigateTo({ - url:'../list/news-list' + url:'/pages/list/news-list' }) }, backPage(){ diff --git a/pages/about/about.vue b/pages/ucenter/about/about.vue similarity index 100% rename from pages/about/about.vue rename to pages/ucenter/about/about.vue diff --git a/pages/ucenter/help.vue b/pages/ucenter/help/help.vue similarity index 100% rename from pages/ucenter/help.vue rename to pages/ucenter/help/help.vue diff --git a/pages/settings/dc-push/push.js b/pages/ucenter/settings/dc-push/push.js similarity index 100% rename from pages/settings/dc-push/push.js rename to pages/ucenter/settings/dc-push/push.js diff --git a/pages/settings/settings.vue b/pages/ucenter/settings/settings.vue similarity index 96% rename from pages/settings/settings.vue rename to pages/ucenter/settings/settings.vue index c741a7eb3ba12fd3327bd612d6fda75ad0bdca4f..6541a660f75dac5847191ec057af9e6344285b9e 100644 --- a/pages/settings/settings.vue +++ b/pages/ucenter/settings/settings.vue @@ -25,7 +25,7 @@ return { agreeList: [{ title: '个人资料', - to: '' + to: '../edit/edit' }, { title: '修改密码', @@ -67,7 +67,7 @@ logout: 'user/logout' }), changePwd(){ - if(this.userInfo.phone){ + if(this.userInfo && this.userInfo.phone){ uni.navigateTo({ url:'/uni_modules/uni-login-page/pages/index/pwd-retrieve?phoneNumber='+ this.userInfo.phone +'&phoneArea=+86' }); diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue index 0100c6236a951beba70f08f33d77dd720248594d..7bc252052b47d9b9877f205ce9afbcfa836fcce8 100644 --- a/pages/ucenter/ucenter.vue +++ b/pages/ucenter/ucenter.vue @@ -59,17 +59,17 @@ ucenterList: [ [{ title: '阅读过的文章', - to: '/pages/agree-list/agree-list' + to: '/pages/ucenter/agree-list/agree-list' }, { title: '我的积分', - to: '/pages/agree-list/agree-list' + to: '/pages/ucenter/agree-list/agree-list' }], [{ title: '政策与协议', - to: '/pages/agree-list/agree-list' + to: '/pages/ucenter/agree-list/agree-list' }, { title: '关于', - to: '/pages/about/about' + to: '/pages/ucenter/about/about' }, //#ifdef APP-PLUS { @@ -81,10 +81,10 @@ ], [{ title: '反馈', - to: '/pages/uni-feedback/uni-feedback' + to: '/pages/ucenter/uni-feedback/uni-feedback' }, { title: '设置', - to: '/pages/settings/settings' + to: '/pages/ucenter/settings/settings' }] ] }