clunt
/
dingdong-mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

后台接口对接

This commit is contained in:
donqi 2022-06-21 21:42:29 +08:00
parent 481b7cd763
commit c8d40a0d16
5 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/js/data.js
View File

@ -765,7 +765,7 @@ const myInfo = {
}]
},
serOrderNum: {
wait2Pay: 1,
wait2Pay: 0,
wait2Serv: 0,
processing: 0,
afterServ: 0,

4
common/js/request.js
View File

@ -10,9 +10,9 @@ export default {
title: '加载中'
})
// request 触发前拼接 url
// args.url = 'https://www.opsoul.com' + args.url;
args.url = 'https://www.opsoul.com' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url;
args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url;
if (args.data) {
args.data.deptId = globalData.deptId;
args.data.from = globalData.from;

11
pages/index/my-home.vue
View File

@ -107,6 +107,14 @@
<text>服务中</text>
</view>
<view class="cu-item" @click="showMyOrders(servOrderTabList, 4, servOrderType)">
<view class="cuIcon-notice">
<view class="cu-tag badge" v-if="myInfo.serOrderNum.afterServ > 0">
<block>{{myInfo.serOrderNum.afterServ}}</block>
</view>
</view>
<text>完成待确认</text>
</view>
<view class="cu-item" @click="showMyOrders(servOrderTabList, 5, servOrderType)">
<view class="cuIcon-forward">
<view class="cu-tag badge" v-if="myInfo.serOrderNum.wait2Forward > 0">
<block>{{myInfo.serOrderNum.wait2Forward}}</block>
@ -259,6 +267,9 @@
}, {
type: 3,
name: '服务中'
}, {
type: 6,
name: '完成待确认'
}, {
type: 4,
name: '已完成'

40
pages/my/my-order.vue
View File

@ -27,7 +27,7 @@
<view class="cuIcon-right"></view>
</view>
</view>
<view class='cu-tag bg-yellow radius margin-right-sm' v-if="tabCur === 3" @click="showServDetail(shopOrder)">查看订单详情</view>
<!-- <view class='cu-tag bg-yellow radius margin-right-sm' v-if="tabCur === 3" @click="showServDetail(shopOrder)">查看订单详情</view> -->
</view>
<view class="padding-lr">
<view class="margin-top-sm" @click="showServDetail(shopOrder)">
@ -64,23 +64,21 @@
<button class="cu-btn bg-main-color margin-right-sm shadow-blur">评价</button>
</view> -->
</view>
<view v-if="orderType === 0 && shopOrder.subProcessStatus === 4"
<view v-if="orderType === 0 && shopOrder.orderStatus === 6"
class="padding-tb-sm solid-top">
<view>师傅已提交完成，请验收。</view>
<view>服务保障权益期：</view>
<!-- <view>服务保障权益期：</view> -->
<view class="flex justify-between align-end">
<view>{{shopOrder.finishOrder.finishWaitUntil}}</view>
<!-- <view>{{shopOrder.finishOrder.finishWaitUntil}}</view> -->
<view>
<button v-if="shopOrder.finishOrder.finishStatus === 1"
class="cu-btn sm bg-yellow margin-right-sm"
@click="updateFinisheStatus(2, index)">已验收</button>
<button v-if="shopOrder.finishOrder.finishStatus === 1"
class="cu-btn sm bg-yellow margin-right-sm"
@click="updateFinisheStatus(-1, index)">拒绝完单</button>
<button v-if="shopOrder.finishOrder.finishStatus === 2"
class="cu-btn sm bg-yellow margin-right-sm" disabled type="">已完成验收</button>
<button class="cu-btn sm bg-yellow margin-right-sm"
@click="updateFinisheStatus(shopOrder, 4, false)">确认完单</button>
<button class="cu-btn sm bg-yellow margin-right-sm"
@click="updateFinisheStatus(shopOrder, 3, true)">拒绝完单</button>
<!-- <button v-if="shopOrder.finishOrder.finishStatus === 2"
class="cu-btn sm bg-yellow margin-right-sm" disabled type="">已确认完单</button>
<button v-if="shopOrder.finishOrder.finishStatus === -1"
class="cu-btn sm bg-yellow margin-right-sm" disabled type="">已拒绝完单</button>
class="cu-btn sm bg-yellow margin-right-sm" disabled type="">已拒绝完单</button> -->
</view>
</view>
</view>
@ -209,8 +207,20 @@
updateAgreeStatus(status, index) {
this.myOrders[index].agreedServTime.customerAgreeStatus = status;
},
updateFinisheStatus(status, index) {
this.myOrders[index].finishOrder.finishStatus = status;
async updateFinisheStatus(order, status, ifRollback) {
let res = await this.$request.updateOrder({
id: order.orderMasterId,
orderStatus: status
});
if (res && res.code === 0) {
this.reloadOrderPage();
if (ifRollback) {
uni.showToast({
title: '订单已回滚至服务中状态，请联系师傅',
icon: 'none'
})
}
}
},
showServDetail(order) {
uni.navigateTo({

8
pages/my/serv-detail.vue
View File

@ -56,10 +56,10 @@
<text class="cuIcon-time text-main-color margin-right-xs"></text>
<text>排单时间：{{servDetail.mainServOrder.boodTime}}</text>
</view> -->
<view class="margin-top-sm" v-if="servDetail.orderStatus === 3">
<!-- <view class="margin-top-sm" v-if="servDetail.orderStatus === 3">
<text class="cuIcon-time text-main-color margin-right-xs"></text>
<text>上门时间：{{servDetail.workBeginTime}}</text>
</view>
</view> -->
<view class="margin-top-sm">
<text class="cuIcon-moneybag text-main-color margin-right-xs"></text>
<text>任务金额：</text>
@ -92,8 +92,8 @@
<view class="margin-top-sm">
<view>师傅：{{item.workerName}}</view>
<view class="margin-top-sm">联系方式：{{item.workerPhone}}</view>
<view class="margin-top-sm">预约时间：{{item.revTime}}</view>
<view class="margin-top-sm" v-if="servDetail.orderStatus === 2">上门时间：{{item.workBeginTime}}</view>
<view class="margin-top-sm">预约时间：{{item.expectTimeStart + '~' + item.expectTimeEnd}}</view>
<view class="margin-top-sm" v-if="servDetail.orderStatus === 3 || servDetail.orderStatus === 6 || servDetail.orderStatus === 4">上门时间：{{item.workBeginTime}}</view>
<view class="margin-top-sm" v-if="item.workFinishTime">完成时间：{{item.workFinishTime}}</view>
<simple-product-picked :pickedList="item.orderStandardList" :columnTitleArr="servedColumnHeaders" :valFieldArr="servedValFields"></simple-product-picked>
</view>