Merge pull request 'send wash 7.29' (#88) from zhy into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/88
This commit is contained in:
hansu 2020-07-29 19:01:59 +08:00
commit 04adc72d92
10 changed files with 391 additions and 147 deletions

View File

@ -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');
},
}
}
}

View File

@ -1,13 +1,13 @@
<template>
<view class="comment">
<view class="user-info">
<image src="@/pageE/static/mine/23.png" class="user-avatar"></image>
<view class="user-name">***</view>
<image :src="info.member_avatar" class="user-avatar"></image>
<view class="user-name">{{ info.member_nickname }}</view>
</view>
<view class="user-comment">
<view class="text u-line-2">宝贝收到了和卖家描述的一样,质量不错,很漂亮一直想买这样的杯子这个蓝色的稍微有点小瑕疵不过自己用没问题没问题没问题</view>
<view class="text u-line-2">{{ info.comment }}</view>
<view class="image">
<image v-for="(src, index) in ImageList" :key="index" :src="src" mode="aspectFit"></image>
<image v-for="(src, index) in info.images" :key="index" :src="src" mode="aspectFit"></image>
</view>
</view>
</view>
@ -15,14 +15,10 @@
<script>
export default {
data() {
return {
ImageList: [
require('@/pageE/static/mine/23.png'),
require('@/pageE/static/mine/23.png'),
require('@/pageE/static/mine/23.png'),
require('@/pageE/static/mine/23.png')
]
}
return {}
},
props: {
info: Object,
}
};
</script>

View File

@ -5,16 +5,6 @@
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
<scroll-view scroll-y style="height: 100%;">
<view v-for="(coupon, index) in couponList" :key="index" class="coupon-item">
<!-- <img src="../static/mine/23.png" />
<view class="coupon-main">
<view class="coupon-title">萌店十元优惠券</view>
<view class="coupon-date">
<img src="../static/mine/26.png" />
<view>2020.05.17-2020.06.17</view>
</view>
<view class="coupon-integral">299积分</view>
</view>
<view class="coupon-btn">兑换</view> -->
<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
</view>
<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList.length"></u-empty>

View File

@ -14,7 +14,7 @@
@on-uploaded="setImageList"
>
<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
<img src="../static/mine/27.png" />
<image src="../static/mine/27.png"></image>
</view>
</u-upload>
</view>
@ -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;

View File

@ -10,7 +10,7 @@
:auto-upload="false"
>
<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
<img src="../static/mine/27.png" />
<image src="../static/mine/27.png"></image>
</view>
</u-upload>
</view>
@ -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;

View File

@ -35,7 +35,7 @@
<view class="btn" v-if="item.order_status == 20" @click="sendLaundryOrderConfirm(item.laundry_id)">
确认完成
</view>
<view class="btn" v-if="item.order_status == 50">
<view class="btn" v-if="item.order_status == 50" @click="toComment(item.laundry_id)">
去评价
</view>
</view>
@ -49,8 +49,8 @@
</swiper-item>
<swiper-item class="swiper-item">
<scroll-view scroll-y class="comment">
<view v-for="(item, index) in 3" :key="index" class="comment-item">
<Comment></Comment>
<view v-for="(comment, index) in commentList" :key="index" class="comment-item">
<Comment :info="comment"></Comment>
</view>
</scroll-view>
</swiper-item>
@ -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){

View File

@ -7,7 +7,7 @@
<swiper-item class="swiper-item">
<scroll-view scroll-y="true" style="height: 100%;">
<view class="order-info">
<view class="order-name" @click="order()">
<view class="order-name" @click="showPopup=true">
<view class="title titles" >
<text>选择订单:</text>
<image src="../../static/image/shop/2.png" mode=""></image>
@ -38,9 +38,13 @@
</view>
</view>
</view>
<view class="order-view order-phone">
<view class="title">衣服状况:</view>
<input type="text" v-model="goodsStatus" />
</view>
<view class="order-view order-type" @click="showClothesType=true">
<view class="title">商品类型:</view>
<input type="text" v-model="type" disabled />
<input type="text" v-model="type.label" disabled />
</view>
<view class="order-view order-name">
<view class="title">送洗人:</view>
@ -66,18 +70,22 @@
<view class="upload-image">
<view class="title">上传商品图片</view>
<u-upload
ref="uUpload"
@on-uploaded="onUploaded"
ref="platform"
:custom-btn="true"
:max-count="count"
:action="uaction"
:auto-upload="false"
:header="uheader"
:form-data="uformData"
:name="uname"
@on-uploaded="setImageList"
>
<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
<img src="../static/mine/27.png" />
<image src="../static/mine/27.png"></image>
</view>
</u-upload>
</view>
<view class="wash-btn" @click="reset()">确认送洗</view>
<view class="wash-btn" @click="submitImage">确认送洗</view>
</scroll-view>
</swiper-item>
<swiper-item class="swiper-item">
@ -86,18 +94,22 @@
<view class="title">商品名称:</view>
<input type="text" v-model="goodsName" />
</view>
<view class="order-view order-phone" @click="showClothesType=true">
<view class="title">商品类型:</view>
<input type="text" v-model="type" disabled />
</view>
<view class="order-view order-phone">
<view class="title">衣服状况:</view>
<input type="text" v-model="name" />
<input type="text" v-model="goodsStatus" />
</view>
<view class="order-view order-phone" @click="showClothesType=true">
<view class="title">商品类型:</view>
<input type="text" v-model="type.label" disabled />
</view>
<view class="order-view order-name">
<view class="title">送洗人:</view>
<input type="text" v-model="name" />
</view>
<view class="order-view order-phone">
<view class="title">手机号:</view>
<input type="text" v-model="phone" maxlength="11" />
</view>
<view class="order-view order-area" @click="showAddress=true">
<view class="title">省市区:</view>
<input type="text" v-model="area" disabled />
@ -114,28 +126,33 @@
<view class="upload-image">
<view class="title">上传商品图片</view>
<u-upload
ref="uUpload"
@on-uploaded="onUploaded"
ref="physical"
:custom-btn="true"
:max-count="count"
:action="uaction"
:auto-upload="false"
:header="uheader"
:form-data="uformData"
:name="uname"
@on-uploaded="setImageList"
>
<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
<img src="../static/mine/27.png" />
<image src="../static/mine/27.png"></image>
</view>
</u-upload>
</view>
<view class="wash-btn">确认送洗</view>
<view class="wash-btn" @click="submitImage">确认送洗</view>
</swiper-item>
</swiper>
<u-select v-model="showClothesType" :list="typeList" value-name="id" label-name="name" @confirm="confirmType"></u-select>
<u-select v-model="showClothesType" :list="typeList" value-name="id" label-name="name" @confirm="confirmType" :safe-area-inset-bottom="true" mode="single-column"></u-select>
<u-select v-model="showAddress"
mode="mutil-column-auto"
:list="areaList"
value-name="area_id"
label-name="area_name"
child-name="_child"
@confirm="setArea">
@confirm="setArea"
:safe-area-inset-bottom="true">
</u-select>
<u-popup v-model="showPopup" mode="bottom" border-radius="20">
<view class="order-popup">
@ -182,49 +199,50 @@
<view class="order-btn" @click="confirm">确认</view>
</view>
</u-popup>
<u-toast ref="uToast" />
</view>
</template>
<script>
export default {
data() {
return {
items: [],
// items: [],
count: 4, //
type: '',
name: '',
phone: '',
area: '',
address: '',
// platformForm: {
// type: '',
// name: '',
// phone: '',
// area: '',
// address: '',
// },
// physicalForm: {
// },
goodsName: '',
type: {}, //
name: '', //
phone: '', //
area: '', //
goodsStatus: '', //
address: '', //
goodsName: '', //
list: [{
name: '平台历史订单'
}, {
name: '实体店历史订单'
}],
typeList: [],
orderList: [],
typeList: [], //
orderList: [], //
page: 0,
current: 0,
areaList: [],
swiperCurrent: 0,
areaList: [], // 
showClothesType: false,
showAddress: false,
swiperCurrent: 0,
showPopup : false,
checkedList: [],
page: 0,
swiperHeight: '',
value: '', // radio
checkedGoods: {},
choose: false, //
checkedGoods: {}, //
choose: false, //
filesArr: [], //
uploadImage: [], // ()
uaction: this.$u.http.config.baseUrl + '/Upload/uploadfile', //
uheader: {
"authorization": 'Bearer' + " " + uni.getStorageSync('token')
},
uname: 'common', // formData name
uformData: {
name: 'common', //
},
}
},
onShow() {
@ -242,12 +260,17 @@ export default {
methods: {
getClothesTypeList() {
this.$u.api.getClothesTypeList().then(res => {
if (res.errCode == 0) {
this.typeList = res.data.typeList;
} else {
this.typeList = [];
}
console.log(this.typeList);
})
},
confirmType(e) {
// console.log(e);
this.type = e[0].label;
// console.log(e[0]);
this.type = e[0];
},
async getOrderList({ load = 'reload' } = {}) {
const res = await this.$u.api.getOrderList({
@ -261,15 +284,96 @@ export default {
}
return res;
},
submit() {
this.$refs.uUpload.upload();
},
onUploaded(list) {
console.log(list);
submitImage() {
// this.$refs.uUpload.upload();
this.current == 0 ? this.$refs.platform.upload() : this.$refs.physical.upload();
// this.confirmSend();
},
tabsChange(index) {
this.swiperCurrent = index;
},
setImageList(lists) {
console.log(lists);
let imageList = [];
lists.forEach(res => {
if(res.response.errCode == 0) imageList.push(res.response.data.file_name);
})
// console.log(imageList);
this.filesArr = imageList;
console.log(this.filesArr);
this.confirmSend();
},
validationParams() {
if (this.current == 1) {
if(this.$u.test.isEmpty(this.goodsName)) {
this.showToast('商品名称不能为空', 'warning');
return false;
}
}
if(this.current == 0) {
if(JSON.stringify(this.checkedGoods) != '{}') {
this.showToast('订单不能为空', 'warning');
return false;
}
}
if(this.$u.test.isEmpty(this.goodsStatus)) {
this.showToast('衣服状况不能为空', 'warning');
return false;
}
if(JSON.stringify(this.type) != '{}') {
this.showToast('商品类型不能为空', 'warning');
return false;
}
if(this.$u.test.isEmpty(this.name)) {
this.showToast('送洗人不能为空', 'warning');
return false;
}
if(this.$u.test.isEmpty(this.phone)) {
this.showToast('手机号不能为空', 'warning');
return false;
}
if(!this.$u.test.mobile(this.phone)) {
this.showToast('手机号错误', 'warning');
return false;
}
if(this.$u.test.isEmpty(this.area)) {
this.showToast('地址不能为空', 'warning');
return false;
}
if(this.$u.test.isEmpty(this.address)) {
this.showToast('详细地址不能为空', 'warning');
return false;
}
return true;
},
confirmSend() {
if(!this.validationParams) return false;
let params = {
tid: this.type.value,
member_name: this.name,
area_info: this.area,
address_info: this.address,
goods_images: this.filesArr,
member_phone: this.phone,
condition: this.goodsStatus,
}
if(this.current == 0) {
Object.assign(params, {
type: 1,
order_id: this.checkedGoods.order_id,
goods_id: this.checkedGoods.goods.goods_id,
});
} else if(this.current == 1) {
Object.assign(params, {
type: 2,
goods_name: this.goodsName,
});
}
// console.log(params);
this.$u.api.sendLaundrySave(params).then(res => {
this.$u.toast(res.message);
})
},
radioChange(e){
const ids = e.split(" ");
console.log(ids)
@ -278,6 +382,7 @@ export default {
if(order.order_id == ids[0]) {
Object.assign(checkedGoods, { store: order.extend_store });
Object.assign(checkedGoods, { order_sn: order.order_sn });
Object.assign(checkedGoods, { order_id: order.order_id });
order.extend_order_goods.forEach(goods => {
if(goods.goods_id == ids[1]) {
Object.assign(checkedGoods, { goods: goods });
@ -301,6 +406,8 @@ export default {
this.$u.api.getArea().then((res)=>{
if (res.errCode == 0) {
this.areaList = res.data;
} else {
this.areaList = [];
}
})
},
@ -308,30 +415,13 @@ export default {
let current = e.detail.current;
this.swiperCurrent = current;
this.current = current;
this.toApplyPage(current);
},
order() {
this.showPopup = true;
},
toApplyPage(index) {
// console.log(index)
if(index == 1) {
this.showPopup = false;
this.choose = false
}
},
setViewHeight() {
const res = uni.getSystemInfoSync();
this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
// this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
this.swiperHeight = res.windowHeight + 'px';
},
// replaces(){
// if(this.list[0].name==''){
// this.$set(this.list,0,{name: ''} )
// }else{
// this.$set(this.list,0,{name: ''} )
// }
// },
confirm(){
confirm(e){
this.showPopup = false;
if(JSON.stringify(this.checkedGoods) != '{}'){
this.choose = true;
@ -342,8 +432,11 @@ export default {
close(){
this.showPopup = false
},
reset(){
this.choose = false
showToast(message, type) {
this.$refs.uToast.show({
title: message,
type: type,
})
},
},
};
@ -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;

View File

@ -0,0 +1,98 @@
<template>
<view class="comment">
<view class="main-container">
<u-input v-model="content" type="textarea" height="300" maxlength="200" />
<!-- <u-upload
ref="uUpload"
@on-uploaded="onUploaded"
:custom-btn="true"
:max-count="count"
:auto-upload="false"
>
<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
<image src="../static/mine/27.png"></image>
</view>
</u-upload> -->
</view>
<u-toast ref="uToast" />
<view class="write-btn" @click="addWashEvaluate">发表评价</view>
</view>
</template>
<script>
export default {
data() {
return {
washId: '',
// count: 4, //
content: '',
}
},
onLoad(option) {
this.washId = option.id;
},
methods: {
verifyParams() {
if(this.$u.test.isEmpty(this.content)) {
this.$u.toast('内容不可为空');
return false;
}
return true;
},
addWashEvaluate() {
if(!this.verifyParams()) return false;
this.$u.api.sendOrderComment({
id: this.washId,
comment: this.content,
}).then(res => {
this.$refs.uToast.show({
title: res.message,
back: true,
})
})
},
bindTextAreaBlur(event) {
this.content = event.detail.value;
}
},
};
</script>
<style lang="scss" scoped>
.comment {
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
border-top: 1rpx solid #ffffff;
.main-container {
background-color: #ffffff;
padding: 30rpx;
margin-bottom: 10rpx;
// textarea {
// width: 100% !important;
// height: 500rpx;
// margin-bottom: 60rpx;
// }
// .slot-btn {
// width: 140rpx;
// height: 140rpx;
// background: rgba(236,236,236,1);
// border-radius: 10rpx;
// text-align: center;
// > img {
// margin-top: 48rpx;
// width: 54rpx;
// height: 49rpx;
// }
// }
}
.write-btn {
margin: 120rpx auto 0;
width: 690rpx;
height: 98rpx;
background: rgba(255,120,15,1);
border-radius: 46rpx;
font-size: 36rpx;
color: rgba(255,255,255,1);
text-align: center;
line-height: 98rpx;
}
}
</style>

View File

@ -604,6 +604,19 @@
}
}
},
{
"path": "tool/washComment",
"style": {
"navigationBarTitleText": "送洗评价",
"app-plus": {
"titleSize": "36px",
"titleNView": {
"titleColor": "#333333",
"backgroundColor": "#FFFFFF"
}
}
}
},
{
"path": "tool/WashOrder",
"style": {

View File

@ -7,7 +7,7 @@
<view class="info-left">
<view class="user-nickname">{{ userInfo.member_nickname }}</view>
<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
<img src="/static/image/mine/13.png" />
<image src="/static/image/mine/13.png"></image>
<view class="rank-title">{{ userInfo.member_grade_name }}</view>
</view>
</view>
@ -47,32 +47,32 @@
<view class="title-text">我的订单</view>
<view class="more" @click="toOtherPage('/order/Index')">
<view>查看全部订单</view>
<img src="/static/image/mine/21.png" />
<image src="/static/image/mine/21.png"></image>
</view>
</view>
<view class="content">
<view @click="toOtherPage('/order/Index?current=1')">
<img src="/static/image/mine/6.png" />
<image src="/static/image/mine/6.png"></image>
<view>待支付</view>
</view>
<view @click="toOtherPage('/order/Index?current=2')">
<img src="/static/image/mine/14.png" />
<image src="/static/image/mine/14.png"></image>
<view>已取消</view>
</view>
<view @click="toOtherPage('/order/Index?current=3')">
<img src="/static/image/mine/2.png" />
<image src="/static/image/mine/2.png"></image>
<view>待收货</view>
</view>
<view @click="toOtherPage('/order/Index?current=4')">
<img src="/static/image/mine/1.png" />
<image src="/static/image/mine/1.png"></image>
<view>试穿试送</view>
</view>
<view @click="toOtherPage('/order/Index?current=5')">
<img src="/static/image/mine/3.png" />
<image src="/static/image/mine/3.png"></image>
<view>待评价</view>
</view>
<view @click="toOtherPage('/order/Index?current=6')">
<img src="/static/image/mine/9.png" />
<image src="/static/image/mine/9.png"></image>
<view>售后</view>
</view>
</view>
@ -81,19 +81,19 @@
<view class="title">我的工具</view>
<view class="content">
<view @click="toOtherPage('/tool/SendWash')">
<img src="/static/image/mine/20.png" />
<image src="/static/image/mine/20.png"></image>
<view>送洗</view>
</view>
<view @click="toOtherPage('/tool/Manicure')">
<img src="/static/image/mine/19.png" />
<image src="/static/image/mine/19.png"></image>
<view>美甲</view>
</view>
<view @click="toOtherPage('/tool/MineHistory')">
<img src="/static/image/mine/18.png" />
<image src="/static/image/mine/18.png"></image>
<view>足迹</view>
</view>
<view @click="toOtherPage('/tool/MineCoupon')">
<img src="/static/image/mine/25.png" />
<image src="/static/image/mine/25.png"></image>
<view>优惠券</view>
</view>
</view>
@ -102,19 +102,19 @@
<view class="title">更多工具</view>
<view class="content">
<view @click="toOtherPage('/more/Address')">
<img src="/static/image/mine/17.png" />
<image src="/static/image/mine/17.png"></image>
<view>收货地址</view>
</view>
<view @click="toOtherPage('/more/AfterSalesHelp')">
<img src="/static/image/mine/9.png" />
<image src="/static/image/mine/9.png"></image>
<view>售后政策</view>
</view>
<view @click="toOtherPage('/more/MineHelp')">
<img src="/static/image/mine/16.png" />
<image src="/static/image/mine/16.png"></image>
<view>使用帮助</view>
</view>
<view @click="toOtherPage('/more/Complaints')">
<img src="/static/image/mine/15.png" />
<image src="/static/image/mine/15.png"></image>
<view>投诉意见</view>
</view>
</view>
@ -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) {