From 96adf54c80054ec8a09505064903584a4df9c06d Mon Sep 17 00:00:00 2001 From: XingQue Date: Mon, 29 Jun 2026 02:08:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E7=B4=AB=E8=89=B2=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E5=AE=8C=E5=96=84=E3=80=81=E6=8A=A2=E5=8D=95=E7=AB=AF?= =?UTF-8?q?=E5=8E=BB=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E3=80=81=E6=88=91?= =?UTF-8?q?=E7=9A=84=E9=A1=B5=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- app.wxss | 61 +++++++------ components/chenghao-tag/chenghao-tag.js | 6 +- components/chenghao-tag/chenghao-tag.wxss | 4 +- components/order-card/order-card.wxss | 2 +- components/popup-notice/popup-notice.wxss | 4 +- pages/accept-order/accept-order.js | 13 +-- pages/accept-order/accept-order.json | 6 +- pages/accept-order/accept-order.wxml | 4 +- pages/accept-order/accept-order.wxss | 6 +- pages/assess-log/assess-log.wxss | 2 +- pages/category/category.wxss | 86 +++++++++---------- pages/cs-chat/cs-chat.wxml | 2 +- pages/edit/edit.wxss | 2 +- pages/express-order/express-order.wxss | 14 +-- pages/fighter-edit/fighter-edit.wxss | 6 +- pages/fighter-msg/fighter-msg.wxss | 12 +-- .../fighter-order-detail.js | 4 +- .../fighter-order-detail.wxml | 2 +- .../fighter-order-detail.wxss | 4 +- pages/fighter-orders/fighter-orders.js | 2 +- pages/fighter-recharge/fighter-recharge.wxss | 38 ++++---- pages/fighter/fighter.js | 52 ++++++++++- pages/fighter/fighter.json | 2 +- pages/fighter/fighter.wxml | 13 ++- pages/fighter/fighter.wxss | 22 ++--- pages/gold-fighter/gold-fighter.wxss | 22 ++--- pages/index/index.wxml | 2 +- pages/index/index.wxss | 16 ++-- pages/invite-manager/invite-manager.js | 2 +- pages/invite-manager/invite-manager.wxss | 72 ++++++++-------- .../merchant-dispatch/merchant-dispatch.wxml | 2 +- pages/merchant-home/merchant-home.wxss | 6 +- .../merchant-kefu-key/merchant-kefu-key.wxss | 6 +- .../merchant-kefu-list.wxss | 4 +- pages/merchant-msg/merchant-msg.wxss | 6 +- .../merchant-order-detail.js | 4 +- .../merchant-order-detail.wxss | 10 +-- pages/merchant-orders/merchant-orders.js | 2 +- pages/merchant-orders/merchant-orders.wxss | 12 +-- .../merchant-recharge/merchant-recharge.wxss | 16 ++-- .../merchant-staff-audit.wxss | 10 +-- .../merchant-staff-role.wxss | 14 +-- pages/merchant/merchant.js | 58 ++++++++++--- pages/merchant/merchant.json | 2 +- pages/merchant/merchant.wxml | 13 ++- pages/merchant/merchant.wxss | 6 +- pages/mine/mine.js | 2 +- pages/mine/mine.wxss | 10 +-- pages/order-pool/order-pool.wxml | 4 +- pages/order-pool/order-pool.wxss | 8 +- .../components/fakuan-list/fakuan-list.wxss | 2 +- .../components/jifen-list/jifen-list.wxss | 2 +- pages/penalty/penalty/penalty.wxss | 2 +- pages/poster/poster.js | 2 +- pages/poster/poster.wxss | 8 +- pages/recharge-log/recharge-log.wxss | 2 +- pages/staff-join/staff-join.wxss | 2 +- pages/verify/verify.wxss | 8 +- styles/dashou-xym-order-card.wxss | 44 +++++----- styles/dashou-xym-orders-theme.wxss | 16 ++-- styles/dashou-xym-rank-theme.wxss | 12 +-- styles/dashou-xym-recharge-theme.wxss | 32 +++---- styles/dashou-xym-theme.wxss | 58 ++++++------- styles/shangjia-xym-common.wxss | 16 ++-- styles/shangjia-xym-form.wxss | 22 ++--- tab-bar/index.wxss | 2 +- 66 files changed, 511 insertions(+), 397 deletions(-) diff --git a/app.wxss b/app.wxss index 58b2d37..b58b0e0 100644 --- a/app.wxss +++ b/app.wxss @@ -2,6 +2,15 @@ /* ========== CSS 变量 ========== */ page { + /* 星阙紫色主题 */ + --theme-primary: #9333ea; + --theme-primary-light: #a855f7; + --theme-primary-lighter: #c4b5fd; + --theme-primary-lightest: #ede9fe; + --theme-bg-tint: #f5f3ff; + --theme-gradient: linear-gradient(180deg, #c4b5fd, #a78bfa); + --theme-gradient-bg: linear-gradient(180deg, #c4b5fd 0%, #fff 28%, #f5f3ff 100%); + --color-price: #ff4444; --color-text-main: #333; --color-text-gray: #999; @@ -458,7 +467,7 @@ page { .tag-warning { background: rgba(250, 173, 20, 0.1); - color: #faad14; + color: #a855f7; } .tag-danger { @@ -468,7 +477,7 @@ page { .tag-gold { background: rgba(201, 169, 98, 0.1); - color: #C9A962; + color: #9333ea; } /* ========== 页面容器 ========== */ @@ -515,8 +524,8 @@ page { } .btn-primary--gold { - background: linear-gradient(135deg, #C9A962, #D4B56A); - box-shadow: 0 8rpx 20rpx rgba(201, 169, 98, 0.3); + background: linear-gradient(135deg, #9333ea, #a855f7); + box-shadow: 0 8rpx 20rpx rgba(147, 51, 234, 0.3); } .btn-primary--green { @@ -530,8 +539,8 @@ page { } .btn-primary--orange { - background: linear-gradient(135deg, #ffb347, #ff8c1a); - box-shadow: 0 8rpx 20rpx rgba(255, 140, 26, 0.3); + background: linear-gradient(135deg, #a855f7, #7c3aed); + box-shadow: 0 8rpx 20rpx rgba(124, 58, 237, 0.3); } .btn-primary--purple { @@ -565,8 +574,8 @@ page { } .btn-sm--gold { - background: linear-gradient(135deg, #ffcc00, #ffaa00); - box-shadow: 0 6rpx 16rpx rgba(255, 170, 0, 0.3); + background: linear-gradient(135deg, #c4b5fd, #9333ea); + box-shadow: 0 6rpx 16rpx rgba(147, 51, 234, 0.3); } .btn-sm--green { @@ -604,8 +613,8 @@ page { } .btn-ghost--gold { - color: #C9A962; - border-color: #C9A962; + color: #9333ea; + border-color: #9333ea; } /* 禁用状态 */ @@ -854,8 +863,8 @@ page { } .status-tag--warning { - background: #fffbe6; - color: #faad14; + background: #faf5ff; + color: #a855f7; } .status-tag--info { @@ -962,8 +971,8 @@ page { } @keyframes crownFloat { - 0%, 100% { transform: translateY(0) rotate(5deg) scale(1); filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8)); } - 50% { transform: translateY(-15rpx) rotate(10deg) scale(1.1); filter: drop-shadow(0 0 25rpx rgba(255, 215, 0, 1)); } + 0%, 100% { transform: translateY(0) rotate(5deg) scale(1); filter: drop-shadow(0 0 10rpx rgba(196, 181, 253, 0.8)); } + 50% { transform: translateY(-15rpx) rotate(10deg) scale(1.1); filter: drop-shadow(0 0 25rpx rgba(196, 181, 253, 1)); } } @keyframes haloRotate { @@ -1103,14 +1112,14 @@ page { } .chat-order-bubble { - background: #fff7e0; + background: #f5f3ff; padding: 12rpx; border-radius: 8rpx; } .chat-order-label { font-size: 24rpx; - color: #e6a23c; + color: #a855f7; font-weight: 600; } @@ -1605,7 +1614,7 @@ page { .rank-card--1 .rank-podium-base { height: 80rpx; } -.rank-podium-gold { background: linear-gradient(180deg, rgba(255, 215, 0, 0.3) 0%, rgba(255, 215, 0, 0.1) 100%); border: 1rpx solid rgba(255, 215, 0, 0.4); } +.rank-podium-gold { background: linear-gradient(180deg, rgba(196, 181, 253, 0.3) 0%, rgba(196, 181, 253, 0.1) 100%); border: 1rpx solid rgba(196, 181, 253, 0.4); } .rank-podium-silver { background: linear-gradient(180deg, rgba(192, 192, 192, 0.3) 0%, rgba(192, 192, 192, 0.1) 100%); border: 1rpx solid rgba(192, 192, 192, 0.4); } .rank-podium-bronze { background: linear-gradient(180deg, rgba(205, 127, 50, 0.3) 0%, rgba(205, 127, 50, 0.1) 100%); border: 1rpx solid rgba(205, 127, 50, 0.4); } @@ -1633,7 +1642,7 @@ page { font-size: 85rpx; position: relative; z-index: 2; - filter: drop-shadow(0 0 10rpx rgba(255, 215, 0, 0.8)); + filter: drop-shadow(0 0 10rpx rgba(196, 181, 253, 0.8)); animation: crownFloat 3s ease-in-out infinite; transform: rotate(5deg); } @@ -1645,7 +1654,7 @@ page { transform: translate(-50%, -50%); width: 200rpx; height: 200rpx; - background: radial-gradient(circle, rgba(255, 215, 0, 0.3) 0%, rgba(255, 215, 0, 0.1) 40%, transparent 70%); + background: radial-gradient(circle, rgba(196, 181, 253, 0.3) 0%, rgba(196, 181, 253, 0.1) 40%, transparent 70%); z-index: 0; animation: glowPulse 2s ease-in-out infinite; } @@ -1677,7 +1686,7 @@ page { .rank-card--1 .rank-avatar-container { border-width: 6rpx; } -.rank-frame-gold .rank-avatar-container { border-color: rgba(255, 215, 0, 0.3); filter: drop-shadow(0 0 30rpx rgba(255, 215, 0, 0.5)); } +.rank-frame-gold .rank-avatar-container { border-color: rgba(196, 181, 253, 0.3); filter: drop-shadow(0 0 30rpx rgba(196, 181, 253, 0.5)); } .rank-frame-silver .rank-avatar-container { border-color: rgba(192, 192, 192, 0.3); filter: drop-shadow(0 0 25rpx rgba(192, 192, 192, 0.5)); } .rank-frame-bronze .rank-avatar-container { border-color: rgba(205, 127, 50, 0.3); filter: drop-shadow(0 0 25rpx rgba(205, 127, 50, 0.5)); } @@ -1701,7 +1710,7 @@ page { animation: haloRotate 10s linear infinite; } -.rank-halo-gold { width: 220rpx; height: 220rpx; background: radial-gradient(circle, rgba(255, 215, 0, 0.4) 0%, rgba(255, 215, 0, 0.2) 30%, transparent 70%); } +.rank-halo-gold { width: 220rpx; height: 220rpx; background: radial-gradient(circle, rgba(196, 181, 253, 0.4) 0%, rgba(196, 181, 253, 0.2) 30%, transparent 70%); } .rank-card--1 .rank-halo-gold { width: 260rpx; height: 260rpx; } .rank-halo-silver { width: 200rpx; height: 200rpx; background: radial-gradient(circle, rgba(192, 192, 192, 0.4) 0%, rgba(192, 192, 192, 0.2) 30%, transparent 70%); } .rank-halo-bronze { width: 200rpx; height: 200rpx; background: radial-gradient(circle, rgba(205, 127, 50, 0.4) 0%, rgba(205, 127, 50, 0.2) 30%, transparent 70%); } @@ -1739,7 +1748,7 @@ page { .rank-card--1 .rank-badge { width: 70rpx; height: 70rpx; font-size: 32rpx; bottom: -15rpx; right: -15rpx; } -.rank-badge-gold { background: linear-gradient(135deg, #ffd700, #ff9800); } +.rank-badge-gold { background: linear-gradient(135deg, #c4b5fd, #9333ea); } .rank-badge-silver { background: linear-gradient(135deg, #c0c0c0, #808080); } .rank-badge-bronze { background: linear-gradient(135deg, #cd7f32, #a0522d); } @@ -1754,7 +1763,7 @@ page { overflow: hidden; } -.rank-card--1 .rank-user-info-card { border-color: rgba(255, 215, 0, 0.3); background: rgba(20, 15, 5, 0.95); } +.rank-card--1 .rank-user-info-card { border-color: rgba(196, 181, 253, 0.3); background: rgba(20, 15, 5, 0.95); } .rank-card--2 .rank-user-info-card { border-color: rgba(192, 192, 192, 0.3); background: rgba(25, 25, 35, 0.95); } .rank-card--3 .rank-user-info-card { border-color: rgba(205, 127, 50, 0.3); background: rgba(30, 20, 10, 0.95); } @@ -1769,7 +1778,7 @@ page { text-align: center; } -.rank-card--1 .rank-user-name { color: #ffd700; text-shadow: 0 0 15rpx rgba(255, 215, 0, 0.7); font-size: 34rpx; } +.rank-card--1 .rank-user-name { color: #c4b5fd; text-shadow: 0 0 15rpx rgba(196, 181, 253, 0.7); font-size: 34rpx; } .rank-card--2 .rank-user-name { color: #c0c0c0; text-shadow: 0 0 10rpx rgba(192, 192, 192, 0.7); } .rank-card--3 .rank-user-name { color: #cd7f32; text-shadow: 0 0 10rpx rgba(205, 127, 50, 0.7); } @@ -1807,7 +1816,7 @@ page { margin-right: 4rpx; } -.rank-card--1 .rank-currency { color: #ffd700; } +.rank-card--1 .rank-currency { color: #c4b5fd; } .rank-card--2 .rank-currency { color: #c0c0c0; } .rank-card--3 .rank-currency { color: #cd7f32; } @@ -1818,7 +1827,7 @@ page { text-shadow: 0 0 10rpx rgba(74, 222, 128, 0.5); } -.rank-card--1 .rank-amount { color: #ffd700; text-shadow: 0 0 15rpx rgba(255, 215, 0, 0.7); } +.rank-card--1 .rank-amount { color: #c4b5fd; text-shadow: 0 0 15rpx rgba(196, 181, 253, 0.7); } .rank-card--2 .rank-amount { color: #c0c0c0; text-shadow: 0 0 10rpx rgba(192, 192, 192, 0.7); } .rank-card--3 .rank-amount { color: #cd7f32; text-shadow: 0 0 10rpx rgba(205, 127, 50, 0.7); } diff --git a/components/chenghao-tag/chenghao-tag.js b/components/chenghao-tag/chenghao-tag.js index ae79133..b52ed96 100644 --- a/components/chenghao-tag/chenghao-tag.js +++ b/components/chenghao-tag/chenghao-tag.js @@ -38,8 +38,8 @@ Component({ } else if (cfg.bg_color) { bgStyle = `background: ${cfg.bg_color};`; } else { - // 默认金橙渐变 - bgStyle = `background: linear-gradient(135deg, #FFD700, #FF8C00);`; + // 默认紫色渐变 + bgStyle = `background: linear-gradient(135deg, #c4b5fd, #9333ea);`; } // 3. 形状（后端传入 shape 字段，默认 liubianxing） @@ -66,7 +66,7 @@ Component({ this.setData({ imageUrl: '' }); // 如果 bgStyle 为空，给个默认背景 if (!this.data.bgStyle) { - this.setData({ bgStyle: 'background: linear-gradient(135deg, #FFD700, #FF8C00);' }); + this.setData({ bgStyle: 'background: linear-gradient(135deg, #c4b5fd, #9333ea);' }); } } } diff --git a/components/chenghao-tag/chenghao-tag.wxss b/components/chenghao-tag/chenghao-tag.wxss index d142188..27bdd1d 100644 --- a/components/chenghao-tag/chenghao-tag.wxss +++ b/components/chenghao-tag/chenghao-tag.wxss @@ -85,6 +85,6 @@ animation: glow-anim 2s ease-in-out infinite; } @keyframes glow-anim { - 0%, 100% { box-shadow: 0 0 8rpx rgba(255, 215, 0, 0.4); } - 50% { box-shadow: 0 0 20rpx rgba(255, 215, 0, 0.8), 0 0 40rpx rgba(255, 215, 0, 0.4); } + 0%, 100% { box-shadow: 0 0 8rpx rgba(196, 181, 253, 0.4); } + 50% { box-shadow: 0 0 20rpx rgba(196, 181, 253, 0.8), 0 0 40rpx rgba(196, 181, 253, 0.4); } } \ No newline at end of file diff --git a/components/order-card/order-card.wxss b/components/order-card/order-card.wxss index 62c2737..51c76d2 100644 --- a/components/order-card/order-card.wxss +++ b/components/order-card/order-card.wxss @@ -15,7 +15,7 @@ .card-id { font-size: 24rpx; color: #999; margin-left: 15rpx; } .cross-tag { margin-left: auto; - background: #ff9900; + background: #8b5cf6; color: #fff; font-size: 20rpx; padding: 2rpx 12rpx; diff --git a/components/popup-notice/popup-notice.wxss b/components/popup-notice/popup-notice.wxss index e19960f..76ac9c5 100644 --- a/components/popup-notice/popup-notice.wxss +++ b/components/popup-notice/popup-notice.wxss @@ -138,7 +138,7 @@ .countdown-tip { text-align: center; font-size: 28rpx; - color: #ff6600; + color: #9333ea; margin-bottom: 20rpx; } @@ -223,7 +223,7 @@ height: 120rpx; border-radius: 50%; box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.3); - border: 2rpx solid rgba(255, 215, 0, 0.6); + border: 2rpx solid rgba(196, 181, 253, 0.6); background: #f0f0f0; display: block; transform: translateZ(0); diff --git a/pages/accept-order/accept-order.js b/pages/accept-order/accept-order.js index e47549e..cf10f85 100644 --- a/pages/accept-order/accept-order.js +++ b/pages/accept-order/accept-order.js @@ -70,13 +70,13 @@ Page({ this.syncShopBannerFromGlobal(); this.registerNotificationComponent(); this.loadGlobalStatus(); + if (wx.getStorageSync('uid')) { - reconnectForRole('dashou'); - if (app.startImWhenReady) app.startImWhenReady(); - this.refreshDashouProfileSilent(); - } - if (this.data.xuanzhongLeixingId) { - this.loadDingdanList(true); + // IM 延后连接，避免切 Tab 时卡顿；订单列表不自动刷新，由用户下拉刷新 + setTimeout(() => { + reconnectForRole('dashou'); + if (app.startImWhenReady) app.startImWhenReady(); + }, 600); } }, @@ -588,6 +588,7 @@ Page({ }); if (this.data.xuanzhongLeixingId) { + this.refreshDashouProfileSilent(); this.loadDingdanList(true); } else { this.setData({ scrollViewRefreshing: false }); diff --git a/pages/accept-order/accept-order.json b/pages/accept-order/accept-order.json index e7e7be0..d8aa64a 100644 --- a/pages/accept-order/accept-order.json +++ b/pages/accept-order/accept-order.json @@ -1,12 +1,12 @@ { "navigationBarTitleText": "抢单大厅", - "navigationBarBackgroundColor": "#f7dc51", + "navigationBarBackgroundColor": "#c4b5fd", "navigationBarTextStyle": "black", "enablePullDownRefresh": false, "backgroundTextStyle": "dark", - "backgroundColor": "#fff8e1", + "backgroundColor": "#f5f3ff", "usingComponents": { "chenghao-tag": "/components/chenghao-tag/chenghao-tag", "global-notification": "/components/global-notification/global-notification" } - } \ No newline at end of file + } diff --git a/pages/accept-order/accept-order.wxml b/pages/accept-order/accept-order.wxml index 389b531..cbad5f6 100644 --- a/pages/accept-order/accept-order.wxml +++ b/pages/accept-order/accept-order.wxml @@ -18,7 +18,7 @@ refresher-default-style="black" - refresher-background="#fff8e1" + refresher-background="#f5f3ff" refresher-triggered="{{scrollViewRefreshing}}" @@ -50,7 +50,7 @@ indicator-color="rgba(255,255,255,0.6)" - indicator-active-color="#ffd061" + indicator-active-color="#9333ea" autoplay="{{lunboList.length > 1}}" diff --git a/pages/accept-order/accept-order.wxss b/pages/accept-order/accept-order.wxss index cecbb2b..45c1dbe 100644 --- a/pages/accept-order/accept-order.wxss +++ b/pages/accept-order/accept-order.wxss @@ -486,7 +486,7 @@ background: rgba(0, 0, 0, 0.3); padding: 8rpx 20rpx; border-radius: 60rpx; - border: 1rpx solid rgba(255, 215, 0, 0.3); + border: 1rpx solid rgba(196, 181, 253, 0.3); } /* 分佣图标占位符，用户可替换为自己图标 */ @@ -504,10 +504,10 @@ .fenyong-price { font-size: 44rpx; - color: #ffd700; + color: #c4b5fd; font-weight: 800; margin-right: 4rpx; - text-shadow: 0 0 20px rgba(255, 215, 0, 0.8); + text-shadow: 0 0 20px rgba(196, 181, 253, 0.8); } .fenyong-unit { diff --git a/pages/assess-log/assess-log.wxss b/pages/assess-log/assess-log.wxss index 1b986f6..679e76a 100644 --- a/pages/assess-log/assess-log.wxss +++ b/pages/assess-log/assess-log.wxss @@ -132,7 +132,7 @@ page { border-radius: 20rpx; font-weight: 500; } - .status-0 { background: #FFF3E0; color: #EF6C00; } + .status-0 { background: #F3E8FF; color: #9333ea; } .status-1 { background: #E8F5E9; color: #2E7D32; } .status-2 { background: #FFEBEE; color: #C62828; } .status-3 { background: #E3F2FD; color: #1565C0; } diff --git a/pages/category/category.wxss b/pages/category/category.wxss index 9ce1023..d5791ab 100644 --- a/pages/category/category.wxss +++ b/pages/category/category.wxss @@ -60,13 +60,13 @@ .search-btn { margin-left: 20rpx; - box-shadow: 0 6rpx 20rpx rgba(255, 170, 0, 0.3); + box-shadow: 0 6rpx 20rpx rgba(147, 51, 234, 0.3); transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1); } .search-btn:active { transform: scale(0.95); - box-shadow: 0 4rpx 15rpx rgba(255, 170, 0, 0.4); + box-shadow: 0 4rpx 15rpx rgba(147, 51, 234, 0.4); } .search-btn-text { @@ -127,7 +127,7 @@ transform: translate(-50%, -50%); width: 300rpx; height: 300rpx; - background: radial-gradient(circle, rgba(255, 204, 0, 0.1) 0%, transparent 70%); + background: radial-gradient(circle, rgba(168, 85, 247, 0.1) 0%, transparent 70%); z-index: -1; } @@ -167,8 +167,8 @@ .leixing-active .leixing-image-box { transform: scale(1.12); box-shadow: - 0 18rpx 40rpx rgba(255, 204, 0, 0.3), - 0 8rpx 16rpx rgba(255, 170, 0, 0.2); + 0 18rpx 40rpx rgba(168, 85, 247, 0.3), + 0 8rpx 16rpx rgba(147, 51, 234, 0.2); } .leixing-image { @@ -185,7 +185,7 @@ right: -3rpx; bottom: -3rpx; border-radius: 50%; - background: linear-gradient(135deg, #ffcc00, #ffaa00, #ff8800); + background: linear-gradient(135deg, #c4b5fd, #9333ea, #7c3aed); opacity: 0; transition: opacity 0.4s; z-index: -1; @@ -223,10 +223,10 @@ } .leixing-active .leixing-text { - color: #ff9900; + color: #8b5cf6; font-weight: 600; transform: translateY(-2rpx); - text-shadow: 0 2rpx 4rpx rgba(255, 153, 0, 0.2); + text-shadow: 0 2rpx 4rpx rgba(168, 85, 247, 0.2); } .leixing-active-bar { @@ -234,12 +234,12 @@ bottom: -4rpx; width: 44rpx; height: 4rpx; - background: linear-gradient(90deg, #ffcc00, #ffaa00); + background: linear-gradient(90deg, #c4b5fd, #9333ea); border-radius: 2rpx; opacity: 0; transform: scaleX(0); transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1); - box-shadow: 0 2rpx 8rpx rgba(255, 170, 0, 0.4); + box-shadow: 0 2rpx 8rpx rgba(147, 51, 234, 0.4); } .leixing-active-bar-show { @@ -261,7 +261,7 @@ .border-effect-active { opacity: 1; - border-color: rgba(255, 204, 0, 0.5); + border-color: rgba(168, 85, 247, 0.5); animation: borderGlow 2s infinite; } @@ -295,7 +295,7 @@ } .zhuanqu-item:active { - background: rgba(255, 204, 0, 0.05); + background: rgba(168, 85, 247, 0.05); } .zhuanqu-item-content { @@ -320,9 +320,9 @@ } .zhuanqu-active .zhuanqu-name { - color: #ff9900; + color: #8b5cf6; font-weight: 600; - text-shadow: 0 2rpx 4rpx rgba(255, 153, 0, 0.2); + text-shadow: 0 2rpx 4rpx rgba(168, 85, 247, 0.2); } .zhuanqu-count { @@ -332,7 +332,7 @@ } .zhuanqu-active .zhuanqu-count { - color: #ffaa00; + color: #9333ea; font-weight: 500; } @@ -343,7 +343,7 @@ transform: translateY(-50%); width: 6rpx; height: 44rpx; - background: linear-gradient(180deg, #ffcc00, #ffaa00); + background: linear-gradient(180deg, #a855f7, #9333ea); border-radius: 3rpx 0 0 3rpx; opacity: 0; transition: all 0.3s; @@ -353,7 +353,7 @@ .zhuanqu-indicator-glow { opacity: 1; animation: indicatorGlow 2s infinite; - box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.5); + box-shadow: 0 0 20rpx rgba(168, 85, 247, 0.5); } .indicator-sparkle { @@ -372,7 +372,7 @@ left: 0; right: 0; bottom: 0; - background: linear-gradient(90deg, transparent, rgba(255, 204, 0, 0.05), transparent); + background: linear-gradient(90deg, transparent, rgba(168, 85, 247, 0.05), transparent); opacity: 0; transition: opacity 0.3s; pointer-events: none; @@ -389,7 +389,7 @@ width: 0; height: 0; border-radius: 50%; - background: rgba(255, 204, 0, 0.1); + background: rgba(168, 85, 247, 0.1); transform: translate(-50%, -50%); opacity: 0; pointer-events: none; @@ -463,7 +463,7 @@ right: -4rpx; bottom: -4rpx; border-radius: 18rpx; - background: linear-gradient(135deg, rgba(255, 204, 0, 0.2), transparent); + background: linear-gradient(135deg, rgba(168, 85, 247, 0.2), transparent); opacity: 0; transition: opacity 0.3s; pointer-events: none; @@ -479,7 +479,7 @@ right: 0; width: 20rpx; height: 20rpx; - background: linear-gradient(135deg, #ffcc00, transparent 70%); + background: linear-gradient(135deg, #a855f7, transparent 70%); border-radius: 0 14rpx 0 0; } @@ -514,7 +514,7 @@ left: 0; width: 0; height: 2rpx; - background: linear-gradient(90deg, #ffcc00, #ffaa00); + background: linear-gradient(90deg, #c4b5fd, #9333ea); transition: width 0.3s; } @@ -537,20 +537,20 @@ .price-icon { font-size: 24rpx; - color: #ff6600; + color: #9333ea; font-weight: 500; } .price-integer { font-size: 36rpx; /* 适当调整大小 */ - color: #ff6600; + color: #9333ea; font-weight: 600; margin-left: 2rpx; } .price-decimal { font-size: 24rpx; - color: #ff6600; + color: #9333ea; font-weight: 500; } @@ -573,11 +573,11 @@ .detail-btn { position: relative; padding: 12rpx 28rpx; - background: linear-gradient(135deg, #ffcc00, #ffaa00); + background: linear-gradient(135deg, #c4b5fd, #9333ea); border-radius: 40rpx; transition: all 0.3s cubic-bezier(0.34, 1.56, 0.64, 1); overflow: hidden; - box-shadow: 0 6rpx 20rpx rgba(255, 170, 0, 0.2); + box-shadow: 0 6rpx 20rpx rgba(147, 51, 234, 0.2); display: flex; align-items: center; justify-content: center; @@ -586,7 +586,7 @@ .detail-btn:active { transform: scale(0.95); - box-shadow: 0 4rpx 15rpx rgba(255, 170, 0, 0.4); + box-shadow: 0 4rpx 15rpx rgba(147, 51, 234, 0.4); } .detail-btn-text { @@ -659,7 +659,7 @@ left: 0; right: 0; bottom: 0; - background: linear-gradient(135deg, transparent, rgba(255, 204, 0, 0.03), transparent); + background: linear-gradient(135deg, transparent, rgba(168, 85, 247, 0.03), transparent); opacity: 0; transition: opacity 0.3s; pointer-events: none; @@ -676,7 +676,7 @@ width: 0; height: 0; border-radius: 50%; - background: rgba(255, 204, 0, 0.1); + background: rgba(168, 85, 247, 0.1); transform: translate(-50%, -50%); opacity: 0; pointer-events: none; @@ -707,19 +707,19 @@ } .shangpin-empty-btn { - background: linear-gradient(135deg, #ffcc00, #ffaa00); + background: linear-gradient(135deg, #c4b5fd, #9333ea); color: white; font-size: 26rpx; font-weight: 500; padding: 16rpx 44rpx; border-radius: 40rpx; - box-shadow: 0 8rpx 24rpx rgba(255, 170, 0, 0.3); + box-shadow: 0 8rpx 24rpx rgba(147, 51, 234, 0.3); transition: all 0.3s; } .shangpin-empty-btn:active { transform: scale(0.95); - box-shadow: 0 4rpx 16rpx rgba(255, 170, 0, 0.4); + box-shadow: 0 4rpx 16rpx rgba(147, 51, 234, 0.4); } .load-more-line { @@ -859,7 +859,7 @@ right: -4rpx; bottom: -4rpx; border-radius: 20rpx; - background: linear-gradient(135deg, rgba(255, 204, 0, 0.2), transparent); + background: linear-gradient(135deg, rgba(168, 85, 247, 0.2), transparent); opacity: 0; transition: opacity 0.3s; pointer-events: none; @@ -896,7 +896,7 @@ .info-tag { padding: 6rpx 12rpx; - background: rgba(255, 204, 0, 0.1); + background: rgba(168, 85, 247, 0.1); border-radius: 6rpx; } @@ -921,7 +921,7 @@ left: 0; right: 0; bottom: 0; - background: linear-gradient(135deg, transparent, rgba(255, 204, 0, 0.05), transparent); + background: linear-gradient(135deg, transparent, rgba(168, 85, 247, 0.05), transparent); opacity: 0; transition: opacity 0.3s; pointer-events: none; @@ -977,7 +977,7 @@ width: 100%; height: 100%; border: 4rpx solid transparent; - border-top-color: #ffcc00; + border-top-color: #a855f7; border-radius: 50%; animation: spin 1s linear infinite; } @@ -1028,7 +1028,7 @@ left: 50%; width: 12rpx; height: 12rpx; - background: #ffcc00; + background: #a855f7; border-radius: 50%; transform: translateX(-50%); animation: spin 1s linear infinite; @@ -1045,7 +1045,7 @@ left: 50%; width: 200rpx; height: 200rpx; - background: radial-gradient(circle, rgba(255, 204, 0, 0.2) 0%, transparent 70%); + background: radial-gradient(circle, rgba(168, 85, 247, 0.2) 0%, transparent 70%); transform: translate(-50%, -50%); z-index: -1; } @@ -1076,19 +1076,19 @@ @keyframes borderGlow { 0%, 100% { - border-color: rgba(255, 204, 0, 0.3); + border-color: rgba(168, 85, 247, 0.3); } 50% { - border-color: rgba(255, 204, 0, 0.8); + border-color: rgba(168, 85, 247, 0.8); } } @keyframes indicatorGlow { 0%, 100% { - box-shadow: 0 0 20rpx rgba(255, 204, 0, 0.3); + box-shadow: 0 0 20rpx rgba(168, 85, 247, 0.3); } 50% { - box-shadow: 0 0 30rpx rgba(255, 204, 0, 0.8); + box-shadow: 0 0 30rpx rgba(168, 85, 247, 0.8); } } diff --git a/pages/cs-chat/cs-chat.wxml b/pages/cs-chat/cs-chat.wxml index f805235..723917b 100644 --- a/pages/cs-chat/cs-chat.wxml +++ b/pages/cs-chat/cs-chat.wxml @@ -24,7 +24,7 @@ 订单号：{{item.payload.dingdan_id || '无'}} 服务：{{item.payload.jieshao || ''}} - ¥{{item.payload.jine}} + ¥{{item.payload.jine}} diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss index f98b51a..8ce2df8 100644 --- a/pages/edit/edit.wxss +++ b/pages/edit/edit.wxss @@ -1,6 +1,6 @@ /* pages/edit/edit.wxss */ page { - background: linear-gradient(135deg, #fffaf0 0%, #f0f8ff 100%); + background: linear-gradient(135deg, #faf5ff 0%, #f0f8ff 100%); min-height: 100vh; } diff --git a/pages/express-order/express-order.wxss b/pages/express-order/express-order.wxss index 4584d49..8081935 100644 --- a/pages/express-order/express-order.wxss +++ b/pages/express-order/express-order.wxss @@ -289,7 +289,7 @@ page { } .filter-switch.active { - background: linear-gradient(180deg, #fae04d, #ffc0a3); + background: linear-gradient(180deg, #c4b5fd, #a78bfa); color: #492f00; } @@ -323,7 +323,7 @@ page { .copy-link-btn { padding: 8rpx 20rpx; - background: linear-gradient(180deg, #fae04d, #ffc0a3); + background: linear-gradient(180deg, #c4b5fd, #a78bfa); color: #492f00; border-radius: 15rpx; font-size: 22rpx; @@ -337,7 +337,7 @@ page { .load-more-btn { display: inline-block; padding: 15rpx 40rpx; - background: linear-gradient(180deg, #fae04d, #ffc0a3); + background: linear-gradient(180deg, #c4b5fd, #a78bfa); border-radius: 30rpx; color: #492f00; font-size: 26rpx; @@ -373,7 +373,7 @@ page { .generate-modal-grid-btn, .copy-modal-grid-btn, .edit-modal-grid-btn { - background: linear-gradient(180deg, #fae04d, #ffc0a3); + background: linear-gradient(180deg, #c4b5fd, #a78bfa); color: #492f00; } @@ -484,7 +484,7 @@ page { } .confirm-add-grid-btn { - background: linear-gradient(180deg, #fae04d, #ffc0a3); + background: linear-gradient(180deg, #c4b5fd, #a78bfa); color: #492f00; } @@ -538,7 +538,7 @@ page { } .confirm-new-link-grid-btn { - background: linear-gradient(180deg, #fae04d, #ffc0a3); + background: linear-gradient(180deg, #c4b5fd, #a78bfa); color: #492f00; } @@ -569,7 +569,7 @@ page { width: 90rpx; height: 90rpx; border: 8rpx solid #eee; - border-top: 8rpx solid #ffd061; + border-top: 8rpx solid #9333ea; border-radius: 50%; animation: spin 1.2s linear infinite; margin-bottom: 35rpx; diff --git a/pages/fighter-edit/fighter-edit.wxss b/pages/fighter-edit/fighter-edit.wxss index 653e8db..cccfd60 100644 --- a/pages/fighter-edit/fighter-edit.wxss +++ b/pages/fighter-edit/fighter-edit.wxss @@ -1,7 +1,7 @@ /* 页面容器 */ .container { min-height: 100vh; - background: linear-gradient(135deg, #fffacd 0%, #e6f7ff 100%); + background: linear-gradient(135deg, #f5f3ff 0%, #e6f7ff 100%); padding: 20rpx; box-sizing: border-box; } @@ -27,7 +27,7 @@ height: 180rpx; border-radius: 50%; border: 6rpx solid #ffffff; - box-shadow: 0 0 30rpx rgba(255, 215, 0, 0.4); + box-shadow: 0 0 30rpx rgba(196, 181, 253, 0.4); z-index: 2; position: relative; background-color: #f5f5f5; @@ -38,7 +38,7 @@ width: 220rpx; height: 220rpx; border-radius: 50%; - background: radial-gradient(circle, rgba(255, 215, 0, 0.2) 0%, transparent 70%); + background: radial-gradient(circle, rgba(196, 181, 253, 0.2) 0%, transparent 70%); z-index: 1; animation: halo-pulse 2s infinite ease-in-out; } diff --git a/pages/fighter-msg/fighter-msg.wxss b/pages/fighter-msg/fighter-msg.wxss index 2c19a0c..21bbf83 100644 --- a/pages/fighter-msg/fighter-msg.wxss +++ b/pages/fighter-msg/fighter-msg.wxss @@ -296,9 +296,9 @@ } .zhuangtai-shensuzhong { - background: rgba(255, 165, 0, 0.2); - border-color: #FFA500; - box-shadow: 0 0 8rpx rgba(255, 165, 0, 0.2); + background: rgba(147, 51, 234, 0.2); + border-color: #9333ea; + box-shadow: 0 0 8rpx rgba(147, 51, 234, 0.2); } .zhuangtai-weizhi { @@ -657,9 +657,9 @@ } .cbtn-shensu { - background: rgba(255, 165, 0, 0.1); - border-color: #FFA500; - box-shadow: 0 0 12rpx rgba(255, 165, 0, 0.2); + background: rgba(147, 51, 234, 0.1); + border-color: #9333ea; + box-shadow: 0 0 12rpx rgba(147, 51, 234, 0.2); } .cbtn-shensu-disabled { diff --git a/pages/fighter-order-detail/fighter-order-detail.js b/pages/fighter-order-detail/fighter-order-detail.js index 1703829..582e5f1 100644 --- a/pages/fighter-order-detail/fighter-order-detail.js +++ b/pages/fighter-order-detail/fighter-order-detail.js @@ -30,8 +30,8 @@ Page({ laoban_id: '' }, zhuangtaiYanseMap: { - 1: '#E8F5E9', 2: '#E3F2FD', 3: '#F3E5F5', 4: '#FFF3E0', - 5: '#FFEBEE', 6: '#EFEBE9', 7: '#E0F7FA', 8: '#FFF8E1' + 1: '#E8F5E9', 2: '#E3F2FD', 3: '#F3E5F5', 4: '#F3E8FF', + 5: '#FFEBEE', 6: '#EFEBE9', 7: '#E0F7FA', 8: '#F5F3FF' }, zhuangtaiWenziMap: { 1: '已下单', 2: '进行中', 3: '已完成', 4: '退款中', diff --git a/pages/fighter-order-detail/fighter-order-detail.wxml b/pages/fighter-order-detail/fighter-order-detail.wxml index 47ff950..40790b3 100644 --- a/pages/fighter-order-detail/fighter-order-detail.wxml +++ b/pages/fighter-order-detail/fighter-order-detail.wxml @@ -179,7 +179,7 @@ 申请状态： {{xiangxiShuju.chufa_zhuangtai == 0 ? '审核中' : (xiangxiShuju.chufa_zhuangtai == 1 ? '处罚成功' : '处罚驳回')}} diff --git a/pages/fighter-order-detail/fighter-order-detail.wxss b/pages/fighter-order-detail/fighter-order-detail.wxss index a990b50..2d7a8a8 100644 --- a/pages/fighter-order-detail/fighter-order-detail.wxss +++ b/pages/fighter-order-detail/fighter-order-detail.wxss @@ -432,9 +432,9 @@ /* 🆕 新增：联系老板按钮 */ .boss-btn { - background-color: #ff9800; + background-color: #9333ea; color: #ffffff; - box-shadow: 0 4rpx 15rpx rgba(255, 152, 0, 0.3); + box-shadow: 0 4rpx 15rpx rgba(147, 51, 234, 0.3); } /* 🆕 新增：修改按钮（黑色） */ diff --git a/pages/fighter-orders/fighter-orders.js b/pages/fighter-orders/fighter-orders.js index 8323223..189638b 100644 --- a/pages/fighter-orders/fighter-orders.js +++ b/pages/fighter-orders/fighter-orders.js @@ -19,7 +19,7 @@ Page(createPage({ statusList: [ { name: '全部', key: 'all', zhuangtaiList: [], color: '#333333' }, { name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2], color: '#2196F3' }, - { name: '退款中', key: 'tuikuanzhong', zhuangtaiList: [4], color: '#FF9800' }, + { name: '退款中', key: 'tuikuanzhong', zhuangtaiList: [4], color: '#9333ea' }, { name: '已退款', key: 'yituikuan', zhuangtaiList: [5], color: '#9E9E9E' }, { name: '退款失败', key: 'tuikuanshibai', zhuangtaiList: [6], color: '#F44336' }, { name: '已完成', key: 'yiwancheng', zhuangtaiList: [3], color: '#4CAF50' }, diff --git a/pages/fighter-recharge/fighter-recharge.wxss b/pages/fighter-recharge/fighter-recharge.wxss index 68e9ef8..a576c31 100644 --- a/pages/fighter-recharge/fighter-recharge.wxss +++ b/pages/fighter-recharge/fighter-recharge.wxss @@ -156,7 +156,7 @@ .tag-time { display: block; font-size: 20rpx; - color: #ffd166; + color: #c4b5fd; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -235,7 +235,7 @@ .amount-symbol { font-size: 28rpx; - color: #ffd166; + color: #c4b5fd; margin-right: 6rpx; } @@ -379,7 +379,7 @@ .status-text { font-size: 22rpx; - color: #ff9d66; + color: #a855f7; } .status-text.full { @@ -462,7 +462,7 @@ .btn-energy .energy-dot { width: 6rpx; height: 6rpx; - background: #ffd166; + background: #c4b5fd; border-radius: 50%; animation: energyPulse 1s infinite; } @@ -667,7 +667,7 @@ position: absolute; top: 25rpx; right: 25rpx; - background: linear-gradient(135deg, #ff6b9d, #ff8e53); + background: linear-gradient(135deg, #a855f7, #7c3aed); padding: 5rpx 14rpx; border-radius: 20rpx; font-size: 20rpx; @@ -704,15 +704,15 @@ .price-symbol { font-size: 26rpx; - color: #ffd166; + color: #c4b5fd; margin-right: 5rpx; } .price-number { font-size: 50rpx; font-weight: bold; - color: #ffd166; - text-shadow: 0 0 15rpx rgba(255, 209, 102, 0.6); + color: #c4b5fd; + text-shadow: 0 0 15rpx rgba(196, 181, 253, 0.6); } .price-unit { @@ -876,7 +876,7 @@ .trial-hint { margin-top: 6rpx; - color: #ffb347; + color: #a855f7; } .buy-info { @@ -899,8 +899,8 @@ .price-value { font-size: 32rpx; font-weight: bold; - color: #ffd166; - text-shadow: 0 0 10rpx rgba(255, 209, 102, 0.4); + color: #c4b5fd; + text-shadow: 0 0 10rpx rgba(196, 181, 253, 0.4); } .buy-desc { @@ -911,7 +911,7 @@ /* 🔥 新增：到期日期文字加大 */ .expire-date { font-size: 26rpx; - color: #ffd166; + color: #c4b5fd; font-weight: bold; } @@ -947,8 +947,8 @@ } .tech-buy-btn.trial-buy-btn .buy-btn-bg { - background: linear-gradient(135deg, rgba(255, 179, 71, 0.35), rgba(255, 120, 80, 0.45)); - border: 1px solid rgba(255, 179, 71, 0.6); + background: linear-gradient(135deg, rgba(167, 139, 250, 0.35), rgba(124, 58, 237, 0.45)); + border: 1px solid rgba(167, 139, 250, 0.6); } .tech-buy-btn.renew .buy-btn-bg { @@ -993,7 +993,7 @@ .buy-btn-energy .energy-dot { width: 5rpx; height: 5rpx; - background: #ffd166; + background: #c4b5fd; border-radius: 50%; animation: energyPulse 1s infinite; } @@ -1160,7 +1160,7 @@ .input-prefix { font-size: 40rpx; - color: #ffd166; + color: #c4b5fd; margin-right: 20rpx; font-weight: bold; } @@ -1380,7 +1380,7 @@ .balance-amount { font-size: 24rpx; - color: #ffd166; + color: #c4b5fd; } .balance-arrow { @@ -1417,7 +1417,7 @@ .detail-value { flex: 1; font-size: 30rpx; - color: #ffd166; + color: #c4b5fd; font-weight: bold; } @@ -1481,7 +1481,7 @@ } .spinner-ring.ring-3 { - border-bottom-color: #ffd166; + border-bottom-color: #c4b5fd; animation-delay: 1s; } diff --git a/pages/fighter/fighter.js b/pages/fighter/fighter.js index e6b1e34..6f3aa39 100644 --- a/pages/fighter/fighter.js +++ b/pages/fighter/fighter.js @@ -58,6 +58,7 @@ Page(createPage({ tongguoZongshu: 0, pendingShenheCount: 0, layoutSparse: false, + scrollRefreshing: false, rankBoardList: [ { type: 'dashou', name: '接单员榜', sub: '接单成交', icon: '', shapeClass: 'rank-shape-left', themeClass: 'rank-theme-blue' }, { type: 'guanshi', name: '管事榜', sub: '邀请收入', icon: '', shapeClass: 'rank-shape-right', themeClass: 'rank-theme-gold' }, @@ -196,15 +197,14 @@ Page(createPage({ this.registerNotificationComponent(); this.checkRoleStatuses(); + this.applyCachedProfileFromGlobal(); if (isCenterPageActive(this, 'isDashou', 'dashoustatus')) { if (!this.data.isDashou) this.setData({ isDashou: true }); ensureRoleOnCenterPage(this, 'dashou'); - setTimeout(() => this.refreshAllInfo(false), 300); } else if (isRoleStatusActive(wx.getStorageSync('guanshistatus')) || isRoleStatusActive(wx.getStorageSync('zuzhangstatus')) || isRoleStatusActive(wx.getStorageSync('kaoheguanstatus'))) { ensureRoleOnCenterPage(this, 'dashou'); - setTimeout(() => this.refreshAllInfo(false), 300); } const pages = getCurrentPages(); const currentPage = pages[pages.length - 1]; @@ -304,6 +304,54 @@ Page(createPage({ }); }, + applyCachedProfileFromGlobal() { + const app = getApp(); + const g = app.globalData; + const guanshi = g.guanshi || {}; + const patch = { + dashouNicheng: g.dashouNicheng || this.data.dashouNicheng || '', + zhanghaoStatus: g.zhanghaoStatus ?? this.data.zhanghaoStatus, + yongjin: g.yongjin || this.data.yongjin || '0.00', + zonge: g.zonge || this.data.zonge || '0.00', + yajin: g.yajin || this.data.yajin || '0.00', + chenghao: g.chenghao || this.data.chenghao || '', + jinfen: g.jinfen || this.data.jinfen || '0', + clumber: g.clumber || this.data.clumber || [], + chengjiaoliang: g.chengjiaoliang || this.data.chengjiaoliang || '0', + zaixianZhuangtai: g.zaixianZhuangtai ?? this.data.zaixianZhuangtai ?? 0, + dashouzhuangtai: g.dashouzhuangtai ?? this.data.dashouzhuangtai, + gszhstatus: guanshi.gszhstatus || this.data.gszhstatus || '', + yaoqingzongshu: guanshi.yaoqingzongshu ?? this.data.yaoqingzongshu ?? 0, + fenyongzonge: guanshi.fenyongzonge || this.data.fenyongzonge || '0.00', + fenyongtixian: guanshi.fenyongtixian || this.data.fenyongtixian || '0.00', + }; + this.setData(patch, () => this._updateTotalAssets()); + }, + + async onPullDownRefresh() { + if (this._pullRefreshing) return; + this._pullRefreshing = true; + this.setData({ scrollRefreshing: true }); + try { + this.checkRoleStatuses(); + await Promise.allSettled([ + this._fetchDashouInfoSilent(), + this.fetchChenghaoList(), + this._fetchGuanshiInfoSilent(), + this.fetchGuanshiChenghaoList(), + this._fetchZuzhangInfoSilent(), + this._fetchKaoheguanInfoSilent(), + ]); + this.checkRoleStatuses(); + wx.showToast({ title: '已更新', icon: 'success', duration: 1200 }); + } catch (e) { + wx.showToast({ title: '刷新失败', icon: 'none' }); + } finally { + this._pullRefreshing = false; + this.setData({ scrollRefreshing: false }); + } + }, + async refreshAllInfo(showToast = true) { this.throttledRefresh(async () => { this.setData({ isLoading: true }); diff --git a/pages/fighter/fighter.json b/pages/fighter/fighter.json index 8458bf8..36119d5 100644 --- a/pages/fighter/fighter.json +++ b/pages/fighter/fighter.json @@ -5,7 +5,7 @@ "tab-bar": "/tab-bar/index" }, "navigationStyle": "custom", - "backgroundColor": "#fff8e1", + "backgroundColor": "#f5f3ff", "backgroundTextStyle": "dark", "enablePullDownRefresh": false, "onReachBottomDistance": 50 diff --git a/pages/fighter/fighter.wxml b/pages/fighter/fighter.wxml index 8f9bf1a..358139e 100644 --- a/pages/fighter/fighter.wxml +++ b/pages/fighter/fighter.wxml @@ -33,7 +33,18 @@ - + - +