XingQue/xingque
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 抢单端UI回退前备份当前完整工作区

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
XingQue
2026-06-29 17:59:23 +08:00
parent 6e2f7bc39f
commit e8fb32c1fe
53 changed files with 3410 additions and 1065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
pages/merchant-orders/merchant-orders.wxml
View File

@@ -65,8 +65,9 @@
<!-- 主体：左右布局 -->
<view class="main-container">
<!-- 左侧状态栏（固定） -->
<view class="left-status">
<!-- 左侧状态栏（可纵向滑动） -->
<scroll-view class="left-status" scroll-y enhanced show-scrollbar="{{false}}">
<view class="left-status-inner">
<block wx:for="{{statusList}}" wx:key="key">
<view class="status-item {{currentStatusKey == item.key ? 'status-active' : ''}}" data-key="{{item.key}}" bindtap="switchStatus">
<text class="status-name">{{item.name}}</text>
@@ -75,7 +76,8 @@
<view wx:if="{{item.key === 'jiesuanzhong' && pendingCount > 0}}" class="sj-status-badge">{{pendingCount}}</view>
</view>
</block>
</view>
</view>
</scroll-view>
<!-- 右侧包裹：撑出右边距，里面是 scroll-view -->
<view class="right-wrapper">
@@ -113,123 +115,20 @@
<text class="empty-subtext">快去派发订单吧</text>
</view>
<!-- 订单卡片：逍遥梦 ui-preview 布局 -->
<!-- 订单列表：简洁卡片，突出状态 -->
<view class="sj-order-list">
<block wx:for="{{currentList}}" wx:key="dingdan_id">
<!-- 优质商家金牌卡 -->
<view wx:if="{{item.shangjia_youzhi}}" class="xym-order-item gold-card" data-item="{{item}}" bindtap="goToSjDingdanXiangqing">
<view class="gold-head flexb">
<view class="kehuduan-banner-wrap">
<image class="gold-banner" src="{{goldBannerUrl}}" mode="widthFix"/>
</view>
<view class="sj-order-card" data-item="{{item}}" bindtap="goToSjDingdanXiangqing">
<view class="sj-order-card-head">
<text class="sj-order-id">单号 {{item.dingdan_id}}</text>
<view class="sj-status-tag" style="color:{{item.zhuangtaiColor}};background:{{item.zhuangtaiBg}}">{{item.zhuangtaiZh}}</view>
</view>
<view class="gold-body-wrap">
<view class="order-con gold-inner">
<view wx:if="{{item.isZhiding}}" class="zhiding-strip">
<view class="zhiding-strip-top myflex">
<text class="zhiding-label">指定</text>
<image wx:if="{{item.zhiding_avatar_full}}" class="zhiding-avatar" src="{{item.zhiding_avatar_full}}" mode="aspectFill"/>
<text class="zhiding-name">{{item.zhiding_nicheng || '指定接单员'}}</text>
</view>
<view wx:if="{{item.dashou_biaoqian.length > 0 || item.zhiding_identity_biaoqian.length > 0}}" class="zhiding-strip-tags">
<chenghao-tag wx:for="{{item.dashou_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
<chenghao-tag wx:for="{{item.zhiding_identity_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
</view>
</view>
<view class="order-row myflex">
<image class="o-logo" src="{{item.leixing_icon_url}}" mode="aspectFill"/>
<view class="o-col">
<view class="o-goods line2">{{item.jieshao || '暂无介绍'}}</view>
<view class="tag-row myflex">
<text class="tag-pill tag-youzhi">优质商家</text>
</view>
</view>
</view>
<view class="reward-badge normal-reward">
<text class="reward-yen sm">￥</text>
<text class="reward-num dark">{{item.jine || '0.00'}}</text>
</view>
<view class="remark-block dark">
<text class="remark-label dark-t">商家备注：</text>{{item.beizhu || '暂无'}}
</view>
<view wx:if="{{item.shangjia_biaoqian.length || item.shangjia_identity_biaoqian.length || item.xuqiu_biaoqian.length}}" class="merchant-tags-container">
<scroll-view wx:if="{{item.shangjia_biaoqian.length}}" class="biaoqian-inline-scroll" scroll-x>
<chenghao-tag wx:for="{{item.shangjia_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
</scroll-view>
<scroll-view wx:if="{{item.shangjia_identity_biaoqian.length}}" class="biaoqian-inline-scroll" scroll-x style="margin-top:8rpx">
<chenghao-tag wx:for="{{item.shangjia_identity_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
</scroll-view>
<scroll-view wx:if="{{item.xuqiu_biaoqian.length}}" class="biaoqian-inline-scroll" scroll-x style="margin-top:8rpx">
<chenghao-tag wx:for="{{item.xuqiu_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
</scroll-view>
</view>
<view class="merchant-strip myflex">
<image class="m-avatar" src="{{item.sj_avatar_full}}" mode="aspectFill"/>
<view class="m-info">
<view class="m-name light-t">{{item.sjnicheng || '未知商家'}}</view>
<view class="m-sn light-sub">ID:{{item.shangjia_id}} 发布于 {{item.creat_time}}</view>
</view>
</view>
<view class="o-foot flexb">
<text class="o-amt-grey">订单金额 ￥{{item.jine || '0.00'}}</text>
<view class="sj-status-pill" style="color:{{item.zhuangtaiColor}}">{{item.zhuangtaiZh}}</view>
</view>
</view>
</view>
</view>
<!-- 普通商家订单 -->
<view wx:else class="xym-order-item normal-card" data-item="{{item}}" bindtap="goToSjDingdanXiangqing">
<view class="normal-body-wrap">
<view class="order-con">
<view wx:if="{{item.isZhiding}}" class="zhiding-strip">
<view class="zhiding-strip-top myflex">
<text class="zhiding-label">指定</text>
<image wx:if="{{item.zhiding_avatar_full}}" class="zhiding-avatar" src="{{item.zhiding_avatar_full}}" mode="aspectFill"/>
<text class="zhiding-name">{{item.zhiding_nicheng || '指定接单员'}}</text>
</view>
<view wx:if="{{item.dashou_biaoqian.length > 0 || item.zhiding_identity_biaoqian.length > 0}}" class="zhiding-strip-tags">
<chenghao-tag wx:for="{{item.dashou_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
<chenghao-tag wx:for="{{item.zhiding_identity_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
</view>
</view>
<view class="order-row myflex">
<image class="o-logo" src="{{item.leixing_icon_url}}" mode="aspectFill"/>
<view class="o-col">
<view class="o-goods line2">{{item.jieshao || '暂无介绍'}}</view>
</view>
</view>
<view class="reward-badge normal-reward">
<text class="reward-yen sm">￥</text>
<text class="reward-num dark">{{item.jine || '0.00'}}</text>
</view>
<view class="remark-block dark">
<text class="remark-label dark-t">商家备注：</text>{{item.beizhu || '暂无'}}
</view>
<view wx:if="{{item.shangjia_biaoqian.length || item.shangjia_identity_biaoqian.length || item.xuqiu_biaoqian.length}}" class="merchant-tags-container">
<scroll-view wx:if="{{item.shangjia_biaoqian.length}}" class="biaoqian-inline-scroll" scroll-x>
<chenghao-tag wx:for="{{item.shangjia_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
</scroll-view>
<scroll-view wx:if="{{item.shangjia_identity_biaoqian.length}}" class="biaoqian-inline-scroll" scroll-x style="margin-top:8rpx">
<chenghao-tag wx:for="{{item.shangjia_identity_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
</scroll-view>
<scroll-view wx:if="{{item.xuqiu_biaoqian.length}}" class="biaoqian-inline-scroll" scroll-x style="margin-top:8rpx">
<chenghao-tag wx:for="{{item.xuqiu_biaoqian}}" wx:for-item="tag" wx:key="id" mingcheng="{{tag.mingcheng}}" texiaoJson="{{tag.texiao_json}}" />
</scroll-view>
</view>
<view class="merchant-strip myflex">
<image class="m-avatar" src="{{item.sj_avatar_full}}" mode="aspectFill"/>
<view class="m-info">
<view class="m-name light-t">{{item.sjnicheng || '未知商家'}}</view>
<view class="m-sn light-sub">ID:{{item.shangjia_id}} 发布于 {{item.creat_time}}</view>
</view>
</view>
<view class="o-foot flexb">
<text class="o-amt-grey">订单金额 ￥{{item.jine || '0.00'}}</text>
<view class="sj-status-pill" style="color:{{item.zhuangtaiColor}}">{{item.zhuangtaiZh}}</view>
</view>
</view>
<text class="sj-order-desc line2">{{item.jieshao || '暂无介绍'}}</text>
<view class="sj-order-meta">
<text class="sj-order-amount">¥{{item.jine || '0.00'}}</text>
<text class="sj-order-time">{{item.creat_time}}</text>
</view>
<text class="sj-order-remark line2" wx:if="{{item.beizhu}}">备注：{{item.beizhu}}</text>
</view>
</block>
</view>