diff --git a/App.vue b/App.vue index 336e5c8..7b81ea9 100644 --- a/App.vue +++ b/App.vue @@ -7,7 +7,7 @@ export default { var that = this; //获取设备信息 this.setMenuHeight(); this.autoUpdate(); - uni.hideTabBar() + // uni.hideTabBar() }, globalData: { baseURL: VUE_APP_API_URL+ '/', @@ -27,7 +27,7 @@ export default { onShow(e) { this.globalData.scene = e.scene //隐藏系统tabbar - uni.hideTabBar(); + // uni.hideTabBar(); var query = {}; if (e.query.q) { //通过扫码进来获取二维码上的参数并存入storage diff --git a/config/index.js b/config/index.js index d8845b8..cfe0ced 100644 --- a/config/index.js +++ b/config/index.js @@ -1,7 +1,7 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' // export const VUE_APP_API_URL = 'http://192.168.0.112:8092/api' - // export const VUE_APP_API_URL = 'http://192.168.0.111:8092/api' + // export const VUE_APP_API_URL = 'http://10.11.32.103:8092/api' export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' diff --git a/manifest.json b/manifest.json index 58f2668..2de1985 100644 --- a/manifest.json +++ b/manifest.json @@ -1,73 +1,78 @@ { - "name": "zhaoshangMiniApp", - "appid": "", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - "app-plus": { - "usingComponents": true, - "nvueCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": {}, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ios": {}, - "sdkConfigs": {} - } - }, - "quickapp": {}, - "mp-weixin": { - "appid": "wx5348e39dcbbefe1e", - "setting": { - "urlCheck": false - }, - "usingComponents": true, - "permission": { - "scope.userLocation": { - "desc": "你的位置信息将用于小程序位置接口的效果展示" - } - }, - "plugins": {} - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - } -} \ No newline at end of file + "name" : "zhaoshangMiniApp", + "appid" : "", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + "app-plus" : { + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "modules" : {}, + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "ios" : {}, + "sdkConfigs" : {} + } + }, + "quickapp" : {}, + "mp-weixin" : { + "appid" : "wx5348e39dcbbefe1e", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true, + "permission" : { + "scope.userLocation" : { + "desc" : "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "plugins" : {} + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "h5" : { + "router" : { + "mode" : "history" + } + } +} diff --git a/pages.json b/pages.json index 9b25757..4a2fca5 100644 --- a/pages.json +++ b/pages.json @@ -409,6 +409,12 @@ "style": { "navigationBarTitleText": "退货列表" } + }, + { + "path": "pages/information/index", + "style": { + "navigationBarTitleText": "资讯广场" + } } ], "tabBar": { @@ -434,6 +440,12 @@ "iconPath": "/static/tabbarComponent/icon/tab3.png", "selectedIconPath": "/static/tabbarComponent/icon/tab3-a.png" }, + { + "pagePath": "pages/information/index", + "text": "资讯", + "iconPath": "/static/tabbarComponent/icon/tab3.png", + "selectedIconPath": "/static/tabbarComponent/icon/tab3-a.png" + }, { "pagePath": "pages/user/index", "text": "我的", diff --git a/pages/demandHall/index.vue b/pages/demandHall/index.vue index d77fdc1..ad6ebaa 100644 --- a/pages/demandHall/index.vue +++ b/pages/demandHall/index.vue @@ -148,7 +148,7 @@ - + diff --git a/pages/home/index.vue b/pages/home/index.vue index 26477bb..3efda8d 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -135,7 +135,7 @@ - + + + diff --git a/pages/life/index.vue b/pages/life/index.vue index f9e4cb8..2f6758c 100644 --- a/pages/life/index.vue +++ b/pages/life/index.vue @@ -69,7 +69,7 @@ - +