|
|
@@ -3,7 +3,7 @@
|
|
3
|
3
|
<ul class="tab">
|
|
4
|
4
|
<li
|
|
5
|
5
|
class="tab__item"
|
|
6
|
|
- :class="{'tab__item--active': tab === index}"
|
|
|
6
|
+ :class="{ 'tab__item--active': tab === index }"
|
|
7
|
7
|
v-for="(item, index) in list"
|
|
8
|
8
|
:key="index"
|
|
9
|
9
|
@click="setTab(index)"
|
|
|
@@ -12,10 +12,14 @@
|
|
12
|
12
|
<div class="tab__num" v-if="item.num > 0">{{ item.num }}</div>
|
|
13
|
13
|
</li>
|
|
14
|
14
|
</ul>
|
|
15
|
|
- <div class="page__content">
|
|
|
15
|
+ <div class="page__content" v-if="!noPower">
|
|
16
|
16
|
<swiper class="page__swiper" :current="tab" @change="swiperChange">
|
|
17
|
17
|
<swiper-item v-for="(item, index) in list" :key="index">
|
|
18
|
|
- <scroll-view class="page__scroll" :scroll-y="true" @scrolltolower="getMoreList">
|
|
|
18
|
+ <scroll-view
|
|
|
19
|
+ class="page__scroll"
|
|
|
20
|
+ :scroll-y="true"
|
|
|
21
|
+ @scrolltolower="getMoreList"
|
|
|
22
|
+ >
|
|
19
|
23
|
<ul class="order">
|
|
20
|
24
|
<li
|
|
21
|
25
|
class="order__item"
|
|
|
@@ -24,9 +28,19 @@
|
|
24
|
28
|
>
|
|
25
|
29
|
<div class="order__main">
|
|
26
|
30
|
<div class="order__top">
|
|
27
|
|
- <div
|
|
28
|
|
- class="des"
|
|
29
|
|
- ><span>要求送达时间：</span>{{order.orderInfo.deliveryStartTime | dateFormat('MM-dd hh:mm')}} —— {{order.orderInfo.deliveryEndTime | dateFormat('MM-dd hh:mm')}}</div>
|
|
|
31
|
+ <div class="des">
|
|
|
32
|
+ <span>要求送达时间：</span
|
|
|
33
|
+ >{{
|
|
|
34
|
+ order.orderInfo
|
|
|
35
|
+ .deliveryStartTime
|
|
|
36
|
+ | dateFormat("MM-dd hh:mm")
|
|
|
37
|
+ }}
|
|
|
38
|
+ ——
|
|
|
39
|
+ {{
|
|
|
40
|
+ order.orderInfo.deliveryEndTime
|
|
|
41
|
+ | dateFormat("MM-dd hh:mm")
|
|
|
42
|
+ }}
|
|
|
43
|
+ </div>
|
|
30
|
44
|
<div class="index">
|
|
31
|
45
|
<!-- <span class="symbol">#</span>155 -->
|
|
32
|
46
|
</div>
|
|
|
@@ -34,67 +48,165 @@
|
|
34
|
48
|
<div class="tags">
|
|
35
|
49
|
<span
|
|
36
|
50
|
class="tag geekblue"
|
|
37
|
|
- v-if="order.orderInfo.deliveryMethod===0"
|
|
38
|
|
- >快递</span>
|
|
|
51
|
+ v-if="
|
|
|
52
|
+ order.orderInfo
|
|
|
53
|
+ .deliveryMethod === 0
|
|
|
54
|
+ "
|
|
|
55
|
+ >快递</span
|
|
|
56
|
+ >
|
|
39
|
57
|
<span
|
|
40
|
58
|
class="tag green"
|
|
41
|
|
- v-if="order.orderInfo.deliveryMethod===1"
|
|
42
|
|
- >门店自提</span>
|
|
|
59
|
+ v-if="
|
|
|
60
|
+ order.orderInfo
|
|
|
61
|
+ .deliveryMethod === 1
|
|
|
62
|
+ "
|
|
|
63
|
+ >门店自提</span
|
|
|
64
|
+ >
|
|
43
|
65
|
<span
|
|
44
|
66
|
class="tag magenta"
|
|
45
|
|
- v-if="order.orderInfo.deliveryMethod===2"
|
|
46
|
|
- >送货上门</span>
|
|
|
67
|
+ v-if="
|
|
|
68
|
+ order.orderInfo
|
|
|
69
|
+ .deliveryMethod === 2
|
|
|
70
|
+ "
|
|
|
71
|
+ >送货上门</span
|
|
|
72
|
+ >
|
|
47
|
73
|
</div>
|
|
48
|
74
|
<div class="order__con">
|
|
49
|
|
- <div
|
|
50
|
|
- class="order__title"
|
|
51
|
|
- >{{order.fromAddress.address}} ({{order.storeInfo.name}})</div>
|
|
52
|
|
- <p
|
|
53
|
|
- class="order__des"
|
|
54
|
|
- >{{order.fromAddress.province+ order.fromAddress.city+order.fromAddress.county}}</p>
|
|
|
75
|
+ <div class="order__title">
|
|
|
76
|
+ {{
|
|
|
77
|
+ order.fromAddress.address || ""
|
|
|
78
|
+ }}
|
|
|
79
|
+ ({{ order.storeInfo.name || "" }})
|
|
|
80
|
+ </div>
|
|
|
81
|
+ <p class="order__des">
|
|
|
82
|
+ {{
|
|
|
83
|
+ order.fromAddress.province +
|
|
|
84
|
+ order.fromAddress.city +
|
|
|
85
|
+ order.fromAddress.county ||
|
|
|
86
|
+ ""
|
|
|
87
|
+ }}
|
|
|
88
|
+ </p>
|
|
55
|
89
|
<div
|
|
56
|
90
|
class="order__title on order__title2"
|
|
57
|
|
- >{{order.toAddress.address}}</div>
|
|
58
|
|
- <p
|
|
59
|
|
- class="order__des on"
|
|
60
|
|
- >{{order.toAddress.province+ order.toAddress.city+order.toAddress.county}}</p>
|
|
|
91
|
+ >
|
|
|
92
|
+ {{ order.toAddress.address }}
|
|
|
93
|
+ </div>
|
|
|
94
|
+ <p class="order__des on">
|
|
|
95
|
+ {{
|
|
|
96
|
+ order.toAddress.province +
|
|
|
97
|
+ order.toAddress.city +
|
|
|
98
|
+ order.toAddress.county
|
|
|
99
|
+ }}
|
|
|
100
|
+ </p>
|
|
61
|
101
|
</div>
|
|
62
|
102
|
</div>
|
|
63
|
103
|
<!-- <div class="yuji" v-if="tab!==4">预计{{order | yujiTime}}送达</div> -->
|
|
64
|
104
|
<div
|
|
65
|
105
|
class="remarks"
|
|
66
|
106
|
v-if="order.orderInfo.description"
|
|
67
|
|
- >备注：{{order.orderInfo.description}}</div>
|
|
68
|
|
- <div class="order__btns" v-if="tab!==4">
|
|
69
|
|
- <div class="btn tel" @click="makePhone(order)">
|
|
70
|
|
- <my-image src="/static/icon/tal.png"></my-image>
|
|
|
107
|
+ >
|
|
|
108
|
+ 备注：{{ order.orderInfo.description }}
|
|
|
109
|
+ </div>
|
|
|
110
|
+
|
|
|
111
|
+ <div class="view-detail">
|
|
|
112
|
+ <div class="view-btn" @click="orderClick(order)">查看订单商品</div>
|
|
|
113
|
+ <ul class="goods" v-if="order.viewDetail">
|
|
|
114
|
+ <li
|
|
|
115
|
+ v-for="good of order.orderItems"
|
|
|
116
|
+ :key="good.id"
|
|
|
117
|
+ class="goods__item"
|
|
|
118
|
+ >
|
|
|
119
|
+ <div class="goods__content">
|
|
|
120
|
+ <div class="goods__left">
|
|
|
121
|
+ <my-image
|
|
|
122
|
+ class="goods__img"
|
|
|
123
|
+ :src="good.productImage"
|
|
|
124
|
+ ></my-image>
|
|
|
125
|
+ <div class="goods__info">
|
|
|
126
|
+ <div
|
|
|
127
|
+ class="goods__title"
|
|
|
128
|
+ >
|
|
|
129
|
+ {{
|
|
|
130
|
+ good.productName ||
|
|
|
131
|
+ ""
|
|
|
132
|
+ }}
|
|
|
133
|
+ </div>
|
|
|
134
|
+ <div
|
|
|
135
|
+ class="goods__spec"
|
|
|
136
|
+ >
|
|
|
137
|
+ {{
|
|
|
138
|
+ good.skuName ||
|
|
|
139
|
+ ""
|
|
|
140
|
+ }}
|
|
|
141
|
+ </div>
|
|
|
142
|
+ </div>
|
|
|
143
|
+ </div>
|
|
|
144
|
+ <div class="goods__right">
|
|
|
145
|
+ <div class="goods__price">
|
|
|
146
|
+ ¥{{
|
|
|
147
|
+ good.price
|
|
|
148
|
+ | minuteToRmb
|
|
|
149
|
+ }}
|
|
|
150
|
+ </div>
|
|
|
151
|
+ <div class="goods__num">
|
|
|
152
|
+ {{
|
|
|
153
|
+ "X" +
|
|
|
154
|
+ (good.count || "0")
|
|
|
155
|
+ }}
|
|
|
156
|
+ </div>
|
|
|
157
|
+ </div>
|
|
|
158
|
+ </div>
|
|
|
159
|
+ </li>
|
|
|
160
|
+ </ul>
|
|
|
161
|
+ </div>
|
|
|
162
|
+
|
|
|
163
|
+ <div class="order__btns" v-if="tab !== 4">
|
|
|
164
|
+ <div
|
|
|
165
|
+ class="btn tel"
|
|
|
166
|
+ @click="makePhone(order)"
|
|
|
167
|
+ >
|
|
|
168
|
+ <my-image
|
|
|
169
|
+ src="/static/icon/tal.png"
|
|
|
170
|
+ ></my-image>
|
|
71
|
171
|
<span>联系</span>
|
|
72
|
172
|
</div>
|
|
73
|
173
|
<div
|
|
74
|
174
|
class="btn active"
|
|
75
|
|
- v-if="tab===0"
|
|
76
|
|
- @click="receivingOrder(order,oindex)"
|
|
77
|
|
- >接单</div>
|
|
|
175
|
+ v-if="tab === 0"
|
|
|
176
|
+ @click="receivingOrder(order, oindex)"
|
|
|
177
|
+ >
|
|
|
178
|
+ 接单
|
|
|
179
|
+ </div>
|
|
78
|
180
|
<div
|
|
79
|
181
|
class="btn active"
|
|
80
|
|
- v-if="tab===1"
|
|
81
|
|
- @click="packagedOrder(order,oindex)"
|
|
82
|
|
- >打包完</div>
|
|
|
182
|
+ v-if="tab === 1"
|
|
|
183
|
+ @click="packagedOrder(order, oindex)"
|
|
|
184
|
+ >
|
|
|
185
|
+ 打包完
|
|
|
186
|
+ </div>
|
|
83
|
187
|
<div
|
|
84
|
188
|
class="btn active"
|
|
85
|
|
- v-if="tab===2"
|
|
86
|
|
- @click="deliveryOrder(order,oindex)"
|
|
87
|
|
- >配送中</div>
|
|
|
189
|
+ v-if="tab === 2"
|
|
|
190
|
+ @click="deliveryOrder(order, oindex)"
|
|
|
191
|
+ >
|
|
|
192
|
+ 配送中
|
|
|
193
|
+ </div>
|
|
88
|
194
|
<div
|
|
89
|
195
|
class="btn active"
|
|
90
|
|
- v-if="tab===3"
|
|
91
|
|
- @click="completeOrder(order,oindex)"
|
|
92
|
|
- >完成订单</div>
|
|
|
196
|
+ v-if="tab === 3"
|
|
|
197
|
+ @click="completeOrder(order, oindex)"
|
|
|
198
|
+ >
|
|
|
199
|
+ 完成订单
|
|
|
200
|
+ </div>
|
|
93
|
201
|
</div>
|
|
94
|
202
|
</li>
|
|
95
|
203
|
</ul>
|
|
96
|
204
|
<div class="null" v-if="loading && !item.list.length">
|
|
97
|
|
- <img class="null__img" src="/static/common/order_null.jpg" alt />
|
|
|
205
|
+ <img
|
|
|
206
|
+ class="null__img"
|
|
|
207
|
+ src="/static/common/order_null.jpg"
|
|
|
208
|
+ alt
|
|
|
209
|
+ />
|
|
98
|
210
|
<div class="null__title">还没有相关数据哦</div>
|
|
99
|
211
|
<!-- <div class="null__sub-title">xxx</div> -->
|
|
100
|
212
|
</div>
|
|
|
@@ -102,6 +214,10 @@
|
|
102
|
214
|
</swiper-item>
|
|
103
|
215
|
</swiper>
|
|
104
|
216
|
</div>
|
|
|
217
|
+ <div v-if="noPower" class="tips">
|
|
|
218
|
+ 当前小程序需要绑定手机号使用,
|
|
|
219
|
+ <span class="bind" @click="goBind">去绑定</span>
|
|
|
220
|
+ </div>
|
|
105
|
221
|
</div>
|
|
106
|
222
|
</template>
|
|
107
|
223
|
|
|
|
@@ -187,17 +303,17 @@ export default {
|
|
187
|
303
|
async onShow() {
|
|
188
|
304
|
const self = this;
|
|
189
|
305
|
// 未授权
|
|
190
|
|
- if (this.$store.state.user.noPower === true) {
|
|
191
|
|
- console.log("未授权重定向", this.$store.state.user);
|
|
192
|
|
- this.idrouter.replace({
|
|
193
|
|
- path: "/pages/index/bind",
|
|
194
|
|
- isReLaunch: true,
|
|
195
|
|
- query: {
|
|
196
|
|
- openId: this.$store.state.user.openId,
|
|
197
|
|
- },
|
|
198
|
|
- });
|
|
199
|
|
- return;
|
|
200
|
|
- }
|
|
|
306
|
+ // if (this.$store.state.user.noPower === true) {
|
|
|
307
|
+ // console.log("未授权重定向", this.$store.state.user);
|
|
|
308
|
+ // this.idrouter.replace({
|
|
|
309
|
+ // path: "/pages/index/bind",
|
|
|
310
|
+ // isReLaunch: true,
|
|
|
311
|
+ // query: {
|
|
|
312
|
+ // openId: this.$store.state.user.openId,
|
|
|
313
|
+ // },
|
|
|
314
|
+ // });
|
|
|
315
|
+ // return;
|
|
|
316
|
+ // }
|
|
201
|
317
|
await self.fn.init();
|
|
202
|
318
|
this.getList();
|
|
203
|
319
|
},
|
|
|
@@ -245,7 +361,6 @@ export default {
|
|
245
|
361
|
// self.list[1].num = data.countInfo.unpaidOrderCount
|
|
246
|
362
|
// self.list[2].num = data.countInfo.waitShippedOrderCount
|
|
247
|
363
|
// self.list[3].num = data.countInfo.waitReceivedOrderCount
|
|
248
|
|
- console.log(data);
|
|
249
|
364
|
self.list[self.tab].list = data;
|
|
250
|
365
|
self.loading = true;
|
|
251
|
366
|
uni.hideLoading();
|
|
|
@@ -276,38 +391,6 @@ export default {
|
|
276
|
391
|
);
|
|
277
|
392
|
});
|
|
278
|
393
|
},
|
|
279
|
|
- // // 取消订单
|
|
280
|
|
- // cancel(val, key) {
|
|
281
|
|
- // const self = this;
|
|
282
|
|
-
|
|
283
|
|
- // self.fn
|
|
284
|
|
- // .showModal({
|
|
285
|
|
- // title: "取消订单",
|
|
286
|
|
- // content: "这么好的宝贝，确定不要了？",
|
|
287
|
|
- // })
|
|
288
|
|
- // .then((res) => {
|
|
289
|
|
- // if (res.confirm) {
|
|
290
|
|
- // self.api
|
|
291
|
|
- // .post(
|
|
292
|
|
- // "/Order/Cancel",
|
|
293
|
|
- // {
|
|
294
|
|
- // orderId: val.shopOrderId,
|
|
295
|
|
- // reason: "",
|
|
296
|
|
- // },
|
|
297
|
|
- // {
|
|
298
|
|
- // repeat: true,
|
|
299
|
|
- // }
|
|
300
|
|
- // )
|
|
301
|
|
- // .then(() => {
|
|
302
|
|
- // if (self.tab !== 0 && self.tab !== 4) {
|
|
303
|
|
- // self.list[self.tab].num--;
|
|
304
|
|
- // }
|
|
305
|
|
- // self.list[self.tab].list.splice(key, 1);
|
|
306
|
|
- // self.fn.showToast("订单取消成功");
|
|
307
|
|
- // });
|
|
308
|
|
- // }
|
|
309
|
|
- // });
|
|
310
|
|
- // },
|
|
311
|
394
|
|
|
312
|
395
|
// 打电话
|
|
313
|
396
|
makePhone(val) {
|
|
|
@@ -407,14 +490,31 @@ export default {
|
|
407
|
490
|
}
|
|
408
|
491
|
});
|
|
409
|
492
|
},
|
|
|
493
|
+
|
|
|
494
|
+ goBind() {
|
|
|
495
|
+ this.router.push({
|
|
|
496
|
+ path: "/pages/index/bind",
|
|
|
497
|
+ isReLaunch: true,
|
|
|
498
|
+ query: {
|
|
|
499
|
+ openId: this.$store.state.user.openId,
|
|
|
500
|
+ },
|
|
|
501
|
+ });
|
|
|
502
|
+ },
|
|
|
503
|
+
|
|
|
504
|
+ orderClick(order){
|
|
|
505
|
+ order.viewDetail = !order.viewDetail;
|
|
|
506
|
+ this.list = [...this.list];
|
|
|
507
|
+ }
|
|
410
|
508
|
},
|
|
411
|
509
|
|
|
412
|
510
|
// 数据计算
|
|
413
|
511
|
computed: {
|
|
414
|
512
|
orderList() {
|
|
415
|
|
- console.log(3, this.list[this.tab].list);
|
|
416
|
513
|
return this.list[this.tab].list;
|
|
417
|
514
|
},
|
|
|
515
|
+ noPower() {
|
|
|
516
|
+ return this.$store.state.user.noPower;
|
|
|
517
|
+ },
|
|
418
|
518
|
},
|
|
419
|
519
|
|
|
420
|
520
|
// 数据监听
|
|
|
@@ -525,7 +625,7 @@ page {
|
|
525
|
625
|
align-items: center;
|
|
526
|
626
|
.des {
|
|
527
|
627
|
font-size: px(40);
|
|
528
|
|
- span{
|
|
|
628
|
+ span {
|
|
529
|
629
|
color: #666;
|
|
530
|
630
|
}
|
|
531
|
631
|
}
|
|
|
@@ -711,4 +811,121 @@ page {
|
|
711
|
811
|
color: #999;
|
|
712
|
812
|
}
|
|
713
|
813
|
}
|
|
|
814
|
+.tips {
|
|
|
815
|
+ padding: px(60) px(30);
|
|
|
816
|
+ text-align: center;
|
|
|
817
|
+ font-size: px(44);
|
|
|
818
|
+ .bind {
|
|
|
819
|
+ color: #3582fb;
|
|
|
820
|
+ }
|
|
|
821
|
+}
|
|
|
822
|
+.view-detail {
|
|
|
823
|
+ padding: px(20) px(40) px(50);
|
|
|
824
|
+ .view-btn {
|
|
|
825
|
+ display: block;
|
|
|
826
|
+ text-align: right;
|
|
|
827
|
+ font-size: px(38);
|
|
|
828
|
+ color: #3582fb;
|
|
|
829
|
+ }
|
|
|
830
|
+}
|
|
|
831
|
+
|
|
|
832
|
+.goods {
|
|
|
833
|
+ margin-top: px(40);
|
|
|
834
|
+ padding: 0 px(45);
|
|
|
835
|
+ background-color: #f5f5f5;
|
|
|
836
|
+
|
|
|
837
|
+ &__item {
|
|
|
838
|
+ min-height: px(225);
|
|
|
839
|
+ padding-top: px(30);
|
|
|
840
|
+ & ~ .goods__item {
|
|
|
841
|
+ border-top: solid px(3) #ececec;
|
|
|
842
|
+ }
|
|
|
843
|
+
|
|
|
844
|
+ &:first-child {
|
|
|
845
|
+ border-top: none;
|
|
|
846
|
+ }
|
|
|
847
|
+ }
|
|
|
848
|
+
|
|
|
849
|
+ &__content {
|
|
|
850
|
+ display: flex;
|
|
|
851
|
+ justify-content: space-between;
|
|
|
852
|
+ }
|
|
|
853
|
+
|
|
|
854
|
+ &__left {
|
|
|
855
|
+ display: flex;
|
|
|
856
|
+ flex: 1;
|
|
|
857
|
+ }
|
|
|
858
|
+
|
|
|
859
|
+ &__img /deep/ img {
|
|
|
860
|
+ width: px(170);
|
|
|
861
|
+ height: px(170);
|
|
|
862
|
+ border-radius: px(10);
|
|
|
863
|
+ }
|
|
|
864
|
+
|
|
|
865
|
+ &__info {
|
|
|
866
|
+ flex: 1;
|
|
|
867
|
+ margin-left: px(30);
|
|
|
868
|
+ }
|
|
|
869
|
+
|
|
|
870
|
+ &__title {
|
|
|
871
|
+ @include omits(2);
|
|
|
872
|
+ font-size: px(36);
|
|
|
873
|
+ color: #333;
|
|
|
874
|
+ }
|
|
|
875
|
+
|
|
|
876
|
+ &__spec {
|
|
|
877
|
+ @include omits(1);
|
|
|
878
|
+ margin-top: px(30);
|
|
|
879
|
+ font-size: px(36);
|
|
|
880
|
+ color: #999;
|
|
|
881
|
+ }
|
|
|
882
|
+
|
|
|
883
|
+ &__right {
|
|
|
884
|
+ display: flex;
|
|
|
885
|
+ flex-direction: column;
|
|
|
886
|
+ align-items: flex-end;
|
|
|
887
|
+ width: px(210);
|
|
|
888
|
+ }
|
|
|
889
|
+
|
|
|
890
|
+ &__price {
|
|
|
891
|
+ font-size: px(36);
|
|
|
892
|
+ color: #333;
|
|
|
893
|
+ }
|
|
|
894
|
+
|
|
|
895
|
+ &__num {
|
|
|
896
|
+ margin-top: px(20);
|
|
|
897
|
+ font-size: px(36);
|
|
|
898
|
+ color: #999;
|
|
|
899
|
+ }
|
|
|
900
|
+
|
|
|
901
|
+ &__bottom {
|
|
|
902
|
+ display: flex;
|
|
|
903
|
+ justify-content: space-between;
|
|
|
904
|
+ align-items: center;
|
|
|
905
|
+ padding: px(30) 0;
|
|
|
906
|
+ }
|
|
|
907
|
+
|
|
|
908
|
+ &__text {
|
|
|
909
|
+ font-size: px(36);
|
|
|
910
|
+ color: #999;
|
|
|
911
|
+ }
|
|
|
912
|
+
|
|
|
913
|
+ &__status {
|
|
|
914
|
+ display: flex;
|
|
|
915
|
+ align-items: center;
|
|
|
916
|
+ }
|
|
|
917
|
+
|
|
|
918
|
+ &__btn {
|
|
|
919
|
+ display: flex;
|
|
|
920
|
+ justify-content: center;
|
|
|
921
|
+ align-items: center;
|
|
|
922
|
+ height: px(70);
|
|
|
923
|
+ padding: 0 px(40);
|
|
|
924
|
+ margin-left: px(30);
|
|
|
925
|
+ font-size: px(36);
|
|
|
926
|
+ color: #666;
|
|
|
927
|
+ border-radius: px(35);
|
|
|
928
|
+ border: solid px(3) #999;
|
|
|
929
|
+ }
|
|
|
930
|
+}
|
|
714
|
931
|
</style>
|
