diff --git a/app/libs/login.js b/app/libs/login.js index 0428390..66c50ec 100644 --- a/app/libs/login.js +++ b/app/libs/login.js @@ -39,39 +39,45 @@ export function _toLogin(push, pathLogin) { Cache.set('login_back_url',path); } - // #ifdef H5 - if (isWeixin()) { - let urlData = location.pathname + location.search - if (urlData.indexOf('?') !== -1) { - urlData += '&go_longin=1'; - } else { - urlData += '?go_longin=1'; - } - if (!Cache.has('snsapiKey')) { - auth.oAuth('snsapi_base', urlData); - } else { - if (['/pages/user/index'].indexOf(login_back_url) == -1) { - uni.navigateTo({ - url: '/pages/users/wechat_login/index' - }) - } - } - } else { - if (['/pages/user/index'].indexOf(login_back_url) == -1) { - uni.navigateTo({ - url: '/pages/users/login/index' - }) - } - } - // #endif + // // #ifdef H5 + // if (isWeixin()) { + // let urlData = location.pathname + location.search + // if (urlData.indexOf('?') !== -1) { + // urlData += '&go_longin=1'; + // } else { + // urlData += '?go_longin=1'; + // } + // if (!Cache.has('snsapiKey')) { + // auth.oAuth('snsapi_base', urlData); + // } else { + // if (['/pages/user/index'].indexOf(login_back_url) == -1) { + // uni.navigateTo({ + // url: '/pages/users/wechat_login/index' + // }) + // } + // } + // } else { + // if (['/pages/user/index'].indexOf(login_back_url) == -1) { + // uni.navigateTo({ + // url: '/pages/users/login/index' + // }) + // } + // } + // // #endif + + // if (['pages/user/index','/pages/user/index'].indexOf(login_back_url) == -1) { + // // #ifdef MP + // uni.navigateTo({ + // url: '/pages/users/wechat_login/index' + // }) + // // #endif + // } if (['pages/user/index','/pages/user/index'].indexOf(login_back_url) == -1) { - // #ifdef MP uni.navigateTo({ - url: '/pages/users/wechat_login/index' + url: '/pages/users/login/index' }) - // #endif - } + } } diff --git a/app/pages.json b/app/pages.json index d77e61c..c684964 100644 --- a/app/pages.json +++ b/app/pages.json @@ -184,6 +184,10 @@ "navigationBarTitleText": "溯源信息查看", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -192,6 +196,10 @@ "navigationBarTitleText": "食材满意度评价", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -200,6 +208,10 @@ "navigationBarTitleText": "物供相关查询", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -208,6 +220,10 @@ "navigationBarTitleText": "采购相关操作", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -216,6 +232,10 @@ "navigationBarTitleText": "库存查询", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -224,6 +244,10 @@ "navigationBarTitleText": "审批处理", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -232,6 +256,10 @@ "navigationBarTitleText": "物资领用", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -240,6 +268,10 @@ "navigationBarTitleText": "投诉与建议", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -248,6 +280,10 @@ "navigationBarTitleText": "报修服务", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -256,6 +292,10 @@ "navigationBarTitleText": "通知公告列表", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } }, { @@ -264,6 +304,10 @@ "navigationBarTitleText": "通知详情", "navigationBarBackgroundColor": "#409EFF", "navigationBarTextStyle": "white" + // #ifdef H5 + , + "navigationStyle": "custom" + // #endif } } ] diff --git a/app/pages/index/index.vue b/app/pages/index/index.vue index da7ce28..519654f 100644 --- a/app/pages/index/index.vue +++ b/app/pages/index/index.vue @@ -105,6 +105,12 @@ 报修服务 + + + + + + 通知公告 diff --git a/app/pages/supply_chain/approval/index.vue b/app/pages/supply_chain/approval/index.vue index b8b169f..c2ca75a 100644 --- a/app/pages/supply_chain/approval/index.vue +++ b/app/pages/supply_chain/approval/index.vue @@ -1,13 +1,5 @@