diff --git a/common/api/shop.js b/common/api/shop.js index bda384f..2bbc626 100644 --- a/common/api/shop.js +++ b/common/api/shop.js @@ -278,7 +278,8 @@ export default { searchwordlist() { return vm.$u.post('ShopSearch/searchwordlist') }, - saveGoodsTry({ member_name, member_mobile, area_info, address_detail, goods_id, num, store_id }) { + // 提交试穿订单 + saveGoodsTry({ member_name, member_mobile, area_info, address_detail, goods_id, num, store_id, appointment_time }) { return vm.$u.post('Order/saveGoodsTry', { member_name: member_name, member_mobile: member_mobile, @@ -287,6 +288,7 @@ export default { goods_id: goods_id, num: num, store_id: store_id, + appointment_time: appointment_time, }) }, } diff --git a/common/api/user.js b/common/api/user.js index bd1ad4e..b4754a0 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -244,6 +244,10 @@ export default { goodsTryOrderList() { return vm.$u.post('order/goodsTryOrderList'); }, + // 试穿订单确认完成 + goodsTryConfirm({ id }) { + return vm.$u.post('order/goodsTryConfirm', { id: id }); + }, // 订单详情 getOrderInfo({ order_id }) { return vm.$u.post('Order/orderInfo', { order_id: order_id }); @@ -330,6 +334,30 @@ export default { code: code, }); }, + // 送洗列表-平台订单 实体店订单 + sendLaundryOrderList({ type, page }) { + return vm.$u.post('member/sendLaundryOrderList', { + type: type, + page: page, + }); + }, + // 送洗-获取衣服类型 + getClothesTypeList() { + return vm.$u.post('member/getClothesTypeList'); + }, + // 送洗评价 + sendOrderComment({ id, comment }) { + return vm.$u.post('member/sendOrderComment', { + id: id, + comment: comment, + }); + }, + // 送洗确认完成 + sendLaundryOrderConfirm({ id }) { + return vm.$u.post('member/sendOrderConfirm', { + id: id, + }); + } } } } \ No newline at end of file diff --git a/components/mine/order-item/try.vue b/components/mine/order-item/try.vue new file mode 100644 index 0000000..fe7f10b --- /dev/null +++ b/components/mine/order-item/try.vue @@ -0,0 +1,192 @@ + + + \ No newline at end of file diff --git a/pageB/triedDress/index.vue b/pageB/triedDress/index.vue index 1ffea1d..bc6f2c1 100644 --- a/pageB/triedDress/index.vue +++ b/pageB/triedDress/index.vue @@ -21,11 +21,12 @@ - + - + + @@ -63,11 +64,20 @@ export default { address: '', // 选择地址 area: '', // 详细地址 time: '', + showTime: false, number: 1, // 商品数量 area_id: '', // 地区id 省 city_id: '', // 城市id goodsInfo: {}, store: {}, + params: { + year: true, + month: true, + day: true, + hour: true, + minute: true, + second: false + }, } }, mounted() { @@ -98,10 +108,22 @@ export default { this.$u.toast('详细地址不可为空'); return false; } + if(this.$u.test.isEmpty(this.time)) { + this.$u.toast('预约时间不可为空'); + return false; + } + if(new Date(this.time) < new Date()) { + this.$u.toast('预约时间错误'); + return false; + } return true; }, + chooseDate(e) { + let time = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute; + this.time = time; + }, confirmBtn() { - if(!this.verification) return false; + if(!this.verification()) return false; this.$u.api.saveGoodsTry({ member_name: this.name, member_mobile: this.phone, @@ -110,7 +132,8 @@ export default { goods_id: this.goodsInfo.goods_id, num: this.number, store_id: this.store.store_id, - }).then((res)=>{ + appointment_time: new Date(this.time), + }).then(res => { this.$u.toast(res.message); if (res.errCode == 0) { // this.$u.route({ type: 'navigateBack' }); diff --git a/pageE/order/Index.vue b/pageE/order/Index.vue index 3683c9e..85783fc 100644 --- a/pageE/order/Index.vue +++ b/pageE/order/Index.vue @@ -8,7 +8,8 @@ - + + @@ -20,6 +21,7 @@ \ No newline at end of file diff --git a/pages/mine/index.vue b/pages/mine/index.vue index b084394..80aecbd 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -24,7 +24,7 @@ 商品收藏 - {{ userInfo.member_fav_store_num }} + {{ userInfo.member_fav_store_num || 0 }} 店铺收藏 @@ -32,11 +32,11 @@ 图文收藏 - {{ userInfo ? userInfo.member_points : 0 }} + {{ userInfo.member_points || 0 }} 积分数 - {{ userInfo.member_snsfrend_num }} + {{ userInfo.member_snsfrend_num || 0 }} 关注