From ff7c6b358d48af057deb313c7fec833c2496b12b Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Fri, 31 Jul 2020 21:47:41 +0800
Subject: [PATCH] order comment 7.31
---
common/api/user.js | 11 +-
components/mine/order-item/index.vue | 66 ++++----
pageE/order/Comment.vue | 233 ++++++++++++++++++++-------
pageE/order/Details.vue | 76 +++++----
pageE/order/Index.vue | 71 ++++----
pageE/order/Logistics.vue | 3 +-
pageE/static/mine/36.png | Bin 0 -> 9873 bytes
pages.json | 3 +
pages/mine/index.vue | 11 +-
static/image/mine/35.png | Bin 0 -> 834 bytes
10 files changed, 310 insertions(+), 164 deletions(-)
create mode 100644 pageE/static/mine/36.png
create mode 100644 static/image/mine/35.png
diff --git a/common/api/user.js b/common/api/user.js
index 39c86d6..4727a9f 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -230,16 +230,15 @@ export default {
});
},
// 订单列表
- getOrderList({ page, type, refund_state }) {
+ getOrderList({ page, type }) {
let params = { page: page };
- if(type >= 0 || typeof type == 'string') Object.assign(params, {state_type: type});
- if(refund_state) Object.assign(params, {refund_state: refund_state});
+ if(type > 0) Object.assign(params, {type: type});
return vm.$u.post('Order/orderList', params);
},
// 售后列表
- getAfterSaleList({ page }) {
- return vm.$u.post('order/afterSaleList', { page: page });
- },
+ // getAfterSaleList({ page }) {
+ // return vm.$u.post('order/afterSaleList', { page: page });
+ // },
// 试穿列表
goodsTryOrderList() {
return vm.$u.post('order/goodsTryOrderList');
diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index c0c3af9..445a5d9 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -15,7 +15,7 @@
{{ spec + ';' }}
- 结束时间：{{ order.add_time * 1000 | date('yyyy-mm-dd hh:MM') }}
+
总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}
@@ -24,14 +24,14 @@
-
- 确认收货
- 查看物流
-
- 取消支付
- 立即支付
- 联系官方客服
- 提交官方审核
+
+ 查看物流
+ 确认收货
+
+ 取消支付
+ 立即支付
+ 联系官方客服
+ 提交官方审核
@@ -40,7 +40,7 @@ import common from '@/static/js/common.js';
export default {
data() {
return {
- state: '', // 1: 待收货 2: 待评价 3: 交易成功 4: 已取消 5: 已退款 6: 待支付, 7: 售后
+ state: '',
}
},
props: {
@@ -49,44 +49,25 @@ export default {
created() {
this.viewState();
},
- filters: {
- // timeLine(timestamp) {
- // const timestamp = 0.5*60*60*1000;
- // const now = new Date().getTime();
- // let line = now - timestamp * 1000;
- // return common.getLineTime({ timestamp: line });
- // }
- },
methods: {
viewState() {
let state;
- switch (this.order.order_state) {
- case 0: // 已取消
- state = '已取消';
- break;
- case 10: // 未付款
+ switch (this.order.view_type) {
+ case 1:
state = '待支付';
break;
- case 20: // 已付款
- state = '交易成功';
+ case 2:
+ state = '待发货';
break;
- case 30: // 已发货
+ case 3:
state = '待收货';
break;
- case 40: // 已收货
- if(this.order.evaluation_state == 0) state = '待评价';
- else state = '交易成功'
+ case 4:
+ state = '待评价';
break;
default:
break;
}
- if(this.order.refund_state) state = '已退款';
- // 申请退款
- if(this.order.refund_data) {
- if([1, 2].indexOf(this.order.refund_data.refund_state) >= 0) state = '待退款';
- if(this.order.refund_data.refund_state == 3) state = '已退款';
- }
-
this.state = state;
},
cancelOrder() {
@@ -94,7 +75,17 @@ export default {
order_id: this.order.order_id,
}).then(res => {
if(res.errCode == 0) {
- this.$emit("refreshOrderList", { reload: 'again' });
+ this.$emit("refreshOrderList");
+ }
+ this.$u.toast(res.message);
+ })
+ },
+ confirmReceive() {
+ this.$u.api.confirmReceive({
+ order_id: this.order.order_id,
+ }).then(res => {
+ if(res.errCode == 0) {
+ this.$emit("refreshOrderList");
}
this.$u.toast(res.message);
})
@@ -165,6 +156,7 @@ export default {
line-height: 38rpx;
}
.goods-sku {
+ display: inline-block;
max-width: 230rpx;
background: rgba(236,236,236,1);
border-radius: 6rpx;
diff --git a/pageE/order/Comment.vue b/pageE/order/Comment.vue
index b6eb931..f6a7895 100644
--- a/pageE/order/Comment.vue
+++ b/pageE/order/Comment.vue
@@ -1,34 +1,47 @@
-
-
+
+
物流评分
-
+
服务态度
-
- 描述相符
-
-
- 发表意见
+ 发表意见
@@ -81,30 +162,62 @@ export default {
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
.main-container {
- background-color: #ffffff;
- padding: 30rpx;
margin-bottom: 10rpx;
- textarea {
- width: 100% !important;
- margin-bottom: 60rpx;
- }
- .slot-btn {
- width: 140rpx;
- height: 140rpx;
- background: rgba(236,236,236,1);
- border-radius: 10rpx;
- text-align: center;
- > image {
- margin-top: 48rpx;
- width: 54rpx;
- height: 49rpx;
+ .goods-comment {
+ background-color: #ffffff;
+ padding: 30rpx;
+ margin-bottom: 30rpx;
+ .goods-info {
+ display: flex;
+ margin-bottom: 40rpx;
+ > image {
+ width: 113rpx;
+ height: 106rpx;
+ border-radius: 5rpx;
+ margin-right: 20rpx;
+ background-color: antiquewhite;
+ }
+ .goods-text {
+ .goods-name {
+ width: 530rpx;
+ font-size: 28rpx;
+ color: rgba(0,0,51,1);
+ margin-bottom: 20rpx;
+ }
+ .goods-spec {
+ max-width: 300rpx;
+ box-sizing: content-box;
+ padding: 10rpx 15rpx;
+ font-size: 24rpx;
+ color: rgba(153,153,153,1);
+ background:rgba(236,236,236,1);
+ border-radius: 6rpx;
+ display: inline-block;
+ }
+ }
+ }
+ textarea {
+ width: 100% !important;
+ margin-bottom: 60rpx;
+ }
+ .slot-btn {
+ width: 140rpx;
+ height: 140rpx;
+ background: rgba(236,236,236,1);
+ border-radius: 10rpx;
+ text-align: center;
+ > image {
+ margin-top: 48rpx;
+ width: 54rpx;
+ height: 49rpx;
+ }
}
}
}
.rate {
- background-color: #ffffff;
- padding: 33rpx 30rpx;
- > view {
+ // background-color: #ffffff;
+ // padding: 33rpx 30rpx;
+ // > view {
display: flex;
&:not(:last-child) {
margin-bottom: 35rpx;
@@ -114,7 +227,11 @@ export default {
font-size: 28rpx;
color: rgba(51,51,51,1);
}
- }
+ // }
+ }
+ .order-rate {
+ background-color: #ffffff;
+ padding: 33rpx 30rpx;
}
.write-btn {
margin: 120rpx auto 0;
diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index 1a9544a..7eee07d 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -3,7 +3,7 @@
{{ s_object[state].text }}
- 距离结束22:22:22
+ 结束时间：{{ orderInfo.end_time }}
@@ -67,8 +67,10 @@
创建时间：{{ orderInfo.add_time | date}}
-
- 查看物流
+
+ 申请退款
+ 查看物流
+ 确认收货
取消支付
立即支付
@@ -96,8 +98,8 @@ export default {
image: '../static/mine/31.png',
},
'4': {
- text: '已取消',
- image: '../static/mine/33.png',
+ text: '待发货',
+ image: '../static/mine/36.png',
},
'5': {
text: '已退款',
@@ -112,45 +114,44 @@ export default {
image: '../static/mine/34.png',
},
},
- current: 0,
- orderInfo: {}
+ orderInfo: {},
+ oid: '',
}
},
onLoad(option) {
this.setTitle();
+ this.oid = option.oid;
this.getOrderInfo(option.oid);
},
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.getOrderInfo(this.oid);
+ },
methods: {
viewState(value) {
let state;
switch (value) {
- case 0: // 已取消
- state = '4';
- break;
- case 10: // 未付款
+ case 1:
state = '6';
break;
- case 20: // 已付款
- state = '3';
+ case 2:
+ state = '4';
break;
- case 30: // 已发货
+ case 3:
state = '1';
break;
- case 40: // 已收货
- if(this.orderInfo.evaluation_state == 0) state = '2';
+ case 4:
+ state = '2';
+ break;
+ case 6:
+ state = '7';
+ break;
+ case 7:
+ state = '5';
break;
default:
break;
}
- if(this.orderInfo.refund_state) state = '5';
- // 申请退款
- if(this.orderInfo.refund_list) {
- const refund = this.orderInfo.refund_list[this.orderInfo.extend_order_common.order_id];
- if(this.orderInfo.refund_list) {
- if([1, 2].indexOf(refund.refund_state) >= 0) state = '7';
- if(refund.refund_state == 3) state = '8';
- }
- }
this.state = state;
},
getOrderInfo(id) {
@@ -159,9 +160,14 @@ export default {
}).then(res => {
if(res.errCode == 0) {
this.orderInfo = res.data;
- this.viewState(this.orderInfo.order_state);
+ this.viewState(this.orderInfo.view_type);
+ this.setTitle(this.orderInfo.view_type);
}
+ uni.stopPullDownRefresh(); // 结束刷新
})
+ },
+ applyRefund() {
+
},
cancelOrder() {
this.$u.api.cancelOrder({
@@ -172,10 +178,20 @@ export default {
}
})
},
- setTitle(){
+ confirmReceive() {
+ this.$u.api.confirmReceive({
+ order_id: this.order.order_id,
+ }).then(res => {
+ if(res.errCode == 0) {
+ this.getOrderInfo(this.oid);
+ }
+ this.$u.toast(res.message);
+ })
+ },
+ setTitle(value){
let title = '';
- switch (this.current) {
- case '1':
+ switch (value) {
+ case 1:
title = "支付成功"
break;
default:
@@ -292,6 +308,7 @@ export default {
}
.store-goods {
display: flex;
+ margin-bottom: 20rpx;
> image {
width: 180rpx;
height: 160rpx;
@@ -300,6 +317,7 @@ export default {
flex-shrink: 0;
}
.goods-info {
+ flex: 1;
display: flex;
flex-direction: column;
justify-content: space-between;
diff --git a/pageE/order/Index.vue b/pageE/order/Index.vue
index 85783fc..cde9515 100644
--- a/pageE/order/Index.vue
+++ b/pageE/order/Index.vue
@@ -30,15 +30,15 @@ export default {
}, {
name: '待支付'
}, {
- name: '已取消'
+ name: '待发货'
}, {
name: '待收货'
}, {
name: '试穿试送'
- }, {
- name: '待评价'
}, {
name: '售后'
+ }, {
+ name: '待评价'
}],
orderList: [],
loadStatus: ['loadmore','loadmore','loadmore','loadmore','loadmore','loadmore','loadmore'],
@@ -59,13 +59,11 @@ export default {
this.orderList = [];
}
this.page = 0;
- // again 重新请求列表 不然往列表里添加
- if(value == 6) {
- this.getAfterSaleList({ reload: 'again' });
- } else if(value == 4) {
- this.goodsTryOrderList({ reload: 'again' });
+ // reload 重新请求列表 loadmore 往列表里添加
+ if(value == 4) {
+ this.goodsTryOrderList({ load: 'reload' });
} else {
- this.getOrderList({ reload: 'again' });
+ this.getOrderList({ load: 'reload' });
}
},
},
@@ -75,25 +73,31 @@ export default {
this.swiperCurrent = this.current;
this.setViewHeight();
},
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.refreshOrderList();
+ },
methods: {
setOrderType() {
let type;
- // state_type 订单状态：0:已取消 10:未付款 20:已付款 30:已发货 40:已收货
switch (this.current) {
case 1:
- type = 10; // 待支付
+ type = 1; // 待支付
break;
case 2:
- type = 0; // 已取消
+ type = 2; // 待发货
break;
case 3:
- type = 30; // 待收货
+ type = 3; // 待收货
break;
case 4:
type = -1; // 试穿试送
break;
case 5:
- type = 'state_noeval'; // 待评价
+ type = 8; // 售后
+ break;
+ case 6:
+ type = 4; // 待评价
break;
default:
type = -1;
@@ -103,46 +107,52 @@ export default {
},
refreshOrderList() {
this.page = 0;
- if(this.current == 6) {
- this.getAfterSaleList({ reload: 'again' });
- } else if(this.current == 4) {
- this.goodsTryOrderList({ reload: 'again' });
+ // if(this.current == 6) {
+ // this.getAfterSaleList({ load: 'reload' });
+ // } else
+ if(this.current == 4) {
+ this.goodsTryOrderList({ load: 'reload' });
} else {
- this.getOrderList({ reload: 'again' });
+ this.getOrderList({ load: 'reload' });
}
},
- async getOrderList({ reload = '' } = {}) {
+ // 普通
+ async getOrderList({ load = 'loadmore' } = {}) {
const type = this.setOrderType();
const res = await this.$u.api.getOrderList({
page: this.page,
type: type,
})
this.timer = true;
+ uni.stopPullDownRefresh(); // 结束刷新
if(res.errCode == 0) {
- if(reload) this.orderList = res.data;
- else this.orderList.push(...res.data);
+ if(load == 'reload') this.orderList = res.data;
+ else if(load == 'loadmore') this.orderList.push(...res.data);
}
return res;
},
- async getAfterSaleList({ reload = '' } = {}) {
+ // 售后
+ async getAfterSaleList({ load = 'loadmore' } = {}) {
const res = await this.$u.api.getAfterSaleList({
page: this.page,
})
this.timer = true;
if(res.errCode == 0) {
- if(reload) this.orderList = res.data;
- else this.orderList.push(...res.data);
+ if(load == 'reload') this.orderList = res.data;
+ else if(load == 'loadmore') this.orderList.push(...res.data);
}
return res;
},
- async goodsTryOrderList({ reload = '' } = {}) {
+ // 试穿
+ async goodsTryOrderList({ load = 'loadmore' } = {}) {
const res = await this.$u.api.goodsTryOrderList({
page: this.page,
})
+ uni.stopPullDownRefresh(); // 结束刷新
this.timer = true;
if(res.errCode == 0) {
- if(reload) this.orderList = res.data.list;
- else this.orderList.push(...res.data.list);
+ if(load == 'reload') this.orderList = res.data.list;
+ else if(load == 'loadmore') this.orderList.push(...res.data.list);
}
return res;
},
@@ -154,8 +164,9 @@ export default {
this.loadStatus.splice(this.current, 1, "loading");
this.page++;
let promise;
- if(this.current == 6) promise = this.getAfterSaleList();
- else if(this.current == 4) promise = this.goodsTryOrderList();
+ // if(this.current == 6) promise = this.getAfterSaleList();
+ // else
+ if(this.current == 4) promise = this.goodsTryOrderList();
else promise = this.getOrderList();
promise.then(res => {
this.loadStatus.splice(this.current, 1, "nomore");
diff --git a/pageE/order/Logistics.vue b/pageE/order/Logistics.vue
index 9d7e90c..8217e5a 100644
--- a/pageE/order/Logistics.vue
+++ b/pageE/order/Logistics.vue
@@ -42,7 +42,8 @@ export default {
},
methods: {
getOrderLogistics(id) {
- this.$u.api.orderLogistics({ id: 16 }).then(res => {
+ this.$u.api.orderLogistics({ id: id }).then(res => {
+ this.$u.toast(res.message);
if(res.errCode == 0) {
this.expressInfo = res.data.express_info;
this.list = res.data.express_list;
diff --git a/pageE/static/mine/36.png b/pageE/static/mine/36.png
new file mode 100644
index 0000000000000000000000000000000000000000..9185b1b4af4a4c66f8d74b0454a745f65405a9c7
GIT binary patch
literal 9873
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
F{{;c&$6EjZ
literal 0
HcmV?d00001
diff --git a/pages.json b/pages.json
index 985e461..c7c8971 100644
--- a/pages.json
+++ b/pages.json
@@ -809,6 +809,7 @@
{
"path": "order/Index",
"style": {
+ "enablePullDownRefresh": true,
"navigationBarTitleText": "我的订单",
"app-plus": {
"titleSize": "36px",
@@ -822,6 +823,7 @@
{
"path": "order/Details",
"style": {
+ "enablePullDownRefresh": true,
"navigationBarTitleText": "订单详情",
"app-plus": {
"titleSize": "36px",
@@ -897,6 +899,7 @@
{
"path": "pages/mine/index",
"style": {
+ "enablePullDownRefresh": true,
"navigationBarTitleText": "我的",
"app-plus": {
"titleSize": "36px",
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 1ee1c0f..7fbe69e 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -56,8 +56,8 @@
待支付
-
- 已取消
+
+ 待发货
@@ -138,6 +138,10 @@ export default {
onShow() {
this.getUserInfo();
},
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.getUserInfo();
+ },
onNavigationBarButtonTap() {
this.toOtherPage("/setting/Index");
},
@@ -147,6 +151,7 @@ export default {
if (res.errCode == 0) {
// this.userInfo = res.data.MemberArray;
this.$set(this, 'userInfo', res.data.MemberArray);
+ uni.stopPullDownRefresh();
}
})
},
@@ -316,7 +321,7 @@ export default {
@include image-size($image-width: 33rpx, $image-height: 36rpx);
}
> view:nth-child(2){
- @include image-size($image-width: 39rpx, $image-height: 33rpx);
+ @include image-size($image-width: 38rpx, $image-height: 32rpx);
}
> view:nth-child(3){
@include image-size($image-width: 41rpx, $image-height: 33rpx);
diff --git a/static/image/mine/35.png b/static/image/mine/35.png
new file mode 100644
index 0000000000000000000000000000000000000000..241666221eda5a52515a201e4f8b784eff8c6bdb
GIT binary patch
literal 834
zcmeAS@N?(olHy`uVBq!ia0vp^K0xfi!3HEZgiZ`#U|{C-ba4!+h#FPP4>p~{FKVAIxfRy?wpKbi`_nz$m&NCHK0iL$J0nktVORaRnxOgXn{;^l
z|NihzXqb{SQTS(FpunOt+zFk|y;>ipy=-;6*gVs0N^##*2Z!LZivpkNZBTN&qpT#$
zn8T1!(Cfl=L#{s|X0h>Ps!{Zz@sgxL)PbcyrNPW9b=T;_H&@
zdh`n1idyFeRXvtky1gle)JTQF|@Yg6QmpRQ*rr*|G%XN+IrPvCCvTx@(ZD-u;T{dgd+Q^e$
zk7Z|b*)_eY_K2OduD{=v|H^u&N4LLeE)6aE$^EVHu(HXidyKJ>CuJsEnOzfo*qgm$
zfv&l}&Za=C&*o{cW
zOs(U;%*wNEwj~D9!7^u_wKiMM2s|M1y^RRUS8_wa;&~1~D*pB#um7R{sxxzj+e@_x
z+6R=EiJP4?JXI$Ynw_9~Y3BRCTkWJ$`51OSeEw9j@Q&8qqrX!(F_w0JO#P_;Sk#2)
zn#a0=*T-+Z-X~eSa(0?z&rJtAg_GpKC{_*^wc0xNLaB5CQ)Aoh_&WFD>&71XL>Z+8g
yyI=o?vl_KGzIE8