|
|
@@ -19,8 +19,8 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-for="(item, index) in orderList" :key="index">
|
|
|
- <view class="list" @click="goOrderDetails(item.orderId)">
|
|
|
- <view class="myclient_list">
|
|
|
+ <view class="list" >
|
|
|
+ <view class="myclient_list" @click="goOrderDetails(item.orderId)">
|
|
|
<view class="myclient_list_name">
|
|
|
<view class="nl">
|
|
|
{{item.mainTitle}}
|
|
|
@@ -77,7 +77,7 @@
|
|
|
{{item.selfTakeName}}
|
|
|
</view>
|
|
|
<view class="am1-2">
|
|
|
- <image src="http://www.gzzzyd.com/groupon/order_details/距离@2x.png" mode="scaleToFill" />
|
|
|
+ <image src="http://www.gzzzyd.com/groupon/order_details/导航图标@2x.png" mode="scaleToFill" />
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -95,9 +95,11 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="op-area">
|
|
|
- <button v-if="item.orderState == 1" class="action-btn" @click="goPay()">立即付款</button>
|
|
|
- <button v-if="item.orderState == 2" class="info-btn" @click="goPay()">申请退货</button>
|
|
|
- <button v-if="item.orderState == 2" class="action-btn" @click="goPay()">取货码 {{item.pickupCode}}</button>
|
|
|
+ <button v-if="item.orderState == 1" class="action-btn" @click="cancelOrder(item.orderId)">取消订单</button>
|
|
|
+ <button v-if="item.orderState == 1" class="action-btn" @click="goPay(item)">立即付款</button>
|
|
|
+ <!-- <button v-if="item.orderState == 4" class="info-btn" @click="goPay()">申请退货</button> -->
|
|
|
+ <button v-if="item.canRefund" class="info-btn" @click="refundOrder(item.orderId)">申请退款</button>
|
|
|
+ <button v-if="item.orderState == 2" class="action-btn" @click="viewPickCode(item.pickupCode)">取货码 {{item.pickupCode}}</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -126,13 +128,12 @@ let sysHeightTop = (uni.getSystemInfoSync().statusBarHeight + 43) + 'px';
|
|
|
const app = getApp();
|
|
|
import {
|
|
|
getUserOrderPage,
|
|
|
- postUserOrderCancel,
|
|
|
+ orderCancel,
|
|
|
postUserOrderRefund
|
|
|
} from '@/api/home.js';
|
|
|
import {
|
|
|
getOrderList,
|
|
|
orderData,
|
|
|
- orderCancel,
|
|
|
orderDel,
|
|
|
orderPay
|
|
|
} from '@/api/order.js';
|
|
|
@@ -205,7 +206,7 @@ export default {
|
|
|
orderData: {}, //订单详细统计
|
|
|
orderStatus: 0, //订单状态
|
|
|
page: 1,
|
|
|
- limit: 20,
|
|
|
+ limit: 5,
|
|
|
payMode: [{
|
|
|
name: this.$t(`微信支付`),
|
|
|
icon: 'icon-weixinzhifu',
|
|
|
@@ -306,6 +307,13 @@ export default {
|
|
|
*/
|
|
|
payClose: function () {
|
|
|
this.pay_close = false;
|
|
|
+ },
|
|
|
+ /**
|
|
|
+ * 查看取货码
|
|
|
+ * @param {Object} code
|
|
|
+ */
|
|
|
+ viewPickCode(code) {
|
|
|
+
|
|
|
},
|
|
|
/**
|
|
|
* 生命周期函数--监听页面加载
|
|
|
@@ -317,38 +325,12 @@ export default {
|
|
|
}
|
|
|
if (options.status) this.orderStatus = options.status;
|
|
|
},
|
|
|
- /**
|
|
|
- * 获取订单统计数据
|
|
|
- *
|
|
|
- */
|
|
|
- getOrderData: function () {
|
|
|
- let that = this;
|
|
|
- // orderData().then(res => {
|
|
|
- // that.$set(that, 'orderData', res.data);
|
|
|
- // that.payMode.map(item => {
|
|
|
- // if (item.value == 'weixin') {
|
|
|
- // item.payStatus = res.data.pay_weixin_open ? true : false;
|
|
|
- // }
|
|
|
- // if (item.value == 'alipay') {
|
|
|
- // item.payStatus = res.data.ali_pay_status ? true : false;
|
|
|
- // }
|
|
|
- // if (item.value == 'yue') {
|
|
|
- // item.payStatus = res.data.yue_pay_status == 1 ? true : false;
|
|
|
- // }
|
|
|
- // if (item.value == 'friend') {
|
|
|
- // item.payStatus = res.data.friend_pay_status == 1 ? true : false;
|
|
|
- // }
|
|
|
- // });
|
|
|
- // //#ifdef MP
|
|
|
- // this.payMode[1].payStatus = false;
|
|
|
- // //#endif
|
|
|
- // });
|
|
|
- },
|
|
|
+
|
|
|
/**
|
|
|
* 取消订单
|
|
|
*
|
|
|
*/
|
|
|
- cancelOrder: function (index, order_id) {
|
|
|
+ cancelOrder: function (order_id) {
|
|
|
let that = this;
|
|
|
if (!order_id)
|
|
|
return that.$util.Tips({
|
|
|
@@ -359,19 +341,12 @@ export default {
|
|
|
content: that.$t(`确定取消该订单`),
|
|
|
success: function (res) {
|
|
|
if (res.confirm) {
|
|
|
- postUserOrderCancel({ id: order_id })
|
|
|
+ orderCancel(order_id)
|
|
|
.then(res => {
|
|
|
return that.$util.Tips({
|
|
|
title: res.msg,
|
|
|
icon: 'success'
|
|
|
- },
|
|
|
- function () {
|
|
|
- that.orderList.splice(index, 1);
|
|
|
- that.$set(that, 'orderList', that.orderList);
|
|
|
- // that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
|
|
|
- // that.getOrderList()
|
|
|
- }
|
|
|
- );
|
|
|
+ });
|
|
|
})
|
|
|
.catch(err => {
|
|
|
return that.$util.Tips({
|
|
|
@@ -387,9 +362,9 @@ export default {
|
|
|
});
|
|
|
|
|
|
},
|
|
|
- refundOrder: function (index, order_id) {
|
|
|
+ refundOrder: function (orderId) {
|
|
|
let that = this;
|
|
|
- if (!order_id)
|
|
|
+ if (!orderId)
|
|
|
return that.$util.Tips({
|
|
|
title: that.$t(`缺少订单号无法申请退款订单`)
|
|
|
});
|
|
|
@@ -398,20 +373,13 @@ export default {
|
|
|
content: that.$t(`确定申请退款该订单`),
|
|
|
success: function (res) {
|
|
|
if (res.confirm) {
|
|
|
- postUserOrderRefund({ id: order_id })
|
|
|
+ postUserOrderRefund({ id: orderId })
|
|
|
.then(res => {
|
|
|
+ this.getOrderList()
|
|
|
return that.$util.Tips({
|
|
|
- title: res.msg,
|
|
|
+ title: "申请成功",
|
|
|
icon: 'success'
|
|
|
- },
|
|
|
- function () {
|
|
|
- that.orderList.splice(index, 1);
|
|
|
- that.$set(that, 'orderList', that.orderList);
|
|
|
- // that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
|
|
|
- // that.getOrderData();
|
|
|
- // this.getOrderList()
|
|
|
- }
|
|
|
- );
|
|
|
+ });
|
|
|
})
|
|
|
.catch(err => {
|
|
|
return that.$util.Tips({
|
|
|
@@ -431,11 +399,11 @@ export default {
|
|
|
* 打开支付组件
|
|
|
*
|
|
|
*/
|
|
|
- goPay: function (item, order_no) {
|
|
|
+ goPay: function (item) {
|
|
|
this.$set(this, 'pay_close', true);
|
|
|
- this.$set(this, 'pay_order_id', order_no);
|
|
|
- this.$set(this, 'pay_orderId', item.id);
|
|
|
- this.$set(this, 'totalPrice', item.totalFee);
|
|
|
+ this.$set(this, 'pay_order_id', item.orderNo);
|
|
|
+ this.$set(this, 'pay_orderId', item.orderId);
|
|
|
+ this.$set(this, 'totalPrice', item.paymentAmount);
|
|
|
},
|
|
|
/**
|
|
|
* 支付成功回调
|
|
|
@@ -470,33 +438,11 @@ export default {
|
|
|
uni.navigateTo({
|
|
|
url: '/pages/groupbuying_details/order_details_list/index?orderId=' + orderId
|
|
|
});
|
|
|
- // let that = this;
|
|
|
- // if (!order_id)
|
|
|
- // return that.$util.Tips({
|
|
|
- // title: that.$t(`缺少订单号无法查看订单详情`)
|
|
|
- // });
|
|
|
- // uni.showLoading({
|
|
|
- // title: that.$t(`正在加载中`)
|
|
|
- // });
|
|
|
- // openOrderSubscribe()
|
|
|
- // .then(() => {
|
|
|
- // uni.hideLoading();
|
|
|
- // uni.navigateTo({
|
|
|
- // url: '/pages/goods/order_details/index?order_id=' + order_id
|
|
|
- // // +'&order='+JSON.stringify(order)
|
|
|
- // // +'&goods='+encodeURIComponent(JSON.stringify(order.orderGoods))
|
|
|
- // })
|
|
|
- // })
|
|
|
- // .catch(err => {
|
|
|
- // uni.hideLoading();
|
|
|
- // });
|
|
|
-
|
|
|
},
|
|
|
/**
|
|
|
* 切换类型
|
|
|
*/
|
|
|
statusClick: function (status) {
|
|
|
- console.log("切换类型 -> ", status.orderStatus);
|
|
|
if (status.orderStatus == this.orderStatus) return;
|
|
|
this.orderStatus = status.orderStatus;
|
|
|
this.loadend = false;
|
|
|
@@ -566,8 +512,8 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
},
|
|
|
onReachBottom: function () {
|
|
|
this.getOrderList();
|
