Skip to content

7
7-Eleven
Commit 27bc66e2 by 赵雅纹
Options

Merge branch 'dev_7.1.0' into feature-zyw-sc

parents fc615389 999b9cf4
Showing with 59 additions and 158 deletions
src/pages/order/order.wxml
......@@ -12,125 +12,66 @@
{{item.name}}
</view>
</view>
<view class="order-content">
<block
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>
<!--订单状态(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}}"
<view class="order-content">
<block
wx:for="{{orderList}}"
wx:for-item="item"
wx:for-index="k"
wx:key="{{k}}"
>
{{item.name}}
</view>
</view>
<view class="order-content">
<block
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 class="order-list">
<view class="order-header">
<view class="order-number">
<text>订单号</text>
<text class="number">{{item.id}}</text>
</view>
<view class="pro-number">
<text class="total-pro">共{{item.skuCount}}件商品</text>
<view class="total-price">
实付
<text class="price">￥{{item.payAmount}}</text>
<!--订单状态(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}}'
/>
</view>
</block>
</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>
</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>
</block>
</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}}"/>
<no-more wx:if="{{noMoreFlag}}" />
</view>
src/pages/orderDetail/orderDetail.js
......@@ -10,46 +10,7 @@ wxService.page({
* 页面的初始数据
*/
data: {
// detail: null,
detail:
{
"id": "613402110104571904",
"memberId": "598887367880871936",
"status": "N",
"skuVOList": [
{
"productId": "1556108606443006",
"productCode": "test001",
"productName": "test001",
"skuId": "1556108807316001",
"skuCode": "test001-4",
"skuSpec": "颜色：白，尺寸：xl",
"count": 3919,
"price": 0.03,
"discount": 0,
"mainImgUrl": "http://testimg3.bigaka.com/group3/M00/00/17/Cv6CBF1Z9TKAU6T1AAAG8CvHO2o415.png",
"amount": 117.57
},
{
"productId": "1556108606443006",
"productCode": "test001",
"productName": "test001",
"skuId": "1556108807316000",
"skuCode": "test001-3",
"skuSpec": "颜色：红，尺寸：xl",
"count": 420,
"price": 0.02,
"discount": 0,
"mainImgUrl": "http://testimg3.bigaka.com/group3/M00/00/17/Cv6CBF1Z9TKAU6T1AAAG8CvHO2o415.png",
"amount": 8.4
}
],
"createTime": "2019-08-20 16:00:59",
"discount": 0,
"freightMoney": 0,
"payAmount": 125.97,
"skuCount": 4339
}
detail: null
},
/**
......@@ -66,11 +27,10 @@ wxService.page({
let detailOrderList = wx.getStorageSync('orderList')
let currentDetail = detailOrderList.filter(item => item.id == id)
console.log("currentDetail", currentDetail)
// if (!Object.keys(this.options).length){ return }
// this.setData({
// detail: this.options
// })
this.setData({
detail: currentDetail[0]
})
},
copy(e) {
wx.setClipboardData({
......
src/pages/orderDetail/orderDetail.wxml
......@@ -46,7 +46,7 @@
</view>
<view class="pro-wrap">
<block wx:for="{{detail.skuVOList}}" wx:key="{{item}}">
<block wx:for="{{detail.skuVOList}}" wx:for-item="item" wx:key="">
<view class="pro-list">
<image class="pro-img" src="{{item.mainImgUrl}}"></image>
<view class="pro-info">
......
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