Skip to content

7
7-Eleven
Commit 77cedff3 by 赵雅纹
Options

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

parents 29dda26e d442da71
Showing with 220 additions and 20 deletions
src/pages/cart/cart.js
......@@ -214,7 +214,7 @@ wxService.page({
cartListData.filter(item => { // 选中的商品信息
return item.checked
}).map(item => {
skuIds.push(item.skuId)
skuIds.push(item.skuId -0)
})
if (skuIds.length == 0) {
wx.showToast({
......@@ -223,10 +223,14 @@ wxService.page({
})
return false
}
// 去下单页
// 去下单页 && 参数
// let parmas = {
// specId: skuIds.join(',')
// }
// wxService
// .router('/subPackage/home/pages/orderInit/orderInit')
// .router('/pages/confirmOrder/confirmOrder')
// .search(parmas)
// 直接调支付
this.handleGoBuy(skuIds)
},
handleGoBuy(parmas) {
......@@ -234,11 +238,13 @@ wxService.page({
wx.showLoading({
title: '加载中'
})
// 获取支付参数
wxService.post(`/sale/trade/buyer/create`,parmas).then(res => {
if (!res) return false;
const { result, data } = res && res.data || res && res.result
if (result == 0) {
delete data.appId
console.log('data', data)
wx.requestPayment(Object.assign({
success(res) {
wx.hideLoading()
......
src/pages/confirmOrder/confirmOrder.js
// pages/confirmOrder/confirmOrder.js
Page({
const wxService = require('../../utils/wxService')
wxService.page({
/**
* 页面的初始数据
*/
data: {
addressInfo: '',
showSelectCoupon: false
showSelectCoupon: false,
skuIds: []
},
/**
......@@ -15,16 +17,29 @@ Page({
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
let skuIds = []
skuIds.push(this.options.specId)
// 计算优惠价
if(skuIds){this.calPreferentialPrice(skuIds)}
},
calPreferentialPrice(skuIds) {
wx.showLoading({
title: '加载中'
})
wxService.post(`/sale/trade/buyer/preview`,skuIds).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
console.log('data', data)
}
}
})
},
//获取微信地址
chooseWxAddress() {
wx.chooseAddress({
......
src/pages/order/order.js
......@@ -45,7 +45,8 @@ wxService.page({
totalPages: 0,
subImgs: [],
trade: '', // 订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货)
no_data: true
no_data: true,
currentTradeId: ''
},
/**
......@@ -108,6 +109,7 @@ wxService.page({
// 立即支付
handelToPay(e) {
const { id } = e.currentTarget.dataset
console.log('0000', id)
wx.showLoading({
title: '加载中',
mask: true
......@@ -149,11 +151,29 @@ wxService.page({
}
})
},
// 查看详情
handelCheckRfDetail(e){
const { id } = e.currentTarget.dataset
},
// 退货寄回
handelCheckRfSend(e){
const { id } = e.currentTarget.dataset
},
// 取消退款
handelCancelRefund(e){
const { id } = e.currentTarget.dataset
},
// 订单详情
handelDetail(e) {
// const {detail} = e.currentTarget.dataset
const { id } = e.currentTarget.dataset
wxService.router(`/pages/orderDetail/orderDetail?id=${id}`)
},
// 退单详情
handelDetailRf(e) {
const { id } = e.currentTarget.dataset
wxService.router(`/pages/refundDetail/refundDetail?id=${id}`)
},
//点击切换tab
switchTab(e) {
const { type, status } = e.currentTarget.dataset
......@@ -213,15 +233,61 @@ wxService.page({
orderList: this.data.pageNo == 1 ? [...data] : [...this.data.orderList, ...data],
noMoreFlag: data.length < pageSize ? true : false
},()=>{
// this.data.orderList.forEach(item =>{
// console.log('item', item)
// // 退单列表
// if(item.tradeId){
// console.log('item.tradeId', item.tradeId)
// let currentTradeId = item.tradeId
// this.setData({
// currentTradeId
// },()=>{
// this.refundDetail()
// })
// }
// })
this.setData({
no_data: this.data.orderList.length ? true : false
})
})
}
}
})
},
// 退单详情
// refundDetail(){
// console.log('tradeId', this.data.currentTradeId)
// wx.showLoading({
// title: '加载中',
// mask: true
// })
// wxService.get(`/sale/trade/buyer/${this.data.currentTradeId}`).then(res => {
// if (res) {
// const { result, data } = res.data
// if (result == 0) {
// wx.hideLoading()
// console.log('daya', data, [...this.data.orderList, ...data])
// console.log('this.data.orderList', this.data.orderList)
// this.data.orderList.forEach(item =>{
// console.log('item.tradeId == data.id', item.tradeId,data.id)
// if(item.tradeId == data.id){
// console.log('...item, ...data',item, data)
// this.setData({
// orderList: [...item, ...data]
// },()=>{
// console.log('orderList', this.data.orderList)
// })
// }
// })
// }
// }
// })
// },
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
......
src/pages/order/order.wxml
......@@ -26,12 +26,54 @@
<text class="number">{{item.id}}</text>
</view>
<!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) 关闭 取消 新建 待付款 已支付 待发货 已发货 待收货 已完成 已收货 交易关闭 取消-->
<!--退单状态(C:取消;N:新建,A:已审核;R:退货已发R货;D:退货已收货)-->
<view wx:if="{{currentIndex == 5}}">
<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 == 'A'}}">待寄回</text>
<text class="order-status" wx-if="{{item.status == 'R'}}">退货中</text>
<text class="order-status" wx-if="{{item.status == 'D'}}">退款成功</text>
</view>
<view wx:else>
<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>
<!-- 类型 -->
<view wx:if="{{currentIndex == 5}}">
<view
class="pro-list"
data-detail="{{item}}"
data-id="{{item.id}}"
bindtap="handelDetailRf"
>
<scroll-view scroll-x="true">
<view class="uploadWrap" scroll-x="true">
<block wx:for='{{item.tradeVO.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>
</scroll-view>
</view>
<view class="pro-number">
<text class="total-pro">共{{item.count}}件商品</text>
<view class="total-price">
实付
<text class="price">￥{{item.amount}}</text>
</view>
</view>
</view>
<view wx:else>
<view
class="pro-list"
data-detail="{{item}}"
......@@ -60,6 +102,31 @@
<text class="price">￥{{item.payAmount}}</text>
</view>
</view>
</view>
<view wx:if="{{currentIndex == 5}}">
<view class="btn-group">
<!--退单状态(C:取消;N:新建,A:已审核;R:退货已发R货;D:退货已收货)-->
<view class="order-status-rf" wx-if="{{item.status == 'C'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
</view>
<view class="order-status-rf" wx-if="{{item.status == 'N'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfSend">退货寄回</button>
<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelCancelRefund">取消退款</button>
</view>
<view class="order-status-rf" wx-if="{{item.status == 'A'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
</view>
<view class="order-status-rf" wx-if="{{item.status == 'R'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
</view>
<view class="order-status-rf" wx-if="{{item.status == 'D'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
</view>
</view>
</view>
<view wx:else>
<view class="btn-group">
<view class="order-status" wx-if="{{item.status == 'C'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelDelOrder">删除订单</button>
......@@ -72,12 +139,13 @@
</view>
<view class="order-status" wx-if="{{item.status == 'D'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}">查看物流</button>
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelConfirmReceipt">确认收货</button>
<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelConfirmReceipt">确认收货</button>
</view>
<view class="order-status" wx-if="{{item.status == 'R'}}" />
<!--<button class="btn btn-sm btn-primary btn-outline ">再来一单</button>-->
</view>
</view>
</view>
</block>
<view class="no-bottom">
<no-more wx:if="{{noMoreFlag}}" />
......
src/pages/order/order.wxss
......@@ -55,6 +55,9 @@ scroll-view{
font-size: 26rpx;
color: #333333;
}
.order-status-rf {
display: flex;
}
.pro-list{
margin-top: 16rpx;
}
......
src/pages/orderDetail/orderDetail.js
......@@ -10,7 +10,8 @@ wxService.page({
* 页面的初始数据
*/
data: {
detail: null
detail: null,
id: ''
},
/**
......@@ -29,7 +30,11 @@ wxService.page({
// /trade/buyer/{id} 订单详情
console.log('id', id)
if(id) {
this.setData({
id
},()=>{
this.getOrderDetail(id)
})
}
// this.setData({
// detail: currentDetail[0]
......@@ -62,8 +67,10 @@ wxService.page({
handelCancelOrder() { console.log('取消订单') },
// 申请退款
handelRequestRefund(e) {
console.log('----', e)
const { id } = e.currentTarget.dataset
const { detail } = e.currentTarget.dataset
detail.id = this.data.id
let params = JSON.stringify(detail)
// 退款申请
wxService.router(`/pages/refund/refund`).search({params})
......
src/pages/orderDetail/orderDetail.wxml
......@@ -110,10 +110,10 @@
</view>
<view class="button-wrap" wx-if="{{detail.status == 'D'}}">
<button class="btn btn-primary btn-lg" data-id="{{detail.id}}" data-detail="{{detail}}" bindtap="handelRequestRefund">申请退款</button>
<button class="btn btn-lg btn-gray" data-id="{{detail.id}}" bindtap="handelCancelOrder">确认收货</button>
<button class="btn btn-lg btn-gray" data-id="{{detail.id}}" bindtap="handelConfirmReceipt">确认收货</button>
</view>
<view class="button-wrap" wx-if="{{detail.status == 'R'}}">
<button class="btn btn-lg btn-gray" data-id="{{detail.id}}" data-detail="{{detail}}" bindtap="handelConfirmReceipt">申请退款</button>
<button class="btn btn-lg btn-gray" data-id="{{detail.id}}" data-detail="{{detail}}" bindtap="handelRequestRefund">申请退款</button>
</view>
</view>
src/pages/refund/refund.js
......@@ -80,6 +80,7 @@ wxService.page({
}
})
console.log('refundCreateDto', refundCreateDto)
this.handelRequestRefund(refundCreateDto)
......@@ -95,7 +96,15 @@ wxService.page({
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
wx.showToast({
title: '申请退款成功',
icon: 'none'
});
// 订单列表
setTimeout(() => {
// wxService.router(`/pages/order/order`).search({params})
wxService.router(`/pages/order/order`)
}, 2000)
}
}
})
......@@ -258,7 +267,8 @@ wxService.page({
})
this.setData({
cartList: detail.skuVOList,
refundAmount: detail.payAmount
refundAmount: detail.payAmount,
'refundCreateDto.tradeId': detail.id
})
},
......
src/pages/refundDetail/refundDetail.js
......@@ -5,7 +5,8 @@ Page({
* 页面的初始数据
*/
data: {
showApplyRefundModal:false
showApplyRefundModal:false,
id:''
},
/**
......@@ -19,9 +20,33 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { id } = this.options
console.log('id', id)
if(id) {
this.setData({
id
},()=>{
this.getRfDetail(id)
})
}
},
getRfDetail(id) {
// wx.showLoading({
// title: '加载中',
// mask: true
// })
// wxService.get(`/sale/trade/buyer/${id}`).then(res => {
// if (res) {
// const { result, data } = res.data
// if (result == 0) {
// wx.hideLoading()
// this.setData({
// detail: data
// })
// }
// }
// })
},
copy(e){
wx.setClipboardData({
//准备复制的数据
......
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