diff --git a/App.vue b/App.vue index 9887ab2..33dd413 100644 --- a/App.vue +++ b/App.vue @@ -18,6 +18,7 @@ export default { }; }, onLaunch: function() { + uni.setStorageSync("isJump", null); // 禁止横屏 // #ifdef APP-PLUS plus.screen.lockOrientation("portrait-primary"); @@ -32,6 +33,22 @@ export default { }, }); + if ( + uni.getStorageSync("guidePages") != 2 || + !uni.getStorageSync("guidePages") + ) { + plus.navigator.closeSplashscreen(); + } else { + uni.switchTab({ + url: "/pages/home/index", + success: function () { + plus.navigator.closeSplashscreen(); + let page = getCurrentPages()[0]; + page.$vm.requestAll(); + }, + }); + } + //取出缓存数据 store.commit("setCacheData"); // #ifdef MP-WEIXIN diff --git a/main.js b/main.js index 964c2bc..9507107 100644 --- a/main.js +++ b/main.js @@ -26,6 +26,8 @@ Vue.prototype.judgeLogin = judgeLogin; Vue.prototype.isShowHtml = store.state.loadingShow; Vue.prototype.$baseUrl = "https://api.nuttyreading.com/" +//Vue.prototype.$baseUrl = 'http://192.168.110.100:9200/pb/' + //判断手机型号 uni.getSystemInfo({ success: function (res) { diff --git a/manifest.json b/manifest.json index 10b1c54..fadced8 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "心灵空间", "appid" : "__UNI__BBBDFD2", "description" : "心灵空间", - "versionName" : "1.0.23", - "versionCode" : 1023, + "versionName" : "1.0.24", + "versionCode" : 1024, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 799268c..8020af1 100644 --- a/pages.json +++ b/pages.json @@ -34,6 +34,17 @@ } } }, + { + "path": "pages/visitor/taihu", + "style": { + "navigationBarTitleText": "太湖公益", + "app-plus": { + "bounce": "none", + "titleNView": false, + "popGesture": "none" + } + } + }, { "path": "pages/visitor/mine", "style": { @@ -78,6 +89,17 @@ } } }, + { + "path": "pages/visitor/taihuDetail", + "style": { + "navigationBarTitleText": "消息详情", + "app-plus": { + "bounce": "none", + "titleNView": false, + "popGesture": "none" + } + } + }, { "path": "pages/user/forget", "style": { diff --git a/pages/curriculum/list/index.vue b/pages/curriculum/list/index.vue index 52c64d8..1a084e4 100644 --- a/pages/curriculum/list/index.vue +++ b/pages/curriculum/list/index.vue @@ -28,7 +28,7 @@ - + 暂无封面图 @@ -460,7 +460,7 @@ export default { } .list_item_image,.image_null{ width: 250rpx; - height: 220rpx; + height: 250rpx; background-color: rgba(125, 193, 240, 0.1); display: flex; justify-content: center; @@ -469,6 +469,7 @@ export default { } .list_item_image image{ width: 100%; + height: 250rpx; } .list_item_right{ margin-left: 30rpx; diff --git a/pages/goods/order.vue b/pages/goods/order.vue index 093a95b..7b4426d 100644 --- a/pages/goods/order.vue +++ b/pages/goods/order.vue @@ -88,7 +88,7 @@ - -