zhangjing/cardtest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[订单拆分，周五福利添加配送方式]

Browse Source
This commit is contained in:
zhangjing
2021-06-03 15:41:05 +08:00
parent e4752f75b7
commit cf31e7c5d7
12 changed files with 331 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pages/order/order.wxml
View File

@@ -8,17 +8,21 @@
<!-- <view class="state-tips" wx:if="{{counts.init != 0}}">{{counts.init}}</view> -->
</view>
<view class="order-tab-item {{stateType == 'paid' ? 'active':''}}" data-state="paid" bindtap="orderTab">
待发货
{{orderType == 'welfare' || orderType == 'rights' ? '待发货' : '已支付'}}
<!-- <view class="state-tips" wx:if="{{counts.paid != 0}}">{{counts.paid}}</view> -->
</view>
<!-- <view class="order-tab-item {{stateType == 'delivered' ? 'active':''}}" data-state="delivered" bindtap="orderTab">
待签收
<view class="state-tips" wx:if="{{counts.paid != 0}}">{{counts.paid}}</view>
</view> -->
<view class="order-tab-item {{stateType == 'delivered' ? 'active':''}}" data-state="delivered" bindtap="orderTab">
<view class="order-tab-item {{stateType == 'delivered' ? 'active':''}}" data-state="delivered" bindtap="orderTab" wx:if="{{orderType == 'welfare' || orderType == 'rights'}}">
已发货
<!-- <view class="state-tips" wx:if="{{counts.send != 0}}">{{counts.send}}</view> -->
</view>
<view class="order-tab-item {{stateType == 'completed' ? 'active':''}}" data-state="completed" bindtap="orderTab" wx:else>
已完成
<!-- <view class="state-tips" wx:if="{{counts.send != 0}}">{{counts.send}}</view> -->
</view>
</view>
<!-- 列表 -->
@@ -29,29 +33,38 @@
</view> -->
<view class="uni-border-down order-store">
<view class="order-store-title nowrap">{{item.orderid}}</view>
<view class="order-store-stateText red" wx:if="{{item.state_text == '未支付'}}">{{item.state_text}}</view>
<view class="order-store-stateText green" wx:elif="{{item.state_text == '已支付'}}">{{item.state_text}}</view>
<view class="order-store-stateText" wx:else>{{item.state_text}}</view>
<view class="order-store-stateText red" wx:if="{{item.state_text == '未支付' || item.status_text == '未支付'}}">
{{item.state_text ||item.status_text}}
</view>
<view class="order-store-stateText green" wx:elif="{{item.state_text == '已支付' || item.status_text == '已支付'}}">
{{item.state_text || item.status_text}}
</view>
<view class="order-store-stateText" wx:else>{{item.state_text || item.status_text}}</view>
</view>
<view class="order-goods">
<image class="order-goods-cover" src="{{item.items.cover}}" mode="aspectFill"></image>
<image class="order-goods-cover" src="{{item.items.cover || item.source.right.cover}}" mode="aspectFill"></image>
<view class="order-goods-content">
<view class="order-goods-content-name nowrap">{{item.items.title}}</view>
<view class="orderVirtual {{item.items.type != 'virtual' ? '' : 'active'}}">
<view class="order-goods-content-name nowrap">{{item.items.title || item.source.right.title}}</view>
<view class="orderVirtual" wx:if="{{orderType == 'welfare' || orderType == 'welfareGoods'}}">
{{item.type_text}}
</view>
<view class="orderVirtual {{item.items.type != 'virtual' ? '' : 'active'}}" wx:else>
<block wx:if="{{item.items.type == 'virtual'}}">红包电子券</block>
<block wx:else>实物券</block>
</view>
<view class="order-goods-content-price nowrap">
<text>￥{{item.items.price}}</text> × {{item.items.qty}}
<text>￥{{item.items.price || item.source.welfare.price}}</text> × {{item.items.qty ? item.items.qty : '1'}}
</view>
</view>
</view>
<view class="uni-border-top order-btns">
<navigator class="order-btn" url="/pages/orderData/orderData?id={{item.orderid}}">订单详情</navigator>
<view class="order-btn" bindtap="orderDelete" data-id="{{item.orderid}}" wx:if="{{item.canCancel == true}}">
取消订单</view>
<view class="order-btn order-btn-back" bindtap="submitPay" data-id="{{item.orderid}}"
wx:if="{{item.canPay == true}}">立即支付</view>
<navigator class="order-btn" url="/pages/orderData/orderData?id={{item.orderid}}&orderType={{orderType}}">订单详情</navigator>
<view class="order-btn" bindtap="orderDelete" data-id="{{item.orderid}}" wx:if="{{item.canCancel == true || item.can.cancel == true}}">
取消订单
</view>
<view class="order-btn order-btn-back" bindtap="submitPay" data-id="{{item.orderid}}" wx:if="{{item.canPay == true || item.can.pay == true}}">
立即支付
</view>
<!-- <view class="order-btn order-btn-back" bindtap="" data-id="{{item.orderid}}" wx:if="{{item.canSign == true}}">待签收</view> -->
</view>
</view>
@@ -82,13 +95,13 @@
</view>
<radio class="radio" value="1" checked></radio>
</view>
<view class="payContList-label">
<!-- <view class="payContList-label">
<view class="payContList-label-name">
<image class="payContList-label-img" src="/static/img/wqb.jpg"></image>
沃钱包支付
</view>
<radio class="radio" value="2"></radio>
</view>
</view> -->
</radio-group>
<button class="payWayBtn" bindtap="orderPay">确认</button>
</view>