diff --git a/common/api/user.js b/common/api/user.js
index b4754a0..60f9645 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -357,7 +357,39 @@ export default {
return vm.$u.post('member/sendOrderConfirm', {
id: id,
});
- }
+ },
+ // 提交送洗
+ sendLaundrySave({
+ type,
+ tid,
+ condition,
+ member_name,
+ member_phone,
+ area_info,
+ address_info,
+ goods_name,
+ order_id,
+ goods_id,
+ goods_images,
+ }) {
+ return vm.$u.post('member/sendLaundrySave', {
+ type: type,
+ tid: tid,
+ condition: condition,
+ member_name: member_name,
+ member_phone: member_phone,
+ area_info: area_info,
+ address_info: address_info,
+ goods_name: goods_name,
+ order_id: order_id,
+ goods_id: goods_id,
+ goods_images: goods_images,
+ });
+ },
+ // 送洗评论列表
+ sendCommentList() {
+ return vm.$u.post('member/sendCommentList');
+ },
}
}
}
\ No newline at end of file
diff --git a/components/mine/comment/index.vue b/components/mine/comment/index.vue
index 667085b..70c0c0e 100644
--- a/components/mine/comment/index.vue
+++ b/components/mine/comment/index.vue
@@ -1,13 +1,13 @@
@@ -15,14 +15,10 @@
diff --git a/pageE/mine/MemberServeCoupon.vue b/pageE/mine/MemberServeCoupon.vue
index 094ab67..0d5f7f3 100644
--- a/pageE/mine/MemberServeCoupon.vue
+++ b/pageE/mine/MemberServeCoupon.vue
@@ -5,16 +5,6 @@
-
diff --git a/pageE/more/WriteComments.vue b/pageE/more/WriteComments.vue
index ee9ef41..906c7ed 100644
--- a/pageE/more/WriteComments.vue
+++ b/pageE/more/WriteComments.vue
@@ -14,7 +14,7 @@
@on-uploaded="setImageList"
>
-
+
@@ -102,7 +102,7 @@ export default {
background: rgba(236,236,236,1);
border-radius: 10rpx;
text-align: center;
- > img {
+ > image {
margin-top: 48rpx;
width: 54rpx;
height: 49rpx;
diff --git a/pageE/order/Comment.vue b/pageE/order/Comment.vue
index 511814b..b6eb931 100644
--- a/pageE/order/Comment.vue
+++ b/pageE/order/Comment.vue
@@ -10,7 +10,7 @@
:auto-upload="false"
>
-
+
@@ -94,7 +94,7 @@ export default {
background: rgba(236,236,236,1);
border-radius: 10rpx;
text-align: center;
- > img {
+ > image {
margin-top: 48rpx;
width: 54rpx;
height: 49rpx;
diff --git a/pageE/tool/SendWash.vue b/pageE/tool/SendWash.vue
index 1a2a80d..eb147e7 100644
--- a/pageE/tool/SendWash.vue
+++ b/pageE/tool/SendWash.vue
@@ -35,7 +35,7 @@
确认完成
-
+
去评价
@@ -49,8 +49,8 @@
@@ -84,6 +84,7 @@ export default {
page: 1,
orderList: [],
timer: true,
+ commentList: [],
}
},
components: {
@@ -111,11 +112,22 @@ export default {
return state;
},
},
+ watch: {
+ current(index) {
+ if(index == 1) {
+ uni.navigateTo({
+ url: '/pageE/tool/WashOrder'
+ });
+ this.showPopup = false;
+ }
+ }
+ },
onShow() {
this.current = 0;
this.swiperCurrent = 0;
this.showPopup = false;
this.sendLaundryOrderList();
+ this.sendCommentList();
},
methods: {
async sendLaundryOrderList({ load = 'reload' } = {}) {
@@ -159,31 +171,33 @@ export default {
this.page--;
})
},
+ // 送洗评论列表
+ sendCommentList() {
+ this.$u.api.sendCommentList().then(res => {
+ if(res.errCode == 0) {
+ this.commentList = res.data.list;
+ } else {
+ this.commentList = [];
+ }
+ })
+ },
+ toComment(id) {
+ this.$u.route('/pageE/tool/washComment', {
+ id: id
+ });
+ },
tabsChange(index) {
this.swiperCurrent = index;
- this.toApplyPage(index);
+ if (index == 0){
+ this.showPopup = !this.showPopup;
+ } else {
+ this.showPopup = false;
+ }
},
animationfinish(e) {
let current = e.detail.current;
this.swiperCurrent = current;
this.current = current;
- this.toApplyPage(current);
- },
- toApplyPage(index) {
- var that = this;
- if(index == 1) {
- this.showPopup = false;
- uni.navigateTo({
- url: '/pageE/tool/WashOrder'
- });
- } else if (index == 0){
- this.history();
- } else {
- this.showPopup = false;
- }
- },
- history(){
- this.showPopup = true;
},
replaces(e){
if(e == 1){
diff --git a/pageE/tool/WashOrder.vue b/pageE/tool/WashOrder.vue
index fec10fb..efad8d6 100644
--- a/pageE/tool/WashOrder.vue
+++ b/pageE/tool/WashOrder.vue
@@ -7,7 +7,7 @@
-
+
选择订单:
@@ -38,9 +38,13 @@
+
+ 衣服状况:
+
+
商品类型:
-
+
送洗人:
@@ -66,18 +70,22 @@
上传商品图片
-
+
- 确认送洗
+ 确认送洗
@@ -86,18 +94,22 @@
商品名称:
-
- 商品类型:
-
-
衣服状况:
-
+
+
+
+ 商品类型:
+
送洗人:
+
+ 手机号:
+
+
省市区:
@@ -114,28 +126,33 @@
上传商品图片
-
+
- 确认送洗
+ 确认送洗
-
+
+ @confirm="setArea"
+ :safe-area-inset-bottom="true">
+
@@ -487,7 +580,7 @@ export default {
background: rgba(236,236,236,1);
border-radius: 10rpx;
text-align: center;
- > img {
+ > image {
width: 54rpx;
height: 49rpx;
margin-top: 48rpx;
diff --git a/pageE/tool/washComment.vue b/pageE/tool/washComment.vue
new file mode 100644
index 0000000..17cc029
--- /dev/null
+++ b/pageE/tool/washComment.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b073bf6..985e461 100644
--- a/pages.json
+++ b/pages.json
@@ -604,6 +604,19 @@
}
}
},
+ {
+ "path": "tool/washComment",
+ "style": {
+ "navigationBarTitleText": "送洗评价",
+ "app-plus": {
+ "titleSize": "36px",
+ "titleNView": {
+ "titleColor": "#333333",
+ "backgroundColor": "#FFFFFF"
+ }
+ }
+ }
+ },
{
"path": "tool/WashOrder",
"style": {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 80aecbd..2ab7b73 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -7,7 +7,7 @@
{{ userInfo.member_nickname }}
-
+
{{ userInfo.member_grade_name }}
@@ -47,32 +47,32 @@
我的订单
查看全部订单
-
+
-
+
待支付
-
+
已取消
-
+
待收货
-
+
试穿试送
-
+
待评价
-
+
售后
@@ -81,19 +81,19 @@
我的工具
-
+
送洗
-
+
美甲
-
+
足迹
-
+
优惠券
@@ -102,19 +102,19 @@
更多工具
-
+
收货地址
-
+
售后政策
-
+
使用帮助
-
+
投诉意见
@@ -189,10 +189,11 @@ export default {
border-radius: 13rpx;
align-items: center;
padding: 0 17rpx 0 10rpx;
- > img {
+ > image {
margin-right: 9rpx;
width: 20rpx;
height: 22rpx;
+ flex-shrink: 0;
}
.rank-title {
font-size: 16rpx;
@@ -240,7 +241,7 @@ export default {
}
}
.mine-container {
- @mixin common-mine($content-padding-top, $content-padding-bottom, $image-height) {
+ @mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) {
box-sizing: border-box;
width: 690rpx;
background: rgba(255,255,255,1);
@@ -270,9 +271,11 @@ export default {
display: flex;
> view {
text-align: center;
- > img {
+ > image {
+ width: $image-width;
height: $image-height;
margin-bottom: 15rpx;
+ flex-shrink: 0;
}
> view {
font-size: 22rpx;
@@ -285,16 +288,19 @@ export default {
@include common-mine(
$content-padding-top: 22rpx,
$content-padding-bottom: 30rpx,
- $image-height: 36rpx
+ $image-height: 36rpx,
+ $image-width: 36rpx,
);
.title {
justify-content: space-between;
.more {
display: flex;
align-items: center;
- > img {
+ > image {
+ width: 19rpx;
height: 19rpx;
margin-left: 10rpx;
+ flex-shrink: 0;
}
}
}
@@ -309,7 +315,8 @@ export default {
@include common-mine(
$content-padding-top: 8rpx,
$content-padding-bottom: 25rpx,
- $image-height: 71rpx
+ $image-height: 71rpx,
+ $image-width: 71rpx,
);
.content {
> view:not(:last-child) {
@@ -321,7 +328,8 @@ export default {
@include common-mine(
$content-padding-top: 8rpx,
$content-padding-bottom: 48rpx,
- $image-height: 71rpx
+ $image-height: 71rpx,
+ $image-width: 71rpx,
);
.content {
> view:not(:last-child) {