From 95316b05f985f1a429ac46c37b134d2f84958224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?= =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com> Date: Mon, 16 Jun 2025 17:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/my-tabbar.vue | 21 ++++++++++++--------- packageA/center/detailSys.vue | 4 ++-- packageA/my/cancelActivity.vue | 4 ++-- packageA/my/pendinPayDetail.vue | 7 +++---- packageB/names/index.vue | 2 +- pages/center/index.vue | 8 ++++---- pages/fenl/index.vue | 9 +-------- pages/index/index.vue | 13 +++++++------ pages/my/applyOwner.vue | 6 +++--- pages/my/index.vue | 14 +++++++++----- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/components/my-tabbar.vue b/components/my-tabbar.vue index 8197de2..d49bcad 100644 --- a/components/my-tabbar.vue +++ b/components/my-tabbar.vue @@ -8,13 +8,14 @@ {{item.name}} - + + style="border-radius: 50%;width: 102rpx;height: 102rpx"> + style="border-radius: 50%;width: 102rpx;height: 102rpx;"> - {{item.name}} + + {{item.name}} @@ -244,8 +245,8 @@ width: 100%; height: 100rpx; padding-bottom: 0; - background: url('/static/bottom_tab.png') no-repeat; - background-size: 100%; + background: url('/static/bottom_tab.png') no-repeat; + background-size: 100%; box-sizing: border-box; .list { @@ -256,7 +257,8 @@ width: 200rpx; height: 130rpx; position: relative; - z-index: 1000; + z-index: 1000; + image { width: 44rpx; height: 44rpx; @@ -300,9 +302,10 @@ align-items: center; justify-content: center; width: 200rpx; - height: 130rpx; + height: 125rpx; position: relative; - z-index: 1000; + z-index: 1000; + image { width: 44rpx; height: 44rpx; diff --git a/packageA/center/detailSys.vue b/packageA/center/detailSys.vue index 346f47c..c66ea97 100644 --- a/packageA/center/detailSys.vue +++ b/packageA/center/detailSys.vue @@ -168,7 +168,7 @@ - + @@ -1345,7 +1345,7 @@ export default { width: 288rpx; height: 36rpx; font-family: PingFang SC Bold, PingFang SC Bold; - font-weight: 400; + font-weight: 600; font-size: 36rpx; color: #202020; line-height: 36rpx; diff --git a/packageA/my/cancelActivity.vue b/packageA/my/cancelActivity.vue index aa8e023..791b7c2 100644 --- a/packageA/my/cancelActivity.vue +++ b/packageA/my/cancelActivity.vue @@ -50,11 +50,11 @@ 订单编号 - {{detailAny.order_no}} + {{detailAny.order_no}} 报名人昵称 - {{ detailAny.user.nickname }} + {{ detailAny.user.nickname }} 核销/报名人数 diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue index b4de637..506b23d 100644 --- a/packageA/my/pendinPayDetail.vue +++ b/packageA/my/pendinPayDetail.vue @@ -97,17 +97,16 @@ - + v-if="detailAny.detail.feel == 0 && (detailAny.status == 9 || detailAny.status == 2 || detailAny.status == 3) && (detail.status==4|| detail.status==5)"> 申请售后 + v-if="detailAny.detail.feel == 0 && detailAny.status == 2 && (detail.status==1 || detail.status==2 || detail.status==3)"> 取消订单 + v-if="detailAny.detail.feel == 1 && detailAny.status == 2 && (detail.status==1 || detail.status==2 || detail.status==3)"> 取消订单 diff --git a/packageB/names/index.vue b/packageB/names/index.vue index 17d093e..5bbbdbf 100644 --- a/packageB/names/index.vue +++ b/packageB/names/index.vue @@ -124,7 +124,7 @@ export default { .input { border-radius: 18rpx 18rpx 18rpx 18rpx; border: 1rpx solid #707070; - height: 80rpx; + height: 90rpx; padding-left: 10rpx; color: #999999; } diff --git a/pages/center/index.vue b/pages/center/index.vue index fe879f2..d431716 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -119,8 +119,8 @@ - 未上传 - 已上传 + 未上传 + 已上传 @@ -278,7 +278,7 @@ - 已选择 + 已选择 @@ -353,7 +353,7 @@ - diff --git a/pages/fenl/index.vue b/pages/fenl/index.vue index fb162fc..5ad1ad7 100644 --- a/pages/fenl/index.vue +++ b/pages/fenl/index.vue @@ -5,7 +5,7 @@ + search-icon="/static/index/search.png" @change="search()" bgColor="#F8f8f8"> 搜索 @@ -197,13 +197,6 @@ dateWeeks(e) { return dateWeek(e); }, - //底部翻页 - onReachBottom() { - if (this.hotList.length < this.count) { - this.page++; - this.getHotList(); - } - }, // 重置列表 resetLists() { this.page = 1; diff --git a/pages/index/index.vue b/pages/index/index.vue index 0141e0b..8b068f9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -567,12 +567,12 @@ export default { // } // }, //底部翻页 - onReachBottom() { - if (this.hotList.length < this.count) { - this.page++; - this.getHotList(); - } - }, + // onReachBottom() { + // if (this.hotList.length < this.count) { + // this.page++; + // this.getHotList(); + // } + // }, // 重置列表 resetLists() { this.page = 1; @@ -595,6 +595,7 @@ export default { } else { this.tjShow = false; } + this.resetLists(); this.getHotList(); }, diff --git a/pages/my/applyOwner.vue b/pages/my/applyOwner.vue index de76dc3..f479361 100644 --- a/pages/my/applyOwner.vue +++ b/pages/my/applyOwner.vue @@ -332,14 +332,14 @@ } .text_lab{ color: #3D3D3D; - font-weight: 400; + font-weight: 600; font-family: PingFang SC, PingFang SC; - font-size: 28rpx; + font-size: 32rpx; } .line-row { margin: 40rpx 0rpx; - height: 1rpx; + height: 1px; width: 100%; background: #EEEEEE; } diff --git a/pages/my/index.vue b/pages/my/index.vue index d2f321d..8264c0b 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -774,18 +774,22 @@ } else { this.showPopup = false uni.showToast({ - title: '登陆失败', - icon: 'error', + title: '登陆状态失效...', + icon: 'none', duration: 2000 }) } }).catch(error => { console.log('error', error); - this.showPopup = false + this.showPopup = false; + uni.clearStorageSync() + uni.reLaunch({ + url: '/pages/my/index' + }) uni.showToast({ - title: '登陆失败', - icon: 'error', + title: '登陆状态失效...', + icon: 'none', duration: 2000 }) })