diff --git a/app.json b/app.json index 3c5f34c..225097d 100644 --- a/app.json +++ b/app.json @@ -69,7 +69,7 @@ "usingComponents": { "popup-notice": "/components/popup-notice/popup-notice", - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" }, "window": { @@ -87,14 +87,14 @@ { "pagePath": "pages/order-pool/order-pool", "text": "接单池", - "iconPath": "/images/jiedanchi.png", - "selectedIconPath": "/images/jiedanchi.png" + "iconPath": "/images/order-pool.png", + "selectedIconPath": "/images/order-pool.png" }, { "pagePath": "pages/order-pool2/order-pool2", "text": "接单池", - "iconPath": "/images/jiedanchi.png", - "selectedIconPath": "/images/jiedanchi.png" + "iconPath": "/images/order-pool.png", + "selectedIconPath": "/images/order-pool.png" } ] diff --git a/images/_exit.png b/images/_exit.png new file mode 100644 index 0000000..e9ddd3a Binary files /dev/null and b/images/_exit.png differ diff --git a/images/fenlei.png b/images/category.png similarity index 100% rename from images/fenlei.png rename to images/category.png diff --git a/images/yiwancheng.png b/images/completed.png similarity index 100% rename from images/yiwancheng.png rename to images/completed.png diff --git a/images/tuichu.png b/images/exit.png similarity index 100% rename from images/tuichu.png rename to images/exit.png diff --git a/images/jinpaidashou.png b/images/gold-fighter.png similarity index 100% rename from images/jinpaidashou.png rename to images/gold-fighter.png diff --git a/images/zhuye.png b/images/home.png similarity index 100% rename from images/zhuye.png rename to images/home.png diff --git a/images/xiaoxi.png b/images/messages.png similarity index 100% rename from images/xiaoxi.png rename to images/messages.png diff --git a/images/mine.png b/images/mine.png new file mode 100644 index 0000000..4c09107 Binary files /dev/null and b/images/mine.png differ diff --git a/images/gonggao.png b/images/notice.png similarity index 100% rename from images/gonggao.png rename to images/notice.png diff --git a/images/jiedanchi.png b/images/order-pool.png similarity index 100% rename from images/jiedanchi.png rename to images/order-pool.png diff --git a/images/dingdan.png b/images/orders.png similarity index 100% rename from images/dingdan.png rename to images/orders.png diff --git a/images/goumai.png b/images/purchase.png similarity index 100% rename from images/goumai.png rename to images/purchase.png diff --git a/images/shuaxin.png b/images/refresh.png similarity index 100% rename from images/shuaxin.png rename to images/refresh.png diff --git a/images/yituikuan.png b/images/refunded.png similarity index 100% rename from images/yituikuan.png rename to images/refunded.png diff --git a/images/sousuo.png b/images/search.png similarity index 100% rename from images/sousuo.png rename to images/search.png diff --git a/images/tiaoxuan.png b/images/select.png similarity index 100% rename from images/tiaoxuan.png rename to images/select.png diff --git a/images/weixinzhifu.png b/images/wechat-pay.png similarity index 100% rename from images/weixinzhifu.png rename to images/wechat-pay.png diff --git a/images/wode.png b/images/wode.png deleted file mode 100644 index 1fec6b3..0000000 Binary files a/images/wode.png and /dev/null differ diff --git a/images/zhuanqu.png b/images/zone.png similarity index 100% rename from images/zhuanqu.png rename to images/zone.png diff --git a/pages/accept-order/accept-order.wxml b/pages/accept-order/accept-order.wxml index ce757cf..56de902 100644 --- a/pages/accept-order/accept-order.wxml +++ b/pages/accept-order/accept-order.wxml @@ -216,5 +216,5 @@ - + \ No newline at end of file diff --git a/pages/assessor/assessor.json b/pages/assessor/assessor.json index 78582c0..31206e9 100644 --- a/pages/assessor/assessor.json +++ b/pages/assessor/assessor.json @@ -1,7 +1,7 @@ { "usingComponents": { "global-notification": "/components/global-notification/global-notification", - "custom-tab-bar": "/custom-tab-bar/index", + "tab-bar": "/tab-bar/index", "popup-notice": "/components/popup-notice/popup-notice" }, "navigationBarTitleText": "考核官", diff --git a/pages/assessor/assessor.wxml b/pages/assessor/assessor.wxml index 0e6853e..7641606 100644 --- a/pages/assessor/assessor.wxml +++ b/pages/assessor/assessor.wxml @@ -125,4 +125,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/category/category.json b/pages/category/category.json index 4af9065..2c3e377 100644 --- a/pages/category/category.json +++ b/pages/category/category.json @@ -1,6 +1,6 @@ { "usingComponents": { "global-notification": "/components/global-notification/global-notification", - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" } } \ No newline at end of file diff --git a/pages/category/category.wxml b/pages/category/category.wxml index 208f034..8e35f37 100644 --- a/pages/category/category.wxml +++ b/pages/category/category.wxml @@ -3,7 +3,7 @@ - + - + \ No newline at end of file diff --git a/pages/fighter-orders/fighter-orders.wxml b/pages/fighter-orders/fighter-orders.wxml index dd01c53..b74e1e4 100644 --- a/pages/fighter-orders/fighter-orders.wxml +++ b/pages/fighter-orders/fighter-orders.wxml @@ -109,4 +109,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/fighter/fighter.js b/pages/fighter/fighter.js index e4b9270..cc2f07e 100644 --- a/pages/fighter/fighter.js +++ b/pages/fighter/fighter.js @@ -126,6 +126,7 @@ Page({ iconContact: gsBase + 'icon-contact.png', avatarDefault: ossImageUrl + 'avatar/default.jpg', iconClear: ossImageUrl + 'beijing/tubiao/grzx_qingchu.jpg', + iconSwitch: '/images/_exit.png', iconKefu: ossImageUrl + 'beijing/tubiao/grzx_kefu.jpg', iconKuaishou: ossImageUrl + 'beijing/tubiao/grzx_guanzhualong.jpg', iconKaoheDafen: khBase + 'daofen.png', @@ -1181,4 +1182,9 @@ Page({ }, }); }, + + switchToNormal() { + lockPrimaryRole('normal'); + wx.reLaunch({ url: '/pages/mine/mine' }); + }, }) diff --git a/pages/fighter/fighter.json b/pages/fighter/fighter.json index e0b7415..42b7954 100644 --- a/pages/fighter/fighter.json +++ b/pages/fighter/fighter.json @@ -2,7 +2,7 @@ "usingComponents": { "global-notification": "/components/global-notification/global-notification", "chenghao-tag": "/components/chenghao-tag/chenghao-tag", - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" }, "navigationBarBackgroundColor": "#e8ecf4", "navigationBarTextStyle": "black", diff --git a/pages/fighter/fighter.wxml b/pages/fighter/fighter.wxml index 532e035..59b4daf 100644 --- a/pages/fighter/fighter.wxml +++ b/pages/fighter/fighter.wxml @@ -12,9 +12,13 @@ 平台直签注册 + + + 返回点单端 + - 清除缓存，回到点单端 + 清除缓存，重新登录 @@ -363,10 +367,15 @@ 用户规则 + + + 返回点单端 + + 清除缓存 - 回点单端 + 重新登录 @@ -380,5 +389,5 @@ - + diff --git a/pages/fighter/fighter.wxss b/pages/fighter/fighter.wxss index dfe67c9..6a299ba 100644 --- a/pages/fighter/fighter.wxss +++ b/pages/fighter/fighter.wxss @@ -1,14 +1,15 @@ +/* 打手端 */ + page { - background: #F8FAFE; - font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', sans-serif; + background: #f5f5f5; color: #1A1A1A; } -/* .page-bg 与全局相同，仅保留差异 */ .page-bg { opacity: 0.42; } +/* 未注册 */ .unreg-area { position: relative; z-index: 2; @@ -21,12 +22,10 @@ page { .unreg-card { width: 100%; - background: rgba(255, 255, 255, 0.78); - backdrop-filter: blur(25rpx); - border-radius: 32rpx; - padding: 40rpx 32rpx; - box-shadow: 0 12rpx 40rpx rgba(0, 0, 0, 0.05); - border: 1rpx solid rgba(255, 255, 255, 0.6); + background: #fff; + border-radius: 16rpx; + padding: 48rpx 36rpx; + box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.06); } .unreg-title, @@ -35,107 +34,110 @@ page { font-weight: 700; color: #1A1A1A; display: block; - margin-bottom: 16rpx; + margin-bottom: 20rpx; } .section-title-sm { font-size: 26rpx; - margin-bottom: 12rpx; - color: #444; + margin-bottom: 0; + color: #333; } -/* .unreg-input 与 .input-rounded 类似，仅保留差异 */ .unreg-input { height: 80rpx; - border-radius: 40rpx; - margin-bottom: 16rpx; + border-radius: 12rpx; + margin-bottom: 20rpx; + background: #f7f7f7; + padding: 0 24rpx; + font-size: 28rpx; + border: 1rpx solid #e8e8e8; } -.ph { color: #999; } +.ph { color: #bbb; } -/* .unreg-btn 与 .btn .btn-secondary 类似，仅保留差异 */ .unreg-btn { width: 100%; height: 80rpx; - background: rgba(255, 255, 255, 0.65); - border-radius: 40rpx; - border: 1rpx solid rgba(0, 0, 0, 0.06); + background: #333; + border-radius: 12rpx; margin-bottom: 16rpx; + display: flex; + align-items: center; + justify-content: center; } -/* .unreg-btn-secondary 与 .btn-secondary 类似，仅保留差异 */ .unreg-btn-secondary { margin-bottom: 0; - background: rgba(255, 255, 255, 0.45); + background: #f5f5f5; + border: 1rpx solid #e0e0e0; +} + +.unreg-btn-secondary .unreg-btn-text { + color: #555; } .unreg-btn-text { font-size: 28rpx; font-weight: 600; + color: #fff; } .unreg-clear { display: flex; align-items: center; justify-content: center; - margin-top: 28rpx; + margin-top: 24rpx; padding-top: 20rpx; - border-top: 1rpx solid rgba(0, 0, 0, 0.05); + border-top: 1rpx solid #f0f0f0; } .unreg-clear-icon { width: 28rpx; height: 28rpx; - margin-right: 10rpx; - opacity: 0.65; + margin-right: 8rpx; + opacity: 0.5; } .unreg-clear-text { font-size: 22rpx; - color: #888; + color: #999; } +/* 主体 */ .main-body { position: relative; z-index: 2; padding: 0 24rpx 150rpx; } -/* .refresh-btn 与全局 .refresh-btn .refresh-btn--light 完全相同，删除 */ - -/* .refresh-icon 与全局 .refresh-icon 完全相同，删除 */ - +/* 用户卡片 */ .user-card { position: relative; - margin-top: 48rpx; - margin-bottom: 20rpx; - border-radius: 28rpx; + margin-top: 24rpx; + margin-bottom: 16rpx; + border-radius: 16rpx; overflow: hidden; - min-height: 120rpx; - box-shadow: 0 8rpx 28rpx rgba(0, 0, 0, 0.06); + background: #fff; + box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.05); } .user-card-bg { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 0; + display: none; } .user-card-inner { - position: relative; - z-index: 1; display: flex; align-items: center; - padding: 20rpx 24rpx; - background: rgba(255, 255, 255, 0.72); - backdrop-filter: blur(12rpx); + padding: 24rpx; } -/* .user-avatar 与 .avatar-circle .avatar-md 类似，仅保留差异 */ .user-avatar { + width: 88rpx; + height: 88rpx; + border-radius: 50%; + border: 2rpx solid #f0f0f0; + object-fit: cover; + flex-shrink: 0; margin-right: 20rpx; } @@ -145,48 +147,47 @@ page { display: flex; align-items: center; flex-wrap: wrap; - margin-bottom: 8rpx; + margin-bottom: 6rpx; } .user-name { font-size: 30rpx; font-weight: 700; - margin-right: 6rpx; + margin-right: 8rpx; } .role-tags { display: flex; flex-wrap: wrap; - gap: 2rpx; + gap: 6rpx; align-items: center; - margin-left: 2rpx; } .role-tag { font-size: 18rpx; - padding: 4rpx 12rpx; - border-radius: 12rpx; - font-weight: 600; - line-height: 1.35; - border: 1rpx solid transparent; + padding: 2rpx 10rpx; + border-radius: 6rpx; + font-weight: 500; + line-height: 1.4; } -.role-tag-dashou { background: #e8edf3; color: #2c3e50; border-color: #b8c4d0; } -.role-tag-guanshi { background: #edf0ea; color: #3d5238; border-color: #c2d0bc; } -.role-tag-zuzhang { background: #f0ece8; color: #5c4a38; border-color: #d4c8b8; } -.role-tag-kaohe { background: #eceef3; color: #3a4460; border-color: #c0c8d8; } +.role-tag-dashou { background: #eef1f5; color: #4a5568; } +.role-tag-guanshi { background: #eef5ee; color: #3d6b3d; } +.role-tag-zuzhang { background: #f5f0eb; color: #7c5e3a; } +.role-tag-kaohe { background: #eef0f5; color: #4a5070; } .uid-row { display: inline-flex; align-items: center; - background: rgba(0, 0, 0, 0.03); - border-radius: 20rpx; - padding: 4rpx 14rpx; + background: #f7f7f7; + border-radius: 8rpx; + padding: 4rpx 12rpx; } -.uid-text { font-size: 22rpx; margin-right: 8rpx; } +.uid-text { font-size: 22rpx; color: #999; margin-right: 6rpx; } .copy-icon { width: 22rpx; height: 22rpx; } +/* 称号 */ .badge-zone { margin-bottom: 12rpx; } .badge-scroll { white-space: nowrap; } .badge-scroll-sub { margin-top: 6rpx; } @@ -198,58 +199,42 @@ page { margin-right: -12rpx; } -.section-card { margin-bottom: 22rpx; } -.section-last { margin-bottom: 32rpx; } +/* 分区卡片 */ +.section-card { margin-bottom: 16rpx; } +.section-last { margin-bottom: 24rpx; } .section-head-line { display: flex; align-items: center; - margin-bottom: 12rpx; + margin-bottom: 10rpx; + padding: 0 4rpx; } .section-head-icon { - width: 32rpx; - height: 32rpx; + width: 28rpx; + height: 28rpx; margin-right: 8rpx; - opacity: 0.88; + opacity: 0.6; } -.section-title-sm { - font-size: 22rpx; - margin-bottom: 0; - color: #555; - font-weight: 600; -} - -/* 黑卡 VIP */ +/* VIP充值 */ .vip-black-card { position: relative; - height: 152rpx; - border-radius: 28rpx; + height: 140rpx; + border-radius: 16rpx; overflow: hidden; - margin-bottom: 16rpx; - box-shadow: 0 12rpx 40rpx rgba(20, 20, 24, 0.18); + margin-bottom: 12rpx; + background: #1a1a2e; } .vip-black-bg { position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; + top: 0; left: 0; + width: 100%; height: 100%; z-index: 0; } -.vip-black-overlay { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 1; - background: linear-gradient(135deg, rgba(18, 18, 22, 0.72) 0%, rgba(38, 38, 44, 0.55) 100%); - pointer-events: none; -} +.vip-black-overlay { display: none; } .vip-black-body { position: relative; @@ -262,135 +247,145 @@ page { box-sizing: border-box; } -.vip-black-text { - flex: 1; - min-width: 0; -} +.vip-black-text { flex: 1; min-width: 0; } .vip-black-title { display: block; - font-size: 30rpx; + font-size: 28rpx; font-weight: 700; - color: #f3ead8; - letter-spacing: 1rpx; + color: #f0e6c8; } .vip-black-sub { display: block; font-size: 20rpx; - color: rgba(243, 234, 216, 0.62); - margin-top: 6rpx; + color: rgba(240,230,200,0.5); + margin-top: 4rpx; } .vip-black-action { flex-shrink: 0; - padding: 14rpx 28rpx; - background: linear-gradient(135deg, rgba(243, 234, 216, 0.22) 0%, rgba(243, 234, 216, 0.1) 100%); - border: 1rpx solid rgba(243, 234, 216, 0.35); + padding: 10rpx 24rpx; + border: 1rpx solid rgba(240,230,200,0.3); border-radius: 999rpx; } .vip-black-go { - font-size: 24rpx; + font-size: 22rpx; font-weight: 600; - color: #f3ead8; + color: #f0e6c8; } /* 资产面板 */ .asset-panel { position: relative; - border-radius: 28rpx; + border-radius: 16rpx; overflow: hidden; - box-shadow: 0 12rpx 40rpx rgba(26, 43, 80, 0.1); - border: 1rpx solid rgba(212, 175, 110, 0.28); + background: #fff; + box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.04); } -.asset-panel-fallback { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 0; - background: linear-gradient(145deg, #faf6ee 0%, #ece4d4 45%, #e6edf8 100%); -} - -.asset-panel-bg { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 1; -} +.asset-panel-fallback { display: none; } +.asset-panel-bg { display: none; } .asset-panel-inner { - position: relative; - z-index: 2; - padding: 20rpx 18rpx 14rpx; - background: rgba(255, 255, 255, 0.62); - backdrop-filter: blur(20rpx); + padding: 20rpx 20rpx 14rpx; } .asset-panel-head { display: flex; align-items: center; - margin-bottom: 14rpx; + margin-bottom: 12rpx; } .asset-panel-head-icon { - width: 30rpx; - height: 30rpx; + width: 28rpx; + height: 28rpx; margin-right: 8rpx; } .asset-panel-head-title { - font-size: 28rpx; + font-size: 26rpx; font-weight: 700; - color: #222; + color: #333; } -.money-strip { +/* 总资产 */ +.total-asset-row { + border-radius: 12rpx; + overflow: hidden; + margin-bottom: 12rpx; + background: #faf8f4; + border: 1rpx solid #efe8d8; +} + +.total-asset-fallback { display: none; } +.total-asset-bg { display: none; } + +.total-asset-inner { display: flex; - gap: 12rpx; - margin-bottom: 14rpx; - overflow-x: auto; + align-items: center; + justify-content: space-between; + padding: 20rpx; } -.money-block { +.total-asset-left { flex: 1; - min-width: 200rpx; - border-radius: 20rpx; - padding: 16rpx 14rpx; - background: rgba(0, 0, 0, 0.025); - border: 1rpx solid rgba(0, 0, 0, 0.05); + min-width: 0; + padding-right: 16rpx; } -.money-label { - font-size: 20rpx; - color: #888; +.total-asset-label { display: block; + font-size: 22rpx; + color: #999; } -.money-val { - font-size: 34rpx; +.total-asset-val { + display: block; + font-size: 44rpx; font-weight: 800; - display: block; - margin: 6rpx 0 4rpx; - line-height: 1.15; - color: #1A1A1A; + color: #2c2416; + margin: 4rpx 0 8rpx; + line-height: 1.1; } -.money-tip { - font-size: 18rpx; - color: #AAA; +.asset-breakdown-list { + display: flex; + flex-direction: column; + gap: 2rpx; } +.asset-breakdown-line { + display: flex; + align-items: center; + justify-content: space-between; + padding-right: 8rpx; +} + +.breakdown-name { font-size: 20rpx; color: #aaa; } +.breakdown-amt { font-size: 20rpx; color: #777; font-weight: 500; } + +.withdraw-btn { + flex-shrink: 0; + min-width: 110rpx; + height: 64rpx; + line-height: 64rpx; + text-align: center; + padding: 0 24rpx; + font-weight: 700; + font-size: 24rpx; + border-radius: 999rpx; + background: #333; + color: #fff; +} + +/* 统计格子 */ .stats-grid { display: flex; flex-wrap: wrap; - border-top: 1rpx solid rgba(0, 0, 0, 0.05); - padding-top: 12rpx; + border-top: 1rpx solid #f0f0f0; + padding-top: 10rpx; } .mini-stat { @@ -409,39 +404,40 @@ page { .mini-lbl { font-size: 18rpx; - color: #999; + color: #aaa; display: block; - margin-top: 4rpx; + margin-top: 2rpx; } /* 排行榜 */ .rank-section { - margin-bottom: 22rpx; + margin-bottom: 16rpx; padding: 0 2rpx; } .rank-hub-head { display: flex; align-items: center; - margin-bottom: 18rpx; + margin-bottom: 12rpx; + padding: 0 4rpx; } .rank-hub-head-icon { - width: 32rpx; - height: 32rpx; - margin-right: 10rpx; + width: 28rpx; + height: 28rpx; + margin-right: 8rpx; } .rank-hub-title { - font-size: 28rpx; + font-size: 26rpx; font-weight: 700; - color: #222; + color: #333; display: block; } .rank-hub-sub { font-size: 20rpx; - color: #999; + color: #bbb; margin-top: 2rpx; display: block; } @@ -450,42 +446,21 @@ page { display: flex; flex-wrap: wrap; justify-content: space-between; - row-gap: 18rpx; + row-gap: 12rpx; } .rank-cell { width: 48.5%; - height: 156rpx; + height: 140rpx; position: relative; - border-radius: 24rpx; + border-radius: 16rpx; overflow: hidden; - filter: drop-shadow(0 8rpx 18rpx rgba(0, 0, 0, 0.08)); -} - -.rank-shape-left { - clip-path: polygon( - 0 8%, - 5% 0, - 95% 0, - 100% 5%, - 87% 95%, - 5% 100%, - 0 92% - ); + box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08); } +.rank-shape-left, .rank-shape-right { - clip-path: polygon( - 14% 5%, - 5% 0, - 95% 0, - 100% 5%, - 100% 95%, - 95% 100%, - 5% 100%, - 0 95%, - 14% 8% - ); + clip-path: none; } .rank-cell-inner { @@ -493,23 +468,21 @@ page { height: 100%; position: relative; display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-start; - padding: 0 22rpx 0 20rpx; + align-items: center; + padding: 0 20rpx; box-sizing: border-box; - border-radius: 24rpx; + border-radius: 16rpx; overflow: hidden; } .rank-bg-icon { position: absolute; - width: 148rpx; - height: 148rpx; - right: -18rpx; + width: 120rpx; + height: 120rpx; + right: -12rpx; top: 50%; transform: translateY(-50%) rotate(-10deg); - opacity: 0.2; + opacity: 0.15; z-index: 0; pointer-events: none; } @@ -517,61 +490,52 @@ page { .rank-content { position: relative; z-index: 1; - display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-start; } .rank-main-icon { - width: 76rpx; - height: 76rpx; - margin-bottom: 8rpx; - filter: drop-shadow(0 6rpx 16rpx rgba(0, 0, 0, 0.22)); + width: 56rpx; + height: 56rpx; + margin-bottom: 6rpx; } .rank-shape-right .rank-cell-inner { - padding: 0 20rpx 0 28rpx; - align-items: flex-end; + padding: 0 20rpx; + flex-direction: row-reverse; } .rank-shape-right .rank-bg-icon { right: auto; - left: -18rpx; + left: -12rpx; transform: translateY(-50%) rotate(10deg); } .rank-shape-right .rank-content { - align-items: flex-end; + text-align: right; } .rank-theme-blue .rank-cell-inner { - background: linear-gradient(135deg, #7ec4ff 0%, #4d9ef5 55%, #3b82e8 100%); + background: linear-gradient(135deg, #5ba3e6, #3b82e8); } - .rank-theme-gold .rank-cell-inner { - background: linear-gradient(135deg, #ffe28a 0%, #ffc94d 55%, #f5a623 100%); + background: linear-gradient(135deg, #f0c850, #e8a820); } - .rank-theme-purple .rank-cell-inner { - background: linear-gradient(135deg, #c4b5fd 0%, #9b87f5 55%, #7c6be8 100%); + background: linear-gradient(135deg, #9b87f5, #7c6be8); } - .rank-theme-orange .rank-cell-inner { - background: linear-gradient(135deg, #ffb896 0%, #ff8f6b 55%, #f56a4a 100%); + background: linear-gradient(135deg, #f08050, #e05a30); } .rank-cell-name { - font-size: 26rpx; + font-size: 24rpx; font-weight: 700; color: #fff; - text-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.15); line-height: 1.2; } .rank-cell-sub { font-size: 18rpx; - color: rgba(255, 255, 255, 0.88); + color: rgba(255,255,255,0.8); margin-top: 2rpx; } @@ -583,28 +547,18 @@ page { /* 功能面板 */ .func-panel { position: relative; - border-radius: 28rpx; + border-radius: 16rpx; overflow: hidden; - box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.04); + background: #fff; + box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.04); } -.func-panel-bg { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 0; -} +.func-panel-bg { display: none; } .func-grid { - position: relative; - z-index: 1; display: flex; flex-wrap: wrap; - padding: 10rpx 4rpx; - background: rgba(255, 255, 255, 0.85); - backdrop-filter: blur(12rpx); + padding: 8rpx 4rpx; } .func-cell { @@ -617,156 +571,105 @@ page { } .func-icon { - width: 52rpx; - height: 52rpx; - margin-bottom: 10rpx; + width: 48rpx; + height: 48rpx; + margin-bottom: 8rpx; } .func-label { font-size: 20rpx; - color: #444; + color: #555; text-align: center; line-height: 1.25; padding: 0 4rpx; } .func-grid-sparse .func-cell { - width: 25%; - padding: 22rpx 0; + padding: 20rpx 0; } .func-grid-sparse .func-icon { - width: 58rpx; - height: 58rpx; - margin-bottom: 12rpx; + width: 52rpx; + height: 52rpx; + margin-bottom: 10rpx; } .func-grid-sparse .func-label { - font-size: 24rpx; + font-size: 22rpx; } .layout-sparse-padding { padding-bottom: 80rpx; } -.money-strip-single .money-block { - min-width: 100%; -} - -.money-strip-single .money-val { - font-size: 44rpx; -} - -.auth-inline { - display: flex; - align-items: center; - gap: 12rpx; - background: rgba(255, 255, 255, 0.72); - border-radius: 24rpx; - padding: 12rpx 16rpx; - border: 1rpx solid rgba(255, 255, 255, 0.5); -} - -.auth-input { - flex: 1; - height: 64rpx; - background: #fff; - border-radius: 32rpx; - padding: 0 24rpx; - font-size: 26rpx; -} - -.auth-btn { - flex-shrink: 0; - height: 64rpx; - line-height: 64rpx; - padding: 0 28rpx; - background: rgba(0, 0, 0, 0.06); - border-radius: 32rpx; - font-size: 26rpx; - font-weight: 600; -} - -/* .list-card 与 .card 类似，仅保留差异 */ +/* 列表卡片 */ .list-card { position: relative; - border-radius: 28rpx; - box-shadow: 0 6rpx 24rpx rgba(0, 0, 0, 0.04); + border-radius: 16rpx; + overflow: hidden; + background: #fff; + box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.04); } -.list-card-bg { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 0; -} +.list-card-bg { display: none; } .list-card-inner { position: relative; z-index: 1; - background: rgba(255, 255, 255, 0.88); - backdrop-filter: blur(12rpx); } -/* .list-item 与全局 .list-item 类似，仅保留差异 */ .list-item { + display: flex; + align-items: center; padding: 22rpx 20rpx; + border-bottom: 1rpx solid #f5f5f5; } .list-item:last-child { border-bottom: none; } -/* .list-icon 与全局 .list-icon 类似，仅保留差异（缺少 flex-shrink:0） */ .list-icon { width: 36rpx; height: 36rpx; margin-right: 16rpx; + flex-shrink: 0; } -/* .list-text 与全局 .list-text 类似，仅保留差异 */ .list-text { + flex: 1; font-size: 26rpx; + color: #333; } .list-sub { font-size: 20rpx; - color: #999; + color: #bbb; margin-right: 8rpx; } -/* .list-arrow 与全局 .list-arrow 类似，仅保留差异 */ .list-arrow { - opacity: 0.45; + width: 20rpx; + height: 20rpx; + opacity: 0.3; + flex-shrink: 0; } /* 客服入口 */ .kefu-banner { position: relative; - margin-bottom: 18rpx; - border-radius: 28rpx; + margin-bottom: 16rpx; + border-radius: 16rpx; overflow: hidden; - box-shadow: 0 10rpx 32rpx rgba(44, 62, 80, 0.14); + background: #2c3e50; } .kefu-banner-bg { position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; + top: 0; left: 0; + width: 100%; height: 100%; z-index: 0; } -.kefu-banner-overlay { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 1; - background: linear-gradient(135deg, rgba(36, 48, 62, 0.82) 0%, rgba(52, 68, 88, 0.68) 100%); -} +.kefu-banner-overlay { display: none; } .kefu-banner-content { position: relative; @@ -774,7 +677,7 @@ page { display: flex; align-items: center; justify-content: space-between; - padding: 22rpx 24rpx; + padding: 20rpx 24rpx; } .kefu-banner-left { @@ -785,15 +688,15 @@ page { } .kefu-banner-icon { - width: 44rpx; - height: 44rpx; - margin-right: 16rpx; + width: 40rpx; + height: 40rpx; + margin-right: 14rpx; flex-shrink: 0; } .kefu-banner-title { display: block; - font-size: 28rpx; + font-size: 26rpx; font-weight: 700; color: #fff; } @@ -801,118 +704,27 @@ page { .kefu-banner-sub { display: block; font-size: 20rpx; - color: rgba(255, 255, 255, 0.72); - margin-top: 4rpx; + color: rgba(255,255,255,0.6); + margin-top: 2rpx; } .kefu-banner-btn { flex-shrink: 0; - padding: 12rpx 26rpx; - font-size: 24rpx; + padding: 10rpx 22rpx; + font-size: 22rpx; color: #2c3e50; font-weight: 600; - background: rgba(255, 255, 255, 0.92); + background: #fff; border-radius: 999rpx; margin-left: 16rpx; } -/* 总资产 */ -.total-asset-row { +/* 身份认证 */ +.auth-grid { position: relative; - border-radius: 24rpx; - overflow: hidden; - margin-bottom: 14rpx; - border: 1rpx solid rgba(212, 175, 110, 0.38); - box-shadow: inset 0 1rpx 0 rgba(255, 255, 255, 0.85), 0 4rpx 16rpx rgba(0, 0, 0, 0.05); -} - -.total-asset-fallback { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - z-index: 0; - background: linear-gradient(135deg, #faf6ee 0%, #f0e8d8 50%, #ebeef5 100%); -} - -.total-asset-bg { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; z-index: 1; -} - -.total-asset-inner { - position: relative; - z-index: 2; display: flex; - align-items: center; - justify-content: space-between; - padding: 22rpx 20rpx; - background: rgba(255, 255, 255, 0.52); - backdrop-filter: blur(14rpx); -} - -.total-asset-left { - flex: 1; - min-width: 0; - padding-right: 16rpx; -} - -.total-asset-label { - display: block; - font-size: 22rpx; - color: #777; -} - -.total-asset-val { - display: block; - font-size: 46rpx; - font-weight: 800; - color: #3d3420; - margin: 6rpx 0 10rpx; - line-height: 1.1; - letter-spacing: -0.5rpx; -} - -.asset-breakdown-list { - display: flex; - flex-direction: column; - gap: 4rpx; -} - -.asset-breakdown-line { - display: flex; - align-items: center; - justify-content: space-between; - padding-right: 8rpx; -} - -.breakdown-name { - font-size: 20rpx; - color: #888; -} - -.breakdown-amt { - font-size: 20rpx; - color: #666; - font-weight: 500; -} - -/* .withdraw-btn 与 .btn-sm--dark 类似，仅保留差异 */ -.withdraw-btn { - flex-shrink: 0; - min-width: 120rpx; - height: 72rpx; - line-height: 72rpx; - text-align: center; - padding: 0 28rpx; - font-weight: 700; - border-radius: 999rpx; - box-shadow: 0 6rpx 20rpx rgba(44, 62, 80, 0.22); + padding: 12rpx 8rpx; } .auth-grid-dynamic { @@ -928,16 +740,6 @@ page { box-sizing: border-box; } -/* 身份认证 */ -.auth-grid { - position: relative; - z-index: 1; - display: flex; - padding: 12rpx 8rpx; - background: rgba(255, 255, 255, 0.88); - backdrop-filter: blur(12rpx); -} - .auth-cell { flex: 1; display: flex; @@ -947,36 +749,46 @@ page { } .auth-cell-icon { - width: 48rpx; - height: 48rpx; + width: 44rpx; + height: 44rpx; margin-bottom: 8rpx; } .auth-cell-name { font-size: 22rpx; - color: #444; - margin-bottom: 6rpx; + color: #555; + margin-bottom: 4rpx; } .auth-cell-tag { font-size: 18rpx; - color: #888; + color: #bbb; padding: 2rpx 10rpx; border-radius: 999rpx; - background: rgba(0, 0, 0, 0.04); + background: #f5f5f5; } .auth-cell-tag-done { color: #5a6b57; - background: rgba(90, 107, 87, 0.1); + background: #eef5ee; } -/* .loading-mask 与全局 .loading-mask .loading-mask--light 完全相同，删除 */ +/* 加载 */ +.loading-mask { + position: fixed; + top: 0; left: 0; right: 0; bottom: 0; + background: rgba(255,255,255,0.7); + display: flex; + align-items: center; + justify-content: center; + z-index: 10000; +} -/* .loading-spinner 与 .spinner--md 类似，仅保留差异 */ .loading-spinner { - width: 52rpx; - height: 52rpx; - border: 3rpx solid rgba(0, 0, 0, 0.08); - border-top-color: #1A1A1A; + width: 48rpx; + height: 48rpx; + border: 4rpx solid #e8e8e8; + border-top-color: #333; + border-radius: 50%; + animation: spin 0.8s linear infinite; } diff --git a/pages/gold-fighter/gold-fighter.json b/pages/gold-fighter/gold-fighter.json index d2be079..e5dcf48 100644 --- a/pages/gold-fighter/gold-fighter.json +++ b/pages/gold-fighter/gold-fighter.json @@ -2,7 +2,7 @@ "usingComponents": { "global-notification": "/components/global-notification/global-notification", "chenghao-tag": "/components/chenghao-tag/chenghao-tag", - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" }, "navigationBarTitleText": "金牌用户", "navigationBarBackgroundColor": "#0B2A4A", diff --git a/pages/gold-fighter/gold-fighter.wxml b/pages/gold-fighter/gold-fighter.wxml index 5912b19..00914fd 100644 --- a/pages/gold-fighter/gold-fighter.wxml +++ b/pages/gold-fighter/gold-fighter.wxml @@ -184,7 +184,7 @@ - + diff --git a/pages/index/index.json b/pages/index/index.json index 06f55f5..3a14f51 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -1,7 +1,7 @@ { "usingComponents": { "global-notification": "/components/global-notification/global-notification", - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" }, "navigationBarTitleText": "商城", diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 7f871f9..515fcf3 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,171 +1,171 @@ - - - - - - - - - - {{shangpingonggao || '暂无公告'}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{item.jieshao}} - - - - - - - - - - - - - - {{item.zhuanqu.mingzi}} - - - - - - - - - - - - - - {{item.biaoqian}} - - - - - - ¥ - {{item.priceInteger}} - .{{item.priceDecimal}} - - - - - - - - - - - - - - 暂无商品 - - - - - - - - - - - 公告详情 - × - - - {{shangpingonggao || '暂无公告内容'}} - - - - - - - - 加载中... - - - - - - \ No newline at end of file + + + + + + + + + + {{shangpingonggao || '暂无公告'}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{item.jieshao}} + + + + + + + + + + + + + + {{item.zhuanqu.mingzi}} + + + + + + + + + + + + + + {{item.biaoqian}} + + + + + + ¥ + {{item.priceInteger}} + .{{item.priceDecimal}} + + + + + + + + + + + + + + 暂无商品 + + + + + + + + + + + 公告详情 + × + + + {{shangpingonggao || '暂无公告内容'}} + + + + + + + + 加载中... + + + + + + \ No newline at end of file diff --git a/pages/leader/leader.json b/pages/leader/leader.json index b6ac8e6..2e5e637 100644 --- a/pages/leader/leader.json +++ b/pages/leader/leader.json @@ -6,6 +6,6 @@ "backgroundTextStyle": "light", "usingComponents": { "global-notification": "/components/global-notification/global-notification", - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" } } \ No newline at end of file diff --git a/pages/leader/leader.wxml b/pages/leader/leader.wxml index 494e032..5584b59 100644 --- a/pages/leader/leader.wxml +++ b/pages/leader/leader.wxml @@ -99,7 +99,7 @@ - + diff --git a/pages/manager/manager.json b/pages/manager/manager.json index 6a1a405..01910a8 100644 --- a/pages/manager/manager.json +++ b/pages/manager/manager.json @@ -2,7 +2,7 @@ "usingComponents": { "global-notification": "/components/global-notification/global-notification", "chenghao-tag": "/components/chenghao-tag/chenghao-tag", - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" }, "navigationBarBackgroundColor": "#f0f4f8", "navigationBarTextStyle": "black", diff --git a/pages/manager/manager.wxml b/pages/manager/manager.wxml index 3ba8dbc..23106a1 100644 --- a/pages/manager/manager.wxml +++ b/pages/manager/manager.wxml @@ -118,5 +118,5 @@ - + \ No newline at end of file diff --git a/pages/merchant-dispatch/merchant-dispatch.wxml b/pages/merchant-dispatch/merchant-dispatch.wxml index 73a2f05..32394e5 100644 --- a/pages/merchant-dispatch/merchant-dispatch.wxml +++ b/pages/merchant-dispatch/merchant-dispatch.wxml @@ -1,159 +1,195 @@ - - - - - 可用余额 - - {{sjyue}} - 元 - - 派单将从此余额扣除 - - - - - 选择订单类型 - - - - {{item.jieshao}} - - - - - - - - - - 订单介绍 - - {{dingdanJieshao.length}}/50 - - - - - 订单备注（选填） - - {{dingdanBeizhu.length}}/50 - - - - - 老板昵称/ID - - {{laobanName.length}}/15 - - - - - 指定UID（选填） - - - - - - 订单价格（元） - - 范围：0.1 - 10000元 - - - - - 要求打手标签*如金牌打手（选填） - - - {{selectedLabelName || '无'}} - - - - - - - 要求打手押金（建议≤50元） - - - - - - - - - {{isSubmitting ? '派发中...' : '立即派发'}} - - - - - - - - 加载中... - - - - - - - - - 教程 - - - - - \ No newline at end of file + + + + + 可用余额 + + {{sjyue}} + 元 + + 派单将从此余额扣除 + + + + + + + 选择订单类型 + + + + {{item.jieshao}} + + + + + + + + + 填写订单信息 + + + + + + 订单介绍 + * + {{dingdanJieshao.length}}/50 + + + + + + + + 订单备注 + {{dingdanBeizhu.length}}/50 + + + + + + + + 老板昵称/ID + * + {{laobanName.length}}/15 + + + + + + + + 指定UID + 选填 + + + + + + + + 订单价格 + * + + + ¥ + + + 范围 0.1 ~ 10000 元，最多两位小数 + + + + + + 要求打手标签 + 选填 + + + + {{selectedLabelName || '不限制'}} + ▸ + + + + + + + + 要求打手押金 + 选填 + + + + {{commissionEnabled ? '已开启' : '未开启'}} + + + + + + + + + + + + {{isSubmitting ? '派发中...' : '立即派发'}} + + + + + + + + 加载中... + + + + + + + + 教程 + + + + diff --git a/pages/merchant-dispatch/merchant-dispatch.wxss b/pages/merchant-dispatch/merchant-dispatch.wxss index 949c6b7..71aaaf7 100644 --- a/pages/merchant-dispatch/merchant-dispatch.wxss +++ b/pages/merchant-dispatch/merchant-dispatch.wxss @@ -1,374 +1,339 @@ -/* pages/merchant-dispatch/merchant-dispatch.wxss - 黑金升级版 + 背景图由js动态拼接 */ -page { - background-color: #0a0a0f; - } - - .page-container { - min-height: 100vh; - /* 背景图通过内联 style 动态设置，此处不再写死 */ - background-size: cover; - background-position: center; - background-attachment: fixed; - position: relative; - padding: 30rpx; - box-sizing: border-box; - padding-bottom: 140rpx; - } - - /* 半透明遮罩增强文字可读性 - 不使用通配符 */ - .page-container::before { - content: ''; - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: rgba(10, 10, 15, 0.75); - backdrop-filter: blur(6rpx); - z-index: 0; - pointer-events: none; - } - - /* 所有直接子元素手动提升层级（替代 * 选择器） */ - .balance-card, - .section, - .form-container, - .btn-container, - .loading-mask { - position: relative; - z-index: 1; - } - - /* 余额卡片 - 黑金风格 */ - .balance-card { - background: linear-gradient(135deg, rgba(20,20,30,0.95), rgba(30,30,50,0.95)); - border-radius: 24rpx; - padding: 36rpx; - margin-bottom: 40rpx; - color: #fff; - box-shadow: 0 15rpx 35rpx rgba(0,0,0,0.4), 0 0 40rpx rgba(0,180,255,0.15); - text-align: center; - border: 1.5rpx solid rgba(0,180,255,0.2); - backdrop-filter: blur(10rpx); - overflow: hidden; - } - .balance-card::before { - content: ''; - position: absolute; - top: -50%; left: -50%; - width: 200%; height: 200%; - background: linear-gradient(45deg, transparent 30%, rgba(0,180,255,0.1) 50%, transparent 70%); - animation: cardShine 6s infinite linear; - z-index: 1; - } - @keyframes cardShine { - 0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); } - 100% { transform: translateX(100%) translateY(100%) rotate(45deg); } - } - .balance-label { - font-size: 28rpx; - color: rgba(255,255,255,0.8); - margin-bottom: 18rpx; - font-weight: 500; - position: relative; - z-index: 2; - } - .balance-amount { - display: flex; - align-items: baseline; - justify-content: center; - margin-bottom: 15rpx; - position: relative; - z-index: 2; - } - .amount-value { - font-size: 64rpx; - font-weight: bold; - color: #FFD700; - text-shadow: 0 0 20rpx rgba(255,215,0,0.7); - animation: amountGlow 3s infinite alternate; - } - @keyframes amountGlow { - 0% { color: #FFD700; text-shadow: 0 0 15rpx rgba(255,215,0,0.6); } - 100% { color: #FFE44D; text-shadow: 0 0 25rpx rgba(255,215,0,0.9); } - } - .amount-unit { - font-size: 36rpx; - color: #FFD700; - margin-left: 12rpx; - font-weight: 500; - } - .balance-tip { - font-size: 24rpx; - color: rgba(255,255,255,0.6); - position: relative; - z-index: 2; - } - - /* 区域标题 */ - .section { - margin-bottom: 35rpx; - } - .section-title { - font-size: 32rpx; - font-weight: 700; - color: #FFFFFF; - margin-bottom: 25rpx; - padding-left: 12rpx; - border-left: 6rpx solid #9C27B0; - text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.3); - } - - /* 商品类型横向滚动 */ - .type-scroll { - white-space: nowrap; - display: flex; - height: 90rpx; - } - .type-item { - display: inline-flex; - flex-shrink: 0; - align-items: center; - justify-content: center; - height: 85rpx; - padding: 0 40rpx; - margin-right: 20rpx; - background: rgba(255,255,255,0.08); - border-radius: 45rpx; - border: 2rpx solid rgba(255,255,255,0.15); - font-size: 28rpx; - color: rgba(255,255,255,0.8); - transition: all 0.3s cubic-bezier(0.175,0.885,0.32,1.275); - backdrop-filter: blur(10rpx); - } - .type-active { - background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%); - border-color: #9C27B0; - color: white; - transform: scale(1.05); - box-shadow: 0 10rpx 25rpx rgba(156,39,176,0.4); - } - .type-text { - max-width: 220rpx; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-weight: 500; - } - - /* 表单容器 - 玻璃态 */ - .form-container { - background: rgba(30,30,45,0.85); - backdrop-filter: blur(20rpx); - border-radius: 30rpx; - padding: 30rpx; - box-shadow: 0 10rpx 30rpx rgba(0,0,0,0.3); - border: 1.5rpx solid rgba(255,255,255,0.1); - margin-bottom: 40rpx; - } - .form-item { - margin-bottom: 35rpx; - position: relative; - } - .form-item:last-child { - margin-bottom: 0; - } - .form-label { - font-size: 30rpx; - font-weight: 600; - color: rgba(255,255,255,0.9); - display: block; - margin-bottom: 15rpx; - } - .form-label.required::after { - content: '*'; - color: #ff4444; - margin-left: 8rpx; - } - .form-input { - width: 100%; - height: 80rpx; - background: rgba(255,255,255,0.1); - border-radius: 16rpx; - padding: 0 25rpx; - font-size: 28rpx; - color: #FFFFFF; - border: 2rpx solid rgba(255,255,255,0.2); - box-sizing: border-box; - transition: all 0.3s; - } - .form-input:focus { - border-color: #9C27B0; - background: rgba(255,255,255,0.15); - } - .word-count { - position: absolute; - right: 0; - top: 0; - font-size: 24rpx; - color: rgba(255,255,255,0.5); - } - .price-tip { - font-size: 24rpx; - color: rgba(255,255,255,0.5); - margin-top: 10rpx; - display: block; - } - .picker-view { - background: rgba(255,255,255,0.1); - border-radius: 16rpx; - padding: 20rpx 25rpx; - border: 2rpx solid rgba(255,255,255,0.2); - color: rgba(255,255,255,0.9); - font-size: 28rpx; - } - .commission-item { - display: flex; - align-items: center; - flex-wrap: wrap; - gap: 20rpx; - } - .commission-item .form-label { - width: 100%; - margin-bottom: 10rpx; - } - .commission-input { - flex: 1; - background: rgba(255,255,255,0.1); - border-radius: 16rpx; - padding: 20rpx; - color: #fff; - border: 2rpx solid rgba(255,255,255,0.2); - font-size: 28rpx; - } - - /* 提交按钮区域 */ - .btn-container { - position: fixed; - bottom: 0; - left: 0; - right: 0; - background: linear-gradient(to top, rgba(10,10,15,0.95), transparent); - padding: 30rpx; - box-sizing: border-box; - z-index: 9999; - } - .submit-btn { - background: linear-gradient(135deg, #ff4444 0%, #cc0000 100%); - border-radius: 50rpx; - height: 90rpx; - display: flex; - align-items: center; - justify-content: center; - box-shadow: 0 10rpx 30rpx rgba(255,68,68,0.3); - transition: all 0.3s; - position: relative; - overflow: hidden; - } - .submit-btn::after { - content: ''; - position: absolute; - top: 0; - left: -100%; - width: 100%; - height: 100%; - background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent); - animation: shine 2s infinite; - } - .btn-hover { - transform: translateY(-2rpx); - box-shadow: 0 15rpx 40rpx rgba(255,68,68,0.4); - } - .btn-disabled { - opacity: 0.6; - filter: grayscale(0.3); - pointer-events: none; - } - .btn-text { - font-size: 36rpx; - font-weight: bold; - color: white; - letter-spacing: 4rpx; - position: relative; - z-index: 2; - } - @keyframes shine { - 0% { left: -100%; } - 100% { left: 100%; } - } - - /* 加载遮罩 */ - .loading-mask { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: rgba(0,0,0,0.8); - display: flex; - align-items: center; - justify-content: center; - z-index: 10000; - } - .loading-content { - background: rgba(40,40,60,0.95); - padding: 60rpx 80rpx; - border-radius: 30rpx; - display: flex; - flex-direction: column; - align-items: center; - box-shadow: 0 25rpx 70rpx rgba(0,0,0,0.6); - } - .loading-spinner { - width: 90rpx; - height: 90rpx; - border: 8rpx solid rgba(0,180,255,0.2); - border-top: 8rpx solid #00B4FF; - border-radius: 50%; - animation: spin 1.2s linear infinite; - margin-bottom: 35rpx; - } - .loading-text { - font-size: 30rpx; - color: #00B4FF; - font-weight: 600; - } - @keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } - } - - /* ========== 教程按钮样式（修改后：右上角，更大更显眼） ========== */ - .tutorial-btn { - position: fixed; - right: 0; - top: 20%; /* 右上区域，不再是垂直居中 */ - transform: translateY(-50%); - width: 120rpx; /* 增大宽度 */ - height: 120rpx; /* 增大高度 */ - background: rgba(0, 0, 0, 0.75); - backdrop-filter: blur(15rpx); - border-radius: 60rpx 0 0 60rpx; - display: flex; - align-items: center; - justify-content: center; - z-index: 10001; - box-shadow: -8rpx 0 20rpx rgba(0,0,0,0.3); - transition: right 0.3s ease-out; - border: 2rpx solid rgba(255,215,0,0.5); - border-right: none; - } - .tutorial-btn-text { - color: #FFD700; - font-size: 36rpx; /* 文字更大 */ - font-weight: bold; - writing-mode: vertical-rl; - letter-spacing: 6rpx; - } - .tutorial-btn-hidden { - right: -80rpx; /* 缩进后只露出约40rpx边缘 */ - } - .tutorial-btn-hover { - background: rgba(0, 0, 0, 0.9); - transform: translateY(-50%) scale(1.05); - } \ No newline at end of file +/* 商家派单 */ + +page { + background: #f5f5f5; +} + +.page { + min-height: 100vh; + padding: 24rpx; + padding-bottom: 160rpx; + box-sizing: border-box; +} + +/* 余额卡片 */ +.balance-card { + background: #1a1a2e; + border-radius: 16rpx; + padding: 36rpx 32rpx; + margin-bottom: 20rpx; + text-align: center; +} + +.balance-label { + font-size: 24rpx; + color: rgba(255,255,255,0.5); + display: block; +} + +.balance-row { + display: flex; + align-items: baseline; + justify-content: center; + margin: 12rpx 0 8rpx; +} + +.balance-value { + font-size: 52rpx; + font-weight: 700; + color: #f0d060; + line-height: 1; +} + +.balance-unit { + font-size: 26rpx; + color: #f0d060; + margin-left: 6rpx; + font-weight: 500; +} + +.balance-tip { + font-size: 20rpx; + color: rgba(255,255,255,0.35); + display: block; +} + +/* 卡片 */ +.card { + background: #fff; + border-radius: 16rpx; + padding: 28rpx; + margin-bottom: 20rpx; +} + +.card-header { + display: flex; + align-items: center; + margin-bottom: 20rpx; +} + +.card-dot { + width: 8rpx; + height: 8rpx; + border-radius: 4rpx; + background: #9C27B0; + margin-right: 12rpx; + flex-shrink: 0; +} + +.card-title { + font-size: 28rpx; + font-weight: 700; + color: #333; +} + +/* 订单类型 */ +.type-scroll { + white-space: nowrap; + display: flex; + padding: 8rpx 0; +} + +.type-chip { + display: inline-flex; + flex-shrink: 0; + align-items: center; + justify-content: center; + height: 64rpx; + padding: 0 28rpx; + margin-right: 14rpx; + background: #f5f5f5; + border-radius: 32rpx; + font-size: 24rpx; + color: #666; + border: 1rpx solid transparent; +} + +.type-chip--active { + background: #f3e5f9; + color: #9C27B0; + border-color: #9C27B0; + font-weight: 600; +} + +/* 表单字段 */ +.field { + margin-bottom: 24rpx; +} + +.field:last-child { + margin-bottom: 0; +} + +.field-head { + display: flex; + align-items: center; + margin-bottom: 10rpx; +} + +.field-label { + font-size: 26rpx; + font-weight: 600; + color: #333; +} + +.field-required { + font-size: 26rpx; + color: #e04040; + margin-left: 4rpx; +} + +.field-optional { + font-size: 20rpx; + color: #bbb; + margin-left: 8rpx; +} + +.field-count { + font-size: 20rpx; + color: #ccc; + margin-left: auto; +} + +.field-input { + width: 100%; + height: 76rpx; + background: #f7f7f7; + border-radius: 12rpx; + padding: 0 20rpx; + font-size: 26rpx; + color: #333; + border: 1rpx solid #eee; + box-sizing: border-box; +} + +.field-hint { + font-size: 20rpx; + color: #bbb; + margin-top: 8rpx; + display: block; +} + +/* 价格输入 */ +.price-input-wrap { + display: flex; + align-items: center; + background: #f7f7f7; + border-radius: 12rpx; + border: 1rpx solid #eee; + overflow: hidden; +} + +.price-prefix { + font-size: 28rpx; + font-weight: 700; + color: #999; + padding-left: 20rpx; + flex-shrink: 0; +} + +.price-input { + border: none; + background: transparent; + flex: 1; +} + +/* Picker */ +.field-picker { + display: flex; + align-items: center; + justify-content: space-between; + height: 76rpx; + background: #f7f7f7; + border-radius: 12rpx; + padding: 0 20rpx; + border: 1rpx solid #eee; + font-size: 26rpx; + color: #333; +} + +.field-picker-ph { + color: #bbb; +} + +.field-picker-arrow { + font-size: 24rpx; + color: #ccc; +} + +/* Switch 行 */ +.switch-row { + display: flex; + align-items: center; + margin-bottom: 12rpx; +} + +.switch-label { + font-size: 22rpx; + color: #999; + margin-left: 12rpx; +} + +/* 底部留白 */ +.bottom-space { + height: 20rpx; +} + +/* 提交栏 */ +.submit-bar { + position: fixed; + bottom: 0; + left: 0; + right: 0; + background: #fff; + padding: 16rpx 24rpx; + padding-bottom: calc(16rpx + env(safe-area-inset-bottom)); + border-top: 1rpx solid #f0f0f0; + z-index: 9999; +} + +.submit-btn { + height: 88rpx; + background: #e04040; + border-radius: 12rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 32rpx; + font-weight: 700; + color: #fff; + letter-spacing: 2rpx; +} + +.submit-btn--hover { + opacity: 0.85; +} + +.submit-btn--disabled { + opacity: 0.5; + pointer-events: none; +} + +/* 加载 */ +.loading-mask { + position: fixed; + top: 0; left: 0; right: 0; bottom: 0; + background: rgba(255,255,255,0.8); + display: flex; + align-items: center; + justify-content: center; + z-index: 10000; +} + +.loading-box { + background: #fff; + padding: 48rpx 64rpx; + border-radius: 16rpx; + display: flex; + flex-direction: column; + align-items: center; + box-shadow: 0 4rpx 20rpx rgba(0,0,0,0.08); +} + +.loading-spinner { + width: 44rpx; + height: 44rpx; + border: 4rpx solid #eee; + border-top-color: #333; + border-radius: 50%; + animation: spin 0.8s linear infinite; + margin-bottom: 16rpx; +} + +.loading-text { + font-size: 24rpx; + color: #666; +} + +/* 教程按钮 */ +.tutorial-btn { + position: fixed; + right: 0; + top: 20%; + transform: translateY(-50%); + width: 72rpx; + height: 72rpx; + background: #9C27B0; + border-radius: 36rpx 0 0 36rpx; + display: flex; + align-items: center; + justify-content: center; + z-index: 10001; + transition: right 0.3s ease-out; +} + +.tutorial-btn-text { + color: #fff; + font-size: 22rpx; + font-weight: 600; + writing-mode: vertical-rl; + letter-spacing: 4rpx; +} + +.tutorial-btn--hidden { + right: -44rpx; +} + +.tutorial-btn--hover { + opacity: 0.85; +} diff --git a/pages/merchant-orders/merchant-orders.wxml b/pages/merchant-orders/merchant-orders.wxml index 3f209d6..9c74d97 100644 --- a/pages/merchant-orders/merchant-orders.wxml +++ b/pages/merchant-orders/merchant-orders.wxml @@ -132,4 +132,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/merchant/merchant.js b/pages/merchant/merchant.js index db052a2..b4eeb47 100644 --- a/pages/merchant/merchant.js +++ b/pages/merchant/merchant.js @@ -127,6 +127,7 @@ Page({ iconCopy: `${imgDir}icon_copy.png`, avatarFrame: `${imgDir}avatar_frame.png`, iconClear: `${ossBase}beijing/tubiao/grzx_qingchu.jpg`, + iconSwitch: '/images/_exit.png', } }); }, @@ -359,4 +360,9 @@ Page({ }, }); }, + + switchToNormal() { + lockPrimaryRole('normal'); + wx.reLaunch({ url: '/pages/mine/mine' }); + }, }); \ No newline at end of file diff --git a/pages/merchant/merchant.json b/pages/merchant/merchant.json index c00917d..2e9bbe2 100644 --- a/pages/merchant/merchant.json +++ b/pages/merchant/merchant.json @@ -2,7 +2,7 @@ "usingComponents": { "global-notification": "/components/global-notification/global-notification", "popup-notice": "/components/popup-notice/popup-notice", - "custom-tab-bar": "/custom-tab-bar/index", + "tab-bar": "/tab-bar/index", "chenghao-tag": "/components/chenghao-tag/chenghao-tag" }, "navigationBarTitleText": "商家中心", diff --git a/pages/merchant/merchant.wxml b/pages/merchant/merchant.wxml index 87fcff8..33044ce 100644 --- a/pages/merchant/merchant.wxml +++ b/pages/merchant/merchant.wxml @@ -15,10 +15,14 @@ 已有邀请码？点击上方注册 + + + 返回点单端 + 清除缓存 - 回点单端 + 重新登录 @@ -167,10 +171,14 @@ + + + 返回点单端 + 清除缓存 - 回点单端 + 重新登录 @@ -188,4 +196,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/messages/messages.json b/pages/messages/messages.json index 7e4a6e8..0dbdec6 100644 --- a/pages/messages/messages.json +++ b/pages/messages/messages.json @@ -1,6 +1,6 @@ { "usingComponents": { "global-notification": "/components/global-notification/global-notification", - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" } } \ No newline at end of file diff --git a/pages/messages/messages.wxml b/pages/messages/messages.wxml index 16d5ea2..1b0373b 100644 --- a/pages/messages/messages.wxml +++ b/pages/messages/messages.wxml @@ -64,6 +64,6 @@ - + \ No newline at end of file diff --git a/pages/mine/mine.json b/pages/mine/mine.json index 241131f..a1b6de3 100644 --- a/pages/mine/mine.json +++ b/pages/mine/mine.json @@ -1,7 +1,7 @@ { "usingComponents": { "global-notification": "/components/global-notification/global-notification", - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" }, "navigationBarTitleText": "个人中心", "navigationBarBackgroundColor": "#F7F3ED", diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 36510d0..99a35aa 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -113,5 +113,5 @@ - + \ No newline at end of file diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index 5a0b5cc..3c9db8d 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -1,251 +1,263 @@ -/* pages/gerenzhongxin/gerenzhongxin.wxss — 最终完美版（毛玻璃强化+图标左右贴边） */ +/* 我的页面 */ -/* 全局 */ page { - background: #F7F3ED; - height: 100vh; - overflow: hidden; - } - - .page-root { - position: relative; - width: 100%; - height: 100vh; - display: flex; - flex-direction: column; - } - - .bg-layer { - position: fixed; - top: 0; left: 0; - width: 100vw; height: 100vh; - background: radial-gradient(ellipse at 30% 20%, rgba(201,169,98,0.08) 0%, transparent 60%), - radial-gradient(ellipse at 80% 70%, rgba(201,169,98,0.05) 0%, transparent 50%); - z-index: 0; - pointer-events: none; - } - - .main-scroll { - position: relative; - z-index: 2; - flex: 1; - width: 100%; - overflow-y: auto; - padding-bottom: calc(140rpx + env(safe-area-inset-bottom)); - } - - .main-content { - padding: 60rpx 40rpx 0; - } - - /* 图标基础 */ - .icon-dark { - filter: brightness(0) saturate(100%) opacity(0.65); - } - .icon-color { - filter: none; - } - .icon-size { - width: 52rpx; - height: 52rpx; - } - - /* 图标独立淡金背景 */ - .icon-bg { - background: rgba(201,169,98,0.08); - border-radius: 24rpx; - display: flex; - align-items: center; - justify-content: center; - padding: 18rpx; - } - - /* 头部（头像完美正圆） */ - .hero { - position: relative; - margin-bottom: 100rpx; - } - .settings-icon { - position: absolute; - top: 0; right: 0; - width: 60rpx; height: 60rpx; - display: flex; align-items: center; justify-content: center; - } - .user-block { - display: flex; align-items: center; - } - .avatar-outside { - width: 140rpx; - height: 140rpx; - border-radius: 50%; - background: rgba(201,169,98,0.06); - padding: 10rpx; - margin-right: 35rpx; - display: flex; - align-items: center; - justify-content: center; - box-sizing: border-box; - } - .avatar { - width: 100%; - height: 100%; - border-radius: 50%; - display: block; - border: none; - } - .nickname { - font-size: 44rpx; font-weight: 700; color: #1A1A1A; - display: block; - } - .uid { - font-size: 28rpx; color: #7A7A7A; - margin-top: 12rpx; - display: block; - } - .login-btn { - margin-top: 45rpx; - height: 92rpx; - border-radius: 46rpx; - } - - /* 分区间距 */ - .section { - margin-top: 110rpx; - } - .section-close { - margin-top: 80rpx; - } - - .title-line { - margin-bottom: 40rpx; - padding: 18rpx 28rpx; - line-height: 1.2; - } - .gradient-bg { - background: linear-gradient(to right, rgba(201,169,98,0.01), rgba(201,169,98,0.10)); - } - .title-text { - font-size: 38rpx; - font-weight: 700; - color: #1A1A1A; - letter-spacing: 2rpx; - } - - /* 毛玻璃订单容器（强化玻璃质感，淡灰半透，无白边） */ - .frosted-box { - background: rgba(235, 235, 240, 0.45); /* 淡灰玻璃底 */ - backdrop-filter: blur(25px); - -webkit-backdrop-filter: blur(25px); - border-radius: 36rpx; - padding: 45rpx 0; /* 去掉左右内边距，让图标真正贴边 */ - box-shadow: 0 4rpx 16rpx rgba(0,0,0,0.05), inset 0 1rpx 0 rgba(255,255,255,0.7); - border: none; - } - - /* 订单行 - 图标完全左右贴边，间距最大化 */ - .order-row { - display: flex; - justify-content: space-between; - align-items: center; - padding: 0 5rpx; /* 极微的内边距，防止图片被裁剪，但视觉上仍贴边 */ - } - .order-unit { - display: flex; - flex-direction: column; - align-items: center; - position: relative; - flex: 1; /* 等分剩余空间 */ - margin: 0; /* 无额外间距 */ - } - .order-name { - font-size: 28rpx; - color: #1C1C1C; - margin-top: 18rpx; - font-weight: 500; - } - .badge { - position: absolute; - top: -10rpx; - right: 12rpx; - background: #C5615E; - color: #fff; - font-size: 22rpx; - min-width: 38rpx; - height: 38rpx; - border-radius: 19rpx; - display: flex; - align-items: center; - justify-content: center; - padding: 0 8rpx; - font-weight: 600; - } - - /* 更多服务 */ - .service-row { - display: flex; - gap: 80rpx; - justify-content: flex-start; - } - .auth-service-row { - gap: 100rpx; - } - .service-unit { - display: flex; - flex-direction: column; - align-items: center; - min-width: 120rpx; - } - .service-name { - font-size: 26rpx; - color: #1C1C1C; - margin-top: 14rpx; - font-weight: 500; - } - .icon-bg-sm { - padding: 14rpx; - border-radius: 20rpx; - } - .icon-size-sm { - width: 44rpx; - height: 44rpx; - } - .auth-tag { - font-size: 20rpx; - color: #aaa; - margin-top: 6rpx; - } - .auth-tag-done { - color: #C9A962; - font-weight: 500; - } - - /* 清除缓存 */ - .clear-row { - display: flex; - align-items: center; - padding: 22rpx 0; - } - .clear-word { - flex: 1; - font-size: 30rpx; - color: #1C1C1C; - margin-left: 18rpx; - font-weight: 500; - } - .arrow-right { - width: 36rpx; - height: 36rpx; - opacity: 0.45; - margin-left: 15rpx; - } - - /* 底部 */ - .footer { - margin-top: 130rpx; - padding-bottom: 20rpx; - text-align: center; - font-size: 26rpx; - color: #aaa; - } - .divider { margin: 0 15rpx; } - .coop { color: #C9A962; font-weight: 500; } \ No newline at end of file + background: #F7F3ED; + height: 100vh; + overflow: hidden; +} + +.page-root { + position: relative; + width: 100%; + height: 100vh; + display: flex; + flex-direction: column; +} + +.bg-layer { + position: fixed; + top: 0; left: 0; + width: 100vw; height: 100vh; + background: radial-gradient(ellipse at 30% 20%, rgba(201,169,98,0.08) 0%, transparent 60%), + radial-gradient(ellipse at 80% 70%, rgba(201,169,98,0.05) 0%, transparent 50%); + z-index: 0; + pointer-events: none; +} + +.main-scroll { + position: relative; + z-index: 2; + flex: 1; + width: 100%; + overflow-y: auto; + padding-bottom: calc(140rpx + env(safe-area-inset-bottom)); +} + +.main-content { + padding: 50rpx 36rpx 0; +} + +/* 图标 */ +.icon-dark { + filter: brightness(0) saturate(100%) opacity(0.65); +} +.icon-color { + filter: none; +} +.icon-size { + width: 48rpx; + height: 48rpx; +} +.icon-bg { + background: rgba(201,169,98,0.08); + border-radius: 22rpx; + display: flex; + align-items: center; + justify-content: center; + padding: 16rpx; +} + +/* 头部 */ +.hero { + position: relative; + margin-bottom: 60rpx; +} +.settings-icon { + position: absolute; + top: 0; right: 0; + width: 56rpx; height: 56rpx; + display: flex; align-items: center; justify-content: center; +} +.settings-icon .icon-dark { + width: 44rpx; height: 44rpx; +} +.user-block { + display: flex; + align-items: center; +} +.avatar-outside { + width: 128rpx; + height: 128rpx; + border-radius: 50%; + background: linear-gradient(135deg, rgba(201,169,98,0.12), rgba(201,169,98,0.04)); + padding: 8rpx; + margin-right: 28rpx; + display: flex; + align-items: center; + justify-content: center; + box-sizing: border-box; +} +.avatar { + width: 100%; + height: 100%; + border-radius: 50%; + display: block; +} +.nickname { + font-size: 40rpx; + font-weight: 700; + color: #1A1A1A; + display: block; +} +.uid { + font-size: 26rpx; + color: #999; + margin-top: 8rpx; + display: block; +} +.login-btn { + margin-top: 36rpx; + height: 88rpx; + border-radius: 44rpx; +} + +/* 分区 */ +.section { + margin-top: 48rpx; +} +.section-close { + margin-top: 36rpx; +} + +.title-line { + margin-bottom: 24rpx; + padding: 14rpx 24rpx; + line-height: 1.2; +} +.gradient-bg { + background: linear-gradient(to right, rgba(201,169,98,0.01), rgba(201,169,98,0.10)); +} +.title-text { + font-size: 34rpx; + font-weight: 700; + color: #1A1A1A; + letter-spacing: 1rpx; +} + +/* 毛玻璃容器 */ +.frosted-box { + background: rgba(255, 255, 255, 0.52); + backdrop-filter: blur(20px); + -webkit-backdrop-filter: blur(20px); + border-radius: 28rpx; + padding: 36rpx 20rpx; + box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.04), inset 0 1rpx 0 rgba(255,255,255,0.8); + border: 1rpx solid rgba(255,255,255,0.5); +} + +/* 订单行 */ +.order-row { + display: flex; + justify-content: space-around; + align-items: center; +} +.order-unit { + display: flex; + flex-direction: column; + align-items: center; + position: relative; + flex: 1; +} +.order-name { + font-size: 26rpx; + color: #333; + margin-top: 14rpx; + font-weight: 500; +} +.badge { + position: absolute; + top: -8rpx; + right: 10rpx; + background: #C5615E; + color: #fff; + font-size: 20rpx; + min-width: 34rpx; + height: 34rpx; + border-radius: 17rpx; + display: flex; + align-items: center; + justify-content: center; + padding: 0 8rpx; + font-weight: 600; +} + +/* 更多服务 */ +.service-row { + display: flex; + gap: 60rpx; + justify-content: flex-start; + padding: 8rpx 0; +} +.auth-service-row { + gap: 80rpx; +} +.service-unit { + display: flex; + flex-direction: column; + align-items: center; + min-width: 110rpx; +} +.service-name { + font-size: 24rpx; + color: #333; + margin-top: 12rpx; + font-weight: 500; +} +.icon-bg-sm { + padding: 12rpx; + border-radius: 18rpx; +} +.icon-size-sm { + width: 40rpx; + height: 40rpx; +} +.auth-tag { + font-size: 20rpx; + color: #bbb; + margin-top: 4rpx; +} +.auth-tag-done { + color: #C9A962; + font-weight: 500; +} + +/* 清除缓存 */ +.clear-row { + display: flex; + align-items: center; + padding: 20rpx 0; +} +.clear-word { + flex: 1; + font-size: 28rpx; + color: #333; + margin-left: 16rpx; + font-weight: 500; +} +.arrow-right { + width: 32rpx; + height: 32rpx; + opacity: 0.35; + margin-left: 12rpx; +} + +/* 底部 */ +.footer { + margin-top: 80rpx; + padding-bottom: 20rpx; + text-align: center; + font-size: 24rpx; + color: #bbb; + display: flex; + align-items: center; + justify-content: center; +} +.footer .divider { + margin: 0 12rpx; + height: auto; + background: none; +} +.coop { + color: #C9A962; + font-weight: 500; +} diff --git a/pages/pick-user/pick-user.json b/pages/pick-user/pick-user.json index f1ce457..742bc53 100644 --- a/pages/pick-user/pick-user.json +++ b/pages/pick-user/pick-user.json @@ -1,5 +1,5 @@ { "usingComponents": { - "custom-tab-bar": "/custom-tab-bar/index" + "tab-bar": "/tab-bar/index" } } \ No newline at end of file diff --git a/pages/pick-user/pick-user.wxml b/pages/pick-user/pick-user.wxml index 86909c4..4959be2 100644 --- a/pages/pick-user/pick-user.wxml +++ b/pages/pick-user/pick-user.wxml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/submit/submit.wxml b/pages/submit/submit.wxml index 7d65224..d3d41bc 100644 --- a/pages/submit/submit.wxml +++ b/pages/submit/submit.wxml @@ -86,7 +86,7 @@ - + 微信支付 ✓ diff --git a/custom-tab-bar/index.js b/tab-bar/index.js similarity index 76% rename from custom-tab-bar/index.js rename to tab-bar/index.js index 9903be0..408a95c 100644 --- a/custom-tab-bar/index.js +++ b/tab-bar/index.js @@ -1,4 +1,4 @@ -// custom-tab-bar/index.js — 三端固定，无身份切换 +// tab-bar/index.js — 三端固定，无身份切换 const app = getApp(); import { getTabRole } from '../utils/primary-role.js'; @@ -6,27 +6,27 @@ const roleCfg = { normal: { name: '点单老板', tabList: [ - { pagePath: 'pages/index/index', text: '商城', iconPath: '/images/zhuye.png', selectedIconPath: '/images/zhuye.png' }, - { pagePath: 'pages/category/category', text: '分类', iconPath: '/images/fenlei.png', selectedIconPath: '/images/fenlei.png' }, - { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, - { pagePath: 'pages/mine/mine', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' }, + { pagePath: 'pages/index/index', text: '商城', iconPath: '/images/home.png', selectedIconPath: '/images/home.png' }, + { pagePath: 'pages/category/category', text: '分类', iconPath: '/images/category.png', selectedIconPath: '/images/category.png' }, + { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/messages.png', selectedIconPath: '/images/messages.png' }, + { pagePath: 'pages/mine/mine', text: '我的', iconPath: '/images/mine.png', selectedIconPath: '/images/mine.png' }, ], }, dashou: { name: '打手', tabList: [ - { pagePath: 'pages/accept-order/accept-order', text: '接单池', iconPath: '/images/jiedanchi.png', selectedIconPath: '/images/jiedanchi.png' }, - { pagePath: 'pages/fighter-orders/fighter-orders', text: '订单', iconPath: '/images/dingdan.png', selectedIconPath: '/images/dingdan.png' }, - { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, - { pagePath: 'pages/fighter/fighter', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' }, + { pagePath: 'pages/accept-order/accept-order', text: '接单池', iconPath: '/images/order-pool.png', selectedIconPath: '/images/order-pool.png' }, + { pagePath: 'pages/fighter-orders/fighter-orders', text: '订单', iconPath: '/images/orders.png', selectedIconPath: '/images/orders.png' }, + { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/messages.png', selectedIconPath: '/images/messages.png' }, + { pagePath: 'pages/fighter/fighter', text: '我的', iconPath: '/images/mine.png', selectedIconPath: '/images/mine.png' }, ], }, shangjia: { name: '商家', tabList: [ - { pagePath: 'pages/merchant-orders/merchant-orders', text: '订单', iconPath: '/images/dingdan.png', selectedIconPath: '/images/dingdan.png' }, - { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, - { pagePath: 'pages/merchant/merchant', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' }, + { pagePath: 'pages/merchant-orders/merchant-orders', text: '订单', iconPath: '/images/orders.png', selectedIconPath: '/images/orders.png' }, + { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/messages.png', selectedIconPath: '/images/messages.png' }, + { pagePath: 'pages/merchant/merchant', text: '我的', iconPath: '/images/mine.png', selectedIconPath: '/images/mine.png' }, ], }, }; diff --git a/custom-tab-bar/index.json b/tab-bar/index.json similarity index 100% rename from custom-tab-bar/index.json rename to tab-bar/index.json diff --git a/custom-tab-bar/index.wxml b/tab-bar/index.wxml similarity index 93% rename from custom-tab-bar/index.wxml rename to tab-bar/index.wxml index cd9976f..1dc5ac0 100644 --- a/custom-tab-bar/index.wxml +++ b/tab-bar/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/custom-tab-bar/index.wxss b/tab-bar/index.wxss similarity index 96% rename from custom-tab-bar/index.wxss rename to tab-bar/index.wxss index d8da288..cdbb7a9 100644 --- a/custom-tab-bar/index.wxss +++ b/tab-bar/index.wxss @@ -1,6 +1,6 @@ -/* custom-tab-bar — 三端固定，全宽 Tab 胶囊 */ +/* tab-bar — 三端固定，全宽 Tab 胶囊 */ -.custom-tab-bar { +.tab-bar { position: fixed; bottom: 0; left: 0; diff --git a/utils/chat-core.js b/utils/chat-core.js index 02488a4..58c4e93 100644 --- a/utils/chat-core.js +++ b/utils/chat-core.js @@ -255,7 +255,7 @@ function updateTabBarBadge(app, unreadCount) { const pages = getCurrentPages(); if (pages.length) { const page = pages[pages.length - 1]; - const tabBar = page.selectComponent('#custom-tab-bar'); + const tabBar = page.selectComponent('#tab-bar'); if (tabBar && tabBar.setData) tabBar.setData({ badgeText }); if (page.getTabBar) { const tb = page.getTabBar();