|
|
@@ -35,7 +35,7 @@
|
|
|
<view class="title-logo"><image :src="shop.shopLogo" mode=""></image></view>
|
|
|
<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>
|
|
|
</view>
|
|
|
- <view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex" @click.stop="detail(order.orderID)">
|
|
|
+ <view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex" @click.stop="detail(order.orderId)">
|
|
|
<view class="goods-pros-t">
|
|
|
<view class="pros-img tui-skeleton-fillet">
|
|
|
<image :src="pros.productImage" alt="" />
|
|
|
@@ -324,9 +324,8 @@
|
|
|
}
|
|
|
},
|
|
|
detail(id) {//订单详情跳转
|
|
|
- console.log(id)
|
|
|
this.isModalLayer = true;
|
|
|
- this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
|
|
|
+ this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderId=${id}`)
|
|
|
},
|
|
|
handButtonConfirm(data) {//获取点击
|
|
|
console.log(data)
|
|
|
@@ -337,39 +336,24 @@
|
|
|
},
|
|
|
handShowAlert(data) {//执行
|
|
|
switch(data.type){
|
|
|
- case 'pay':
|
|
|
- this.$api.navigateTo(`/pages/user/order/order-details?path=pay&state=0&orderID=${this.btnoRderID}`)
|
|
|
- // this.WeChatMiniWxPay(this.hanldOrder);
|
|
|
- break;
|
|
|
- case 'delete':
|
|
|
- this.modal = true;
|
|
|
- this.contentModalText = '确认删除该订单吗？';
|
|
|
- break;
|
|
|
case 'cancel':
|
|
|
this.modal = true;
|
|
|
this.contentModalText = '确认取消该订单吗？';
|
|
|
break;
|
|
|
- case 'refund':
|
|
|
- uni.setStorageSync('refundData',data.order)
|
|
|
- this.$api.navigateTo('/pages/user/order/order-refund')
|
|
|
- break;
|
|
|
- case 'returned':
|
|
|
- uni.setStorageSync('refundData',data.order)
|
|
|
- this.$api.navigateTo('/pages/user/order/order-refund')
|
|
|
+ case 'delete':
|
|
|
+ this.modal = true;
|
|
|
+ this.contentModalText = '确认删除该订单吗？';
|
|
|
break;
|
|
|
case 'query':
|
|
|
this.isModalLayer = true;
|
|
|
- this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
|
|
|
+ this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+data.orderId)
|
|
|
break;
|
|
|
case 'confirm':
|
|
|
this.modal = true;
|
|
|
this.contentModalText = '是否确认收货？'
|
|
|
- // this.handOrderConfirm(data.orderId);
|
|
|
break;
|
|
|
- case 'cancelRefund':
|
|
|
- this.modal = true;
|
|
|
- this.contentModalText = '确定取消退货/退款？'
|
|
|
- // this.handCancelRefundConfirm(data.orderId);
|
|
|
+ case 'pay':
|
|
|
+ this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${data.orderId}`)
|
|
|
break;
|
|
|
}
|
|
|
},
|
|
|
@@ -378,111 +362,50 @@
|
|
|
if(index == 1){
|
|
|
switch(this.OperationType){
|
|
|
case 'delete':
|
|
|
- this.handOrderDetele(data.orderId);
|
|
|
+ this.handOrderDetele(this.btnoRderID);
|
|
|
break
|
|
|
case 'cancel':
|
|
|
- this.handCenceConfirm(data.orderId)
|
|
|
+ this.handCenceConfirm(this.btnoRderID)
|
|
|
break
|
|
|
case 'query':
|
|
|
this.isModalLayer = true;
|
|
|
- this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
|
|
|
+ this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+this.btnoRderID)
|
|
|
break
|
|
|
case 'confirm':
|
|
|
- this.handOrderConfirm(data.orderId);
|
|
|
- break
|
|
|
- case 'pay':
|
|
|
- this.hanldOrderData = data.order;
|
|
|
- this.getOrderPaymentValidation(data)
|
|
|
+ this.handOrderConfirm(this.btnoRderID);
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
this.modal = false;
|
|
|
},
|
|
|
- getOrderPaymentValidation(data){//监听根据付款状态做操作
|
|
|
- this.OrderService.OrderPaymentValidation({orderId:data.orderId}).then(response =>{
|
|
|
- let dataCode = response.data.code
|
|
|
- this.payModelData = response.data
|
|
|
- switch(dataCode){
|
|
|
- case 1:
|
|
|
- this.isPayModel = true;
|
|
|
- this.modelType = 1
|
|
|
- break;
|
|
|
- case 2:
|
|
|
- this.isPayModel = true;
|
|
|
- this.modelType = 2
|
|
|
- break;
|
|
|
- case -1:
|
|
|
- this.$util.modal('','订单已申请全部退款，无需再付款！','确定','',false,() =>{})
|
|
|
- break;
|
|
|
- default:
|
|
|
- if(response.data.onlinePayFlag == '1'){
|
|
|
- this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${response.data.pendingPayments}&orderID=${data.orderId}`)
|
|
|
- }else{
|
|
|
- this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- }).catch(error =>{
|
|
|
- this.$util.msg(error.msg,2000)
|
|
|
- })
|
|
|
- },
|
|
|
- hanldPaymentConfirm(data){//余额抵扣跳转
|
|
|
- this.OrderService.OrderBalanceDeduction({orderId:data.order.orderId}).then(response =>{
|
|
|
- if(data.type === 2){
|
|
|
- let _data = {orderID:data.order.orderId}
|
|
|
- this.$api.navigateTo(`/pages/user/order/success?type=deduction&data=${JSON.stringify({data:_data})}`)
|
|
|
- }else{
|
|
|
- if(data.order.onlinePayFlag === '1'){
|
|
|
- this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${data.order.pendingPayments}&orderID=${data.order.orderId}`)
|
|
|
- }else{
|
|
|
- this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.order.orderId}`)
|
|
|
- }
|
|
|
- }
|
|
|
+ handOrderConfirm (id){//确认收货
|
|
|
+ this.OrderService.ConfirmReceipt({orderId:id}).then(response =>{
|
|
|
+ this.$util.msg(response.msg,2000,true,'success');
|
|
|
+ setTimeout(() => {
|
|
|
+ this.GetOrderDatainit(this.currentTab)
|
|
|
+ },2000)
|
|
|
}).catch(error =>{
|
|
|
this.$util.msg(error.msg,2000)
|
|
|
- })
|
|
|
- },
|
|
|
- hanldCancelConfirm(data){//不使用余额抵扣直接跳转收银台
|
|
|
- if(data.onlinePayFlag == '1'){
|
|
|
- this.$api.navigateTo(`/pages/user/order/order-payment?type=onlinePay&Amount=${this.hanldOrderData.pendingPayments}&orderID=${data.orderId}`)
|
|
|
- }else{
|
|
|
- this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderID=${data.orderId}`)
|
|
|
- }
|
|
|
- },
|
|
|
- handOrderConfirm (id){//确认收货
|
|
|
- this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
|
|
|
- this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
|
|
|
- this.$util.msg(response.msg,2000,true,'success');
|
|
|
- setTimeout(() => {
|
|
|
- this.GetOrderDatainit(this.currentTab)
|
|
|
- },2000)
|
|
|
- }).catch(error =>{
|
|
|
- this.$util.msg(error.msg,2000)
|
|
|
- })
|
|
|
})
|
|
|
},
|
|
|
handOrderDetele(id){//删除订单
|
|
|
- this.$util.modal('提示','确认删除该订单吗？','确定','取消',true,() =>{
|
|
|
- this.OrderService.DeleteOrder({orderID:id}).then(response =>{
|
|
|
- this.$util.msg(response.msg,2000,true,'success');
|
|
|
- setTimeout(() => {
|
|
|
- this.GetOrderDatainit(this.currentTab)
|
|
|
- },2000)
|
|
|
- }).catch(error =>{
|
|
|
- this.$util.msg(error.msg,2000)
|
|
|
- })
|
|
|
+ this.OrderService.DeleteOrder({orderId:id}).then(response =>{
|
|
|
+ this.$util.msg(response.msg,2000,true,'success');
|
|
|
+ setTimeout(() => {
|
|
|
+ this.GetOrderDatainit(this.currentTab)
|
|
|
+ },2000)
|
|
|
+ }).catch(error =>{
|
|
|
+ this.$util.msg(error.msg,2000)
|
|
|
})
|
|
|
},
|
|
|
handCenceConfirm(id){//取消订单
|
|
|
- this.$util.modal('提示','确认取消该订单吗？','确定','取消',true,() =>{
|
|
|
- this.OrderService.CancelOrder({orderID:id}).then(response =>{
|
|
|
- this.$util.msg(response.msg,2000,true,'success');
|
|
|
- setTimeout(() => {
|
|
|
- this.GetOrderDatainit(this.currentTab)
|
|
|
- },2000)
|
|
|
- }).catch(error =>{
|
|
|
- this.$util.msg(error.msg,2000)
|
|
|
- })
|
|
|
+ this.OrderService.CancelOrder({orderId:id}).then(response =>{
|
|
|
+ this.$util.msg(response.msg,2000,true,'success');
|
|
|
+ setTimeout(() => {
|
|
|
+ this.GetOrderDatainit(this.currentTab)
|
|
|
+ },2000)
|
|
|
+ }).catch(error =>{
|
|
|
+ this.$util.msg(error.msg,2000)
|
|
|
})
|
|
|
},
|
|
|
handlSearchPath(){
|
|
|
@@ -493,9 +416,9 @@
|
|
|
if (res.from === 'button') {// 来自页面内转发按钮
|
|
|
}
|
|
|
return {
|
|
|
- title: '您有新的分享订单，快来查看吧~',
|
|
|
+ title: '点击查看您的订单~',
|
|
|
path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userId=${this.userId}`,
|
|
|
- imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
|
|
|
+ imageUrl:'https://static-b.caimei365.com/app/wisa/img/icon/icon-share.png'
|
|
|
}
|
|
|
},
|
|
|
orderPriceToFixed (n){
|
|
|
@@ -545,7 +468,6 @@
|
|
|
StateExpFormat(state){ //订单状态文字和颜色
|
|
|
var HtmlStateText = '',
|
|
|
stateTextObject={
|
|
|
- 0:'待确认',
|
|
|
4:'交易完成',
|
|
|
5:'订单完成',
|
|
|
6:'已关闭',
|
