Skip to content

7
7-Eleven
Commit d999c866 by 赵雅纹
Options

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

parents df093130 bd97eefd
Showing with 148 additions and 126 deletions
src/pages/order/order.js
...@@ -60,6 +60,10 @@ wxService.page({ ...@@ -60,6 +60,10 @@ wxService.page({
onShow: function () { onShow: function () {
this.initOrderList(this.data.pageNo, this.data.pageSize, this.data.trade) this.initOrderList(this.data.pageNo, this.data.pageSize, this.data.trade)
}, },
// 确认收货
handelConfirmReceipt() {
},
handelDetail(e) { handelDetail(e) {
// const {detail} = e.currentTarget.dataset // const {detail} = e.currentTarget.dataset
const { id } = e.currentTarget.dataset const { id } = e.currentTarget.dataset
......
src/pages/order/order.wxml
...@@ -61,11 +61,20 @@ ...@@ -61,11 +61,20 @@
</view> </view>
</view> </view>
<view class="btn-group"> <view class="btn-group">
<button class="btn btn-sm btn-primary btn-outline ">立即支付</button> <text class="order-status" wx-if="{{item.status == 'C'}}">
<button class="btn btn-sm btn-default ">查看物流</button> <button class="btn btn-sm btn-default">删除订单</button></text>
<button class="btn btn-sm btn-default ">确认收货</button> <text class="order-status" wx-if="{{item.status == 'N'}}">
<button class="btn btn-sm btn-primary btn-outline ">再来一单</button> <button class="btn btn-sm btn-primary btn-outline">立即支付</button>
<button class="btn btn-sm btn-default ">删除订单</button> </text>
<text class="order-status" wx-if="{{item.status == 'P'}}">
<button class="btn btn-sm btn-default">查看物流</button>
</text>
<text class="order-status" wx-if="{{item.status == 'D'}}">
<button class="btn btn-sm btn-default">查看物流</button>
</text>
<button class="btn btn-sm btn-default" bindtap="handelConfirmReceipt">确认收货</button>
<text class="order-status" wx-if="{{item.status == 'R'}}"/>
<!--<button class="btn btn-sm btn-primary btn-outline ">再来一单</button>-->
</view> </view>
</view> </view>
</block> </block>
......
src/pages/orderDetail/orderDetail.js
...@@ -23,7 +23,7 @@ wxService.page({ ...@@ -23,7 +23,7 @@ wxService.page({
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
const {id} = this.options const { id } = this.options
let detailOrderList = wx.getStorageSync('orderList') let detailOrderList = wx.getStorageSync('orderList')
let currentDetail = detailOrderList.filter(item => item.id == id) let currentDetail = detailOrderList.filter(item => item.id == id)
...@@ -32,6 +32,18 @@ wxService.page({ ...@@ -32,6 +32,18 @@ wxService.page({
detail: currentDetail[0] detail: currentDetail[0]
}) })
}, },
// 删除订单
handelDelOrder() {
console.log('删除订单')
},
// 立即支付
handelToPay() { console.log('立即支付') },
// 取消订单
handelCancelOrder() { console.log('取消订单') },
// 申请退款
handelRequestRefund() { console.log('申请退款') },
// 确认收货
handelConfirmReceipt() { console.log('确认收货') },
copy(e) { copy(e) {
wx.setClipboardData({ wx.setClipboardData({
//准备复制的数据 //准备复制的数据
......
src/pages/orderDetail/orderDetail.wxml
<view class="page-order-detail"> <view class="page-order-detail">
<view class="header-wrap" style="background-image:url('/assets/imgs/7_1_0/rf_bgc.jpg')"> <view class="header-wrap" style="background-image:url('/assets/imgs/7_1_0/rf_bgc.jpg')">
<view class="refund-status"> <view class="refund-status">
<view class="look-logistics"> <view class="look-logistics">
<navigator url="/pages/logistics/logistics" hover-class="none"> <navigator url="/pages/logistics/logistics" hover-class="none">
<button class="btn btn-primary btn-outline">查看物流</button> <button class="btn btn-primary btn-outline">查看物流</button>
</navigator> </navigator>
</view> </view>
<!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) --> <!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) -->
<view class="order-status" wx-if="{{detail.status == 'C'}}"> <view class="order-status" wx-if="{{detail.status == 'C'}}">
<view class="status">交易关闭</view> <view class="status">交易关闭</view>
<view class="desc">订单已关闭： 支付超时</view> <view class="desc">订单已关闭： 支付超时</view>
</view> </view>
<view class="order-status" wx-if="{{detail.status == 'N'}}"> <view class="order-status" wx-if="{{detail.status == 'N'}}">
<view class="status">待付款</view> <view class="status">待付款</view>
<view class="desc">支付时间仅剩：2小时34分钟，超时将自动关闭</view> <view class="desc">支付时间仅剩：2小时34分钟，超时将自动关闭</view>
</view> </view>
<view class="order-status" wx-if="{{detail.status == 'P'}}"> <view class="order-status" wx-if="{{detail.status == 'P'}}">
<view class="status">待发货</view> <view class="status">待发货</view>
<view class="desc">商家安排发货中，请稍后</view> <view class="desc">商家安排发货中，请稍后</view>
</view> </view>
<view class="order-status" wx-if="{{detail.status == 'D'}}"> <view class="order-status" wx-if="{{detail.status == 'D'}}">
<view class="status">已发货</view> <view class="status">已发货</view>
<view class="desc">顺丰快递： 10086543434</view> <view class="desc">顺丰快递： 10086543434</view>
</view> </view>
<view class="order-status" wx-if="{{detail.status == 'R'}}"> <view class="order-status" wx-if="{{detail.status == 'R'}}">
<view class="status">已完成</view> <view class="status">已完成</view>
<view class="desc">顺丰快递： 10086543434</view> <view class="desc">顺丰快递： 10086543434</view>
</view> </view>
</view> </view>
</view> </view>
<view class="address-info"> <view class="address-info">
<view class="address-name"> <view class="address-name">
<text>用户名称</text> <text>用户名称</text>
<text class="user-phone">83832578475</text> <text class="user-phone">83832578475</text>
</view> </view>
<view class="address-detail"> <view class="address-detail">
上海市浦东新区碧波路690号 上海市浦东新区碧波路690号
</view> </view>
<view class="edit-address"> <view class="edit-address">
<navigator url="/pages/addAddress/addAddress?id=1" hover-class="none"> <navigator url="/pages/addAddress/addAddress?id=1" hover-class="none">
<button class="btn btn-default btn-sm">修改地址</button> <button class="btn btn-default btn-sm">修改地址</button>
</navigator> </navigator>
</view> </view>
</view> </view>
<view class="pro-wrap"> <view class="pro-wrap">
<block wx:for="{{detail.skuVOList}}" wx:for-item="item" wx:key=""> <block wx:for="{{detail.skuVOList}}" wx:for-item="item" wx:key="">
<view class="pro-list"> <view class="pro-list">
<image class="pro-img" src="{{item.mainImgUrl}}"></image> <image class="pro-img" src="{{item.mainImgUrl}}" />
<view class="pro-info"> <view class="pro-info">
<view class="pro-name">{{item.productName}}</view> <view class="pro-name">{{item.productName}}</view>
<view class="pro-desc"> <view class="pro-desc">
规格 {{item.skuSpec}} 规格 {{item.skuSpec}}
</view> </view>
<view class="pro-price"> <view class="pro-price">
<text class="price">￥{{item.price}}</text> <text class="price">￥{{item.price}}</text>
<text class="number">x {{item.count}}</text> <text class="number">x {{item.count}}</text>
</view> </view>
</view> </view>
</view> </view>
</block> </block>
</view> </view>
<view class="order-detail-info"> <view class="order-detail-info">
<view class="order-pro-info"> <view class="order-pro-info">
<view class="order-pro-list"> <view class="order-pro-list">
<text>商品合计</text> <text>商品合计</text>
<text>￥{{detail.payAmount}}</text> <text>￥{{detail.payAmount}}</text>
</view> </view>
<view class="order-pro-list"> <view class="order-pro-list">
<text>运费</text> <text>运费</text>
<text>￥{{detail.freightMoney}}</text> <text>￥{{detail.freightMoney}}</text>
</view> </view>
<view class="order-pro-list"> <view class="order-pro-list">
<text>活动折扣</text> <text>活动折扣</text>
<text>￥{{detail.payAmount}}</text> <text>￥{{detail.payAmount}}</text>
</view> </view>
<view class="order-pro-list"> <view class="order-pro-list">
<text>优惠券优惠</text> <text>优惠券优惠</text>
<text>￥{{detail.discount}}</text> <text>￥{{detail.discount}}</text>
</view> </view>
<view class="order-pro-list"> <view class="order-pro-list">
<text class="pay-amount">实付金额</text> <text class="pay-amount">实付金额</text>
<text class="order-price">￥{{detail.payAmount}}</text> <text class="order-price">￥{{detail.payAmount}}</text>
</view> </view>
</view> </view>
<view class="order-number-info"> <view class="order-number-info">
<view class="order-number-item"> <view class="order-number-item">
<text class="order-number-label">订单编号</text> <text class="order-number-label">订单编号</text>
<text class="order-number-desc">{{detail.id}}</text> <text class="order-number-desc">{{detail.id}}</text>
<view class="copy" bindtap="copy" data-content="{{detail.id}}">复制</view> <view class="copy" bindtap="copy" data-content="{{detail.id}}">复制</view>
</view> </view>
<view class="order-time"> <view class="order-time">
<text class="order-number-label">创建时间</text> <text class="order-number-label">创建时间</text>
<text class="order-number-desc">{{detail.createTime}}</text> <text class="order-number-desc">{{detail.createTime}}</text>
</view> </view>
</view> </view>
</view> </view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="button-wrap" wx-if="{{detail.status == 'C'}}"> <view class="button-wrap" wx-if="{{detail.status == 'C'}}">
<button class="btn btn-primary btn-lg">删除订单</button> <button class="btn btn-primary btn-lg" bindtap="handelDelOrder">删除订单</button>
</view> </view>
<view class="button-wrap" wx-if="{{detail.status == 'N'}}"> <view class="button-wrap" wx-if="{{detail.status == 'N'}}">
<button class="btn btn-primary btn-lg">立即支付</button> <button class="btn btn-primary btn-lg" bindtap="handelToPay">立即支付</button>
<button class="btn btn-lg btn-gray">取消订单</button> <button class="btn btn-lg btn-gray" bindtap="handelCancelOrder">取消订单</button>
</view> </view>
<view class="button-wrap" wx-if="{{detail.status == 'P'}}"> <view class="button-wrap" wx-if="{{detail.status == 'P'}}">
<button class="btn btn-lg btn-gray">申请退款</button> <button class="btn btn-lg btn-gray" bindtap="handelRequestRefund">申请退款</button>
</view> </view>
<view class="button-wrap" wx-if="{{detail.status == 'D'}}"> <view class="button-wrap" wx-if="{{detail.status == 'D'}}">
<button class="btn btn-primary btn-lg">申请退款</button> <button class="btn btn-primary btn-lg" bindtap="handelRequestRefund">申请退款</button>
<button class="btn btn-lg btn-gray">确认收货</button> <button class="btn btn-lg btn-gray" bindtap="handelCancelOrder">确认收货</button>
</view> </view>
<view class="button-wrap" wx-if="{{detail.status == 'R'}}"> <view class="button-wrap" wx-if="{{detail.status == 'R'}}">
<button class="btn btn-lg btn-gray">申请退款</button> <button class="btn btn-lg btn-gray" bindtap="handelConfirmReceipt">申请退款</button>
</view> </view>
</view> </view>
src/project.config.json
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 36, "current": 25,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -203,10 +203,10 @@ ...@@ -203,10 +203,10 @@
"scene": null "scene": null
}, },
{ {
"id": -1, "id": 25,
"name": "订单详情", "name": "订单详情",
"pathName": "pages/orderDetail/orderDetail", "pathName": "pages/orderDetail/orderDetail",
"query": "", "query": "id=613402110104571904",
"scene": null "scene": null
}, },
{ {
......
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