|
|
@@ -9,38 +9,43 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <view class="list" @click="goOrderDetails()">
|
|
|
- <view class="myclient_list">
|
|
|
- <view class="myclient_list_name">
|
|
|
- <view class="nl">
|
|
|
- 重磅集合！花王系列、宝洁洗衣液等好物全重磅集合！
|
|
|
+ <view class="list" v-for="(item, index) in orderList" :key="index">
|
|
|
+ <view class="myclient_list">
|
|
|
+ <view class="myclient_list_name">
|
|
|
+ <view class="nl">
|
|
|
+ {{item.mainTitle}}
|
|
|
+ </view>
|
|
|
+ <view class="status">
|
|
|
+ {{item.grouponBizStateDesc}}
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- <view class="status">
|
|
|
- 待收货
|
|
|
+ <view class="myclient_list_content">
|
|
|
+
|
|
|
+ <view class="phone">
|
|
|
+ <image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/日期@2x.png" />
|
|
|
+ <text>
|
|
|
+ 团购日期:{{item.grouponStartTimeStr}} 至 {{item.grouponEndTimeStr}}
|
|
|
+ </text>
|
|
|
+ </view>
|
|
|
+ <view class="time">
|
|
|
+ <image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/时间@2x.png" />
|
|
|
+ <text>
|
|
|
+ 提货时间:{{item.takeStartTimeStr}} 至 {{item.takeEndTimeStr}}
|
|
|
+ </text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="myclient_list_content">
|
|
|
-
|
|
|
- <view class="phone">
|
|
|
- <image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/日期@2x.png" />
|
|
|
- <text>
|
|
|
- 团购日期:04/26 10:15 至 04/26
|
|
|
- </text>
|
|
|
- </view>
|
|
|
- <view class="time">
|
|
|
- <image referrerpolicy="no-referrer" src="http://www.gzzzyd.com/groupon/home_slices/时间@2x.png" />
|
|
|
- <text>
|
|
|
- 提货时间:05/01 10:15 至 05/13
|
|
|
- </text>
|
|
|
- </view>
|
|
|
+ <view class="op-area">
|
|
|
+ <button class="action-btn" @click="goOrderDetails(item.id, 1)">
|
|
|
+ 网点订单
|
|
|
+ </button>
|
|
|
+ <button class="action-btn" @click="goOrderDetails(item.id, 2)">
|
|
|
+ 全部订单
|
|
|
+ </button>
|
|
|
</view>
|
|
|
+
|
|
|
</view>
|
|
|
- <view class="op-area">
|
|
|
- <button class="action-btn" @click="goPay()">网点订单</button>
|
|
|
- <button class="action-btn" @click="goPay()">全部订单</button>
|
|
|
- </view>
|
|
|
-
|
|
|
- </view>
|
|
|
+
|
|
|
|
|
|
<view class="loadingicon acea-row row-center-wrapper" v-if="orderList.length > 0">
|
|
|
<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
|
|
|
@@ -68,11 +73,7 @@ import {
|
|
|
postUserOrderRefund
|
|
|
} from '@/api/home.js';
|
|
|
import {
|
|
|
- getOrderList,
|
|
|
- orderData,
|
|
|
- orderCancel,
|
|
|
- orderDel,
|
|
|
- orderPay
|
|
|
+ getCommanderOrder,
|
|
|
} from '@/api/order.js';
|
|
|
import {
|
|
|
getUserInfo
|
|
|
@@ -107,69 +108,38 @@ export default {
|
|
|
return {
|
|
|
navigationList: [{
|
|
|
title: '全部',
|
|
|
- id: 0
|
|
|
+ id: 0,
|
|
|
+ grouponState: 0,
|
|
|
}
|
|
|
,
|
|
|
{
|
|
|
title: '待收货',
|
|
|
- id: 1
|
|
|
+ id: 1,
|
|
|
+ grouponState: 1,
|
|
|
},
|
|
|
{
|
|
|
title: '待提货',
|
|
|
- id: 2
|
|
|
+ id: 2,
|
|
|
+ grouponState: 2,
|
|
|
},
|
|
|
{
|
|
|
title: '已完成',
|
|
|
- id: 3
|
|
|
+ id: 3,
|
|
|
+ grouponState: 3,
|
|
|
},
|
|
|
{
|
|
|
title: '售后',
|
|
|
- id: 4
|
|
|
+ id: 4,
|
|
|
+ grouponState: 4,
|
|
|
},
|
|
|
],
|
|
|
loading: false, //是否加载中
|
|
|
loadend: false, //是否加载完毕
|
|
|
loadTitle: this.$t(`加载更多`), //提示语
|
|
|
orderList: [], //订单数组
|
|
|
- orderData: {}, //订单详细统计
|
|
|
- orderStatus: 0, //订单状态
|
|
|
+ grouponState: 0, //订单状态
|
|
|
page: 1,
|
|
|
limit: 20,
|
|
|
- payMode: [{
|
|
|
- name: this.$t(`微信支付`),
|
|
|
- icon: 'icon-weixinzhifu',
|
|
|
- value: 'weixin',
|
|
|
- title: this.$t(`使用微信快捷支付`),
|
|
|
- payStatus: true
|
|
|
- },
|
|
|
- // {
|
|
|
- // name: this.$t(`支付宝支付`),
|
|
|
- // icon: 'icon-zhifubao',
|
|
|
- // value: 'alipay',
|
|
|
- // title: this.$t(`使用支付宝支付`),
|
|
|
- // payStatus: true
|
|
|
- // },
|
|
|
- // {
|
|
|
- // name: this.$t(`余额支付`),
|
|
|
- // icon: 'icon-yuezhifu',
|
|
|
- // value: 'yue',
|
|
|
- // title: this.$t(`可用余额`),
|
|
|
- // number: 0,
|
|
|
- // payStatus: true
|
|
|
- // }, {
|
|
|
- // "name": this.$t(`好友代付`),
|
|
|
- // "icon": "icon-haoyoudaizhifu",
|
|
|
- // value: 'friend',
|
|
|
- // title: this.$t(`找微信好友支付`),
|
|
|
- // payStatus: 1,
|
|
|
- // }
|
|
|
- ],
|
|
|
- pay_close: false,
|
|
|
- pay_order_id: '',
|
|
|
- pay_orderId: '',
|
|
|
- totalPrice: '0',
|
|
|
- isAuto: false, //没有授权的不会自动授权
|
|
|
- isShowAuth: false //是否隐藏授权
|
|
|
};
|
|
|
},
|
|
|
computed: mapGetters(['isLogin']),
|
|
|
@@ -178,21 +148,13 @@ export default {
|
|
|
this.page = 1;
|
|
|
this.orderList = []
|
|
|
this.loadend = false;
|
|
|
- this.onLoadFun();
|
|
|
- this.getOrderList();
|
|
|
+ // this.onLoadFun();
|
|
|
+ this.getCommanderOrderList()
|
|
|
} else {
|
|
|
toLogin();
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- onLoadFun () {
|
|
|
- this.getOrderData();
|
|
|
- this.getUserInfo();
|
|
|
- },
|
|
|
- // 授权关闭
|
|
|
- authColse: function (e) {
|
|
|
- this.isShowAuth = e;
|
|
|
- },
|
|
|
/**
|
|
|
* 事件回调
|
|
|
*
|
|
|
@@ -203,182 +165,21 @@ export default {
|
|
|
let value = opt.value != undefined ? opt.value : null;
|
|
|
action && this[action] && this[action](value);
|
|
|
},
|
|
|
- /**
|
|
|
- * 获取用户信息
|
|
|
- *
|
|
|
- */
|
|
|
- getUserInfo: function () {
|
|
|
- let that = this;
|
|
|
- getUserInfo().then(res => {
|
|
|
- that.payMode[2].number = res.data.now_money;
|
|
|
- that.$set(that, 'payMode', that.payMode);
|
|
|
- });
|
|
|
- },
|
|
|
- /**
|
|
|
- * 关闭支付组件
|
|
|
- *
|
|
|
- */
|
|
|
- payClose: function () {
|
|
|
- this.pay_close = false;
|
|
|
- },
|
|
|
+
|
|
|
/**
|
|
|
* 生命周期函数--监听页面加载
|
|
|
*/
|
|
|
onLoad: function (options) {
|
|
|
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) {
|
|
|
- let that = this;
|
|
|
- if (!order_id)
|
|
|
- return that.$util.Tips({
|
|
|
- title: that.$t(`缺少订单号无法取消订单`)
|
|
|
- });
|
|
|
- uni.showModal({
|
|
|
- title: that.$t(`取消订单`),
|
|
|
- content: that.$t(`确定取消该订单`),
|
|
|
- success: function (res) {
|
|
|
- if (res.confirm) {
|
|
|
- postUserOrderCancel({ id: 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({
|
|
|
- title: err
|
|
|
- });
|
|
|
- });
|
|
|
- } else if (res.cancel) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: that.$t(`已取消`)
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- },
|
|
|
- refundOrder: function (index, order_id) {
|
|
|
- let that = this;
|
|
|
- if (!order_id)
|
|
|
- return that.$util.Tips({
|
|
|
- title: that.$t(`缺少订单号无法申请退款订单`)
|
|
|
- });
|
|
|
- uni.showModal({
|
|
|
- title: that.$t(`申请退款`),
|
|
|
- content: that.$t(`确定申请退款该订单`),
|
|
|
- success: function (res) {
|
|
|
- if (res.confirm) {
|
|
|
- postUserOrderRefund({ id: 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.getOrderData();
|
|
|
- // this.getOrderList()
|
|
|
- }
|
|
|
- );
|
|
|
- })
|
|
|
- .catch(err => {
|
|
|
- return that.$util.Tips({
|
|
|
- title: err
|
|
|
- });
|
|
|
- });
|
|
|
- } else if (res.cancel) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: that.$t(`已取消`)
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
+
|
|
|
|
|
|
- },
|
|
|
- /**
|
|
|
- * 打开支付组件
|
|
|
- *
|
|
|
- */
|
|
|
- goPay: function (item, order_no) {
|
|
|
- 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);
|
|
|
- },
|
|
|
- /**
|
|
|
- * 支付成功回调
|
|
|
- *
|
|
|
- */
|
|
|
- pay_complete: function () {
|
|
|
- this.loadend = false;
|
|
|
- this.page = 1;
|
|
|
- this.$set(this, 'orderList', []);
|
|
|
- this.pay_close = false;
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/goods/order_pay_status/index?order_id=' + this.pay_orderId +
|
|
|
- '&msg=' + this.$t(`支付成功`) + '&type=3&totalPrice=' + this.totalPrice
|
|
|
- })
|
|
|
- this.pay_order_id = '';
|
|
|
- this.pay_orderId = '';
|
|
|
- this.getOrderData();
|
|
|
- this.getOrderList();
|
|
|
- },
|
|
|
- /**
|
|
|
- * 支付失败回调
|
|
|
- *
|
|
|
- */
|
|
|
- pay_fail: function () {
|
|
|
- this.pay_close = false;
|
|
|
- this.pay_order_id = '';
|
|
|
- },
|
|
|
/**
|
|
|
* 去订单详情
|
|
|
*/
|
|
|
- goOrderDetails: function (order_id, order) {
|
|
|
+ goOrderDetails: function (grouponId, queryType) {
|
|
|
uni.navigateTo({
|
|
|
- url: '/pages/groupbuying/leader_order_details/index?order_id= + order_id'
|
|
|
+ url: '/pages/groupbuying/leader_order_details/index?grouponId=' + grouponId + '&queryType=' + queryType
|
|
|
});
|
|
|
// let that = this;
|
|
|
// if (!order_id)
|
|
|
@@ -406,12 +207,25 @@ export default {
|
|
|
* 切换类型
|
|
|
*/
|
|
|
statusClick: function (status) {
|
|
|
- if (status == this.orderStatus) return;
|
|
|
- this.orderStatus = status;
|
|
|
+ console.log("status ", status)
|
|
|
+ if (status.grouponState == this.grouponState) return;
|
|
|
+ this.grouponState = status.grouponState;
|
|
|
this.loadend = false;
|
|
|
this.page = 1;
|
|
|
this.$set(this, 'orderList', []);
|
|
|
- this.getOrderList();
|
|
|
+ this.getCommanderOrderList();
|
|
|
+ },
|
|
|
+ getCommanderOrderList() {
|
|
|
+ let that = this;
|
|
|
+ getCommanderOrder({
|
|
|
+ grouponState: that.grouponState,
|
|
|
+ current: that.page,
|
|
|
+ size: that.limit,
|
|
|
+ }).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ that.orderList = res.data.records;
|
|
|
+ console.log(that.orderList)
|
|
|
+ })
|
|
|
},
|
|
|
/**
|
|
|
* 获取订单列表
|
|
|
@@ -444,42 +258,6 @@ export default {
|
|
|
// });
|
|
|
},
|
|
|
|
|
|
- /**
|
|
|
- * 删除订单
|
|
|
- */
|
|
|
- delOrder: function (order_id, index) {
|
|
|
- let that = this;
|
|
|
- uni.showModal({
|
|
|
- title: that.$t(`删除订单`),
|
|
|
- content: that.$t(`确定删除该订单`),
|
|
|
- success: function (res) {
|
|
|
- if (res.confirm) {
|
|
|
- orderDel(order_id)
|
|
|
- .then(res => {
|
|
|
- that.orderList.splice(index, 1);
|
|
|
- that.$set(that, 'orderList', that.orderList);
|
|
|
- that.$set(that.orderData, 'unpaid_count', that.orderData
|
|
|
- .unpaid_count - 1);
|
|
|
- that.getOrderData();
|
|
|
- return that.$util.Tips({
|
|
|
- title: that.$t(`删除成功`),
|
|
|
- icon: 'success'
|
|
|
- });
|
|
|
- })
|
|
|
- .catch(err => {
|
|
|
- return that.$util.Tips({
|
|
|
- title: err
|
|
|
- });
|
|
|
- });
|
|
|
- } else if (res.cancel) {
|
|
|
- return that.$util.Tips({
|
|
|
- title: that.$t(`已取消`)
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- }
|
|
|
},
|
|
|
onReachBottom: function () {
|
|
|
this.getOrderList();
|
|
|
@@ -819,5 +597,17 @@ export default {
|
|
|
color: #666666;
|
|
|
line-height: 64rpx;
|
|
|
}
|
|
|
+
|
|
|
+ .text_13 {
|
|
|
+ overflow-wrap: break-word;
|
|
|
+ color: rgba(178, 35, 56, 1);
|
|
|
+ font-size: 12px;
|
|
|
+ font-weight: NaN;
|
|
|
+ text-align: center;
|
|
|
+ white-space: nowrap;
|
|
|
+ line-height: 18px;
|
|
|
+ margin-right: 14px;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
</style>
|
