Commit 999b9cf4 by 高淑倩

del: 订单列表多余字段

parent 331fb87f
...@@ -12,125 +12,66 @@ ...@@ -12,125 +12,66 @@
{{item.name}} {{item.name}}
</view> </view>
</view> </view>
<view class="order-content"> <view class="order-content">
<block <block
wx:for="{{orderList}}" wx:for="{{orderList}}"
wx:for-item="item" wx:for-item="item"
wx:for-index="k" wx:for-index="k"
wx:key="{{k}}" wx:key="{{k}}"
>
<view class="order-list">
<view class="order-header">
<view class="order-number">
<text>订单号</text>
<text class="number">{{item.id}}</text>
</view>
<!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) 关闭 取消 新建 待付款 已支付 待发货 已发货 待收货 已完成 已收货 交易关闭 取消-->
<text class="order-status" wx-if="{{item.status == 'C'}}">交易关闭</text>
<text class="order-status" wx-if="{{item.status == 'N'}}">待付款</text>
<text class="order-status" wx-if="{{item.status == 'P'}}">待发货</text>
<text class="order-status" wx-if="{{item.status == 'D'}}">待收货</text>
<text class="order-status" wx-if="{{item.status == 'R'}}">已完成</text>
</view>
<view class="pro-list" data-detail="{{item}}" data-id="{{item.id}}" bindtap="handelDetail">
<scroll-view scroll-x="true">
<view class="uploadWrap" scroll-x="true">
<block wx:for='{{item.skuVOList}}' wx:for-item="sub" wx:key="s" >
<view class="upload_Item">
<image class="upload_Item_img" src="{{sub.mainImgUrl}}" bindtap='goProDetail' data-id='{{sub.goodsId}}'></image>
</view>
</block>
</view>
</scroll-view>
</view>
<view class="pro-number">
<text class="total-pro">共{{item.skuCount}}件商品</text>
<view class="total-price">
实付
<text class="price">¥{{item.payAmount}}</text>
</view>
</view>
<view class="btn-group">
<button class="btn btn-sm btn-primary btn-outline ">立即支付</button>
<button class="btn btn-sm btn-default ">查看物流</button>
<button class="btn btn-sm btn-default ">确认收货</button>
<button class="btn btn-sm btn-primary btn-outline ">再来一单</button>
<button class="btn btn-sm btn-default ">删除订单</button>
</view>
</view>
</block>
</view>
</view>
<view class="no-bottom">
<no-more wx:if="{{noMoreFlag}}"/>
</view>
<!--pages/order/order.wxml-->
<view class='page-order'>
<view class="swiper-tab">
<view
class="swiper-tab-item {{currentIndex == item.type ? 'active' : ''}}"
wx:for="{{swiperItem}}"
wx:key="{{index}}"
bindtap="switchTab"
data-type="{{item.type}}"
data-status="{{item.status}}"
> >
{{item.name}} <view class="order-list">
</view> <view class="order-header">
</view> <view class="order-number">
<view class="order-content"> <text>订单号</text>
<block <text class="number">{{item.id}}</text>
wx:for="{{orderList}}"
wx:for-item="item"
wx:for-index="k"
wx:key="{{k}}"
>
<view class="order-list">
<view class="order-header">
<view class="order-number">
<text>订单号</text>
<text class="number">{{item.id}}</text>
</view>
{{item.status}}
<!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) 关闭 取消 新建 待付款 已支付 待发货 已发货 待收货 已完成 已收货 交易关闭 取消-->
<text class="order-status" wx-if="{{item.status == 'C'}}">交易关闭</text>
<text class="order-status" wx-if="{{item.status == 'N'}}">待付款</text>
<text class="order-status" wx-if="{{item.status == 'P'}}">待发货</text>
<text class="order-status" wx-if="{{item.status == 'D'}}">待收货</text>
<text class="order-status" wx-if="{{item.status == 'R'}}">已完成</text>
</view>
<view class="pro-list" data-id="{{item.id}}" bindtap="handelDetail">
<scroll-view scroll-x="true">
<view class="uploadWrap" scroll-x="true">
<block wx:for='{{item.skuVOList}}' wx:for-item="sub" wx:key="s" >
<view class="upload_Item">
<image class="upload_Item_img" src="{{sub.mainImgUrl}}" bindtap='goProDetail' data-id='{{sub.goodsId}}'></image>
</view>
</block>
</view>
</scroll-view>
</view> </view>
<view class="pro-number"> <!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) 关闭 取消 新建 待付款 已支付 待发货 已发货 待收货 已完成 已收货 交易关闭 取消-->
<text class="total-pro">共{{item.skuCount}}件商品</text> <text class="order-status" wx-if="{{item.status == 'C'}}">交易关闭</text>
<view class="total-price"> <text class="order-status" wx-if="{{item.status == 'N'}}">待付款</text>
实付 <text class="order-status" wx-if="{{item.status == 'P'}}">待发货</text>
<text class="price">¥{{item.payAmount}}</text> <text class="order-status" wx-if="{{item.status == 'D'}}">待收货</text>
<text class="order-status" wx-if="{{item.status == 'R'}}">已完成</text>
</view>
<view
class="pro-list"
data-detail="{{item}}"
data-id="{{item.id}}"
bindtap="handelDetail"
>
<scroll-view scroll-x="true">
<view class="uploadWrap" scroll-x="true">
<block wx:for='{{item.skuVOList}}' wx:for-item="sub" wx:key="s">
<view class="upload_Item">
<image
class="upload_Item_img"
src="{{sub.mainImgUrl}}"
bindtap='goProDetail'
data-id='{{sub.goodsId}}'
/>
</view>
</block>
</view> </view>
</view> </scroll-view>
<view class="btn-group"> </view>
<button class="btn btn-sm btn-primary btn-outline ">立即支付</button> <view class="pro-number">
<button class="btn btn-sm btn-default ">查看物流</button> <text class="total-pro">共{{item.skuCount}}件商品</text>
<button class="btn btn-sm btn-default ">确认收货</button> <view class="total-price">
<button class="btn btn-sm btn-primary btn-outline ">再来一单</button> 实付
<button class="btn btn-sm btn-default ">删除订单</button> <text class="price">¥{{item.payAmount}}</text>
</view> </view>
</view> </view>
</block> <view class="btn-group">
</view> <button class="btn btn-sm btn-primary btn-outline ">立即支付</button>
<button class="btn btn-sm btn-default ">查看物流</button>
<button class="btn btn-sm btn-default ">确认收货</button>
<button class="btn btn-sm btn-primary btn-outline ">再来一单</button>
<button class="btn btn-sm btn-default ">删除订单</button>
</view>
</view>
</block>
</view>
</view> </view>
<view class="no-bottom"> <view class="no-bottom">
<no-more wx:if="{{noMoreFlag}}"/> <no-more wx:if="{{noMoreFlag}}" />
</view> </view>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment