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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ¥
+ {{ goodsInfo.price }}
+
+
+
+
+ {{ goodsInfo.title }}
+
+
+
+
+
+ 库存
+ {{ goodsInfo.stock || 0 }}
+
+
+
+
+ {{ $config.getAppSetting('currency2_name') }}{{ goodsInfo.price * 100 }}
+ (剩余:{{ orderData.use_integral }})
+
+
+
+
+
+
+ 售前·售后须知
+ ›
+
+
+
+
+
+ 商品详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ goodsInfo.price * 100 }}{{ $config.getAppSetting('currency2_name') }} 立即兑换
+
+ ¥{{ goodsInfo.price }} 立即购买
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-->
-
-
+
+
真实概率
@@ -14,31 +14,17 @@
官方真品
-
哈尼盲盒
-
-
-
-
-
-
-
-
-
-
-
-
- 用户123456抽中了一等级的限定盲盒!
-
-
-
-
+
+
+
+
+
+
+
+
+ 用户123456抽中了一等级的限定盲盒!
@@ -57,16 +43,22 @@
-
-
- 今日推荐
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -86,7 +78,7 @@
- 快去参与吧!
+
¥{{ item.price }}
@@ -191,12 +183,15 @@
},
advert: [], //轮播图
tuijian: [], //推荐上新
+ tuijianCurrent: 0, //推荐轮播当前页
aa: false,
gonggao: "",
couponData: "",
canGetCoupon: false,
swCur: 0,
- statusBarHeight
+ statusBarHeight,
+ navBgColor: 'transparent',
+ broadcastTop: 60
};
},
@@ -237,6 +232,15 @@
this.canGetCoupon = true;
},
+ onPageScroll(e) {
+ const scrollTop = e.scrollTop;
+ if (scrollTop > 10) {
+ this.navBgColor = '#E9F5F7';
+ } else {
+ this.navBgColor = 'transparent';
+ }
+ },
+
onShareAppMessage() {
let imageUrl = this.$config.getShareImageUrl();
return {
@@ -247,7 +251,14 @@
};
},
computed: {
- // 删除getBallStyle和getPopupStyle方法
+ // 将推荐数据按每3个一组分页
+ tuijianPages() {
+ const pages = [];
+ for (let i = 0; i < this.tuijian.length; i += 3) {
+ pages.push(this.tuijian.slice(i, i + 3));
+ }
+ return pages;
+ }
},
methods: {
// 删除BallClick和getFloatBall方法
@@ -270,6 +281,9 @@
swChange(e) {
this.swCur = e.detail.current;
},
+ onTuijianChange(e) {
+ this.tuijianCurrent = e.detail.current;
+ },
async receiveCoupon() {
let arr = this.couponData.goods.list.map((item) => item.id);
@@ -410,26 +424,87 @@
font-weight: 600;
}
+ .recommend-section {
+ width: 686rpx;
+ margin: 30rpx auto 0;
+ }
+
+ .recommend-title-img {
+ height: 64rpx;
+ }
+
+ .recommend-swiper {
+ width: 100%;
+ height: 240rpx;
+ }
+
+ .recommend-page {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 100%;
+ padding: 0 10rpx;
+ box-sizing: border-box;
+ }
+
.recommend_item {
- width: 200rpx;
- height: 200rpx;
- flex: 0 0 auto;
- background-color: gray;
- margin-right: 40rpx;
- border-radius: 10rpx;
- // 今日推荐条目四周阴影
- box-shadow: 0 0 15rpx 2rpx rgba(0, 0, 0, 0.3);
+ width: 210rpx;
+ height: 210rpx;
+ border-radius: 16rpx;
+ overflow: hidden;
+ box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.15);
+ }
+
+ .recommend_img {
+ width: 100%;
+ height: 100%;
+ }
+
+ .recommend-dots {
+ display: flex;
+ justify-content: center;
+ padding: 16rpx 0 0;
+ }
+
+ .recommend-dot {
+ width: 12rpx;
+ height: 12rpx;
+ border-radius: 50%;
+ background-color: #d8d8d8;
+ margin: 0 8rpx;
+ transition: all 0.3s;
+
+ &.active {
+ background-color: #666;
+ width: 24rpx;
+ border-radius: 6rpx;
+ }
}
.navLeft {
position: fixed;
- left: 30rpx;
+ left: 0;
+ top: 0;
z-index: 100;
+ width: 100%;
+ transition: background-color 0.3s;
+ }
- >view {
- width: 200rpx;
- height: 70rpx;
- }
+ .navLeft-top {
+ padding: 0 30rpx 10rpx;
+ }
+
+ .broadcast-bar {
+ position: fixed;
+ left: 0;
+ z-index: 99;
+ width: 100%;
+ height: 100rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 0 30rpx;
+ box-sizing: border-box;
}
.pop {
@@ -593,6 +668,7 @@
align-items: center;
border-radius: 16rpx;
background-size: 100% 100%;
+ position: relative;
.news-text {
width: 600rpx;
@@ -605,6 +681,34 @@
font-size: 24rpx;
}
}
+
+ // 左侧渐变遮罩
+ &::before {
+ content: "";
+ position: absolute;
+ left: 50rpx;
+ top: 0;
+ width: 100rpx;
+ height: 100%;
+ background: linear-gradient(to right, #E4F4F8, transparent);
+ z-index: 1;
+ pointer-events: none;
+ border-radius: 16rpx 0 0 16rpx;
+ }
+
+ // 右侧渐变遮罩
+ &::after {
+ content: "";
+ position: absolute;
+ right: 0;
+ top: 0;
+ width: 100rpx;
+ height: 100%;
+ background: linear-gradient(to left, #E4F4F8, transparent);
+ z-index: 1;
+ pointer-events: none;
+ border-radius: 0 16rpx 16rpx 0;
+ }
}
.nav1 {
@@ -631,12 +735,7 @@
}
}
- .yqhy {
- width: 100%;
- height: 300rpx;
- margin-top: 30rpx;
- margin-left: 32rpx;
- }
+ // .yqhy 已废弃,使用 .recommend-section 替代
.nav2 {
width: 710rpx;
@@ -826,7 +925,7 @@
.qbt_con_item {
width: 330rpx;
- height: 505rpx;
+ height: 485rpx;
margin-top: 30rpx;
// border: 1px solid #4a4951;
position: relative;
@@ -917,8 +1016,8 @@
.list_2 {
padding: 28rpx 20rpx 0;
- font-size: 20rpx;
- font-weight: 500;
+ font-size: 28rpx;
+ font-weight: 600;
color: #333333;
}
@@ -937,12 +1036,11 @@
// text-shadow: 0px 2px 8px rgba(233, 18, 252, 0.41);
.item-price {
- font-size: 32rpx;
- font-weight: 400;
+ font-size: 24rpx;
+ font-weight: 500;
color: #333333;
- background-color: #DFFF76;
- padding-left: 10rpx;
- padding-right: 10rpx;
+ background-color: #FCFE7C;
+ padding: 5rpx 22rpx;
border-radius: 0rpx 20rpx 0rpx 20rpx;
text {
diff --git a/honey_box/pages/user/index.vue b/honey_box/pages/user/index.vue
index b58e6d84..3707d88a 100644
--- a/honey_box/pages/user/index.vue
+++ b/honey_box/pages/user/index.vue
@@ -173,10 +173,16 @@
@@ -308,6 +307,9 @@
{include file="Public:footer"/}
+
+
+
@@ -314,6 +312,9 @@
{include file="Public:footer"/}
+
+
+