diff --git a/packageA/afterSales/index.vue b/packageA/afterSales/index.vue index 82a0c88..180a04d 100644 --- a/packageA/afterSales/index.vue +++ b/packageA/afterSales/index.vue @@ -19,7 +19,7 @@ - {{detail.title}} + {{detail.title}} {{detail.address}}{{detail.address_detail}} @@ -700,7 +700,7 @@ } .popup-content{ height: 700rpx; - margin-bottom: 75rpx; + padding-bottom: 130rpx; // overflow-y: auto; } .popup-content-item{ diff --git a/packageA/afterSales/info.vue b/packageA/afterSales/info.vue index 1692cff..a194fcd 100644 --- a/packageA/afterSales/info.vue +++ b/packageA/afterSales/info.vue @@ -9,7 +9,7 @@ - {{ info.detail.title }} + {{ info.detail.title }} ¥{{ info.total_refundprice}} - @@ -186,7 +185,7 @@ - {{ info.detail.address }}{{ info.detail.address_detail }} + {{ info.detail.address }}{{ info.detail.address_detail }} @@ -194,7 +193,7 @@ 退款数量 - {{ info.num }} + {{ info.auth_num }} @@ -1015,7 +1014,7 @@ export default { border-radius: 198rpx 198rpx 198rpx 198rpx; font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; font-weight: 400; - font-size: 32rpx; + font-size: 36rpx; color: #BBFC5B; line-height: 90rpx; text-align: center; diff --git a/packageA/center/applyDetail.vue b/packageA/center/applyDetail.vue index c4954f1..f3a9d61 100644 --- a/packageA/center/applyDetail.vue +++ b/packageA/center/applyDetail.vue @@ -20,11 +20,11 @@ - {{ detail.title }} + {{ detail.title }} - {{ detail.address_detail }} + {{ detail.address }}{{ detail.address_detail }} diff --git a/packageA/center/detailSys.vue b/packageA/center/detailSys.vue index 11eb289..7373f24 100644 --- a/packageA/center/detailSys.vue +++ b/packageA/center/detailSys.vue @@ -300,8 +300,8 @@ }); }, formattedTime() { - const startTime = dateWeek(this.detail.sign_start_time); - const endTime = dateWeek(this.detail.sign_end_time); + const startTime = dateWeek(this.detail.start_time); + const endTime = dateWeek(this.detail.end_time); return { formattedTime: `${startTime} ~ ${endTime}` }; diff --git a/packageA/my/cancelActivity.vue b/packageA/my/cancelActivity.vue index 791b7c2..77b505b 100644 --- a/packageA/my/cancelActivity.vue +++ b/packageA/my/cancelActivity.vue @@ -9,11 +9,12 @@ - {{detail.title}} + {{detail.title}} {{ detailAny.user.nickname }} + / {{ detailAny.join_info.people_number }}人玩过 @@ -31,15 +32,16 @@ - - - {{detail.address}}{{detail.address_detail}} + + + {{detail.address}}{{detail.address_detail}} - + diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue index 04a69f5..02e06d7 100644 --- a/packageA/my/exercise.vue +++ b/packageA/my/exercise.vue @@ -22,7 +22,7 @@ - {{ item.detail.title }} + {{ item.detail.title }} ¥{{ item.totalprice }} @@ -55,14 +55,13 @@ - - - - - 暂无参与活动 - + + + + 暂无参与活动 + 参与活动 - @@ -226,7 +225,7 @@ }; }, onLoad(option) { - + this.isInitialized = true; // 标记已初始化 console.log(1); if (option?.status) { this.selected = option.status @@ -234,11 +233,11 @@ } else { this.getList('-3,0,2,3,4,5,6,7,9'); } - this.isInitialized = true; // 标记已初始化 + }, onShow() { console.log(2); - if (!this.isInitialized) return; // 拦截未初始化时的逻辑 + if (this.isInitialized) return; // 拦截未初始化时的逻辑 setTimeout(()=>{ this.list = [] this.page = 1 @@ -266,6 +265,11 @@ }, methods: { + tofb() { + uni.switchTab({ + url: '/pages/index/index', + }); + }, dateWeeks(e) { return dateWeek(e); }, @@ -403,6 +407,7 @@ } else { this.loadStatus = 'loading'; } + this.isInitialized = false; // 标记已初始化 } else { uni.showToast({ title: res.msg, @@ -491,7 +496,6 @@ .hdkuai { background: #FFFFFF; - width: 690rpx; // height: 360rpx; // justify-content: space-around; margin: 30rpx; @@ -888,6 +892,20 @@ text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */ } + .tofb { + margin-top: 50rpx; + width: 280rpx; + height: 70rpx; + background: #323232; + border-radius: 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 500; + font-size: 32rpx; + color: #BBFC5B; + display: flex; + align-items: center; + justify-content: center; + } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 2efe06d..9179161 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,7 +4,7 @@ backgroundPosition: 'top', backgroundRepeat: 'no-repeat', }"> - + @@ -17,7 +17,7 @@ 搜索 - + @@ -116,7 +116,7 @@ + :maxCount="4" gap="0.4"> @@ -137,9 +137,14 @@ + + + + + + + 暂无发布活动 - - - - 暂无数据 - + + @@ -1026,8 +1030,7 @@ export default { .imgstop_ye { margin-left: 30rpx; - width: 174rpx; - height: 76rpx; + width: 150rpx; position: absolute; right: 0; } diff --git a/pages/my/applyOwner.vue b/pages/my/applyOwner.vue index 622e469..4ffab2f 100644 --- a/pages/my/applyOwner.vue +++ b/pages/my/applyOwner.vue @@ -13,7 +13,7 @@ - + 类型