修正了 pages 名为拼音的问题,以及部分细节

This commit is contained in:
2026-06-13 12:23:44 +08:00
parent 296e41a8a7
commit 6fbae9b32c
57 changed files with 1317 additions and 1463 deletions

View File

@@ -69,7 +69,7 @@
"usingComponents": { "usingComponents": {
"popup-notice": "/components/popup-notice/popup-notice", "popup-notice": "/components/popup-notice/popup-notice",
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
}, },
"window": { "window": {
@@ -87,14 +87,14 @@
{ {
"pagePath": "pages/order-pool/order-pool", "pagePath": "pages/order-pool/order-pool",
"text": "接单池", "text": "接单池",
"iconPath": "/images/jiedanchi.png", "iconPath": "/images/order-pool.png",
"selectedIconPath": "/images/jiedanchi.png" "selectedIconPath": "/images/order-pool.png"
}, },
{ {
"pagePath": "pages/order-pool2/order-pool2", "pagePath": "pages/order-pool2/order-pool2",
"text": "接单池", "text": "接单池",
"iconPath": "/images/jiedanchi.png", "iconPath": "/images/order-pool.png",
"selectedIconPath": "/images/jiedanchi.png" "selectedIconPath": "/images/order-pool.png"
} }
] ]

BIN
images/_exit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
images/mine.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

View File

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

View File

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -216,5 +216,5 @@
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<popup-notice id="popupNotice" /> <popup-notice id="popupNotice" />
<custom-tab-bar /> <tab-bar />
</view> </view>

View File

@@ -1,7 +1,7 @@
{ {
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "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" "popup-notice": "/components/popup-notice/popup-notice"
}, },
"navigationBarTitleText": "考核官", "navigationBarTitleText": "考核官",

View File

@@ -125,4 +125,4 @@
</view> </view>
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<custom-tab-bar /> <tab-bar />

View File

@@ -1,6 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "global-notification": "/components/global-notification/global-notification",
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
} }
} }

View File

@@ -3,7 +3,7 @@
<!-- 1. 毛玻璃搜索框区域(固定) --> <!-- 1. 毛玻璃搜索框区域(固定) -->
<view class="search-container"> <view class="search-container">
<view class="search-box search-box--glass"> <view class="search-box search-box--glass">
<image src="/images/sousuo.png" class="search-icon" /> <image src="/images/search.png" class="search-icon" />
<input <input
type="text" type="text"
class="search-input" class="search-input"
@@ -213,5 +213,5 @@
</view> </view>
<!-- 底部自定义TabBar --> <!-- 底部自定义TabBar -->
<custom-tab-bar /> <tab-bar />
<global-notification id="global-notification" /> <global-notification id="global-notification" />

View File

@@ -109,4 +109,4 @@
</view> </view>
</view> </view>
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<custom-tab-bar /> <tab-bar />

View File

@@ -126,6 +126,7 @@ Page({
iconContact: gsBase + 'icon-contact.png', iconContact: gsBase + 'icon-contact.png',
avatarDefault: ossImageUrl + 'avatar/default.jpg', avatarDefault: ossImageUrl + 'avatar/default.jpg',
iconClear: ossImageUrl + 'beijing/tubiao/grzx_qingchu.jpg', iconClear: ossImageUrl + 'beijing/tubiao/grzx_qingchu.jpg',
iconSwitch: '/images/_exit.png',
iconKefu: ossImageUrl + 'beijing/tubiao/grzx_kefu.jpg', iconKefu: ossImageUrl + 'beijing/tubiao/grzx_kefu.jpg',
iconKuaishou: ossImageUrl + 'beijing/tubiao/grzx_guanzhualong.jpg', iconKuaishou: ossImageUrl + 'beijing/tubiao/grzx_guanzhualong.jpg',
iconKaoheDafen: khBase + 'daofen.png', iconKaoheDafen: khBase + 'daofen.png',
@@ -1181,4 +1182,9 @@ Page({
}, },
}); });
}, },
switchToNormal() {
lockPrimaryRole('normal');
wx.reLaunch({ url: '/pages/mine/mine' });
},
}) })

View File

@@ -2,7 +2,7 @@
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "global-notification": "/components/global-notification/global-notification",
"chenghao-tag": "/components/chenghao-tag/chenghao-tag", "chenghao-tag": "/components/chenghao-tag/chenghao-tag",
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
}, },
"navigationBarBackgroundColor": "#e8ecf4", "navigationBarBackgroundColor": "#e8ecf4",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",

View File

@@ -12,9 +12,13 @@
<view class="unreg-btn unreg-btn-secondary" bindtap="quickRegisterAsPlatform"> <view class="unreg-btn unreg-btn-secondary" bindtap="quickRegisterAsPlatform">
<text class="unreg-btn-text">平台直签注册</text> <text class="unreg-btn-text">平台直签注册</text>
</view> </view>
<view class="unreg-clear" bindtap="switchToNormal">
<image class="unreg-clear-icon" src="{{imgUrls.iconSwitch}}" mode="aspectFit" />
<text class="unreg-clear-text">返回点单端</text>
</view>
<view class="unreg-clear" bindtap="clearCache"> <view class="unreg-clear" bindtap="clearCache">
<image class="unreg-clear-icon" src="{{imgUrls.iconClear}}" mode="aspectFit" /> <image class="unreg-clear-icon" src="{{imgUrls.iconClear}}" mode="aspectFit" />
<text class="unreg-clear-text">清除缓存,回到点单端</text> <text class="unreg-clear-text">清除缓存,重新登录</text>
</view> </view>
</view> </view>
</view> </view>
@@ -363,10 +367,15 @@
<text class="list-text">用户规则</text> <text class="list-text">用户规则</text>
<image class="list-arrow" src="{{imgUrls.iconArrow}}" mode="aspectFit" /> <image class="list-arrow" src="{{imgUrls.iconArrow}}" mode="aspectFit" />
</view> </view>
<view class="list-item" bindtap="switchToNormal">
<image class="list-icon" src="{{imgUrls.iconSwitch}}" mode="aspectFit" />
<text class="list-text">返回点单端</text>
<image class="list-arrow" src="{{imgUrls.iconArrow}}" mode="aspectFit" />
</view>
<view class="list-item" bindtap="clearCache"> <view class="list-item" bindtap="clearCache">
<image class="list-icon" src="{{imgUrls.iconClear}}" mode="aspectFit" /> <image class="list-icon" src="{{imgUrls.iconClear}}" mode="aspectFit" />
<text class="list-text">清除缓存</text> <text class="list-text">清除缓存</text>
<text class="list-sub">回点单端</text> <text class="list-sub">重新登录</text>
<image class="list-arrow" src="{{imgUrls.iconArrow}}" mode="aspectFit" /> <image class="list-arrow" src="{{imgUrls.iconArrow}}" mode="aspectFit" />
</view> </view>
</view> </view>
@@ -380,5 +389,5 @@
</view> </view>
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<custom-tab-bar /> <tab-bar />
<popup-notice id="popupNotice" /> <popup-notice id="popupNotice" />

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "global-notification": "/components/global-notification/global-notification",
"chenghao-tag": "/components/chenghao-tag/chenghao-tag", "chenghao-tag": "/components/chenghao-tag/chenghao-tag",
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
}, },
"navigationBarTitleText": "金牌用户", "navigationBarTitleText": "金牌用户",
"navigationBarBackgroundColor": "#0B2A4A", "navigationBarBackgroundColor": "#0B2A4A",

View File

@@ -184,7 +184,7 @@
</view> </view>
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<custom-tab-bar /> <tab-bar />
<popup-notice id="popupNotice" /> <popup-notice id="popupNotice" />
</view> </view>

View File

@@ -1,7 +1,7 @@
{ {
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "global-notification": "/components/global-notification/global-notification",
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
}, },
"navigationBarTitleText": "商城", "navigationBarTitleText": "商城",

View File

@@ -1,171 +1,171 @@
<!-- pages/shangpin/shangpin.wxml --> <!-- pages/shangpin/shangpin.wxml -->
<view class="shangpin-page"> <view class="shangpin-page">
<!-- 1. 公告栏 --> <!-- 1. 公告栏 -->
<view class="gonggao-box" bindtap="showGonggaoDetail"> <view class="gonggao-box" bindtap="showGonggaoDetail">
<view class="gonggao-icon"> <view class="gonggao-icon">
<image src="/images/gonggao.png" mode="aspectFit" /> <image src="/images/notice.png" mode="aspectFit" />
</view> </view>
<view class="gonggao-content"> <view class="gonggao-content">
<text class="gonggao-text {{gonggaoAnim ? 'gonggao-anim' : ''}}"> <text class="gonggao-text {{gonggaoAnim ? 'gonggao-anim' : ''}}">
{{shangpingonggao || '暂无公告'}} {{shangpingonggao || '暂无公告'}}
</text> </text>
</view> </view>
</view> </view>
<!-- 2. 轮播图区域 --> <!-- 2. 轮播图区域 -->
<view class="lunbo-container"> <view class="lunbo-container">
<swiper <swiper
class="lunbo-swiper" class="lunbo-swiper"
indicator-dots="{{lunboList.length > 1}}" indicator-dots="{{lunboList.length > 1}}"
indicator-color="rgba(255,255,255,0.6)" indicator-color="rgba(255,255,255,0.6)"
indicator-active-color="#ffcc00" indicator-active-color="#ffcc00"
autoplay="{{lunboList.length > 1}}" autoplay="{{lunboList.length > 1}}"
interval="3000" interval="3000"
circular circular
> >
<block wx:for="{{lunboList}}" wx:key="index"> <block wx:for="{{lunboList}}" wx:key="index">
<swiper-item> <swiper-item>
<!-- 移除点击预览事件 --> <!-- 移除点击预览事件 -->
<image <image
src="{{item}}" src="{{item}}"
mode="aspectFill" mode="aspectFill"
class="lunbo-image" class="lunbo-image"
/> />
</swiper-item> </swiper-item>
</block> </block>
</swiper> </swiper>
<!-- 轮播图占位图(无数据时显示) --> <!-- 轮播图占位图(无数据时显示) -->
<view wx:if="{{lunboList.length === 0}}" class="lunbo-placeholder"> <view wx:if="{{lunboList.length === 0}}" class="lunbo-placeholder">
<image src="{{lunbozhanwei}}" mode="aspectFill" class="lunbo-image" /> <image src="{{lunbozhanwei}}" mode="aspectFill" class="lunbo-image" />
</view> </view>
<!-- 刷新按钮 --> <!-- 刷新按钮 -->
<view class="refresh-btn" bindtap="refreshAllData"> <view class="refresh-btn" bindtap="refreshAllData">
<image <image
src="/images/shuaxin.png" src="/images/refresh.png"
mode="aspectFit" mode="aspectFit"
class="refresh-icon {{isRefreshing ? 'refreshing' : ''}}" class="refresh-icon {{isRefreshing ? 'refreshing' : ''}}"
/> />
<view class="refresh-dot"></view> <view class="refresh-dot"></view>
</view> </view>
</view> </view>
<!-- 3. 商品展示区域 --> <!-- 3. 商品展示区域 -->
<view class="shangpin-container"> <view class="shangpin-container">
<!-- 3.1 商品类型选择 --> <!-- 3.1 商品类型选择 -->
<scroll-view <scroll-view
class="leixing-scroll" class="leixing-scroll"
scroll-x scroll-x
scroll-with-animation scroll-with-animation
show-scrollbar="{{false}}" show-scrollbar="{{false}}"
> >
<view class="leixing-list"> <view class="leixing-list">
<block wx:for="{{shangpinleixing}}" wx:key="id"> <block wx:for="{{shangpinleixing}}" wx:key="id">
<view <view
class="leixing-item {{selectedLeixingId === item.id ? 'leixing-active' : ''}}" class="leixing-item {{selectedLeixingId === item.id ? 'leixing-active' : ''}}"
bindtap="selectLeixing" bindtap="selectLeixing"
data-id="{{item.id}}" data-id="{{item.id}}"
> >
<view class="leixing-image-box"> <view class="leixing-image-box">
<image <image
src="{{ossImageUrl + item.tupian_url}}" src="{{ossImageUrl + item.tupian_url}}"
mode="aspectFill" mode="aspectFill"
class="leixing-image" class="leixing-image"
lazy-load="{{true}}" lazy-load="{{true}}"
/> />
<view class="leixing-glow"></view> <view class="leixing-glow"></view>
</view> </view>
<text class="leixing-text">{{item.jieshao}}</text> <text class="leixing-text">{{item.jieshao}}</text>
</view> </view>
</block> </block>
</view> </view>
</scroll-view> </scroll-view>
<!-- 3.2 商品展示 --> <!-- 3.2 商品展示 -->
<view class="shangpin-list-container"> <view class="shangpin-list-container">
<block wx:for="{{filteredData}}" wx:key="*this"> <block wx:for="{{filteredData}}" wx:key="*this">
<!-- 专区标题 --> <!-- 专区标题 -->
<view class="zhuanqu-title" wx:if="{{item.shangpinList.length > 0}}"> <view class="zhuanqu-title" wx:if="{{item.shangpinList.length > 0}}">
<view class="zhuanqu-icon"> <view class="zhuanqu-icon">
<image <image
src="/images/zhuanqu.png" src="/images/zone.png"
mode="aspectFit" mode="aspectFit"
class="zhuanqu-icon-image {{idx % 3 === 0 ? 'zhuanqu-sparkle' : ''}}" class="zhuanqu-icon-image {{idx % 3 === 0 ? 'zhuanqu-sparkle' : ''}}"
/> />
</view> </view>
<text class="zhuanqu-text">{{item.zhuanqu.mingzi}}</text> <text class="zhuanqu-text">{{item.zhuanqu.mingzi}}</text>
</view> </view>
<!-- 商品网格 --> <!-- 商品网格 -->
<view class="shangpin-grid" wx:if="{{item.shangpinList.length > 0}}"> <view class="shangpin-grid" wx:if="{{item.shangpinList.length > 0}}">
<block wx:for="{{item.shangpinList}}" wx:key="id"> <block wx:for="{{item.shangpinList}}" wx:key="id">
<view <view
class="shangpin-card" class="shangpin-card"
bindtap="goToDetail" bindtap="goToDetail"
data-id="{{item.id}}" data-id="{{item.id}}"
> >
<!-- 商品图片 --> <!-- 商品图片 -->
<view class="shangpin-image-box"> <view class="shangpin-image-box">
<image <image
src="{{ossImageUrl + item.tupian_url}}" src="{{ossImageUrl + item.tupian_url}}"
mode="aspectFill" mode="aspectFill"
class="shangpin-image" class="shangpin-image"
lazy-load="{{true}}" lazy-load="{{true}}"
/> />
</view> </view>
<!-- 商品标题 --> <!-- 商品标题 -->
<view class="shangpin-title"> <view class="shangpin-title">
<text class="title-text">{{item.biaoqian}}</text> <text class="title-text">{{item.biaoqian}}</text>
</view> </view>
<!-- 价格和购买按钮 --> <!-- 价格和购买按钮 -->
<view class="shangpin-footer"> <view class="shangpin-footer">
<view class="price-box"> <view class="price-box">
<text class="price-icon">¥</text> <text class="price-icon">¥</text>
<text class="price-integer">{{item.priceInteger}}</text> <text class="price-integer">{{item.priceInteger}}</text>
<text class="price-decimal">.{{item.priceDecimal}}</text> <text class="price-decimal">.{{item.priceDecimal}}</text>
</view> </view>
<view class="buy-btn"> <view class="buy-btn">
<image src="/images/goumai.png" mode="aspectFit" class="buy-icon" /> <image src="/images/purchase.png" mode="aspectFit" class="buy-icon" />
</view> </view>
</view> </view>
</view> </view>
</block> </block>
</view> </view>
</block> </block>
<!-- 空状态 --> <!-- 空状态 -->
<view wx:if="{{filteredData.length === 0}}" class="empty-state"> <view wx:if="{{filteredData.length === 0}}" class="empty-state">
<image src="/images/empty.png" mode="aspectFit" class="empty-image" /> <image src="/images/empty.png" mode="aspectFit" class="empty-image" />
<text class="empty-text">暂无商品</text> <text class="empty-text">暂无商品</text>
<button class="empty-btn" bindtap="refreshAllData">刷新试试</button> <button class="empty-btn" bindtap="refreshAllData">刷新试试</button>
</view> </view>
</view> </view>
</view> </view>
<!-- 公告详情弹窗 --> <!-- 公告详情弹窗 -->
<view class="gonggao-modal" wx:if="{{showGonggaoModal}}"> <view class="gonggao-modal" wx:if="{{showGonggaoModal}}">
<view class="modal-mask" bindtap="hideGonggaoDetail"></view> <view class="modal-mask" bindtap="hideGonggaoDetail"></view>
<view class="modal-content"> <view class="modal-content">
<view class="modal-header"> <view class="modal-header">
<text class="modal-title">公告详情</text> <text class="modal-title">公告详情</text>
<view class="modal-close" bindtap="hideGonggaoDetail">×</view> <view class="modal-close" bindtap="hideGonggaoDetail">×</view>
</view> </view>
<scroll-view class="modal-body" scroll-y> <scroll-view class="modal-body" scroll-y>
<text class="modal-text">{{shangpingonggao || '暂无公告内容'}}</text> <text class="modal-text">{{shangpingonggao || '暂无公告内容'}}</text>
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<!-- 加载提示 --> <!-- 加载提示 -->
<view class="loading-toast" wx:if="{{isLoading}}"> <view class="loading-toast" wx:if="{{isLoading}}">
<view class="loading-spinner"></view> <view class="loading-spinner"></view>
<text class="loading-text">加载中...</text> <text class="loading-text">加载中...</text>
</view> </view>
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<popup-notice id="popupNotice" /> <popup-notice id="popupNotice" />
</view> </view>
<!-- 底部自定义TabBar --> <!-- 底部自定义TabBar -->
<custom-tab-bar /> <tab-bar />

View File

@@ -6,6 +6,6 @@
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "global-notification": "/components/global-notification/global-notification",
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
} }
} }

View File

@@ -99,7 +99,7 @@
</view> </view>
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<custom-tab-bar /> <tab-bar />
</view> </view>
<!-- 加载遮罩(保持不变) --> <!-- 加载遮罩(保持不变) -->

View File

@@ -2,7 +2,7 @@
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "global-notification": "/components/global-notification/global-notification",
"chenghao-tag": "/components/chenghao-tag/chenghao-tag", "chenghao-tag": "/components/chenghao-tag/chenghao-tag",
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
}, },
"navigationBarBackgroundColor": "#f0f4f8", "navigationBarBackgroundColor": "#f0f4f8",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",

View File

@@ -118,5 +118,5 @@
</view> </view>
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<custom-tab-bar /> <tab-bar />
<popup-notice id="popupNotice" /> <popup-notice id="popupNotice" />

View File

@@ -1,159 +1,195 @@
<!-- pages/merchant-dispatch/merchant-dispatch.wxml --> <!-- pages/merchant-dispatch/merchant-dispatch.wxml -->
<view class="page-container" style="background-image: url('{{bgImageUrl}}');"> <view class="page">
<!-- 顶部商家余额展示 (黑金卡片) --> <!-- 余额卡片 -->
<view class="balance-card"> <view class="balance-card">
<text class="balance-label">可用余额</text> <text class="balance-label">可用余额</text>
<view class="balance-amount"> <view class="balance-row">
<text class="amount-value">{{sjyue}}</text> <text class="balance-value">{{sjyue}}</text>
<text class="amount-unit">元</text> <text class="balance-unit">元</text>
</view> </view>
<text class="balance-tip">派单将从此余额扣除</text> <text class="balance-tip">派单将从此余额扣除</text>
</view> </view>
<!-- 商品类型选择 (横向滑动) --> <!-- 订单类型 -->
<view class="section"> <view class="card">
<text class="section-title">选择订单类型</text> <view class="card-header">
<scroll-view class="type-scroll" scroll-x="true" enable-flex> <view class="card-dot"></view>
<block wx:for="{{shangpinList}}" wx:key="id"> <text class="card-title">选择订单类型</text>
<view </view>
class="type-item {{selectedTypeId === item.id ? 'type-active' : ''}}" <scroll-view class="type-scroll" scroll-x="true" enable-flex>
data-id="{{item.id}}" <view
data-item="{{item}}" class="type-chip {{selectedTypeId === item.id ? 'type-chip--active' : ''}}"
bindtap="onSelectType" wx:for="{{shangpinList}}"
> wx:key="id"
<text class="type-text">{{item.jieshao}}</text> data-id="{{item.id}}"
</view> data-item="{{item}}"
</block> bindtap="onSelectType"
</scroll-view> >
</view> {{item.jieshao}}
</view>
<!-- 表单区域 --> </scroll-view>
<view class="form-container"> </view>
<!-- 订单介绍 -->
<view class="form-item"> <!-- 表单 -->
<text class="form-label required">订单介绍</text> <view class="card">
<input <view class="card-header">
class="form-input" <view class="card-dot"></view>
placeholder="请输入订单主要内容必填最多50字" <text class="card-title">填写订单信息</text>
maxlength="50" </view>
value="{{dingdanJieshao}}"
bindinput="onDingdanJieshaoInput" <!-- 订单介绍 -->
/> <view class="field">
<text class="word-count">{{dingdanJieshao.length}}/50</text> <view class="field-head">
</view> <text class="field-label">订单介绍</text>
<text class="field-required">*</text>
<!-- 订单备注 --> <text class="field-count">{{dingdanJieshao.length}}/50</text>
<view class="form-item"> </view>
<text class="form-label">订单备注(选填)</text> <input
<input class="field-input"
class="form-input" placeholder="请输入订单主要内容"
placeholder="填写或补充其他信息" maxlength="50"
maxlength="50" value="{{dingdanJieshao}}"
value="{{dingdanBeizhu}}" bindinput="onDingdanJieshaoInput"
bindinput="onDingdanBeizhuInput" />
/> </view>
<text class="word-count">{{dingdanBeizhu.length}}/50</text>
</view> <!-- 订单备注 -->
<view class="field">
<!-- 老板游戏昵称/UID --> <view class="field-head">
<view class="form-item"> <text class="field-label">订单备注</text>
<text class="form-label required">老板昵称/ID</text> <text class="field-count">{{dingdanBeizhu.length}}/50</text>
<input </view>
class="form-input" <input
placeholder="请输入必填最多15字" class="field-input"
maxlength="15" placeholder="选填,补充其他信息"
value="{{laobanName}}" maxlength="50"
bindinput="onLaobanNameInput" value="{{dingdanBeizhu}}"
/> bindinput="onDingdanBeizhuInput"
<text class="word-count">{{laobanName.length}}/15</text> />
</view> </view>
<!-- 指定打手UID --> <!-- 老板昵称/ID -->
<view class="form-item"> <view class="field">
<text class="form-label">指定UID选填</text> <view class="field-head">
<input <text class="field-label">老板昵称/ID</text>
class="form-input" <text class="field-required">*</text>
placeholder="请输入指定UID" <text class="field-count">{{laobanName.length}}/15</text>
maxlength="10" </view>
value="{{zhidingUid}}" <input
bindinput="onZhidingUidInput" class="field-input"
/> placeholder="请输入老板昵称或ID"
</view> maxlength="15"
value="{{laobanName}}"
<!-- 订单价格 --> bindinput="onLaobanNameInput"
<view class="form-item"> />
<text class="form-label required">订单价格(元)</text> </view>
<input
class="form-input" <!-- 指定打手UID -->
type="digit" <view class="field">
placeholder="0.1 - 10000支持两位小数" <view class="field-head">
value="{{jiage}}" <text class="field-label">指定UID</text>
bindinput="onJiageInput" <text class="field-optional">选填</text>
/> </view>
<text class="price-tip">范围0.1 - 10000元</text> <input
</view> class="field-input"
placeholder="指定某位打手接单"
<!-- 新增:抢单要求标签(从商品类型的称号列表选择) --> maxlength="10"
<view class="form-item" wx:if="{{currentTypeChenghaoList.length > 0}}"> value="{{zhidingUid}}"
<text class="form-label">要求打手标签*如金牌打手(选填)</text> bindinput="onZhidingUidInput"
<picker />
mode="selector" </view>
range="{{currentTypeChenghaoList}}"
range-key="mingcheng" <!-- 订单价格 -->
bindchange="onLabelChange" <view class="field">
> <view class="field-head">
<view class="picker-view"> <text class="field-label">订单价格</text>
<text>{{selectedLabelName || '无'}}</text> <text class="field-required">*</text>
</view> </view>
</picker> <view class="price-input-wrap">
</view> <text class="price-prefix">¥</text>
<input
<!-- 新增:佣金要求(压金) --> class="field-input price-input"
<view class="form-item commission-item"> type="digit"
<text class="form-label">要求打手押金建议≤50元</text> placeholder="0.1 - 10000"
<switch checked="{{commissionEnabled}}" bindchange="onCommissionToggle"/> value="{{jiage}}"
<input bindinput="onJiageInput"
wx:if="{{commissionEnabled}}" />
class="commission-input" </view>
type="digit" <text class="field-hint">范围 0.1 ~ 10000 元,最多两位小数</text>
placeholder="押金金额" </view>
value="{{commissionValue}}"
bindinput="onCommissionValueInput" <!-- 打手标签 -->
/> <view class="field" wx:if="{{currentTypeChenghaoList.length > 0}}">
</view> <view class="field-head">
</view> <text class="field-label">要求打手标签</text>
<text class="field-optional">选填</text>
<!-- 立即派发按钮 --> </view>
<view class="btn-container"> <picker
<view mode="selector"
class="submit-btn {{isSubmitting ? 'btn-disabled' : ''}}" range="{{currentTypeChenghaoList}}"
bindtap="onSubmit" range-key="mingcheng"
hover-class="btn-hover" bindchange="onLabelChange"
> >
<text class="btn-text">{{isSubmitting ? '派发中...' : '立即派发'}}</text> <view class="field-picker">
</view> <text class="{{selectedLabelName ? '' : 'field-picker-ph'}}">{{selectedLabelName || '不限制'}}</text>
</view> <text class="field-picker-arrow">▸</text>
</view>
<!-- 加载遮罩 --> </picker>
<view class="loading-mask" wx:if="{{isLoading}}"> </view>
<view class="loading-content">
<view class="loading-spinner"></view> <!-- 押金要求 -->
<text class="loading-text">加载中...</text> <view class="field">
</view> <view class="field-head">
</view> <text class="field-label">要求打手押金</text>
<text class="field-optional">选填</text>
<!-- 全局通知组件 --> </view>
<global-notification id="global-notification" /> <view class="switch-row">
<switch checked="{{commissionEnabled}}" bindchange="onCommissionToggle" color="#9C27B0"/>
<!-- 教程按钮紧贴右侧5秒后缩进 --> <text class="switch-label">{{commissionEnabled ? '已开启' : '未开启'}}</text>
<view </view>
class="tutorial-btn {{tutorialBtnHidden ? 'tutorial-btn-hidden' : ''}}" <input
bindtap="onTutorialBtnTap" wx:if="{{commissionEnabled}}"
hover-class="tutorial-btn-hover" class="field-input"
> type="digit"
<text class="tutorial-btn-text">教程</text> placeholder="输入押金金额建议≤50元"
</view> value="{{commissionValue}}"
bindinput="onCommissionValueInput"
<!-- 使用教程弹窗组件 --> />
<popup-notice id="popupNotice" /> </view>
</view> </view>
<!-- 底部留白 -->
<view class="bottom-space"></view>
<!-- 提交按钮 -->
<view class="submit-bar">
<view
class="submit-btn {{isSubmitting ? 'submit-btn--disabled' : ''}}"
bindtap="onSubmit"
hover-class="submit-btn--hover"
>
{{isSubmitting ? '派发中...' : '立即派发'}}
</view>
</view>
<!-- 加载遮罩 -->
<view class="loading-mask" wx:if="{{isLoading}}">
<view class="loading-box">
<view class="loading-spinner"></view>
<text class="loading-text">加载中...</text>
</view>
</view>
<global-notification id="global-notification" />
<!-- 教程按钮 -->
<view
class="tutorial-btn {{tutorialBtnHidden ? 'tutorial-btn--hidden' : ''}}"
bindtap="onTutorialBtnTap"
hover-class="tutorial-btn--hover"
>
<text class="tutorial-btn-text">教程</text>
</view>
<popup-notice id="popupNotice" />
</view>

View File

@@ -1,374 +1,339 @@
/* pages/merchant-dispatch/merchant-dispatch.wxss - 黑金升级版 + 背景图由js动态拼接 */ /* 商家派单 */
page {
background-color: #0a0a0f; page {
} background: #f5f5f5;
}
.page-container {
min-height: 100vh; .page {
/* 背景图通过内联 style 动态设置,此处不再写死 */ min-height: 100vh;
background-size: cover; padding: 24rpx;
background-position: center; padding-bottom: 160rpx;
background-attachment: fixed; box-sizing: border-box;
position: relative; }
padding: 30rpx;
box-sizing: border-box; /* 余额卡片 */
padding-bottom: 140rpx; .balance-card {
} background: #1a1a2e;
border-radius: 16rpx;
/* 半透明遮罩增强文字可读性 - 不使用通配符 */ padding: 36rpx 32rpx;
.page-container::before { margin-bottom: 20rpx;
content: ''; text-align: center;
position: fixed; }
top: 0;
left: 0; .balance-label {
right: 0; font-size: 24rpx;
bottom: 0; color: rgba(255,255,255,0.5);
background: rgba(10, 10, 15, 0.75); display: block;
backdrop-filter: blur(6rpx); }
z-index: 0;
pointer-events: none; .balance-row {
} display: flex;
align-items: baseline;
/* 所有直接子元素手动提升层级(替代 * 选择器) */ justify-content: center;
.balance-card, margin: 12rpx 0 8rpx;
.section, }
.form-container,
.btn-container, .balance-value {
.loading-mask { font-size: 52rpx;
position: relative; font-weight: 700;
z-index: 1; color: #f0d060;
} line-height: 1;
}
/* 余额卡片 - 黑金风格 */
.balance-card { .balance-unit {
background: linear-gradient(135deg, rgba(20,20,30,0.95), rgba(30,30,50,0.95)); font-size: 26rpx;
border-radius: 24rpx; color: #f0d060;
padding: 36rpx; margin-left: 6rpx;
margin-bottom: 40rpx; font-weight: 500;
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; .balance-tip {
border: 1.5rpx solid rgba(0,180,255,0.2); font-size: 20rpx;
backdrop-filter: blur(10rpx); color: rgba(255,255,255,0.35);
overflow: hidden; display: block;
} }
.balance-card::before {
content: ''; /* 卡片 */
position: absolute; .card {
top: -50%; left: -50%; background: #fff;
width: 200%; height: 200%; border-radius: 16rpx;
background: linear-gradient(45deg, transparent 30%, rgba(0,180,255,0.1) 50%, transparent 70%); padding: 28rpx;
animation: cardShine 6s infinite linear; margin-bottom: 20rpx;
z-index: 1; }
}
@keyframes cardShine { .card-header {
0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); } display: flex;
100% { transform: translateX(100%) translateY(100%) rotate(45deg); } align-items: center;
} margin-bottom: 20rpx;
.balance-label { }
font-size: 28rpx;
color: rgba(255,255,255,0.8); .card-dot {
margin-bottom: 18rpx; width: 8rpx;
font-weight: 500; height: 8rpx;
position: relative; border-radius: 4rpx;
z-index: 2; background: #9C27B0;
} margin-right: 12rpx;
.balance-amount { flex-shrink: 0;
display: flex; }
align-items: baseline;
justify-content: center; .card-title {
margin-bottom: 15rpx; font-size: 28rpx;
position: relative; font-weight: 700;
z-index: 2; color: #333;
} }
.amount-value {
font-size: 64rpx; /* 订单类型 */
font-weight: bold; .type-scroll {
color: #FFD700; white-space: nowrap;
text-shadow: 0 0 20rpx rgba(255,215,0,0.7); display: flex;
animation: amountGlow 3s infinite alternate; padding: 8rpx 0;
} }
@keyframes amountGlow {
0% { color: #FFD700; text-shadow: 0 0 15rpx rgba(255,215,0,0.6); } .type-chip {
100% { color: #FFE44D; text-shadow: 0 0 25rpx rgba(255,215,0,0.9); } display: inline-flex;
} flex-shrink: 0;
.amount-unit { align-items: center;
font-size: 36rpx; justify-content: center;
color: #FFD700; height: 64rpx;
margin-left: 12rpx; padding: 0 28rpx;
font-weight: 500; margin-right: 14rpx;
} background: #f5f5f5;
.balance-tip { border-radius: 32rpx;
font-size: 24rpx; font-size: 24rpx;
color: rgba(255,255,255,0.6); color: #666;
position: relative; border: 1rpx solid transparent;
z-index: 2; }
}
.type-chip--active {
/* 区域标题 */ background: #f3e5f9;
.section { color: #9C27B0;
margin-bottom: 35rpx; border-color: #9C27B0;
} font-weight: 600;
.section-title { }
font-size: 32rpx;
font-weight: 700; /* 表单字段 */
color: #FFFFFF; .field {
margin-bottom: 25rpx; margin-bottom: 24rpx;
padding-left: 12rpx; }
border-left: 6rpx solid #9C27B0;
text-shadow: 0 2rpx 4rpx rgba(0,0,0,0.3); .field:last-child {
} margin-bottom: 0;
}
/* 商品类型横向滚动 */
.type-scroll { .field-head {
white-space: nowrap; display: flex;
display: flex; align-items: center;
height: 90rpx; margin-bottom: 10rpx;
} }
.type-item {
display: inline-flex; .field-label {
flex-shrink: 0; font-size: 26rpx;
align-items: center; font-weight: 600;
justify-content: center; color: #333;
height: 85rpx; }
padding: 0 40rpx;
margin-right: 20rpx; .field-required {
background: rgba(255,255,255,0.08); font-size: 26rpx;
border-radius: 45rpx; color: #e04040;
border: 2rpx solid rgba(255,255,255,0.15); margin-left: 4rpx;
font-size: 28rpx; }
color: rgba(255,255,255,0.8);
transition: all 0.3s cubic-bezier(0.175,0.885,0.32,1.275); .field-optional {
backdrop-filter: blur(10rpx); font-size: 20rpx;
} color: #bbb;
.type-active { margin-left: 8rpx;
background: linear-gradient(135deg, #9C27B0 0%, #673AB7 100%); }
border-color: #9C27B0;
color: white; .field-count {
transform: scale(1.05); font-size: 20rpx;
box-shadow: 0 10rpx 25rpx rgba(156,39,176,0.4); color: #ccc;
} margin-left: auto;
.type-text { }
max-width: 220rpx;
overflow: hidden; .field-input {
text-overflow: ellipsis; width: 100%;
white-space: nowrap; height: 76rpx;
font-weight: 500; background: #f7f7f7;
} border-radius: 12rpx;
padding: 0 20rpx;
/* 表单容器 - 玻璃态 */ font-size: 26rpx;
.form-container { color: #333;
background: rgba(30,30,45,0.85); border: 1rpx solid #eee;
backdrop-filter: blur(20rpx); box-sizing: border-box;
border-radius: 30rpx; }
padding: 30rpx;
box-shadow: 0 10rpx 30rpx rgba(0,0,0,0.3); .field-hint {
border: 1.5rpx solid rgba(255,255,255,0.1); font-size: 20rpx;
margin-bottom: 40rpx; color: #bbb;
} margin-top: 8rpx;
.form-item { display: block;
margin-bottom: 35rpx; }
position: relative;
} /* 价格输入 */
.form-item:last-child { .price-input-wrap {
margin-bottom: 0; display: flex;
} align-items: center;
.form-label { background: #f7f7f7;
font-size: 30rpx; border-radius: 12rpx;
font-weight: 600; border: 1rpx solid #eee;
color: rgba(255,255,255,0.9); overflow: hidden;
display: block; }
margin-bottom: 15rpx;
} .price-prefix {
.form-label.required::after { font-size: 28rpx;
content: '*'; font-weight: 700;
color: #ff4444; color: #999;
margin-left: 8rpx; padding-left: 20rpx;
} flex-shrink: 0;
.form-input { }
width: 100%;
height: 80rpx; .price-input {
background: rgba(255,255,255,0.1); border: none;
border-radius: 16rpx; background: transparent;
padding: 0 25rpx; flex: 1;
font-size: 28rpx; }
color: #FFFFFF;
border: 2rpx solid rgba(255,255,255,0.2); /* Picker */
box-sizing: border-box; .field-picker {
transition: all 0.3s; display: flex;
} align-items: center;
.form-input:focus { justify-content: space-between;
border-color: #9C27B0; height: 76rpx;
background: rgba(255,255,255,0.15); background: #f7f7f7;
} border-radius: 12rpx;
.word-count { padding: 0 20rpx;
position: absolute; border: 1rpx solid #eee;
right: 0; font-size: 26rpx;
top: 0; color: #333;
font-size: 24rpx; }
color: rgba(255,255,255,0.5);
} .field-picker-ph {
.price-tip { color: #bbb;
font-size: 24rpx; }
color: rgba(255,255,255,0.5);
margin-top: 10rpx; .field-picker-arrow {
display: block; font-size: 24rpx;
} color: #ccc;
.picker-view { }
background: rgba(255,255,255,0.1);
border-radius: 16rpx; /* Switch 行 */
padding: 20rpx 25rpx; .switch-row {
border: 2rpx solid rgba(255,255,255,0.2); display: flex;
color: rgba(255,255,255,0.9); align-items: center;
font-size: 28rpx; margin-bottom: 12rpx;
} }
.commission-item {
display: flex; .switch-label {
align-items: center; font-size: 22rpx;
flex-wrap: wrap; color: #999;
gap: 20rpx; margin-left: 12rpx;
} }
.commission-item .form-label {
width: 100%; /* 底部留白 */
margin-bottom: 10rpx; .bottom-space {
} height: 20rpx;
.commission-input { }
flex: 1;
background: rgba(255,255,255,0.1); /* 提交栏 */
border-radius: 16rpx; .submit-bar {
padding: 20rpx; position: fixed;
color: #fff; bottom: 0;
border: 2rpx solid rgba(255,255,255,0.2); left: 0;
font-size: 28rpx; right: 0;
} background: #fff;
padding: 16rpx 24rpx;
/* 提交按钮区域 */ padding-bottom: calc(16rpx + env(safe-area-inset-bottom));
.btn-container { border-top: 1rpx solid #f0f0f0;
position: fixed; z-index: 9999;
bottom: 0; }
left: 0;
right: 0; .submit-btn {
background: linear-gradient(to top, rgba(10,10,15,0.95), transparent); height: 88rpx;
padding: 30rpx; background: #e04040;
box-sizing: border-box; border-radius: 12rpx;
z-index: 9999; display: flex;
} align-items: center;
.submit-btn { justify-content: center;
background: linear-gradient(135deg, #ff4444 0%, #cc0000 100%); font-size: 32rpx;
border-radius: 50rpx; font-weight: 700;
height: 90rpx; color: #fff;
display: flex; letter-spacing: 2rpx;
align-items: center; }
justify-content: center;
box-shadow: 0 10rpx 30rpx rgba(255,68,68,0.3); .submit-btn--hover {
transition: all 0.3s; opacity: 0.85;
position: relative; }
overflow: hidden;
} .submit-btn--disabled {
.submit-btn::after { opacity: 0.5;
content: ''; pointer-events: none;
position: absolute; }
top: 0;
left: -100%; /* 加载 */
width: 100%; .loading-mask {
height: 100%; position: fixed;
background: linear-gradient(90deg, transparent, rgba(255,255,255,0.3), transparent); top: 0; left: 0; right: 0; bottom: 0;
animation: shine 2s infinite; background: rgba(255,255,255,0.8);
} display: flex;
.btn-hover { align-items: center;
transform: translateY(-2rpx); justify-content: center;
box-shadow: 0 15rpx 40rpx rgba(255,68,68,0.4); z-index: 10000;
} }
.btn-disabled {
opacity: 0.6; .loading-box {
filter: grayscale(0.3); background: #fff;
pointer-events: none; padding: 48rpx 64rpx;
} border-radius: 16rpx;
.btn-text { display: flex;
font-size: 36rpx; flex-direction: column;
font-weight: bold; align-items: center;
color: white; box-shadow: 0 4rpx 20rpx rgba(0,0,0,0.08);
letter-spacing: 4rpx; }
position: relative;
z-index: 2; .loading-spinner {
} width: 44rpx;
@keyframes shine { height: 44rpx;
0% { left: -100%; } border: 4rpx solid #eee;
100% { left: 100%; } border-top-color: #333;
} border-radius: 50%;
animation: spin 0.8s linear infinite;
/* 加载遮罩 */ margin-bottom: 16rpx;
.loading-mask { }
position: fixed;
top: 0; .loading-text {
left: 0; font-size: 24rpx;
right: 0; color: #666;
bottom: 0; }
background: rgba(0,0,0,0.8);
display: flex; /* 教程按钮 */
align-items: center; .tutorial-btn {
justify-content: center; position: fixed;
z-index: 10000; right: 0;
} top: 20%;
.loading-content { transform: translateY(-50%);
background: rgba(40,40,60,0.95); width: 72rpx;
padding: 60rpx 80rpx; height: 72rpx;
border-radius: 30rpx; background: #9C27B0;
display: flex; border-radius: 36rpx 0 0 36rpx;
flex-direction: column; display: flex;
align-items: center; align-items: center;
box-shadow: 0 25rpx 70rpx rgba(0,0,0,0.6); justify-content: center;
} z-index: 10001;
.loading-spinner { transition: right 0.3s ease-out;
width: 90rpx; }
height: 90rpx;
border: 8rpx solid rgba(0,180,255,0.2); .tutorial-btn-text {
border-top: 8rpx solid #00B4FF; color: #fff;
border-radius: 50%; font-size: 22rpx;
animation: spin 1.2s linear infinite; font-weight: 600;
margin-bottom: 35rpx; writing-mode: vertical-rl;
} letter-spacing: 4rpx;
.loading-text { }
font-size: 30rpx;
color: #00B4FF; .tutorial-btn--hidden {
font-weight: 600; right: -44rpx;
} }
@keyframes spin {
0% { transform: rotate(0deg); } .tutorial-btn--hover {
100% { transform: rotate(360deg); } opacity: 0.85;
} }
/* ========== 教程按钮样式(修改后:右上角,更大更显眼) ========== */
.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);
}

View File

@@ -132,4 +132,4 @@
</view> </view>
</view> </view>
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<custom-tab-bar /> <tab-bar />

View File

@@ -127,6 +127,7 @@ Page({
iconCopy: `${imgDir}icon_copy.png`, iconCopy: `${imgDir}icon_copy.png`,
avatarFrame: `${imgDir}avatar_frame.png`, avatarFrame: `${imgDir}avatar_frame.png`,
iconClear: `${ossBase}beijing/tubiao/grzx_qingchu.jpg`, 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' });
},
}); });

View File

@@ -2,7 +2,7 @@
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "global-notification": "/components/global-notification/global-notification",
"popup-notice": "/components/popup-notice/popup-notice", "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" "chenghao-tag": "/components/chenghao-tag/chenghao-tag"
}, },
"navigationBarTitleText": "商家中心", "navigationBarTitleText": "商家中心",

View File

@@ -15,10 +15,14 @@
</view> </view>
<button class="register-btn" bindtap="onRegister">立即注册</button> <button class="register-btn" bindtap="onRegister">立即注册</button>
<view class="register-tip">已有邀请码?点击上方注册</view> <view class="register-tip">已有邀请码?点击上方注册</view>
<view class="sys-item sys-item-unreg" bindtap="switchToNormal">
<image class="sys-icon" src="{{imgUrls.iconSwitch}}" mode="aspectFit" />
<text class="sys-text">返回点单端</text>
</view>
<view class="sys-item sys-item-unreg" bindtap="clearCache"> <view class="sys-item sys-item-unreg" bindtap="clearCache">
<image class="sys-icon" src="{{imgUrls.iconClear}}" mode="aspectFit" /> <image class="sys-icon" src="{{imgUrls.iconClear}}" mode="aspectFit" />
<text class="sys-text">清除缓存</text> <text class="sys-text">清除缓存</text>
<text class="sys-sub">回点单端</text> <text class="sys-sub">重新登录</text>
</view> </view>
</view> </view>
</view> </view>
@@ -167,10 +171,14 @@
</view> </view>
<view class="sys-list"> <view class="sys-list">
<view class="sys-item" bindtap="switchToNormal">
<image class="sys-icon" src="{{imgUrls.iconSwitch}}" mode="aspectFit" />
<text class="sys-text">返回点单端</text>
</view>
<view class="sys-item" bindtap="clearCache"> <view class="sys-item" bindtap="clearCache">
<image class="sys-icon" src="{{imgUrls.iconClear}}" mode="aspectFit" /> <image class="sys-icon" src="{{imgUrls.iconClear}}" mode="aspectFit" />
<text class="sys-text">清除缓存</text> <text class="sys-text">清除缓存</text>
<text class="sys-sub">回点单端</text> <text class="sys-sub">重新登录</text>
</view> </view>
</view> </view>
@@ -188,4 +196,4 @@
<!-- 全局组件 --> <!-- 全局组件 -->
<global-notification id="global-notification" /> <global-notification id="global-notification" />
<popup-notice id="popupNotice" /> <popup-notice id="popupNotice" />
<custom-tab-bar /> <tab-bar />

View File

@@ -1,6 +1,6 @@
{ {
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "global-notification": "/components/global-notification/global-notification",
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
} }
} }

View File

@@ -64,6 +64,6 @@
</view> </view>
<!-- 底部自定义TabBar --> <!-- 底部自定义TabBar -->
<custom-tab-bar /> <tab-bar />
<global-notification id="global-notification" /> <global-notification id="global-notification" />
</view> </view>

View File

@@ -1,7 +1,7 @@
{ {
"usingComponents": { "usingComponents": {
"global-notification": "/components/global-notification/global-notification", "global-notification": "/components/global-notification/global-notification",
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
}, },
"navigationBarTitleText": "个人中心", "navigationBarTitleText": "个人中心",
"navigationBarBackgroundColor": "#F7F3ED", "navigationBarBackgroundColor": "#F7F3ED",

View File

@@ -113,5 +113,5 @@
</scroll-view> </scroll-view>
</view> </view>
<custom-tab-bar /> <tab-bar />
<global-notification id="global-notification" /> <global-notification id="global-notification" />

View File

@@ -1,251 +1,263 @@
/* pages/gerenzhongxin/gerenzhongxin.wxss — 最终完美版(毛玻璃强化+图标左右贴边) */ /* 我的页面 */
/* 全局 */
page { page {
background: #F7F3ED; background: #F7F3ED;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
} }
.page-root { .page-root {
position: relative; position: relative;
width: 100%; width: 100%;
height: 100vh; height: 100vh;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.bg-layer { .bg-layer {
position: fixed; position: fixed;
top: 0; left: 0; top: 0; left: 0;
width: 100vw; height: 100vh; width: 100vw; height: 100vh;
background: radial-gradient(ellipse at 30% 20%, rgba(201,169,98,0.08) 0%, transparent 60%), 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%); radial-gradient(ellipse at 80% 70%, rgba(201,169,98,0.05) 0%, transparent 50%);
z-index: 0; z-index: 0;
pointer-events: none; pointer-events: none;
} }
.main-scroll { .main-scroll {
position: relative; position: relative;
z-index: 2; z-index: 2;
flex: 1; flex: 1;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
padding-bottom: calc(140rpx + env(safe-area-inset-bottom)); padding-bottom: calc(140rpx + env(safe-area-inset-bottom));
} }
.main-content { .main-content {
padding: 60rpx 40rpx 0; padding: 50rpx 36rpx 0;
} }
/* 图标基础 */ /* 图标 */
.icon-dark { .icon-dark {
filter: brightness(0) saturate(100%) opacity(0.65); filter: brightness(0) saturate(100%) opacity(0.65);
} }
.icon-color { .icon-color {
filter: none; filter: none;
} }
.icon-size { .icon-size {
width: 52rpx; width: 48rpx;
height: 52rpx; height: 48rpx;
} }
.icon-bg {
/* 图标独立淡金背景 */ background: rgba(201,169,98,0.08);
.icon-bg { border-radius: 22rpx;
background: rgba(201,169,98,0.08); display: flex;
border-radius: 24rpx; align-items: center;
display: flex; justify-content: center;
align-items: center; padding: 16rpx;
justify-content: center; }
padding: 18rpx;
} /* 头部 */
.hero {
/* 头部(头像完美正圆) */ position: relative;
.hero { margin-bottom: 60rpx;
position: relative; }
margin-bottom: 100rpx; .settings-icon {
} position: absolute;
.settings-icon { top: 0; right: 0;
position: absolute; width: 56rpx; height: 56rpx;
top: 0; right: 0; display: flex; align-items: center; justify-content: center;
width: 60rpx; height: 60rpx; }
display: flex; align-items: center; justify-content: center; .settings-icon .icon-dark {
} width: 44rpx; height: 44rpx;
.user-block { }
display: flex; align-items: center; .user-block {
} display: flex;
.avatar-outside { align-items: center;
width: 140rpx; }
height: 140rpx; .avatar-outside {
border-radius: 50%; width: 128rpx;
background: rgba(201,169,98,0.06); height: 128rpx;
padding: 10rpx; border-radius: 50%;
margin-right: 35rpx; background: linear-gradient(135deg, rgba(201,169,98,0.12), rgba(201,169,98,0.04));
display: flex; padding: 8rpx;
align-items: center; margin-right: 28rpx;
justify-content: center; display: flex;
box-sizing: border-box; align-items: center;
} justify-content: center;
.avatar { box-sizing: border-box;
width: 100%; }
height: 100%; .avatar {
border-radius: 50%; width: 100%;
display: block; height: 100%;
border: none; border-radius: 50%;
} display: block;
.nickname { }
font-size: 44rpx; font-weight: 700; color: #1A1A1A; .nickname {
display: block; font-size: 40rpx;
} font-weight: 700;
.uid { color: #1A1A1A;
font-size: 28rpx; color: #7A7A7A; display: block;
margin-top: 12rpx; }
display: block; .uid {
} font-size: 26rpx;
.login-btn { color: #999;
margin-top: 45rpx; margin-top: 8rpx;
height: 92rpx; display: block;
border-radius: 46rpx; }
} .login-btn {
margin-top: 36rpx;
/* 分区间距 */ height: 88rpx;
.section { border-radius: 44rpx;
margin-top: 110rpx; }
}
.section-close { /* 分区 */
margin-top: 80rpx; .section {
} margin-top: 48rpx;
}
.title-line { .section-close {
margin-bottom: 40rpx; margin-top: 36rpx;
padding: 18rpx 28rpx; }
line-height: 1.2;
} .title-line {
.gradient-bg { margin-bottom: 24rpx;
background: linear-gradient(to right, rgba(201,169,98,0.01), rgba(201,169,98,0.10)); padding: 14rpx 24rpx;
} line-height: 1.2;
.title-text { }
font-size: 38rpx; .gradient-bg {
font-weight: 700; background: linear-gradient(to right, rgba(201,169,98,0.01), rgba(201,169,98,0.10));
color: #1A1A1A; }
letter-spacing: 2rpx; .title-text {
} font-size: 34rpx;
font-weight: 700;
/* 毛玻璃订单容器(强化玻璃质感,淡灰半透,无白边) */ color: #1A1A1A;
.frosted-box { letter-spacing: 1rpx;
background: rgba(235, 235, 240, 0.45); /* 淡灰玻璃底 */ }
backdrop-filter: blur(25px);
-webkit-backdrop-filter: blur(25px); /* 毛玻璃容器 */
border-radius: 36rpx; .frosted-box {
padding: 45rpx 0; /* 去掉左右内边距,让图标真正贴边 */ background: rgba(255, 255, 255, 0.52);
box-shadow: 0 4rpx 16rpx rgba(0,0,0,0.05), inset 0 1rpx 0 rgba(255,255,255,0.7); backdrop-filter: blur(20px);
border: none; -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);
.order-row { border: 1rpx solid rgba(255,255,255,0.5);
display: flex; }
justify-content: space-between;
align-items: center; /* 订单行 */
padding: 0 5rpx; /* 极微的内边距,防止图片被裁剪,但视觉上仍贴边 */ .order-row {
} display: flex;
.order-unit { justify-content: space-around;
display: flex; align-items: center;
flex-direction: column; }
align-items: center; .order-unit {
position: relative; display: flex;
flex: 1; /* 等分剩余空间 */ flex-direction: column;
margin: 0; /* 无额外间距 */ align-items: center;
} position: relative;
.order-name { flex: 1;
font-size: 28rpx; }
color: #1C1C1C; .order-name {
margin-top: 18rpx; font-size: 26rpx;
font-weight: 500; color: #333;
} margin-top: 14rpx;
.badge { font-weight: 500;
position: absolute; }
top: -10rpx; .badge {
right: 12rpx; position: absolute;
background: #C5615E; top: -8rpx;
color: #fff; right: 10rpx;
font-size: 22rpx; background: #C5615E;
min-width: 38rpx; color: #fff;
height: 38rpx; font-size: 20rpx;
border-radius: 19rpx; min-width: 34rpx;
display: flex; height: 34rpx;
align-items: center; border-radius: 17rpx;
justify-content: center; display: flex;
padding: 0 8rpx; align-items: center;
font-weight: 600; justify-content: center;
} padding: 0 8rpx;
font-weight: 600;
/* 更多服务 */ }
.service-row {
display: flex; /* 更多服务 */
gap: 80rpx; .service-row {
justify-content: flex-start; display: flex;
} gap: 60rpx;
.auth-service-row { justify-content: flex-start;
gap: 100rpx; padding: 8rpx 0;
} }
.service-unit { .auth-service-row {
display: flex; gap: 80rpx;
flex-direction: column; }
align-items: center; .service-unit {
min-width: 120rpx; display: flex;
} flex-direction: column;
.service-name { align-items: center;
font-size: 26rpx; min-width: 110rpx;
color: #1C1C1C; }
margin-top: 14rpx; .service-name {
font-weight: 500; font-size: 24rpx;
} color: #333;
.icon-bg-sm { margin-top: 12rpx;
padding: 14rpx; font-weight: 500;
border-radius: 20rpx; }
} .icon-bg-sm {
.icon-size-sm { padding: 12rpx;
width: 44rpx; border-radius: 18rpx;
height: 44rpx; }
} .icon-size-sm {
.auth-tag { width: 40rpx;
font-size: 20rpx; height: 40rpx;
color: #aaa; }
margin-top: 6rpx; .auth-tag {
} font-size: 20rpx;
.auth-tag-done { color: #bbb;
color: #C9A962; margin-top: 4rpx;
font-weight: 500; }
} .auth-tag-done {
color: #C9A962;
/* 清除缓存 */ font-weight: 500;
.clear-row { }
display: flex;
align-items: center; /* 清除缓存 */
padding: 22rpx 0; .clear-row {
} display: flex;
.clear-word { align-items: center;
flex: 1; padding: 20rpx 0;
font-size: 30rpx; }
color: #1C1C1C; .clear-word {
margin-left: 18rpx; flex: 1;
font-weight: 500; font-size: 28rpx;
} color: #333;
.arrow-right { margin-left: 16rpx;
width: 36rpx; font-weight: 500;
height: 36rpx; }
opacity: 0.45; .arrow-right {
margin-left: 15rpx; width: 32rpx;
} height: 32rpx;
opacity: 0.35;
/* 底部 */ margin-left: 12rpx;
.footer { }
margin-top: 130rpx;
padding-bottom: 20rpx; /* 底部 */
text-align: center; .footer {
font-size: 26rpx; margin-top: 80rpx;
color: #aaa; padding-bottom: 20rpx;
} text-align: center;
.divider { margin: 0 15rpx; } font-size: 24rpx;
.coop { color: #C9A962; font-weight: 500; } 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;
}

View File

@@ -1,5 +1,5 @@
{ {
"usingComponents": { "usingComponents": {
"custom-tab-bar": "/custom-tab-bar/index" "tab-bar": "/tab-bar/index"
} }
} }

View File

@@ -1,2 +1,2 @@
<view></view> <view></view>
<custom-tab-bar /> <tab-bar />

View File

@@ -86,7 +86,7 @@
<!-- 支付方式 --> <!-- 支付方式 -->
<view class="payment-item"> <view class="payment-item">
<view class="payment-method"> <view class="payment-method">
<image src="/images/weixinzhifu.png" class="payment-icon" /> <image src="/images/wechat-pay.png" class="payment-icon" />
<text class="payment-text">微信支付</text> <text class="payment-text">微信支付</text>
<view class="payment-checkbox"> <view class="payment-checkbox">
<text class="checkbox-text">✓</text> <text class="checkbox-text">✓</text>

View File

@@ -1,4 +1,4 @@
// custom-tab-bar/index.js — 三端固定,无身份切换 // tab-bar/index.js — 三端固定,无身份切换
const app = getApp(); const app = getApp();
import { getTabRole } from '../utils/primary-role.js'; import { getTabRole } from '../utils/primary-role.js';
@@ -6,27 +6,27 @@ const roleCfg = {
normal: { normal: {
name: '点单老板', name: '点单老板',
tabList: [ tabList: [
{ pagePath: 'pages/index/index', text: '商城', iconPath: '/images/zhuye.png', selectedIconPath: '/images/zhuye.png' }, { pagePath: 'pages/index/index', text: '商城', iconPath: '/images/home.png', selectedIconPath: '/images/home.png' },
{ pagePath: 'pages/category/category', text: '分类', iconPath: '/images/fenlei.png', selectedIconPath: '/images/fenlei.png' }, { pagePath: 'pages/category/category', text: '分类', iconPath: '/images/category.png', selectedIconPath: '/images/category.png' },
{ pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/messages.png', selectedIconPath: '/images/messages.png' },
{ pagePath: 'pages/mine/mine', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' }, { pagePath: 'pages/mine/mine', text: '我的', iconPath: '/images/mine.png', selectedIconPath: '/images/mine.png' },
], ],
}, },
dashou: { dashou: {
name: '打手', name: '打手',
tabList: [ tabList: [
{ pagePath: 'pages/accept-order/accept-order', text: '接单池', iconPath: '/images/jiedanchi.png', selectedIconPath: '/images/jiedanchi.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/dingdan.png', selectedIconPath: '/images/dingdan.png' }, { pagePath: 'pages/fighter-orders/fighter-orders', text: '订单', iconPath: '/images/orders.png', selectedIconPath: '/images/orders.png' },
{ pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/messages.png', selectedIconPath: '/images/messages.png' },
{ pagePath: 'pages/fighter/fighter', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' }, { pagePath: 'pages/fighter/fighter', text: '我的', iconPath: '/images/mine.png', selectedIconPath: '/images/mine.png' },
], ],
}, },
shangjia: { shangjia: {
name: '商家', name: '商家',
tabList: [ tabList: [
{ pagePath: 'pages/merchant-orders/merchant-orders', text: '订单', iconPath: '/images/dingdan.png', selectedIconPath: '/images/dingdan.png' }, { pagePath: 'pages/merchant-orders/merchant-orders', text: '订单', iconPath: '/images/orders.png', selectedIconPath: '/images/orders.png' },
{ pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/xiaoxi.png', selectedIconPath: '/images/xiaoxi.png' }, { pagePath: 'pages/messages/messages', text: '消息', iconPath: '/images/messages.png', selectedIconPath: '/images/messages.png' },
{ pagePath: 'pages/merchant/merchant', text: '我的', iconPath: '/images/wode.png', selectedIconPath: '/images/wode.png' }, { pagePath: 'pages/merchant/merchant', text: '我的', iconPath: '/images/mine.png', selectedIconPath: '/images/mine.png' },
], ],
}, },
}; };

View File

@@ -1,4 +1,4 @@
<view class="custom-tab-bar"> <view class="tab-bar">
<view class="bar-row"> <view class="bar-row">
<view class="tab-capsule"> <view class="tab-capsule">
<block wx:for="{{tabList}}" wx:key="index"> <block wx:for="{{tabList}}" wx:key="index">

View File

@@ -1,6 +1,6 @@
/* custom-tab-bar — 三端固定,全宽 Tab 胶囊 */ /* tab-bar — 三端固定,全宽 Tab 胶囊 */
.custom-tab-bar { .tab-bar {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;

View File

@@ -255,7 +255,7 @@ function updateTabBarBadge(app, unreadCount) {
const pages = getCurrentPages(); const pages = getCurrentPages();
if (pages.length) { if (pages.length) {
const page = pages[pages.length - 1]; 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 (tabBar && tabBar.setData) tabBar.setData({ badgeText });
if (page.getTabBar) { if (page.getTabBar) {
const tb = page.getTabBar(); const tb = page.getTabBar();