Commit 40529336 by wangyalan-git

流转中心/订单列表修改/收益中

parent 4af630f6
......@@ -22,6 +22,8 @@
"pages/recent-news/recent-news",
"pages/news-detail/news-detail",
"pages/invite/invite",
"pages/orderFlow/orderFlow",
"pages/orderWithdrawal/orderWithdrawal",
"pages/distribution/index",
"pages/userAccount/comDetails/index",
"pages/userAccount/distributionOrder/index",
......
var http = require('../../utils/http.js');
var config = require('../../utils/config.js');
Page({
/**
* 页面的初始数据
*/
data: {
list: [],
current: 1,
pages: 0,
sts: 0
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
if (options.sts) {
this.setData({
sts: options.sts
});
this.loadOrderData(options.sts, 1);
} else {
this.loadOrderData(0, 1);
}
},
/**
* 加载订单数据
*/
loadOrderData: function(sts, current) {
var ths = this;
wx.showLoading();
//加载订单列表
var params = {
url: "/p/myOrder/myOrder",
method: "GET",
data: {
current: current,
size: 10,
status: sts,
},
callBack: function(res) {
//console.log(res);
var list = [];
if (res.current == 1) {
list = res.records;
} else {
list = ths.data.list;
Array.prototype.push.apply(list, res.records);
}
ths.setData({
list: list,
pages: res.pages,
current: res.current
});
wx.hideLoading();
}
};
http.request(params);
},
/**
* 状态点击事件
*/
onStsTap: function(e) {
var sts = e.currentTarget.dataset.sts;
this.setData({
sts: sts
});
this.loadOrderData(sts, 1);
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
if (this.data.current < this.data.pages) {
this.loadOrderData(this.data.sts, this.data.current + 1);
}
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
},
/**
* 查看物流
*/
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.loadOrderData(ths.data.sts, 1);
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);
},
/**
* 查看订单详情
*/
toOrderDetailPage: function(e) {
wx.navigateTo({
url: '/pages/order-detail/order-detail?orderNum=' + e.currentTarget.dataset.ordernum,
})
},
/**
* 确认收货
*/
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.loadOrderData(ths.data.sts, 1);
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.loadOrderData(ths.data.sts, 1);
wx.hideLoading();
}
}
http.request(params);
} else if (res.cancel) {
console.log('用户点击取消')
}
}
})
}
})
\ No newline at end of file
{
"backgroundTextStyle": "light",
"navigationBarTitleText": "流转中心",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#fafafa"
}
\ No newline at end of file
<!--pages/orderList/orderList.wxml-->
<view class='container'>
<!-- 头部菜单 -->
<view class='order-tit'>
<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="7" class="{{sts==7?'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="5" class="{{sts==5?'on':''}}">已完成</text>
</view>
<!-- end 头部菜单 -->
<view class='main'>
<view class="empty" wx:if="{{list.length==0}}">
还没有任何相关订单
</view>
<!-- 订单列表 -->
<block wx:for="{{list}}" wx:key=''>
<view class='prod-item'>
<view class="order-num">
<text>订单编号:{{item.orderNumber}}</text>
<view class='order-state'>
<!-- 订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 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?'转单完成':''))))))))}}</text>
<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'
data-ordernum="{{item.orderNumber}}"></image>
</view>
</view>
</view>
<!-- 商品列表 -->
<!-- 一个订单单个商品的显示 -->
<block wx:if="{{item.orderItemDtos.length==1}}">
<block wx:for="{{item.orderItemDtos}}" wx:for-item="prod" wx:key=''>
<view>
<view class='item-cont' bindtap='toOrderDetailPage' data-ordernum="{{item.orderNumber}}">
<view class='prod-pic'>
<image src='{{prod.pic}}'></image>
</view>
<view class='prod-info'>
<view class='prodname'>
{{prod.prodName}}
</view>
<view class='prod-info-cont'>{{prod.skuName}}</view>
<view class='price-nums'>
<view>
<text class='prodprice' style="margin-left: 20rpx;"><text class='symbol'>¥</text>
<text class='big-num'>{{wxs.parsePrice(prod.updatePrice)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(prod.updatePrice)[1]}}</text></text>
</view>
<text class="prodcount">x{{prod.prodCount}}</text>
</view>
</view>
</view>
</view>
</block>
</block>
<!-- 一个订单多个商品时的显示 -->
<block wx:else>
<view class='item-cont' bindtap='toOrderDetailPage' data-ordernum="{{item.orderNumber}}">
<scroll-view scroll-x="true" scroll-left='0' scroll-with-animation="false" class="categories">
<block wx:for="{{item.orderItemDtos}}" wx:for-item="prod" wx:key=''>
<view class='prod-pic'>
<image src="{{prod.pic}}"></image>
</view>
</block>
</scroll-view>
</view>
</block>
<view class='total-num'>
<!-- <text class="prodcount">共1件商品</text> -->
<view class='prodprice'>实付:
<text class='symbol'>¥</text>
<text class='big-num'>{{wxs.parsePrice(item.actualTotal)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(item.actualTotal)[1]}}</text>
</view>
<view class='prodprice'>订单金额:
<text class='symbol'>¥</text>
<text class='big-num'>{{wxs.parsePrice(item.orderIncome.nowOrderAmount)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(item.orderIncome.nowOrderAmount)[1]}}</text>
</view>
</view>
<!-- end 商品列表 -->
<view class='prod-foot'>
<view class='btn'>
<text wx:if="{{item.status==1}}" class="button" bindtap="onCancelOrder" data-ordernum="{{item.orderNumber}}"
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>
<text wx:if="{{item.status==3 || item.status==5}}" class="button" bindtap="toDeliveryPage"
data-ordernum="{{item.orderNumber}}" hover-class='none'>查看物流</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>
</block>
</view>
</view>
<!-- end 订单列表 -->
<wxs module="wxs" src="../../wxs/number.wxs" />
\ No newline at end of file
/* pages/orderList/orderList.wxss */
page {
background-color: #f4f4f4;
color: #333;
}
/* 头部菜单 */
.order-tit {
position: fixed;
top: 0;
display: flex;
justify-content: space-around;
z-index: 999;
width: 100%;
height: 100rpx;
line-height: 100rpx;
background-color: #fff;
border-bottom: 2rpx solid #f4f4f4;
}
.order-tit text {
display: block;
font-size: 28rpx;
color: 999;
width: 100rpx;
text-align: center;
}
.order-tit text.on {
border-bottom: 4rpx solid #eb2444;
color: #eb2444;
}
/* end 头部菜单 */
.main {
margin-top: 100rpx;
}
/* 商品列表 */
.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;
font-size: 24rpx;
}
.prod-item .item-cont .categories {
white-space: nowrap;
}
.prod-item .item-cont {
display: flex;
align-items: center;
padding: 20rpx 30rpx;
border-radius: 10rpx;
display: -webkit-flex;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
background: #fafafa;
}
.prod-item .order-num .clear-btn {
width: 32rpx;
height: 32rpx;
font-size: 0;
vertical-align: top;
margin-left: 42rpx;
position: relative;
}
.prod-item .order-num .clear-btn::after {
content: " ";
display: block;
position: absolute;
left: -10px;
top: 0rpx;
width: 1px;
height: 32rpx;
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: inline-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: 36rpx;
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{
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
}
.prod-item .price-nums .prodprice {
color: #333;
}
.prod-item .price-nums .prodcount {
color: #999;
font-family: verdana;
}
.prod-item .total-num .prodprice {
display: inline-block;
color: #333;
}
.prod-item .total-num .prodprice:last-child{
margin-left: 20rpx;
}
.prod-item .total-num .prodcount {
margin-right: 20rpx;
}
.prod-item .prod-foot {
padding: 20rpx 30rpx;
border-top: 2rpx solid #e6e6e6;
}
.prod-item .prod-foot .total {
font-size: 25rpx;
margin-bottom: 20rpx;
padding-bottom: 20rpx;
border-bottom: 2rpx solid #e9eaec;
}
.prod-item .prod-foot .btn {
display: flex;
align-items: center;
justify-content: flex-end;
}
.other-button-hover {
background-color: blue;
}
.button-hover {
background-color: red;
}
/** 添加自定义button点击态样式类**/
.button-hover {
background-color: blue;
}
.button {
margin-left: 10px;
font-size: 26rpx;
background: #fff;
padding: 10rpx 30rpx;
border-radius: 80rpx;
border: 2rpx solid #e1e1e1;
}
.button.warn {
color: #eb2444;
border-color: #eb2444;
}
.button.gray{
color: #999;
border-color: #ccc;
}
/* end 商品列表 */
.empty {
font-size: 24rpx;
margin-top: 100rpx;
text-align: center;
color: #999;
height: 300rpx;
line-height: 300rpx;
}
/* 根据状态显示不同的颜色 */
.order-state .order-sts.red {
color: #eb2444;
}
.order-state .order-sts.gray {
color: #999;
}
......@@ -16,7 +16,7 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
onLoad: function (options) {
if (options.sts) {
this.setData({
sts: options.sts
......@@ -30,7 +30,7 @@ Page({
/**
* 加载订单数据
*/
loadOrderData: function(sts, current) {
loadOrderData: function (sts, current) {
var ths = this;
wx.showLoading();
//加载订单列表
......@@ -42,7 +42,7 @@ Page({
size: 10,
status: sts,
},
callBack: function(res) {
callBack: function (res) {
//console.log(res);
var list = [];
if (res.current == 1) {
......@@ -65,7 +65,7 @@ Page({
/**
* 状态点击事件
*/
onStsTap: function(e) {
onStsTap: function (e) {
var sts = e.currentTarget.dataset.sts;
this.setData({
sts: sts
......@@ -76,42 +76,42 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {
onReachBottom: function () {
if (this.data.current < this.data.pages) {
this.loadOrderData(this.data.sts, this.data.current + 1);
}
......@@ -120,7 +120,7 @@ Page({
/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {
onShareAppMessage: function () {
},
......@@ -128,7 +128,7 @@ Page({
/**
* 查看物流
*/
toDeliveryPage: function(e) {
toDeliveryPage: function (e) {
wx.navigateTo({
url: '/pages/express-delivery/express-delivery?orderNum=' + e.currentTarget.dataset.ordernum
})
......@@ -137,7 +137,7 @@ Page({
/**
* 取消订单
*/
onCancelOrder: function(e) {
onCancelOrder: function (e) {
var ordernum = e.currentTarget.dataset.ordernum;
var ths = this;
wx.showModal({
......@@ -156,7 +156,7 @@ Page({
url: "/p/myOrder/cancel/" + ordernum,
method: "PUT",
data: {},
callBack: function(res) {
callBack: function (res) {
//console.log(res);
ths.loadOrderData(ths.data.sts, 1);
wx.hideLoading();
......@@ -174,7 +174,7 @@ Page({
/**
* 付款
*/
onPayAgain: function(e) {
onPayAgain: function (e) {
wx.showLoading({
mask: true
});
......@@ -194,12 +194,12 @@ Page({
package: res.packageValue,
signType: res.signType,
paySign: res.paySign,
success: function() {
success: function () {
wx.navigateTo({
url: '/pages/pay-result/pay-result?sts=1&orderNumbers=' + e.currentTarget.dataset.ordernum,
})
},
fail: function(err) {
fail: function (err) {
//console.log("支付失败");
}
})
......@@ -213,7 +213,7 @@ Page({
/**
* 查看订单详情
*/
toOrderDetailPage: function(e) {
toOrderDetailPage: function (e) {
wx.navigateTo({
url: '/pages/order-detail/order-detail?orderNum=' + e.currentTarget.dataset.ordernum,
})
......@@ -222,7 +222,7 @@ Page({
/**
* 确认收货
*/
onConfirmReceive: function(e) {
onConfirmReceive: function (e) {
var ths = this;
wx.showModal({
title: '',
......@@ -238,7 +238,7 @@ Page({
url: "/p/myOrder/receipt/" + e.currentTarget.dataset.ordernum,
method: "PUT",
data: {},
callBack: function(res) {
callBack: function (res) {
//console.log(res);
ths.loadOrderData(ths.data.sts, 1);
wx.hideLoading();
......@@ -251,8 +251,8 @@ Page({
}
})
},
//删除已完成||已取消的订单
delOrderList: function(e) {
//删除已完成||已取消的订单
delOrderList: function (e) {
var ths = this
wx.showModal({
title: '',
......@@ -266,7 +266,7 @@ Page({
url: "/p/myOrder/" + ordernum,
method: "DELETE",
data: {},
callBack: function(res) {
callBack: function (res) {
ths.loadOrderData(ths.data.sts, 1);
wx.hideLoading();
}
......@@ -277,5 +277,110 @@ Page({
}
}
})
},
// 提现
onOrderWithdrawal: function (e) {
let data = e.currentTarget.dataset
let amount = 0
if (data.type == 2) {
amount = Number(data.item.orderIncome.nowOrderAmount) - Number(data.item.orderIncome.cashAmomunt)
}else if(data.type == 1){
amount = Number(data.item.orderIncome.toCashAmmount)
}else {
}
wx.navigateTo({
url: '/pages/orderWithdrawal/orderWithdrawal?type=' + data.type + '&ordernum=' + data.ordernum + '&amount='+ amount,
})
},
// 挂单
onPendingOrder: 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.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",
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('用户点击取消')
}
}
})
},
// 提货
onPickGoods: 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.loadOrderData(ths.data.sts, 1);
wx.hideLoading();
}
};
http.request(params);
} else if (res.cancel) {
//console.log('用户点击取消')
}
}
})
},
})
\ No newline at end of file
......@@ -5,6 +5,7 @@
<view class='order-tit'>
<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="7" class="{{sts==7?'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="5" class="{{sts==5?'on':''}}">已完成</text>
......@@ -20,10 +21,12 @@
<view class="order-num">
<text>订单编号:{{item.orderNumber}}</text>
<view class='order-state'>
<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==5?'已完成':'已取消')))}}</text>
<!-- 订单状态 -1已取消 1:待付款 2:待发货 3:待收货 4:待评价 5:成功 6:失败 7收益中 8挂单中 9退单中 10完成 -->
<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>
<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' data-ordernum="{{item.orderNumber}}"></image>
<image src='../../images/icon/clear-his.png' class='clear-list-btn' bindtap='delOrderList'
data-ordernum="{{item.orderNumber}}"></image>
</view>
</view>
</view>
......@@ -43,9 +46,12 @@
</view>
<view class='prod-info-cont'>{{prod.skuName}}</view>
<view class='price-nums'>
<text class='prodprice'><text class='symbol'>¥</text>
<text class='big-num'>{{wxs.parsePrice(prod.price)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(prod.price)[1]}}</text></text>
<view>
<text class='prodprice' style="margin-left: 20rpx;"><text class='symbol'>¥</text>
<text class='big-num'>{{wxs.parsePrice(prod.updatePrice)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(prod.updatePrice)[1]}}</text></text>
</view>
<text class="prodcount">x{{prod.prodCount}}</text>
</view>
</view>
......@@ -68,20 +74,38 @@
<view class='total-num'>
<!-- <text class="prodcount">共1件商品</text> -->
<view class='prodprice'>合计
<view class='prodprice'>实付
<text class='symbol'>¥</text>
<text class='big-num'>{{wxs.parsePrice(item.actualTotal)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(item.actualTotal)[1]}}</text>
</view>
<view class='prodprice'>订单金额:
<text class='symbol'>¥</text>
<text class='big-num'>{{wxs.parsePrice(item.orderIncome.nowOrderAmount)[0]}}</text>
<text class='small-num'>.{{wxs.parsePrice(item.orderIncome.nowOrderAmount)[1]}}</text>
</view>
</view>
<!-- end 商品列表 -->
<view class='prod-foot'>
<view class='btn'>
<text wx:if="{{item.status==1}}" class="button" bindtap="onCancelOrder" data-ordernum="{{item.orderNumber}}" hover-class='none'>取消订单</text>
<text 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>
<text wx:if="{{item.status==3 || item.status==5}}" class="button" bindtap="toDeliveryPage" data-ordernum="{{item.orderNumber}}" hover-class='none'>查看物流</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==1}}" class="button" bindtap="onCancelOrder" data-ordernum="{{item.orderNumber}}"
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>
<text wx:if="{{item.status==3 || item.status==5}}" class="button" bindtap="toDeliveryPage"
data-ordernum="{{item.orderNumber}}" hover-class='none'>查看物流</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="onPendingOrder"
data-ordernum="{{item.orderNumber}}" 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.orderNumber}}" 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>
......
......@@ -165,17 +165,17 @@ page {
padding: 20rpx 30rpx;
font-size: 28rpx;
}
.prod-item .price-nums{
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
}
.prod-item .price-nums .prodprice {
color: #333;
position: absolute;
bottom: 0;
}
.prod-item .price-nums .prodcount {
position: absolute;
bottom: 5rpx;
right: 0;
color: #999;
font-family: verdana;
}
......@@ -184,7 +184,9 @@ page {
display: inline-block;
color: #333;
}
.prod-item .total-num .prodprice:last-child{
margin-left: 20rpx;
}
.prod-item .total-num .prodcount {
margin-right: 20rpx;
}
......@@ -234,7 +236,10 @@ page {
color: #eb2444;
border-color: #eb2444;
}
.button.gray{
color: #999;
border-color: #ccc;
}
/* end 商品列表 */
.empty {
......
// pages/newly/redpacket.js
var http = require("../../utils/http.js");
var app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
amount: 0,
imgStr: '',
amount: '',
name: '',
actualAmount: '',
how: false,//是否显示如何上传收款码提示框
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.setData({
type: this.options.type,
ordernum: this.options.ordernum,
amount: this.options.amount
})
console.log('list',this.data.type,this.data.ordernum)
this.getData();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
allWithdrawal: function () {
this.setData({
amount: this.data.balance
})
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
getData() {
},
gotoShow: function () {
var that = this
wx.chooseImage({
count: 1, // 最多可以选择的图片张数,默认9
sizeType: ['original', 'compressed'], // original 原图,compressed 压缩图,默认二者都有
sourceType: ['album', 'camera'], // album 从相册选图,camera 使用相机,默认二者都有
success: function (res) {
// success
var tempFilePaths = res.tempFilePaths;
// that.setData({
// imgStr: wx.getFileSystemManager().readFileSync(res.tempFilePaths[0], "base64")
// })
that.setData({
imgStr: res.tempFilePaths
})
},
fail: function () {
// fail
},
complete: function () {
// complete
}
})
},
amountinput(e) {
let value = e.detail.value
// let actualAmount = (value * (1 - (this.data.rate / 100))).toFixed(2);
// console.log(value, actualAmount)
this.setData({
amount: value
})
},
nameinput(e) {
let value = e.detail.value
console.log(value)
this.setData({
name: value
})
},
bankinput(e) {
let value = e.detail.value
console.log(value)
this.setData({
bankName: value
})
},
bankCardinput(e) {
let value = e.detail.value
console.log(value)
this.setData({
bankCard: value
})
},
//最新提现做法
inputimg: function () {
let that = this;
var stockAmount = /^\d{1,}$/
if (!stockAmount.test(that.data.amount)) {
wx.showToast({ title: '请填写提现金额', icon: 'none' })
return
}
wx.showLoading()
var params = {
url: "/cashApplyRecord/applyToCash",
method: "POST",
data: {
applyType: that.data.type,
userId: app.globalData.userInfo.userId,
amount: that.data.amount,
name: that.data.name,
bankName: that.data.bankName,
bankCard: that.data.bankCard
},
callBack: (res) => {
wx.hideLoading()
wx.showToast({
title: '操作成功,我们将尽快为您提现',
icon: 'none'
})
},
errBack: (res) => {
wx.hideLoading()
wx.showToast({
title: res.note,
icon: 'none'
})
}
};
http.request(params);
},
//之前提现做法
inputimg2: function () {
let that = this;
if (that.data.imgStr != '' && that.data.amount > 0 && that.data.name != '') {
console.log(that.data.imgStr)
wx.showLoading({
title: '正在上传图片,请等待...'
});
var token = wx.getStorageSync('token');
if (token) {
wx.uploadFile({
url: api.newly_balanceWithdraw, //仅为示例,非真实的接口地址
filePath: that.data.imgStr[0],
name: 'file',
formData: {
token: token,
amount: that.data.amount,
name: that.data.name
},
success: function (res) {
console.log(res)
wx.hideLoading()
if (res.statusCode == 200) {
var obj = JSON.parse(res.data)
console.log(obj, obj.status)
if (obj.status == 200) {
wx.showToast({
title: '操作成功,我们将尽快为您提现',
icon: 'none'
})
that.setData({
imgStr: '',
amount: '',
name: ''
})
} else {
wx.showToast({
title: obj.desc,
icon: 'none'
})
}
} else {
wx.showToast({
title: '操作失败,请稍后重试',
icon: 'none'
})
}
}
})
}
} else {
wx.showToast({
title: '请填写完整的提现信息',
icon: 'none'
})
}
},
//点击如何上传收款码
showHow() {
this.setData({
how: true,
});
},
hideHow() {
this.setData({
how: false,
})
}
})
\ No newline at end of file
{
"navigationBarTitleText": "提现"
}
\ No newline at end of file
<!--pages/newly/redpacket.wxml-->
<view class="container">
<view class='content'>
<view class='top'>
<text class="txt">提现金额</text>
<view class="my-input">
<text>¥</text>
<input class='input' type='text' value="{{amount}}" bindinput="amountinput" placeholder-class='phcolor'
placeholder='请输入提现金额'></input>
</view>
<view class="notice">
可提现金额¥<text>{{amount}}</text><text class="primary" bindtap="allWithdrawal">全部提现</text>
</view>
</view>
</view>
<view class="botton-container">
<!-- <view class='inputimg' type="default" bindtap="gotoShow">点击上传您的收款码</view> -->
<view class='inputimg' type="default" bindtap="inputimg">48小时内到账,确认提现</view>
<!-- <view class='how-container' bindtap="showHow">
<image class='how-img' src="/images/newly/notice.png"></image>
<text class='how-txt'>如何上传收款码?</text>
</view> -->
</view>
<view class="notice-container">
<text class='txt-notice-title'>【温馨提醒】</text>
<text class='txt-notice'></text>
<text class="txt-notice" wx:if="{{type == 2}}">1 收益提现后将不能提货只能退单; \n 2 收益提现将转入余额; \n 3 退单中的订单将不进行收益</text>
<text class="txt-notice" wx:else>1 收益提现后将不能提货只能退单; \n 2 收益提现将转入余额; </text>
</view>
<view class="coupon-notice-window" wx:if="{{how}}">
<view class="container">
<view class="root-corner"></view>
<view class="root">
<view class="content-container">
<text class="title">提示</text>
<!-- 微信 -->
<view class="row-container margin-top">
<image class="logo" src="/images/newly/wechat.png"></image>
<text class="logo-text">如何传微信收款码?</text>
</view>
<text class="logo-desc">1、打开微信,点击右上角“+”\n2、点击收款码,再点二维码收款\n3、保存收款码即可上传</text>
<!-- 支付宝 -->
<view class="row-container margin-top">
<image class="logo" src="/images/newly/alipay.png"></image>
<text class="logo-text">如何传支付宝收款码?</text>
</view>
<text class="logo-desc">1、打开支付宝,点击收钱”\n2、保存收款码即可上传</text>
</view>
<view class="btn" bindtap="hideHow">
<text class="btn-text">知道啦</text>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
page {
background: #f4f4f4;
}
.container {
background: #f4f4f4;
width: 100%;
height: 100%;
min-height: 100%;
overflow: hidden;
}
.content {
width: 100%;
height: 100%;
padding: 40rpx 20rpx 0 20rpx;
display: flex;
flex-direction: column;
}
.top {
float: left;
width: 95%;
background-color: #fff;
border-radius: 20rpx;
box-sizing: border-box;
padding: 20rpx 40rpx;
}
.top .li-line {
width: 100%;
height: 3rpx;
background-color: #CCCCCC;
}
.top .li {
float: left;
width: 100%;
height: 120rpx;
line-height: 120rpx;
position: relative;
box-sizing: border-box;
padding-left: 180rpx;
font-size: 34rpx;
}
.top .txt {
font-size: 30rpx;
color: #333;
}
.top .my-input {
display: flex;
align-items: center;
margin-top: 20rpx;
padding: 20rpx 0;
border-bottom: 1rpx solid #e8e8e8;
}
.top .notice {
color: #999;
font-size: 26rpx;
padding: 20rpx 0;
}
.top .primary {
color: #3a86b9;
margin-left: 30rpx;
}
.phcolor {
font-size: 30rpx;
color: #C4C4C4;
}
.top .showimg {
float: left;
width: 100%;
}
.botton-container {
width: 100%;
margin-top: 30rpx;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.botton-container .inputimg {
width: 95%;
font-size: 30rpx;
height: 76rpx;
line-height: 76rpx;
margin-top: 10rpx;
background-color: #E4BC98;
text-align: center;
border-radius: 15rpx;
color: rgb(83, 37, 3);
}
.botton-container .inputimg2 {
width: 95%;
font-size: 30rpx;
height: 76rpx;
line-height: 76rpx;
margin-top: 30rpx;
background-color: rgb(235, 84, 1);
color: #fff;
text-align: center;
border-radius: 15rpx;
}
.how-container {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
margin-top: 30rpx;
}
.how-container .how-img {
width: 30rpx;
height: 30rpx;
}
.how-container .how-txt {
color: black;
font-size: 28rpx;
margin-left: 10rpx;
}
.notice-container {
width: 100%;
display: flex;
flex-direction: column;
margin-left: 100rpx;
margin-top: 50rpx;
}
.txt-notice {
font-size: 26rpx;
line-height: 50rpx;
color: rgba(0, 0, 0, 1);
}
.txt-notice-title {
font-size: 26rpx;
line-height: 50rpx;
color: rgb(235, 84, 1);
}
.coupon-notice-window {
position: fixed;
z-index: 998;
width: 100%;
height: 100%;
left: 0;
top: 0;
background-color: rgba(0, 0, 0, 0.6);
}
.coupon-notice-window .container {
background-color: rgba(0, 0, 0, 0);
position: relative;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.coupon-notice-window .container .root-corner {
position: absolute;
z-index: 666;
width: 600rpx;
height: 800rpx;
margin-top: 20rpx;
border-radius: 25rpx;
background-color: white;
}
.coupon-notice-window .container .root {
position: absolute;
z-index: 667;
width: 600rpx;
height: 800rpx;
}
.coupon-notice-window .container .content-container {
display: flex;
flex-direction: column;
justify-content: center;
margin-left: 50rpx;
margin-right: 10rpx;
}
.coupon-notice-window .container .content-container .title {
color: black;
font-size: 40rpx;
width: 100%;
text-align: center;
margin-top: 70rpx;
margin-left: -20rpx;
font-weight: bold;
}
.coupon-notice-window .container .content-container .row-container {
display: flex;
flex-direction: row;
align-items: center
}
.margin-top {
margin-top: 20rpx;
}
.logo {
width: 50rpx;
height: 50rpx;
}
.logo-text {
margin-left: 15rpx;
color: black;
font-size: 35rpx;
font-weight: bold;
}
.logo-desc {
font-size: 33rpx;
color: rgb(62, 62, 62);
margin-top: 20rpx;
margin-bottom: 40rpx;
}
.coupon-notice-window .container .btn {
width: 450rpx;
height: 70rpx;
margin-top: 20rpx;
border-radius: 15rpx;
background-color: rgb(235, 84, 1);
margin-left: auto;
margin-right: auto;
display: flex;
align-items: center;
justify-content: center;
}
.coupon-notice-window .container .btn .btn-text {
font-size: 34rpx;
color: white;
}
\ No newline at end of file
......@@ -129,7 +129,11 @@ Page({
title: '正在开发中'
})
},
toOrderFlow: function(){
wx.navigateTo({
url: '/pages/orderFlow/orderFlow',
})
},
toInvitePage: function () {
wx.navigateTo({
url: '/pages/invite/invite',
......
......@@ -78,6 +78,13 @@
</view>
<view class='my-menu'>
<view class='memu-item' bindtap='toOrderFlow'>
<view class="i-name">
<image src='../../images/icon/timePrice.png'></image>
<text>流转中心</text>
</view>
<view class='arrowhead'></view>
</view>
<view class='memu-item' bindtap='toDistCenter'>
<view class="i-name">
<image src='../../images/icon/promotion.png'></image>
......
......@@ -7,6 +7,7 @@ Page({
* 页面的初始数据
*/
data: {
imgUrl: '',
imgStr: '',
amount: '',
name: '',
......@@ -30,6 +31,23 @@ Page({
};
http.request(params);
},
uploadImage(item) {
console.log('ite',item)
var that = this
http.uploadImage('/fileCapi/upload', {
file: item,
fileType: 'miniQr'
}, {
suc: function (res) {
console.log("res",res)
that.setData({
imgUrl: res.result.url,
img: res.result.filePath
})
}
})
},
/**
* 生命周期函数--监听页面加载
*/
......@@ -97,12 +115,17 @@ Page({
success: function (res) {
// success
var tempFilePaths = res.tempFilePaths;
console.log('res.tempFilePaths',res.tempFilePaths)
// that.setData({
// imgStr: wx.getFileSystemManager().readFileSync(res.tempFilePaths[0], "base64")
// })
that.setData({
imgStr: res.tempFilePaths
tempFilePaths.forEach(item => {
that.uploadImage(item)
})
// that.setData({
// imgStr: res.tempFilePaths
// })
},
fail: function () {
// fail
......@@ -149,14 +172,14 @@ Page({
wx.showToast({ title: '请填写收款人', icon: 'none' })
return
}
if (!that.data.bankName) {
wx.showToast({ title: '请填写开户行', icon: 'none' })
return
}
if (!that.data.bankCard) {
wx.showToast({ title: '请填写银行卡号', icon: 'none' })
return
}
// if (!that.data.bankName) {
// wx.showToast({ title: '请填写开户行', icon: 'none' })
// return
// }
// if (!that.data.bankCard) {
// wx.showToast({ title: '请填写银行卡号', icon: 'none' })
// return
// }
var stockAmount = /^\d{1,}$/
if (!stockAmount.test(that.data.amount)) {
wx.showToast({ title: '请填写提现金额', icon: 'none' })
......@@ -171,7 +194,9 @@ Page({
amount: that.data.amount,
name: that.data.name,
bankName: that.data.bankName,
bankCard: that.data.bankCard
bankCard: that.data.bankCard,
img: that.data.img,
applyType: 0
},
callBack: (res) => {
wx.hideLoading()
......
......@@ -4,34 +4,46 @@
<view class='top'>
<view class='li'>
<text class='txt'>收款人</text>
<input class='input' type='text' value="{{name}}" bindinput="nameinput" placeholder-class='phcolor' placeholder='请输入收款人姓名'></input>
<input class='input' type='text' value="{{name}}" bindinput="nameinput" placeholder-class='phcolor'
placeholder='请输入收款人姓名'></input>
</view>
<view class='li'>
<text class='txt'>开户行</text>
<input class='input' type='text' value="{{bankName}}" bindinput="bankinput" placeholder-class='phcolor' placeholder='请输入开户行'></input>
<input class='input' type='text' value="{{bankName}}" bindinput="bankinput" placeholder-class='phcolor'
placeholder='请输入开户行'></input>
</view>
<view class='li'>
<text class='txt'>银行卡号</text>
<input class='input' type='text' value="{{bankCard}}" bindinput="bankCardinput" placeholder-class='phcolor' placeholder='请输入银行卡号'></input>
<input class='input' type='text' value="{{bankCard}}" bindinput="bankCardinput" placeholder-class='phcolor'
placeholder='请输入银行卡号'></input>
</view>
<view class='li no-height'>
<text class='txt' style="top: 20rpx;">收款码</text>
<view bindtap="gotoShow">
<image class="upload-image" src="/images/icon/upload@2x.png" wx:if="{{!imgUrl}}"></image>
<image class="upload-image" wx:else src="{{imgUrl}}"></image>
</view>
</view>
<view class='li'>
<text class='txt'>提现金额</text>
<input class='input' type='text' value="{{amount}}" bindinput="amountinput" placeholder-class='phcolor' placeholder='请输入提现金额'></input>
<input class='input' type='text' value="{{amount}}" bindinput="amountinput" placeholder-class='phcolor'
placeholder='请输入提现金额'></input>
</view>
<view class='li'>
<text class='txt'>到账金额</text>
<text class='input' wx:if="{{amount>=50}}">{{actualAmount}}</text>
</view>
</view>
</view>
<view class="botton-container">
<!-- <view class='inputimg' type="default" bindtap="gotoShow">点击上传您的收款码</view> -->
<view class='inputimg' type="default" bindtap="inputimg">48小时内到账,确认提现</view>
<!-- <view class='how-container' bindtap="showHow">
<view class='how-container' bindtap="showHow">
<image class='how-img' src="/images/newly/notice.png"></image>
<text class='how-txt'>如何上传收款码?</text>
</view> -->
</view>
</view>
<view class="notice-container">
......
......@@ -61,7 +61,14 @@ page {
line-height: 120rpx;
font-size: 30rpx;
}
.top .li.no-height{
height: unset;
line-height: unset;
}
.top .li .upload-image{
width: 150rpx;
height: 150rpx;
}
.phcolor {
font-size: 30rpx;
color: #C4C4C4;
......@@ -130,6 +137,7 @@ page {
flex-direction: column;
margin-left: 100rpx;
margin-top: 50rpx;
margin-bottom: 50rpx;
}
.txt-notice{
......
......@@ -75,8 +75,64 @@ function request(params, isGetTonken) {
})
}
// 上传图片
function uploadImage(url, params, cfg) {
const token = wx.getStorageSync('token')
const header = {
token: token,
'Content-Type': 'application/json;charset=UTF-8'
}
wx.showLoading()
console.log('params.file',params)
wx.uploadFile({
url: config.domain + url,
filePath: params.file,
header: header,
name: 'file',
formData: {
file: params.file,
fileType: params.fileType
},
success: function (res) {
wx.hideLoading()
if (typeof res.data == 'string') {
res.data = JSON.parse(res.data)
}
if (res.data.code == 1) {
//request success callback
if (cfg.suc) {
cfg.suc(res.data)
}
} else if (res.data.code == 401 || res.statusCode == 401) {
//request not authorization
wx.removeStorageSync('token')
wx.removeStorageSync('user')
getApp().globalData.userInfo = null
getApp().goLogin()
} else {
//request error callback
if (cfg.erc) {
cfg.erc(res)
} else if (res.data.msg) {
if (res.data.msg instanceof Array) {
wx.showToast({title: res.data.msg[0]})
} else {
wx.showToast({title: res.data.msg})
}
} else {
wx.showToast({title: '请求失败,请重试!'})
}
}
},
fail: err => {
wx.hideLoading()
wx.showToast({title: '图片上传失败,请重试!'})
if (cfg.erc) {
cfg.erc(err)
}
}
})
}
//获取购物车商品数量
function getCartCount() {
var params = {
......@@ -105,4 +161,5 @@ function getCartCount() {
exports.request = request;
exports.uploadImage = uploadImage;
exports.getCartCount = getCartCount;
\ No newline at end of file
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