Skip to content

Z
zhqg-mini
Commit 0d606b97 by wangyalan-git
Options

订单流转中心修改/提现修改

parent 40529336
Showing with 1423 additions and 91 deletions
app.json
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"pages/orderList/orderList", "pages/orderList/orderList",
"pages/order-detail/order-detail", "pages/order-detail/order-detail",
"pages/submit-order/submit-order", "pages/submit-order/submit-order",
"pages/buyAgain/buyAgain",
"pages/binding-phone/binding-phone", "pages/binding-phone/binding-phone",
"pages/express-delivery/express-delivery", "pages/express-delivery/express-delivery",
"pages/pay-result/pay-result", "pages/pay-result/pay-result",
......
pages/buyAgain/buyAgain.js 0 → 100644
// pages/submit-order/submit-order.js
var http = require("../../utils/http.js");
var app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
popupShow: false,
couponSts: 1,
couponList: [],
orderNumber: '',
userAddr: null,
orderItems: [],
coupon: {
totalLength: 0,
canUseCoupons: [],
noCanUseCoupons: []
},
actualTotal: 0,
total: 0,
totalCount: 0,
transfee: 0,
reduceAmount: 0,
remark: "",
couponIds: [],
payType: 1,
balance: 0,
disabledBalance: false
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
orderNumber: options.orderNumber
})
this.getUserAccount()
},
getUserAccount: function () {
var params = {
url: "/p/user/userAccount",
method: "GET",
data: {},
callBack: res => {
this.setData({
balance: res.result.amount
})
console.log("res", res, this)
}
};
http.request(params);
},
//加载订单数据
loadOrderData: function () {
var addrId = 0;
if (this.data.userAddr != null) {
addrId = this.data.userAddr.addrId;
}
wx.showLoading({
mask: true
});
var params = {
url: "/p/order/queryChangeOrderDetail?orderNumber="+this.data.orderNumber,
method: "POST",
data: {
orderNumber:this.data.orderNumber
},
callBack: res => {
wx.hideLoading();
let result = res.result;
// res.shopCartOrders[0].shopCartItemDiscounts.forEach(itemDiscount => {
// orderItems = orderItems.concat(itemDiscount.shopCartItems)
// })
// if (res.shopCartOrders[0].coupons) {
// let canUseCoupons = []
// let unCanUseCoupons = []
// res.shopCartOrders[0].coupons.forEach(coupon => {
// if (coupon.canUse) {
// canUseCoupons.push(coupon)
// } else {
// unCanUseCoupons.push(coupon)
// }
// })
// this.setData({
// coupons: {
// totalLength: res.shopCartOrders[0].coupons.length,
// canUseCoupons: canUseCoupons,
// unCanUseCoupons: unCanUseCoupons
// }
// })
// }
this.setData({
orderItems: result.orderItemList,
actualTotal: result.actualTotal,
total: result.total,
// totalCount: result.totalCount,
userAddr: result.userAddrDto,
// transfee: result.shopCartOrders[0].transfee,
// shopReduce: result.shopCartOrders[0].shopReduce,
disabledBalance: this.data.balance < result.actualTotal ? true : false
});
},
errCallBack: res => {
wx.hideLoading();
this.chooseCouponErrHandle(res)
}
};
http.request(params);
},
payTypeChange(e) {
console.log(e.detail.value)
this.setData({
payType: e.detail.value
})
},
/**
* 优e.detail.value惠券选择出错处理方法
*/
chooseCouponErrHandle(res) {
// 优惠券不能共用处理方法
if (res.statusCode == 601) {
wx.showToast({
title: res.data,
icon: "none",
duration: 3000,
success: res => {
this.setData({
couponIds: []
})
}
})
setTimeout(() => {
this.loadOrderData();
}, 2500)
}
},
/**
* 提交订单
*/
toPay: function () {
if (!this.data.userAddr) {
wx.showToast({
title: '请选择地址',
icon: "none"
})
return;
}
this.submitOrder();
},
submitOrder: function () {
wx.showLoading({
mask: true
});
var params = {
url: "/p/order/generateChangeOrder",
method: "POST",
data: {
addrId: this.data.userAddr.addrId,
payType: this.data.payType,
relationOrderNumber: this.data.orderNumber,
userId: app.globalData.userInfo.userId
},
callBack: res => {
wx.hideLoading();
if (this.data.payType == 1) {
this.calWeixinPay(res.result.orderNumber);
} else if (this.data.payType == 3) {
this.balancePay(res.result.orderNumber)
} else {
wx.showToast({
title: '暂无此支付方式',
icon: "none"
})
}
}
};
http.request(params);
},
/**
* 唤起微信支付
*/
calWeixinPay: function (orderNumbers) {
wx.showLoading({
mask: true
});
var params = {
url: "/p/order/pay",
method: "POST",
data: {
payType: 1,
orderNumbers: orderNumbers
},
callBack: function (res) {
wx.hideLoading();
wx.requestPayment({
timeStamp: res.timeStamp,
nonceStr: res.nonceStr,
package: res.packageValue,
signType: res.signType,
paySign: res.paySign,
success: e => {
// console.log("支付成功");
wx.navigateTo({
url: '/pages/pay-result/pay-result?sts=1&orderNumbers=' + orderNumbers + "&orderType=" + this.data.orderType,
})
},
fail: err => {
wx.navigateTo({
url: '/pages/pay-result/pay-result?sts=0&orderNumbers=' + orderNumbers + "&orderType=" + this.data.orderType,
})
}
})
}
};
http.request(params);
},
/**
* 余额支付
*/
balancePay: function (orderNumbers) {
wx.showLoading({
mask: true
});
var params = {
url: "/p/order/balancePay",
method: "POST",
data: {
payType: 3,
orderNumbers: orderNumbers
},
callBack: function (res) {
wx.hideLoading();
// console.log("支付成功");
wx.navigateTo({
url: '/pages/pay-result/pay-result?sts=1&orderNumbers=' + orderNumbers + "&orderType=" + this.data.orderType,
})
},
errCallBack: function () {
wx.navigateTo({
url: '/pages/pay-result/pay-result?sts=0&orderNumbers=' + orderNumbers + "&orderType=" + this.data.orderType,
})
}
};
http.request(params);
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
var pages = getCurrentPages();
var currPage = pages[pages.length - 1];
if (currPage.data.selAddress == "yes") {
this.setData({ //将携带的参数赋值
userAddr: currPage.data.item
});
}
//获取订单数据
this.loadOrderData();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
changeCouponSts: function (e) {
this.setData({
couponSts: e.currentTarget.dataset.sts
});
},
showCouponPopup: function () {
this.setData({
popupShow: true
});
},
closePopup: function () {
this.setData({
popupShow: false
});
},
/**
* 去地址页面
*/
toAddrListPage: function () {
wx.navigateTo({
url: '/pages/delivery-address/delivery-address?order=0',
})
},
/**
* 确定选择好的优惠券
*/
choosedCoupon: function () {
this.loadOrderData();
this.setData({
popupShow: false
});
},
/**
* 优惠券子组件发过来
*/
checkCoupon: function (e) {
var ths = this;
let index = ths.data.couponIds.indexOf(e.detail.couponId);
if (index === -1) {
ths.data.couponIds.push(e.detail.couponId)
} else {
ths.data.couponIds.splice(index, 1)
}
}
})
\ No newline at end of file
pages/buyAgain/buyAgain.json 0 → 100644
{
"usingComponents": {
"coupon":"/components/coupon/coupon"
},
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "提交订单",
"navigationBarTextStyle": "black"
}
\ No newline at end of file
pages/buyAgain/buyAgain.wxml 0 → 100644
<!--pages/submit-order/submit-order.wxml-->
<view class='container'>
<view class='submit-order'>
<!-- 收货地址 -->
<view class='delivery-addr ' bindtap='toAddrListPage'>
<view class='addr-bg ' wx:if="{{!userAddr}}">
<view class='add-addr'>
<view class='plus-sign-img'>
<image src='../../images/icon/plus-sign.png'></image>
</view>
<text>新增收货地址</text>
</view>
<view class='arrow empty'></view>
</view>
<view class='addr-bg whole' wx:if="{{userAddr}}">
<view class='addr-icon'>
<image src='../../images/icon/addr.png'></image>
</view>
<view class='user-info'>
<text class='item'>{{userAddr.receiver}}</text>
<text class='item'>{{userAddr.mobile}}</text>
</view>
<view class='addr'>{{userAddr.province}}{{userAddr.city}}{{userAddr.area}}{{userAddr.addr}}</view>
<view class='arrow'></view>
</view>
</view>
<!-- 商品详情 -->
<view class='prod-item'>
<block wx:for="{{orderItems}}" wx:key=''>
<view class='item-cont' bindtap='toOrderDetailPage' data-ordernum="{{item.primaryOrderNo}}">
<view class='prod-pic'>
<image src='{{item.pic}}'></image>
</view>
<view class='prod-info'>
<view class='prodname'>
{{item.prodName}}
</view>
<view class='prod-info-cont'>{{item.skuName}}</view>
<view class='price-nums'>
<text class='prodprice'><text class='symbol'>￥</text>
<text class='big-num'>{{wxs.parsePrice(item.price)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(item.price)[1]}}</text></text>
<text class="prodcount">x{{item.prodCount}}</text>
</view>
</view>
</view>
</block>
<!-- <view class='item-cont' bindtap='toOrderDetailPage' data-ordernum="{{item.primaryOrderNo}}">
<view class='prod-pic'>
<image src='../../images/prod/pic09.jpg'></image>
</view>
<view class='prod-info'>
<view class='prodname'>
THE BEAST/野兽派 易烊千玺同款
</view>
<view class='prod-info-cont'>经典杯型升级，杯型更细长优雅</view>
<view class='price-nums'>
<text class='prodprice'><text class='symbol'>￥</text>
<text class='big-num'>{{wxs.parsePrice(40.00)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(40.00)[1]}}</text></text>
<text class="prodcount">x1</text>
</view>
</view>
</view> -->
<!-- <view class='total-num'>
<text class="prodcount">共{{totalCount}}件商品</text>
<view class='prodprice'>合计：
<text class='symbol'>￥</text>
<text class='big-num'>{{wxs.parsePrice(total)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(total)[1]}}</text>
</view>
</view> -->
</view>
<!-- 订单详情 -->
<view class='order-msg'>
<view class='msg-item'>
<!-- <view class='item coupon' bindtap='showCouponPopup'>
<text class='item-tit'>优惠券：</text>
<text class='item-txt' wx:if="{{!coupons.canUseCoupons}}">暂无可用</text>
<text class='coupon-btn'>{{coupons.totalLength? coupons.totalLength: 0}}张</text>
<text class='arrow'></text>
</view> -->
<view class='item'>
<text>买家留言：</text>
<input placeholder='给卖家留言'></input>
</view>
</view>
</view>
<view class='order-msg'>
<view class='msg-item'>
<view class='item'>
<view class='item-tit'>订单总额：</view>
<view class='item-txt price'>
<text class='symbol'>￥</text>
<text class='big-num'>{{wxs.parsePrice(total)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(total)[1]}}</text>
</view>
</view>
<view class='item'>
<view class='item-tit'>运费：</view>
<view class='item-txt price'>
<text class='symbol'>￥</text>
<text class='big-num'>{{wxs.parsePrice(0)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(0)[1]}}</text>
</view>
</view>
<view class='item'>
<view class='item-tit'>优惠金额：</view>
<view class='item-txt price'>
<text class='symbol'>-￥</text>
<text class='big-num'>{{wxs.parsePrice(0)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(0)[1]}}</text>
</view>
</view>
<view class='item payment'>
<view class='item-txt price'>
小计：
<text class='symbol'>￥</text>
<text class='big-num'>{{wxs.parsePrice(actualTotal)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(actualTotal)[1]}}</text>
</view>
</view>
</view>
</view>
<!-- 支付方式 -->
<view class="order-msg">
<radio-group class="msg-item" bindchange="payTypeChange">
<view class="item flex">
<view class="flex-left">
<image class="pay-icon" src="/images/icon/WeChat@2x.png" mode="widthFix"></image>
<text class='item-tit'>微信支付</text>
</view>
<view class="btn">
<label>
<radio value="1" checked="{{payType == 1}}" color="#eb2444" />
</label>
</view>
</view>
<view class="item flex">
<view class="flex-left">
<image class="pay-icon" src="/images/icon/cash@2x.png" mode="widthFix"></image>
<text class='item-tit'>余额支付({{balance}}元)</text>
</view>
<view class="btn">
<label>
<radio value="3" checked="{{payType == 3}}" disabled="{{disabledBalance}}" color="#eb2444" />
</label>
</view>
</view>
</radio-group>
</view>
</view>
<!-- 底部栏 -->
<view class='submit-order-footer'>
<view class='sub-order'>
<view class='item-txt'>
合计：
<view class='price'>
<text class='symbol'>￥</text>
<text class='big-num'>{{wxs.parsePrice(actualTotal)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(actualTotal)[1]}}</text>
</view>
</view>
</view>
<view class='footer-box' bindtap='toPay'>
提交订单
</view>
</view>
</view>
<!-- 选择优惠券弹窗 -->
<view class="popup-hide" wx:if="{{popupShow}}">
<view class="popup-box">
<view class="popup-tit">
<text>优惠券</text>
<text class="close" bindtap='closePopup'></text>
</view>
<view class="coupon-tabs">
<view class="coupon-tab {{couponSts==1?'on':''}}" bindtap='changeCouponSts' data-sts='1'>
可用优惠券({{coupons.canUseCoupons.length}})</view>
<view class="coupon-tab {{couponSts==2?'on':''}}" bindtap='changeCouponSts' data-sts='2'>
不可用优惠券({{coupons.unCanUseCoupons.length}})</view>
</view>
<view class='popup-cnt'>
<block wx:for="{{coupons.canUseCoupons}}" wx:if="{{couponSts == 1}}" wx:key="couponId">
<coupon item="{{item}}" order="{{true}}" bind:checkCoupon="checkCoupon" canUse="{{true}}"></coupon>
</block>
<block wx:for="{{coupons.unCanUseCoupons}}" wx:if="{{couponSts == 2}}" wx:key="couponId">
<coupon item="{{item}}" order="{{true}}" canUse="{{false}}"></coupon>
</block>
<view class="botm-empty"></view>
</view>
<view class="coupon-ok" wx:if="{{couponSts==1}}">
<text bindtap='choosedCoupon'>确定</text>
</view>
</view>
</view>
<wxs module="wxs" src="../../wxs/number.wxs" />
\ No newline at end of file
pages/buyAgain/buyAgain.wxss 0 → 100644
/* pages/submit-order/submit-order.wxss */
page {
background: #f4f4f4;
}
/* 收货地址 */
.submit-order {
margin-bottom: 120rpx;
}
.submit-order .delivery-addr {
position: relative;
background: #fff;
}
.delivery-addr .addr-bg .add-addr .plus-sign {
color: #eb2444;
border: 2rpx solid #eb2444;
padding: 0rpx 6rpx;
margin-right: 10rpx;
}
.delivery-addr .addr-bg {
padding: 0 30rpx;
}
.delivery-addr .addr-bg.whole {
padding: 0 39rpx 0 77rpx;
}
.delivery-addr .addr-bg .add-addr {
font-size: 28rpx;
color: #666;
display: flex;
align-items: center;
padding: 30rpx 0;
}
.submit-order .delivery-addr .addr-icon {
width: 32rpx;
height: 32rpx;
display: block;
position: absolute;
left: 30rpx;
top: 24rpx;
}
.submit-order .delivery-addr .addr-icon image {
width: 100%;
height: 100%;
}
.submit-order .delivery-addr .user-info {
padding-top: 20rpx;
line-height: 48rpx;
word-wrap: break-word;
word-break: break-all;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.submit-order .delivery-addr .user-info .item {
font-size: 30rpx;
margin-right: 30rpx;
vertical-align: top;
display: inline-block;
}
.submit-order .delivery-addr .addr {
font-size: 26rpx;
line-height: 36rpx;
color: #999;
width: 90%;
padding-bottom: 20rpx;
margin-top: 15rpx;
}
.submit-order .delivery-addr .arrow {
width: 15rpx;
height: 15rpx;
border-top: 2rpx solid #777;
border-right: 2rpx solid #777;
transform: rotate(45deg);
position: absolute;
right: 30rpx;
top: 60rpx;
}
.submit-order .delivery-addr .arrow.empty {
top: 39rpx;
}
.addr-bg .add-addr .plus-sign-img {
width: 32rpx;
height: 32rpx;
font-size: 0;
margin-right: 10rpx;
}
.addr-bg .add-addr .plus-sign-img image {
width: 100%;
height: 100%;
}
/* 商品列表 */
.prod-item {
background-color: #fff;
margin-top: 15rpx;
font-size: 28rpx;
}
.prod-item .item-cont .prod-pic image {
width: 180rpx;
height: 180rpx;
}
.prod-item .order-num {
padding: 20rpx 30rpx;
display: flex;
justify-content: space-between;
font-size: 28rpx;
}
.order-state {
display: flex;
align-items: center;
}
.prod-item .item-cont {
display: flex;
align-items: center;
padding: 30rpx;
border-bottom: 2rpx solid #f1f1f1;
}
.prod-item .order-num .clear-btn {
width: 32rpx;
height: 32rpx;
font-size: 0;
vertical-align: top;
margin-top: 6rpx;
margin-left: 42rpx;
position: relative;
}
.prod-item .order-num .clear-btn::after {
content: " ";
display: block;
position: absolute;
left: -10px;
top: 1px;
width: 1px;
height: 12px;
background: #ddd;
}
.prod-item .order-num .clear-btn .clear-list-btn {
width: 100%;
height: 100%;
vertical-align: middle;
}
.prod-item .item-cont .prod-pic {
font-size: 0;
display: block;
width: 160rpx;
height: 160rpx;
overflow: hidden;
background: #fff;
margin-right: 16rpx;
}
.prod-item .item-cont .prod-pic image {
width: 100%;
height: 100%;
}
.prod-item .item-cont .prod-info {
margin-left: 10rpx;
font-size: 28rpx;
width: 100%;
position: relative;
height: 160rpx;
-webkit-flex: 1;
-ms-flex: 1;
-webkit-box-flex: 1;
-moz-box-flex: 1;
flex: 1;
}
.prod-item .item-cont .prod-info .prodname {
font-size: 28rpx;
line-height: 40rpx;
max-height: 86rpx;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
word-break: break-all;
}
.prod-item .item-cont .prod-info .prod-info-cont {
color: #999;
line-height: 40rpx;
margin-top: 10rpx;
font-size: 22rpx;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
word-break: break-all;
}
.prod-item .total-num {
text-align: right;
padding: 20rpx 30rpx;
font-size: 28rpx;
}
.prod-item .price-nums .prodprice {
position: absolute;
bottom: 0;
}
.prod-item .price-nums .prodcount {
position: absolute;
bottom: 5rpx;
right: 0;
color: #999;
font-family: verdana;
}
.prod-item .total-num .prodprice {
display: inline-block;
color: #333;
}
.prod-item .total-num .prodcount {
margin-right: 20rpx;
}
/*
订单信息 */
.order-msg {
background: #fff;
margin-top: 15rpx;
padding: 0 30rpx;
font-size: 28rpx;
}
.order-msg .msg-item {
border-top: 2rpx solid #f1f1f1;
}
.order-msg .msg-item:first-child {
border: 0;
}
.order-msg .msg-item .item {
position: relative;
display: flex;
padding: 16rpx 0;
align-items: center;
}
.order-msg .msg-item .flex {
display: flex;
align-items: center;
justify-content: space-between;
}
.order-msg .msg-item .flex .flex-left {
display: flex;
align-items: center;
}
.order-msg .msg-item .flex .pay-icon {
width: 40rpx;
margin-right: 10rpx;
}
.order-msg .msg-item .item.payment {
border-top: 2rpx solid #f1f1f1;
color: #eb2444;
}
.order-msg .msg-item .item .item-tit {
line-height: 48rpx;
}
.order-msg .msg-item .item .item-txt {
-webkit-box-flex: 1;
-moz-box-flex: 1;
flex: 1;
font-family: arial;
max-height: 48rpx;
overflow: hidden;
line-height: 48rpx;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
word-break: break-all;
}
.order-msg .msg-item .item.coupon {
border-bottom: 2rpx solid #e1e1e1;
}
.order-msg .msg-item .item input {
flex: 1;
}
.order-msg .msg-item .item .coupon-btn {
display: block;
margin: 0 30rpx;
line-height: 28rpx;
color: #999;
}
.order-msg .msg-item .item .item-txt.price {
text-align: right;
}
.order-msg .msg-item .item .arrow {
width: 15rpx;
height: 15rpx;
border-top: 2rpx solid #999;
border-right: 2rpx solid #999;
transform: rotate(45deg);
position: absolute;
right: 0rpx;
}
/* 底部栏 */
.submit-order-footer {
position: fixed;
bottom: 0;
width: 100%;
max-width: 750rpx;
background: #fff;
margin: auto;
display: -webkit-flex;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: flex;
font-size: 26rpx;
box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.05);
}
.submit-order-footer .sub-order {
flex: 1;
margin: 0 30rpx;
line-height: 100rpx;
display: block;
text-align: left;
font-size: 28rpx;
}
.submit-order-footer .footer-box {
padding: 0 10rpx;
width: 200rpx;
background: #eb2444;
text-align: center;
line-height: 100rpx;
color: #fff;
}
.submit-order-footer .sub-order .item-txt .price {
display: inline;
color: #eb2444;
font-size: 28rpx;
}
.clearfix:after {
content: " ";
display: table;
clear: both;
}
/** 优惠券弹窗 **/
.popup-hide {
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
z-index: 999;
background-color: rgba(0, 0, 0, 0.3);
}
.popup-box {
position: absolute;
bottom: 0;
width: 100%;
height: 80%;
overflow: hidden;
background-color: #fff;
}
.popup-tit {
position: relative;
height: 46px;
line-height: 46px;
padding-left: 10px;
font-size: 16px;
color: #333;
font-weight: bold;
}
.close {
color: #aaa;
border-radius: 12px;
line-height: 20px;
text-align: center;
height: 20px;
width: 20px;
font-size: 18px;
padding: 1px;
top: 10px;
right: 10px;
position: absolute;
}
.close::before {
content: "\2716";
}
.coupon-tabs {
display: flex;
font-size: 14px;
justify-content: space-around;
border-bottom: 1px solid #f2f2f2;
}
.coupon-tab {
padding: 10px 0;
}
.coupon-tab.on {
border-bottom: 2px solid #eb2444;
font-weight: 600;
}
.popup-cnt {
height: calc(100% - 88px);
overflow: auto;
padding: 0 10px;
background: #f4f4f4;
}
.coupon-ok {
position: fixed;
bottom: 0;
width: 100%;
height: 60px;
line-height: 50px;
font-size: 14px;
text-align: center;
box-shadow: 0px -1px 1px #ddd;
background: rgba(255, 255, 255, 0.9);
}
.coupon-ok text {
border-radius: 20px;
display: inline-block;
height: 20px;
line-height: 20px;
width: 450rpx;
padding: 7px;
background: -o-linear-gradient(right, #f45c43, #eb2444);
background: linear-gradient(right, #f45c43, #eb2444);
background: -webkit-linear-gradient(right, #f45c43, #eb2444);
color: #fff;
box-shadow: -1px 3px 3px #aaa;
}
.botm-empty {
height: 60px;
}
/*checkbox 选项框大小 */
checkbox .wx-checkbox-input, radio .wx-radio-input{
border-radius: 50%;
width: 35rpx;
height: 35rpx;
}
/*checkbox选中后样式 */
checkbox .wx-checkbox-input.wx-checkbox-input-checked {
background: #eb2444;
border-color: #eb2444;
}
/*checkbox选中后图标样式 */
checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
text-align: center;
font-size: 22rpx;
color: #fff;
background: transparent;
transform: translate(-50%, -50%) scale(1);
-webkit-transform: translate(-50%, -50%) scale(1);
}
\ No newline at end of file
pages/index/index.wxml
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
<image src='../../images/icon/neweveryday.png'></image> <image src='../../images/icon/neweveryday.png'></image>
<text>每日疯抢</text> <text>每日疯抢</text>
</view> </view>
<view class='item' bindtap='toCouponCenter'> <!-- <view class='item' bindtap='toCouponCenter'>
<image src='../../images/icon/newprods.png'></image> <image src='../../images/icon/newprods.png'></image>
<text>领优惠券</text> <text>领优惠券</text>
</view> </view> -->
</view> </view>
<!-- 消息播放 --> <!-- 消息播放 -->
......
pages/order-detail/order-detail.js
...@@ -28,8 +28,233 @@ Page({ ...@@ -28,8 +28,233 @@ Page({
url: '/pages/prod/prod?prodid=' + prodid, url: '/pages/prod/prod?prodid=' + prodid,
}) })
}, },
/**
* 查看物流
*/
toDeliveryPage: function (e) {
wx.navigateTo({
url: '/pages/express-delivery/express-delivery?orderNum=' + e.currentTarget.dataset.ordernum
})
},
/** /**
* 取消订单
*/
onCancelOrder: function (e) {
var ordernum = e.currentTarget.dataset.ordernum;
var ths = this;
wx.showModal({
title: '',
content: '要取消此订单？',
confirmColor: "#3e62ad",
cancelText: '否',
confirmText: '是',
success(res) {
if (res.confirm) {
wx.showLoading({
mask: true
});
var params = {
url: "/p/myOrder/cancel/" + ordernum,
method: "PUT",
data: {},
callBack: function (res) {
//console.log(res);
ths.loadOrderDetail(ordernum);
wx.hideLoading();
}
};
http.request(params);
} else if (res.cancel) {
//console.log('用户点击取消')
}
}
})
},
/**
* 付款
*/
onPayAgain: function (e) {
wx.showLoading({
mask: true
});
var params = {
url: "/p/order/pay",
method: "POST",
data: {
payType: 1,
orderNumbers: e.currentTarget.dataset.ordernum
},
callBack: res => {
//console.log(res);
wx.hideLoading();
wx.requestPayment({
timeStamp: res.timeStamp,
nonceStr: res.nonceStr,
package: res.packageValue,
signType: res.signType,
paySign: res.paySign,
success: function () {
wx.navigateTo({
url: '/pages/pay-result/pay-result?sts=1&orderNumbers=' + e.currentTarget.dataset.ordernum,
})
},
fail: function (err) {
//console.log("支付失败");
}
})
}
};
http.request(params);
},
/**
* 确认收货
*/
onConfirmReceive: function (e) {
var ths = this;
wx.showModal({
title: '',
content: '我已收到货？',
confirmColor: "#eb2444",
success(res) {
if (res.confirm) {
wx.showLoading({
mask: true
});
var params = {
url: "/p/myOrder/receipt/" + e.currentTarget.dataset.ordernum,
method: "PUT",
data: {},
callBack: function (res) {
//console.log(res);
ths.loadOrderDetail(ordernum);
wx.hideLoading();
}
};
http.request(params);
} else if (res.cancel) {
//console.log('用户点击取消')
}
}
})
},
//删除已完成||已取消的订单
delOrderList: function (e) {
var ths = this
wx.showModal({
title: '',
content: '确定要删除此订单吗？',
confirmColor: "#eb2444",
success(res) {
if (res.confirm) {
var ordernum = e.currentTarget.dataset.ordernum;
wx.showLoading();
var params = {
url: "/p/myOrder/" + ordernum,
method: "DELETE",
data: {},
callBack: function (res) {
ths.loadOrderDetail(ordernum);
wx.hideLoading();
}
}
http.request(params);
} else if (res.cancel) {
console.log('用户点击取消')
}
}
})
},
// 提现
onOrderWithdrawal: function (e) {
let data = e.currentTarget.dataset
let amount = 0
if (data.type == 2) {
amount = Number(this.data.orderIncome.nowOrderAmount) - Number(this.data.orderIncome.cashAmomunt)
}else if(data.type == 1){
amount = Number(this.data.orderIncome.toCashAmmount)
}else {
}
wx.navigateTo({
url: '/pages/orderWithdrawal/orderWithdrawal?type=' + data.type + '&ordernum=' + data.ordernum + '&amount='+ amount,
})
},
// 挂单
onPendingOrder: function (e) {
var ths = this;
var ordernum = e.currentTarget.dataset.ordernum;
wx.showModal({
title: '',
content: '您是否要挂单？',
confirmColor: "#eb2444",
success(res) {
if (res.confirm) {
wx.showLoading({
mask: true
});
var params = {
url: "/p/myOrder/updateOrderStatus",
method: "GET",
data: {
orderNumber: ordernum,
status: 8
},
callBack: function (res) {
//console.log(res);
ths.loadOrderDetail(ordernum);
wx.hideLoading();
}
};
http.request(params);
} else if (res.cancel) {
//console.log('用户点击取消')
}
}
})
},
// 提货
onPickGoods: function (e) {
var ths = this;
var ordernum = e.currentTarget.dataset.ordernum;
wx.showModal({
title: '',
content: '您是否要提货？',
confirmColor: "#eb2444",
success(res) {
if (res.confirm) {
wx.showLoading({
mask: true
});
var params = {
url: "/p/myOrder/updateOrderStatus",
method: "GET",
data: {
orderNumber: ordernum,
status: 2
},
callBack: function (res) {
//console.log(res);
ths.loadOrderDetail(ordernum);
wx.hideLoading();
}
};
http.request(params);
} else if (res.cancel) {
//console.log('用户点击取消')
}
}
})
},
/**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function(options) { onLoad: function(options) {
...@@ -51,6 +276,7 @@ Page({ ...@@ -51,6 +276,7 @@ Page({
}, },
callBack: function(res) { callBack: function(res) {
ths.setData({ ths.setData({
orderIncome: res.orderIncome,
orderNumber: orderNum, orderNumber: orderNum,
actualTotal: res.actualTotal, actualTotal: res.actualTotal,
userAddrDto: res.userAddrDto, userAddrDto: res.userAddrDto,
...@@ -62,6 +288,7 @@ Page({ ...@@ -62,6 +288,7 @@ Page({
transfee: res.transfee, transfee: res.transfee,
reduceAmount: res.reduceAmount, reduceAmount: res.reduceAmount,
actualTotal: res.actualTotal, actualTotal: res.actualTotal,
payType: res.payType
}); });
wx.hideLoading(); wx.hideLoading();
} }
...@@ -70,7 +297,6 @@ Page({ ...@@ -70,7 +297,6 @@ Page({
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
......
pages/order-detail/order-detail.wxml
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
<text class='item'>{{userAddrDto.receiver}}</text> <text class='item'>{{userAddrDto.receiver}}</text>
<text class='item'>{{userAddrDto.mobile}}</text> <text class='item'>{{userAddrDto.mobile}}</text>
</view> </view>
<view class='addr'>{{userAddrDto.province}}{{userAddrDto.city}}{{userAddrDto.area}}{{userAddrDto.area}}{{userAddrDto.addr}}</view> <view class='addr'>
{{userAddrDto.province}}{{userAddrDto.city}}{{userAddrDto.area}}{{userAddrDto.area}}{{userAddrDto.addr}}</view>
</view> </view>
...@@ -17,7 +18,8 @@ ...@@ -17,7 +18,8 @@
<view class='prod-item'> <view class='prod-item'>
<view class="order-num"> <view class="order-num">
<view class='order-state'> <view class='order-state'>
<text class="order-sts gray">{{status}}</text> <text
class="order-sts gray">{{status==1?'待付款':(status==2?'待发货':(status==3?'待收货':(status==4?'待评价':(status==5?'成功':(status==6?'失败':(status==7?'收益中':(status==8?'挂单中':(status==9?'退单中':(status==10?'完成':(status==-1?'已取消':(status==11?'挂单待付款':'')))))))))))}}</text>
</view> </view>
</view> </view>
<block wx:for="{{orderItemDtos}}" wx:key=''> <block wx:for="{{orderItemDtos}}" wx:key=''>
...@@ -35,10 +37,10 @@ ...@@ -35,10 +37,10 @@
</view> </view>
<view class='price-nums clearfix'> <view class='price-nums clearfix'>
<text class='prodprice'><text class='symbol'>￥</text> <text class='prodprice'><text class='symbol'>￥</text>
<text class='big-num'>{{wxs.parsePrice(item.price)[0]}}</text> <text class='big-num'>{{wxs.parsePrice(item.price)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(item.price)[1]}}</text></text> <text class='small-num'>.{{wxs.parsePrice(item.price)[1]}}</text></text>
<view class='btn-box'> <view class='btn-box'>
<text class='btn'>申请售后</text> <!-- <text class='btn'>申请售后</text> -->
<text class='btn'>加购物车</text> <text class='btn'>加购物车</text>
</view> </view>
</view> </view>
...@@ -70,11 +72,19 @@ ...@@ -70,11 +72,19 @@
</view> --> </view> -->
<view class='prod-foot'> <view class='prod-foot'>
<view class='btn'> <view class='btn'>
<button wx:if="{{item.status==1}}" class="button" bindtap="onCancelOrder" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>取消订单</button> <!-- <button wx:if="{{item.status==1}}" class="button" bindtap="onCancelOrder" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>取消订单</button>
<button wx:if="{{item.status==1}}" class="button warn" bindtap="onConfirmReceive" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>再次购买</button> <button wx:if="{{item.status==1}}" class="button warn" bindtap="" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>再次购买</button>
<button wx:if="{{item.status==1}}" class="button warn" bindtap="onPayAgain" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>付款</button> <button wx:if="{{item.status==1}}" class="button warn" bindtap="onPayAgain" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>付款</button>
<button wx:if="{{item.status==3 || item.status==5}}" class="button" bindtap="toDeliveryPage" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>查看物流</button> <button wx:if="{{item.status==3 || item.status==5}}" class="button" bindtap="toDeliveryPage" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>查看物流</button>
<button wx:if="{{item.status==3}}" class="button warn" bindtap="onConfirmReceive" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>确认收货</button> <button wx:if="{{item.status==3}}" class="button warn" bindtap="onConfirmReceive" data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>确认收货</button>
<text wx:if="{{item.status==7}}" class="button gray" bindtap="onPendingOrder"
data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>挂单</text>
<text wx:if="{{item.status==7}}" class="button gray" bindtap="onOrderWithdrawal"
data-ordernum="{{item.orderNumber}}" data-type="2" data-item="{{item}}" hover-class='none'>退单</text>
<text wx:if="{{item.status==7}}" class="button gray" bindtap="onPickGoods"
data-ordernum="{{item.primaryOrderNo}}" hover-class='none'>提货</text>
<text wx:if="{{item.status==7}}" class="button warn" bindtap="onOrderWithdrawal"
data-ordernum="{{item.orderNumber}}" data-type="1" data-item="{{item}}" hover-class='none'>提现</text> -->
</view> </view>
</view> </view>
</view> </view>
...@@ -93,9 +103,9 @@ ...@@ -93,9 +103,9 @@
</view> </view>
</view> </view>
<view class='msg-item'> <view class='msg-item'>
<view class='item'> <view class='item'>
<text class='item-tit'>支付方式：</text> <text class='item-tit'>支付方式：</text>
<text class='item-txt'>微信支付</text> <text class='item-txt'>{{payType==1? '微信支付':(payType == 2? '支付宝':(payType== 3? '余额支付':''))}}</text>
</view> </view>
<view class='item'> <view class='item'>
<text class='item-tit'>配送方式：</text> <text class='item-tit'>配送方式：</text>
...@@ -147,10 +157,28 @@ ...@@ -147,10 +157,28 @@
<!-- 底部栏 --> <!-- 底部栏 -->
<view class='order-detail-footer'> <view class='order-detail-footer'>
<text class='dele-order' wx:if="{{status==5||status==6}}">删除订单</text>
<view class='footer-box'> <view class='footer-box'>
<text class='apply-service'>联系客服</text> <!-- <text class='apply-service'>联系客服</text>
<text class='buy-again'>再次购买</text> <text class='buy-again'>再次购买</text> -->
<text class="apply-service" wx:if="{{status==5||status==6}}" bindtap="delOrderList"
data-ordernum="{{orderNumber}}">删除订单</text>
<text wx:if="{{status==1}}" class="apply-service" bindtap="onCancelOrder" data-ordernum="{{orderNumber}}"
hover-class='none'>取消订单</text>
<!-- <text wx:if="{{status==1}}" class="buy-again" bindtap="buyAgain" data-ordernum="{{orderNumber}}" hover-class='none'>再次购买</text> -->
<text wx:if="{{status==1}}" class="buy-again" bindtap="onPayAgain" data-ordernum="{{orderNumber}}"
hover-class='none'>付款</text>
<text wx:if="{{status==3 || status==5}}" class="apply-service" bindtap="toDeliveryPage"
data-ordernum="{{orderNumber}}" hover-class='none'>查看物流</text>
<text wx:if="{{status==3}}" class="buy-again" bindtap="onConfirmReceive" data-ordernum="{{orderNumber}}"
hover-class='none'>确认收货</text>
<text wx:if="{{status==7}}" class="apply-service" bindtap="onPendingOrder" data-ordernum="{{orderNumber}}"
hover-class='none'>挂单</text>
<text wx:if="{{status==7}}" class="buy-again" bindtap="onOrderWithdrawal" data-ordernum="{{orderNumber}}"
data-type="2" hover-class='none'>退单</text>
<text wx:if="{{status==7}}" class="buy-again" bindtap="onPickGoods" data-ordernum="{{orderNumber}}"
hover-class='none'>提货</text>
<text wx:if="{{status==7}}" class="buy-again" bindtap="onOrderWithdrawal" data-ordernum="{{orderNumber}}"
data-type="1" hover-class='none'>提现</text>
</view> </view>
</view> </view>
......
pages/order-detail/order-detail.wxss
...@@ -219,7 +219,7 @@ page { ...@@ -219,7 +219,7 @@ page {
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
padding: 22rpx 0; padding: 22rpx 0;
font-size: 26rpx; /* font-size: 26rpx; */
box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.05); box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.05);
} }
...@@ -238,7 +238,7 @@ page { ...@@ -238,7 +238,7 @@ page {
line-height: 60rpx; line-height: 60rpx;
} }
.order-detail-footer .footer-box .buy-again { .order-detail-footer .footer-box text:last-child {
font-size: 26rpx; font-size: 26rpx;
color: #fff; color: #fff;
background: #eb2444; background: #eb2444;
...@@ -247,7 +247,7 @@ page { ...@@ -247,7 +247,7 @@ page {
margin-right: 20rpx; margin-right: 20rpx;
} }
.order-detail-footer .footer-box .apply-service { .order-detail-footer .footer-box text:not(:last-child) {
font-size: 26rpx; font-size: 26rpx;
border-radius: 50rpx; border-radius: 50rpx;
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
......
pages/orderFlow/orderFlow.js
...@@ -10,7 +10,7 @@ Page({ ...@@ -10,7 +10,7 @@ Page({
list: [], list: [],
current: 1, current: 1,
pages: 0, pages: 0,
sts: 0 sts: 8
}, },
/** /**
...@@ -23,7 +23,7 @@ Page({ ...@@ -23,7 +23,7 @@ Page({
}); });
this.loadOrderData(options.sts, 1); this.loadOrderData(options.sts, 1);
} else { } else {
this.loadOrderData(0, 1); this.loadOrderData(8, 1);
} }
}, },
...@@ -72,7 +72,14 @@ Page({ ...@@ -72,7 +72,14 @@ Page({
}); });
this.loadOrderData(sts, 1); this.loadOrderData(sts, 1);
}, },
buyAgain: function(e){
let orderNum = e.currentTarget.dataset.ordernum
console.log('orderNum',orderNum,e.currentTarget)
wx.navigateTo({
url: '/pages/buyAgain/buyAgain?orderNumber='+ orderNum,
})
},
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
......
pages/orderFlow/orderFlow.wxml
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<view class='container'> <view class='container'>
<!-- 头部菜单 --> <!-- 头部菜单 -->
<view class='order-tit'> <view class='order-tit'>
<text bindtap='onStsTap' data-sts="0" class="{{sts==0?'on':''}}">全部</text> <!-- <text bindtap='onStsTap' data-sts="0" class="{{sts==0?'on':''}}">全部</text> -->
<text bindtap='onStsTap' data-sts="1" class="{{sts==1?'on':''}}">待支付</text> <text bindtap='onStsTap' data-sts="8" class="{{sts==8?'on':''}}">挂单中</text>
<text bindtap='onStsTap' data-sts="7" class="{{sts==7?'on':''}}">收益中</text> <text bindtap='onStsTap' data-sts="11" class="{{sts==11?'on':''}}">待付款</text>
<text bindtap='onStsTap' data-sts="2" class="{{sts==2?'on':''}}">待发货</text> <!-- <text bindtap='onStsTap' data-sts="2" class="{{sts==2?'on':''}}"></text> -->
<text bindtap='onStsTap' data-sts="3" class="{{sts==3?'on':''}}">待收货</text> <!-- <text bindtap='onStsTap' data-sts="3" class="{{sts==3?'on':''}}">待收货</text>
<text bindtap='onStsTap' data-sts="5" class="{{sts==5?'on':''}}">已完成</text> <text bindtap='onStsTap' data-sts="5" class="{{sts==5?'on':''}}">已完成</text> -->
</view> </view>
<!-- end 头部菜单 --> <!-- end 头部菜单 -->
<view class='main'> <view class='main'>
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<view class="order-num"> <view class="order-num">
<text>订单编号：{{item.orderNumber}}</text> <text>订单编号：{{item.orderNumber}}</text>
<view class='order-state'> <view class='order-state'>
<!-- 订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9转单完成' --> <!-- 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9退单中 10完成 11挂单待付款 -->
<text <text
class="order-sts {{item.status==1?'red':''}} {{(item.status==5||item.status==6)?'gray':''}}">{{item.status==1?'待支付':(item.status==2?'待发货':(item.status==3?'待收货':(item.status==4?'待评价':(item.status==5?'已完成':(item.status==6?'已取消':(item.status==7?'收益中':(item.status==8?'挂单中':(item.status==9?'转单完成':''))))))))}}</text> class="order-sts {{item.status==1?'red':''}} {{(item.status==5||item.status==6)?'gray':''}}">{{item.status==1?'待付款':(item.status==2?'待发货':(item.status==3?'待收货':(item.status==4?'待评价':(item.status==5?'成功':(item.status==6?'失败':(item.status==7?'收益中':(item.status==8?'挂单中':(item.status==9?'退单中':(item.status==10?'完成':(item.status==-1?'已取消':(item.status==11?'挂单待付款':'')))))))))))}}</text>
<view class='clear-btn' wx:if="{{item.status==5 || item.status==6}}"> <view class='clear-btn' wx:if="{{item.status==5 || item.status==6}}">
<image src='../../images/icon/clear-his.png' class='clear-list-btn' bindtap='delOrderList' <image src='../../images/icon/clear-his.png' class='clear-list-btn' bindtap='delOrderList'
data-ordernum="{{item.orderNumber}}"></image> data-ordernum="{{item.orderNumber}}"></image>
...@@ -88,24 +88,10 @@ ...@@ -88,24 +88,10 @@
<!-- end 商品列表 --> <!-- end 商品列表 -->
<view class='prod-foot'> <view class='prod-foot'>
<view class='btn'> <view class='btn'>
<text wx:if="{{item.status==1}}" class="button" bindtap="onCancelOrder" data-ordernum="{{item.orderNumber}}" <text wx:if="{{item.status==11}}" class="button warn" bindtap="onPayAgain"
hover-class='none'>取消订单</text>
<text wx:if="{{item.status !=7}}" class="button warn" bindtap="" data-ordernum="{{item.orderNumber}}"
hover-class='none'>再次购买</text>
<text wx:if="{{item.status==1}}" class="button warn" bindtap="onPayAgain"
data-ordernum="{{item.orderNumber}}" hover-class='none'>付款</text> data-ordernum="{{item.orderNumber}}" hover-class='none'>付款</text>
<text wx:if="{{item.status==3 || item.status==5}}" class="button" bindtap="toDeliveryPage" <text class="button warn" bindtap="buyAgain" data-ordernum="{{item.orderNumber}}" hover-class='none'
data-ordernum="{{item.orderNumber}}" hover-class='none'>查看物流</text> wx:if="{{item.status==8}}">再次购买</text>
<text wx:if="{{item.status==3}}" class="button warn" bindtap="onConfirmReceive"
data-ordernum="{{item.orderNumber}}" hover-class='none'>确认收货</text>
<text wx:if="{{item.status==7}}" class="button gray" bindtap="onConfirmReceive"
data-ordernum="{{item.orderNumber}}" hover-class='none'>挂单</text>
<text wx:if="{{item.status==7}}" class="button gray" bindtap="onConfirmReceive"
data-ordernum="{{item.orderNumber}}" hover-class='none'>退单</text>
<text wx:if="{{item.status==7}}" class="button gray" bindtap="onConfirmReceive"
data-ordernum="{{item.orderNumber}}" hover-class='none'>提货</text>
<text wx:if="{{item.status==7}}" class="button warn" bindtap="onConfirmReceive"
data-ordernum="{{item.orderNumber}}" hover-class='none'>提现</text>
</view> </view>
</view> </view>
</view> </view>
......
pages/orderList/orderList.js
...@@ -296,39 +296,10 @@ Page({ ...@@ -296,39 +296,10 @@ Page({
// 挂单 // 挂单
onPendingOrder: function (e) { onPendingOrder: function (e) {
var ths = this; var ths = this;
let data = e.currentTarget.dataset.item
wx.showModal({ wx.showModal({
title: '', title: '',
content: '我已收到货？', content: '您是否要挂单？',
confirmColor: "#eb2444",
success(res) {
if (res.confirm) {
wx.showLoading({
mask: true
});
var params = {
url: "/p/myOrder/receipt/" + e.currentTarget.dataset.ordernum,
method: "PUT",
data: {},
callBack: function (res) {
//console.log(res);
ths.loadOrderData(ths.data.sts, 1);
wx.hideLoading();
}
};
http.request(params);
} else if (res.cancel) {
//console.log('用户点击取消')
}
}
})
},
// 退单
onChargeback: function (e) {
var ths = this;
wx.showModal({
title: '',
content: '我已收到货？',
confirmColor: "#eb2444", confirmColor: "#eb2444",
success(res) { success(res) {
if (res.confirm) { if (res.confirm) {
...@@ -337,9 +308,12 @@ Page({ ...@@ -337,9 +308,12 @@ Page({
}); });
var params = { var params = {
url: "/p/myOrder/receipt/" + e.currentTarget.dataset.ordernum, url: "/p/myOrder/updateOrderStatus",
method: "PUT", method: "GET",
data: {}, data: {
orderNumber: data.orderNumber,
status: 8
},
callBack: function (res) { callBack: function (res) {
//console.log(res); //console.log(res);
ths.loadOrderData(ths.data.sts, 1); ths.loadOrderData(ths.data.sts, 1);
...@@ -356,9 +330,10 @@ Page({ ...@@ -356,9 +330,10 @@ Page({
// 提货 // 提货
onPickGoods: function (e) { onPickGoods: function (e) {
var ths = this; var ths = this;
let data = e.currentTarget.dataset.item
wx.showModal({ wx.showModal({
title: '', title: '',
content: '我已收到货？', content: '您是否要提货？',
confirmColor: "#eb2444", confirmColor: "#eb2444",
success(res) { success(res) {
if (res.confirm) { if (res.confirm) {
...@@ -367,9 +342,12 @@ Page({ ...@@ -367,9 +342,12 @@ Page({
}); });
var params = { var params = {
url: "/p/myOrder/receipt/" + e.currentTarget.dataset.ordernum, url: "/p/myOrder/updateOrderStatus",
method: "PUT", method: "GET",
data: {}, data: {
orderNumber: data.orderNumber,
status: 2
},
callBack: function (res) { callBack: function (res) {
//console.log(res); //console.log(res);
ths.loadOrderData(ths.data.sts, 1); ths.loadOrderData(ths.data.sts, 1);
......
pages/orderList/orderList.wxml
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<view class="order-num"> <view class="order-num">
<text>订单编号：{{item.orderNumber}}</text> <text>订单编号：{{item.orderNumber}}</text>
<view class='order-state'> <view class='order-state'>
<!-- 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9退单中 10完成 --> <!-- 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9退单中 10完成 11挂单待付款 -->
<text <text
class="order-sts {{item.status==1?'red':''}} {{(item.status==5||item.status==6)?'gray':''}}">{{item.status==1?'待付款':(item.status==2?'待发货':(item.status==3?'待收货':(item.status==4?'待评价':(item.status==5?'成功':(item.status==6?'失败':(item.status==7?'收益中':(item.status==8?'挂单中':(item.status==9?'退单中':(item.status==10?'完成':(item.status==-1?'已取消':''))))))))))}}</text> class="order-sts {{item.status==1?'red':''}} {{(item.status==5||item.status==6)?'gray':''}}">{{item.status==1?'待付款':(item.status==2?'待发货':(item.status==3?'待收货':(item.status==4?'待评价':(item.status==5?'成功':(item.status==6?'失败':(item.status==7?'收益中':(item.status==8?'挂单中':(item.status==9?'退单中':(item.status==10?'完成':(item.status==-1?'已取消':(item.status==11?'挂单待付款':'')))))))))))}}</text>
<view class='clear-btn' wx:if="{{item.status==5 || item.status==6}}"> <view class='clear-btn' wx:if="{{item.status==5 || item.status==6}}">
<image src='../../images/icon/clear-his.png' class='clear-list-btn' bindtap='delOrderList' <image src='../../images/icon/clear-his.png' class='clear-list-btn' bindtap='delOrderList'
data-ordernum="{{item.orderNumber}}"></image> data-ordernum="{{item.orderNumber}}"></image>
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
<view class='btn'> <view class='btn'>
<text wx:if="{{item.status==1}}" class="button" bindtap="onCancelOrder" data-ordernum="{{item.orderNumber}}" <text wx:if="{{item.status==1}}" class="button" bindtap="onCancelOrder" data-ordernum="{{item.orderNumber}}"
hover-class='none'>取消订单</text> hover-class='none'>取消订单</text>
<text wx:if="{{item.status !=7}}" class="button warn" bindtap="" data-ordernum="{{item.orderNumber}}" <!-- <text wx:if="{{item.status !=7}}" class="button warn" bindtap="" data-ordernum="{{item.orderNumber}}"
hover-class='none'>再次购买</text> hover-class='none'>再次购买</text> -->
<text wx:if="{{item.status==1}}" class="button warn" bindtap="onPayAgain" <text wx:if="{{item.status==1}}" class="button warn" bindtap="onPayAgain"
data-ordernum="{{item.orderNumber}}" hover-class='none'>付款</text> data-ordernum="{{item.orderNumber}}" hover-class='none'>付款</text>
<text wx:if="{{item.status==3 || item.status==5}}" class="button" bindtap="toDeliveryPage" <text wx:if="{{item.status==3 || item.status==5}}" class="button" bindtap="toDeliveryPage"
...@@ -99,11 +99,11 @@ ...@@ -99,11 +99,11 @@
<text wx:if="{{item.status==3}}" class="button warn" bindtap="onConfirmReceive" <text wx:if="{{item.status==3}}" class="button warn" bindtap="onConfirmReceive"
data-ordernum="{{item.orderNumber}}" hover-class='none'>确认收货</text> data-ordernum="{{item.orderNumber}}" hover-class='none'>确认收货</text>
<text wx:if="{{item.status==7}}" class="button gray" bindtap="onPendingOrder" <text wx:if="{{item.status==7}}" class="button gray" bindtap="onPendingOrder"
data-ordernum="{{item.orderNumber}}" hover-class='none'>挂单</text> data-item="{{item}}" hover-class='none'>挂单</text>
<text wx:if="{{item.status==7}}" class="button gray" bindtap="onOrderWithdrawal" <text wx:if="{{item.status==7}}" class="button gray" bindtap="onOrderWithdrawal"
data-ordernum="{{item.orderNumber}}" data-type="2" data-item="{{item}}" hover-class='none'>退单</text> data-ordernum="{{item.orderNumber}}" data-type="2" data-item="{{item}}" hover-class='none'>退单</text>
<text wx:if="{{item.status==7}}" class="button gray" bindtap="onPickGoods" <text wx:if="{{item.status==7}}" class="button gray" bindtap="onPickGoods"
data-ordernum="{{item.orderNumber}}" hover-class='none'>提货</text> data-item="{{item}}" hover-class='none'>提货</text>
<text wx:if="{{item.status==7}}" class="button warn" bindtap="onOrderWithdrawal" <text wx:if="{{item.status==7}}" class="button warn" bindtap="onOrderWithdrawal"
data-ordernum="{{item.orderNumber}}" data-type="1" data-item="{{item}}" hover-class='none'>提现</text> data-ordernum="{{item.orderNumber}}" data-type="1" data-item="{{item}}" hover-class='none'>提现</text>
</view> </view>
......
pages/orderList/orderList.wxss
...@@ -192,7 +192,7 @@ page { ...@@ -192,7 +192,7 @@ page {
} }
.prod-item .prod-foot { .prod-item .prod-foot {
padding: 20rpx 30rpx; padding: 0 30rpx;
border-top: 2rpx solid #e6e6e6; border-top: 2rpx solid #e6e6e6;
} }
...@@ -224,7 +224,7 @@ page { ...@@ -224,7 +224,7 @@ page {
} }
.button { .button {
margin-left: 10px; margin: 20rpx 0 20rpx 10px;
font-size: 26rpx; font-size: 26rpx;
background: #fff; background: #fff;
padding: 10rpx 30rpx; padding: 10rpx 30rpx;
......
pages/orderWithdrawal/orderWithdrawal.js
...@@ -147,6 +147,7 @@ Page({ ...@@ -147,6 +147,7 @@ Page({
url: "/cashApplyRecord/applyToCash", url: "/cashApplyRecord/applyToCash",
method: "POST", method: "POST",
data: { data: {
orderNumber: that.data.ordernum,
applyType: that.data.type, applyType: that.data.type,
userId: app.globalData.userInfo.userId, userId: app.globalData.userInfo.userId,
amount: that.data.amount, amount: that.data.amount,
......
pages/user/user.wxml
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
<text>待支付</text> <text>待支付</text>
<text class='num-badge' wx:if="{{orderAmount.unPay>0}}">{{orderAmount.unPay}}</text> <text class='num-badge' wx:if="{{orderAmount.unPay>0}}">{{orderAmount.unPay}}</text>
</view> </view>
<view class='items' bindtap='toOrderListPage' data-sts="7">
<image src='../../images/icon/toTake.png'></image>
<text>收益中</text>
<text class='num-badge' wx:if="{{orderAmount.income>0}}">{{orderAmount.income}}</text>
</view>
<view class='items' bindtap='toOrderListPage' data-sts="2"> <view class='items' bindtap='toOrderListPage' data-sts="2">
<image src='../../images/icon/toDelivery.png'></image> <image src='../../images/icon/toDelivery.png'></image>
<text>待发货</text> <text>待发货</text>
......
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