From 6ecec6289eca451b3288e3e73df81ea54d6dac3f Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Wed, 3 Jul 2024 10:36:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/buyPup.vue | 4 ++-- components/z-navigation/z-navigation.vue | 24 ++++++++++++------------ pages.json | 12 ++++++------ pages/goods/index/index.vue | 4 ++-- pages/peanut/shopping.vue | 7 +++++-- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/components/buyPup.vue b/components/buyPup.vue index 1204329..43aa968 100644 --- a/components/buyPup.vue +++ b/components/buyPup.vue @@ -16,10 +16,10 @@ 立即购买 - + diff --git a/components/z-navigation/z-navigation.vue b/components/z-navigation/z-navigation.vue index 4e7744b..9eac74a 100644 --- a/components/z-navigation/z-navigation.vue +++ b/components/z-navigation/z-navigation.vue @@ -80,12 +80,12 @@ export default { selectedIconPath: "static/tab/icon1_y.png", text: "首页", }, - { - pagePath: "pages/peanut/shopping", - iconPath: "static/tab/tab_nor_02.png", - selectedIconPath: "static/tab/tab_cur_02.png", - text: "购物车", - }, + // { + // pagePath: "pages/peanut/shopping", + // iconPath: "static/tab/tab_nor_02.png", + // selectedIconPath: "static/tab/tab_cur_02.png", + // text: "购物车", + // }, { pagePath: "pages/bookShop/orderList", iconPath: "static/tab/order.png", @@ -112,12 +112,12 @@ export default { selectedIconPath: "static/tab/icon1_y.png", text: "首页", }, - { - pagePath: "pages/peanut/shopping", - iconPath: "static/tab/tab_nor_02.png", - selectedIconPath: "static/tab/tab_cur_02.png", - text: "购物车", - }, + // { + // pagePath: "pages/peanut/shopping", + // iconPath: "static/tab/tab_nor_02.png", + // selectedIconPath: "static/tab/tab_cur_02.png", + // text: "购物车", + // }, { pagePath: "pages/taihu/index", diff --git a/pages.json b/pages.json index 25b8781..ccba855 100644 --- a/pages.json +++ b/pages.json @@ -561,12 +561,12 @@ "selectedIconPath": "static/tab/icon1_y.png", "text": "首页" }, - { - "pagePath": "pages/peanut/shopping", - "iconPath": "static/tab/tab_nor_02.png", - "selectedIconPath": "static/tab/tab_cur_02.png", - "text": "购物车" - }, + // { + // "pagePath": "pages/peanut/shopping", + // "iconPath": "static/tab/tab_nor_02.png", + // "selectedIconPath": "static/tab/tab_cur_02.png", + // "text": "购物车" + // }, { "pagePath": "pages/bookShop/orderList", "iconPath": "static/tab/order.png", diff --git a/pages/goods/index/index.vue b/pages/goods/index/index.vue index f9e3bda..3542f2a 100644 --- a/pages/goods/index/index.vue +++ b/pages/goods/index/index.vue @@ -780,7 +780,7 @@ export default { }, onLoad(options) { this.options = options; - + console.log('options',options) // this.handleClickGetGoodsList(); // this.getUserInfo() // this.getCateList() @@ -1027,7 +1027,7 @@ export default { that.curriculumData.productImageList == null || that.curriculumData.productImageList == "" ) { - this.swiperList.push(that.curriculumData.explainsImg); + this.swiperList.push(that.curriculumData.productImages); } else { that.swiperList = that.curriculumData.productImageList.split(","); // for (var i = 0; i < imgList.length; i++) { diff --git a/pages/peanut/shopping.vue b/pages/peanut/shopping.vue index cd4da1f..0adc7f4 100644 --- a/pages/peanut/shopping.vue +++ b/pages/peanut/shopping.vue @@ -254,7 +254,7 @@ icon: 'error', duration: 1000, }) - }else{ + }else{ uni.navigateTo({ url: '../bookShop/settlement?type=1&list='+JSON.stringify(shangList) }); @@ -265,8 +265,11 @@ // 商品内容跳转 goDetail(id) { uni.navigateTo({ - url: '../bookShop/commodityDetail?id=' + id + url: '/pages/goods/index/index?id=' + id }); + // uni.navigateTo({ + // url: '../bookShop/commodityDetail?id=' + id + // }); }, }, From 016b072054d032da27219d0ab562503cfbcc3df4 Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Wed, 3 Jul 2024 11:22:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 947aa6c..4e14ca4 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "src" : "图片路径" } ], - "versionName" : "1.0.01", - "versionCode" : 1001, + "versionName" : "1.0.02", + "versionCode" : 1002, "app-plus" : { "compatible" : { "ignoreVersion" : true From 2e9a250be3fa34e6c9c7668b2fc51e63932d0b39 Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Wed, 3 Jul 2024 11:39:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/course/myCourse.vue | 5 ++++- pages/course/myCourseLearn.vue | 2 ++ pages/peanut/home.vue | 13 ++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pages/course/myCourse.vue b/pages/course/myCourse.vue index 2cdee98..7a80a6e 100644 --- a/pages/course/myCourse.vue +++ b/pages/course/myCourse.vue @@ -256,7 +256,10 @@ onShow() { // 隐藏原生的tabbar uni.hideTabBar(); - + // #ifdef APP-PLUS + plus.screen.unlockOrientation(); + plus.screen.lockOrientation("portrait-primary"); + // #endif }, onReachBottom() { console.log('触底'); diff --git a/pages/course/myCourseLearn.vue b/pages/course/myCourseLearn.vue index 0c2bbad..4361c82 100644 --- a/pages/course/myCourseLearn.vue +++ b/pages/course/myCourseLearn.vue @@ -204,8 +204,10 @@ onShow() { // 隐藏原生的tabbar uni.hideTabBar(); + // #ifdef APP-PLUS plus.screen.unlockOrientation(); plus.screen.lockOrientation("portrait-primary"); + // #endif this.getData(this.courseId) }, onReachBottom() { diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue index ca385fe..ce63dc3 100644 --- a/pages/peanut/home.vue +++ b/pages/peanut/home.vue @@ -12,8 +12,8 @@ - - + +
学习大纲 @@ -37,7 +37,7 @@ - + @@ -305,8 +305,10 @@ //页面显示 onShow() { uni.hideTabBar(); + // #ifdef APP-PLUS plus.screen.unlockOrientation(); plus.screen.lockOrientation("portrait-primary"); + // #endif this.requestAll() }, onTabItemTap() { @@ -687,7 +689,7 @@