From 27cac4c7f375178d7480a9e32d91800578656829 Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Tue, 7 May 2024 15:27:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E4=B8=89=E5=9B=9B=E7=BA=A7=E5=88=86=E7=B1=BB=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/goods/list.vue | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 7688b30..a036bed 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -12,7 +12,7 @@
-
{{item.name}}
@@ -329,19 +329,25 @@
.then(res => {
if (res.data.list.length > 0) {
that.tabbar = res.data.list;
- res.data.list.forEach(item => {
- item.children.forEach(item_1 => {
- that.goodsType.push(item_1)
- })
- });
- console.log(that.goodsType, that.tabbar)
+
+ // res.data.list.forEach(item => {
+ // item.children.forEach(item_1 => {
+ // that.goodsType.push(item_1)
+ // })
+ // });
+ // console.log(that.goodsType, that.tabbar)
}
})
.catch(reject)
})
},
- onChage(item, type) {
+ onChage(item, type,index) {
if (type == 1) {
+ if(this.tabbar && this.tabbar[index].children && this.tabbar[index].children.length > 0){
+ this.goodsType= this.tabbar[index].children;
+ }
+ this.isActive = '';
+ this.keyName2 = ''
if (item.category_id == this.isBanrdActive) {
this.isBanrdActive = '';
this.keyName1 = ''
From b47fc326547f5fe28bf3dba189c997d38ddb539e Mon Sep 17 00:00:00 2001
From: fanfan
Date: Tue, 7 May 2024 15:33:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 4 ---
pages/activity/seckill.vue | 57 +++++++++++++++++++++++++-------------
pages/news/rules/index.vue | 3 +-
pages/order/detail.vue | 4 +--
pages/order/index.vue | 6 ++--
5 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/manifest.json b/manifest.json
index 8a94b76..e486afc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -92,11 +92,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
-<<<<<<< HEAD
- "appid" : "wxe843b6d7a4bd3389",
-=======
"appid" : "wxa3127ed5c3542a28",
->>>>>>> beac19d5a037464834b39080367b0ebe8183fee7
"libVersion" : "latest",
"setting" : {
// 是否检查安全域名和 TLS 版本
diff --git a/pages/activity/seckill.vue b/pages/activity/seckill.vue
index 17f87e9..6971c63 100644
--- a/pages/activity/seckill.vue
+++ b/pages/activity/seckill.vue
@@ -9,17 +9,22 @@
+
-
-
- {{item.active_time}}
-
-
- {{item.status_text}}
+
+
+
+
+ {{item.active_time}}
+
+
+ {{item.status_text}}
+
+
-
-
+
+
@@ -125,7 +130,7 @@
background: 'url(https://www.royaum.com.cn/static/rank/rank1.png) center top no-repeat',
backgroundSize: '100% auto',
},
- backgroundImg:'',
+ backgroundImg: '',
}
},
/**
@@ -159,8 +164,8 @@
.then(result => {
app.tabbar = result.data.tabbar;
app.goodsList = result.data.goodsList.data
- if(app.goodsList && app.goodsList.length > 0){
- app.goodsList.map(a=>{
+ if (app.goodsList && app.goodsList.length > 0) {
+ app.goodsList.map(a => {
a.original_price = Number(a.original_price)
a.seckill_price_max = Number(a.seckill_price_max)
a.seckill_price_min = Number(a.seckill_price_min)
@@ -244,13 +249,16 @@
// 跳转到秒杀商品详情
handleTargetGoods(sharpGoodsId) {
- let count_down_time = new Date(this.tabbar[this.curTabIndex].count_down_time.replace(/-/g, '/')).getTime()-new Date().getTime()
+ let count_down_time = new Date(this.tabbar[this.curTabIndex].count_down_time.replace(/-/g, '/'))
+ .getTime() - new Date().getTime()
uni.navigateTo({
- url: '/pages/goods/detail?goodsId=' + sharpGoodsId+"&isSeckill="+true+'&isBuy='+count_down_time+'&seckillText='+(this.tabbar[this.curTabIndex].status == this.ActiveStatusEnum.STATE_BEGIN.value ? '结束' : '开始' )
+ url: '/pages/goods/detail?goodsId=' + sharpGoodsId + "&isSeckill=" + true + '&isBuy=' +
+ count_down_time + '&seckillText=' + (this.tabbar[this.curTabIndex].status == this
+ .ActiveStatusEnum.STATE_BEGIN.value ? '结束' : '开始')
})
},
-
+
// 设置微信公众号链接分享卡片内容
setWxofficialShareData() {
this.updateShareCardData({
@@ -325,13 +333,18 @@
.time {
display: flex;
align-items: center;
- width: 100%;
- justify-content: space-around;
+ padding: 0 24rpx;
+ align-items: center;
z-index: 30;
+ .typeList {
+ white-space: nowrap;
+ }
+
.timeItem {
+ margin-right: 15rpx;
.num {
- width: 150rpx;
+ width: 135rpx;
font-size: 28rpx;
font-weight: 500;
color: #FFFFFF;
@@ -342,7 +355,7 @@
}
.desc {
- width: 150rpx;
+ width: 135rpx;
height: 36rpx;
background: #FFFFFF;
border-radius: 62rpx 62rpx 62rpx 62rpx;
@@ -412,6 +425,7 @@
.goodsList {
overflow: hidden;
+
.goodItem {
width: 686rpx;
height: 342rpx;
@@ -422,10 +436,12 @@
padding: 48rpx 32rpx 36rpx 0;
margin: 0 auto;
margin-top: 22rpx;
+
.itemImg {
width: 258rpx;
height: 258rpx;
margin-right: 10rpx;
+
.goodsImg {
width: 100%;
height: 100%;
@@ -456,6 +472,7 @@
.info {
display: flex;
+
.price {
height: 40rpx;
font-size: 28rpx;
@@ -474,6 +491,7 @@
background-image: url('https://www.royaum.com.cn/static/seckill/bottom.png');
background-size: 100% 100%;
margin: 0 12rpx 0 14rpx;
+
.delText {
width: 132rpx;
text-align: center;
@@ -520,7 +538,8 @@
font-weight: 500;
color: #FF423D;
margin-left: 26rpx;
- text{
+
+ text {
font-size: 36rpx;
}
}
diff --git a/pages/news/rules/index.vue b/pages/news/rules/index.vue
index 01f8c18..db0551d 100644
--- a/pages/news/rules/index.vue
+++ b/pages/news/rules/index.vue
@@ -3,8 +3,7 @@
-
-
+
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index e1c75a3..2c7b7f7 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -148,7 +148,7 @@
v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
+ v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.PENDING.value">
取消订单
@@ -273,7 +273,7 @@
v-if="order.order_status == OrderStatusEnum.COMPLETED.value">
删除订单
-
+
取消订单
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 7e8b584..ce3621d 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -54,15 +54,15 @@