diff --git a/honey_box/common/platform/MiniProgramPlatform.js b/honey_box/common/platform/MiniProgramPlatform.js index 4b122ceb..65992363 100644 --- a/honey_box/common/platform/MiniProgramPlatform.js +++ b/honey_box/common/platform/MiniProgramPlatform.js @@ -284,8 +284,14 @@ class MiniProgramPlatform extends BasePlatform { handler: () => { } }; - // 将客服菜单插入到第二个位置 - return [...baseMenuList.slice(0, 1), customServiceMenu, ...baseMenuList.slice(1)]; + // 将客服菜单插入到用户协议后面 + const agreementIndex = baseMenuList.findIndex(item => item.title === '用户协议'); + if (agreementIndex !== -1) { + baseMenuList.splice(agreementIndex + 1, 0, customServiceMenu); + return baseMenuList; + } + // 兜底:放到末尾 + return [...baseMenuList, customServiceMenu]; } handleLogout() { uni.showModal({ diff --git a/honey_box/pages.json b/honey_box/pages.json index 20949777..df2eaf20 100644 --- a/honey_box/pages.json +++ b/honey_box/pages.json @@ -198,6 +198,14 @@ "navigationStyle": "custom" } }, + { + "path": "pages/mall/detail", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, { "path": "pages/user/coupon", "style": { diff --git a/honey_box/pages/mall/detail.vue b/honey_box/pages/mall/detail.vue new file mode 100644 index 00000000..bbc5d67c --- /dev/null +++ b/honey_box/pages/mall/detail.vue @@ -0,0 +1,489 @@ + + + + + diff --git a/honey_box/pages/mall/index.vue b/honey_box/pages/mall/index.vue index b27dd443..4340edc4 100644 --- a/honey_box/pages/mall/index.vue +++ b/honey_box/pages/mall/index.vue @@ -244,28 +244,10 @@ export default { }, - async order_money(data) { - console.log(234); - this.goodsId = data.id; - // API: mall_ordermoney - const res = await calcMallOrderMoney({ - prize_num: 1, - goods_id: data.id, - num: 1, + order_money(data) { + uni.navigateTo({ + url: '/pages/mall/detail?goods_id=' + data.id }); - - if (res.status == 1) { - this.orderData = res.data; - this.zhifu = 0; - // 使用 goods_extend(API 返回的下划线命名) - const goodsExtend = this.orderData.goods_extend || {}; - if (goodsExtend.pay_wechat == 1) { - this.zhifu = 0; - } else if (goodsExtend.pay_currency2 == 1) { - this.zhifu = 1; - } - this.$refs.pop.open(); - } }, close(e) { diff --git a/honey_box/pages/shouye/index.vue b/honey_box/pages/shouye/index.vue index c3f7e71d..57e15c04 100644 --- a/honey_box/pages/shouye/index.vue +++ b/honey_box/pages/shouye/index.vue @@ -5,8 +5,8 @@ -->
@@ -308,6 +307,9 @@
{include file="Public:footer"/} + + +
@@ -314,6 +312,9 @@
{include file="Public:footer"/} + + +