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

...

This commit is contained in:
donqi 2023-04-19 23:40:19 +08:00
parent cb327a417a
commit 6ca60a9811
4 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/js/request.js
View File

@ -36,22 +36,21 @@ export default {
// console.log("停止触发"); // console.log("停止触发");
// return false; // return false;
}, },
success(res) { success(res) {
uni.hideLoading();
if (!res || !res.data || res.data.code !== 0) { if (!res || !res.data || res.data.code !== 0) {
uni.showToast({ uni.showToast({
title: '系统开小差啦T_T，请稍后重试', title: '系统错误',
icon: 'error' icon: 'error'
}) })
} }
}, },
fail(err) { fail(err) {
uni.hideLoading();
uni.showToast({ uni.showToast({
title: '系统开小差啦T_T，请稍后重试', title: '请求失败',
icon: 'error' icon: 'error'
}) })
},
complete(res) {
uni.hideLoading();
} }
}) })
}, },

13
pages/my/b-account-bind.vue
View File

@ -94,16 +94,18 @@
}, },
async submit() { async submit() {
if (this.curAccountType === '1') { if (this.curAccountType === '1') {
if (!this.checkCertify()) {
return;
}
if (!this.validData()) { if (!this.validData()) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请完成必填项的填写' title: '请完成必填项的填写',
duration: 2000
}) })
return; return;
} }
let checkCertifyRes = await this.checkCertify();
if (!checkCertifyRes) {
return;
}
let params = { let params = {
...this.formData, ...this.formData,
workerId: this.curUserInfo.workerId workerId: this.curUserInfo.workerId
@ -116,7 +118,8 @@
} else if (res && res.msg) { } else if (res && res.msg) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: res.msg title: res.msg,
duration: 4000
}) })
} else { } else {
uni.showToast({ uni.showToast({

37
pages/order-manage/order-manage.vue
View File

@ -301,6 +301,7 @@
</view> </view>
</view> </view>
<view class="flex justify-end align-end margin-tb-sm" v-if="!afterServiceRecord.updateBy"> <view class="flex justify-end align-end margin-tb-sm" v-if="!afterServiceRecord.updateBy">
<button class="cu-btn sm bg-yellow margin-right-sm" @tap="showModalByRef('sure2Revisit', order, null)">重新上门</button>
<button class="cu-btn sm bg-yellow margin-right-sm" data-modal="rejectAfterSale" @tap="showModal($event, order)">拒绝处理</button> <button class="cu-btn sm bg-yellow margin-right-sm" data-modal="rejectAfterSale" @tap="showModal($event, order)">拒绝处理</button>
<button class="cu-btn sm bg-yellow margin-right-sm" data-modal="agreeAfterSale" @tap="showModal($event, order)">操作处理</button> <button class="cu-btn sm bg-yellow margin-right-sm" data-modal="agreeAfterSale" @tap="showModal($event, order)">操作处理</button>
</view> </view>
@ -310,7 +311,9 @@
<view v-if="afterServiceRecord.operType === 1"> <view v-if="afterServiceRecord.operType === 1">
<view class="margin-top-xs"> <view class="margin-top-xs">
<text>师傅反馈结果：</text> <text>师傅反馈结果：</text>
<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text> <text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
</view> </view>
<view v-if="afterServiceRecord.workerFeedbackResult === 1"> <view v-if="afterServiceRecord.workerFeedbackResult === 1">
<text>同意退款金额：</text> <text>同意退款金额：</text>
@ -318,7 +321,7 @@
<text v-else-if="afterServiceRecord.refund">{{afterServiceRecord.refund}}</text> <text v-else-if="afterServiceRecord.refund">{{afterServiceRecord.refund}}</text>
<text v-else-if="order.payMoney">{{order.payMoney}}</text> <text v-else-if="order.payMoney">{{order.payMoney}}</text>
</view> </view>
<view> <view v-if="afterServiceRecord.workerFeedbackResult !== 2">
<text>师傅反馈：</text> <text>师傅反馈：</text>
<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text> <text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text> <text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>
@ -337,9 +340,11 @@
<view v-else-if="afterServiceRecord.operType === 2"> <view v-else-if="afterServiceRecord.operType === 2">
<view class="margin-top-xs"> <view class="margin-top-xs">
<text>师傅反馈结果：</text> <text>师傅反馈结果：</text>
<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text> <text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
</view> </view>
<view> <view v-if="afterServiceRecord.workerFeedbackResult !== 2">
<text>师傅反馈：</text> <text>师傅反馈：</text>
<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text> <text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text> <text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>
@ -402,6 +407,7 @@
</view> </view>
</block> </block>
</confirm-modal> </confirm-modal>
<confirm-modal ref="sure2Revisit" :content="'确定重新上门吗？'" @confirm="revisit" @cancel="hideModal"></confirm-modal>
<!-- popup --> <!-- popup -->
<uni-popup ref="dispatchOrderPopup" type="bottom" @change="changePopupState"> <uni-popup ref="dispatchOrderPopup" type="bottom" @change="changePopupState">
@ -656,6 +662,7 @@
params.workFinishTimeExisted = true; params.workFinishTimeExisted = true;
params.drawCashStatusList = [0,1]; params.drawCashStatusList = [0,1];
params.orderStatus = null; params.orderStatus = null;
params.orderStatusList = [4,5];
} else if (this.tabCur === 5) { } else if (this.tabCur === 5) {
// 已完成/子单 // 已完成/子单
params.workFinishTimeExisted = true; params.workFinishTimeExisted = true;
@ -1312,6 +1319,28 @@
duration: 1000 duration: 1000
}) })
} }
},
async revisit() {
let res = await this.$request.editAfterServiceRecord({
id: this.curOrder.afterServiceRecordList[0].id,
orderDetailId: this.curOrder.orderDetailId,
workerFeedbackResult: 2,
updateBy: 2
});
if (res && res.code === 0) {
uni.showToast({
icon: 'success',
title: '提交成功',
duration: 1000
})
this.reloadMasterOrderPage();
return;
}
uni.showToast({
icon: 'error',
duration: 1000,
title: '提交失败',
})
} }
} }
} }

24
pages/order-manage/serv-detail.vue
View File

@ -216,13 +216,15 @@
<view v-if="afterServiceRecord.operType === 1"> <view v-if="afterServiceRecord.operType === 1">
<view class="margin-top-xs"> <view class="margin-top-xs">
<text>师傅反馈结果：</text> <text>师傅反馈结果：</text>
<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text> <text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
</view> </view>
<view v-if="afterServiceRecord.workerFeedbackResult === 1"> <view v-if="afterServiceRecord.workerFeedbackResult === 1">
<text>同意退款金额：</text> <text>同意退款金额：</text>
<text>{{afterServiceRecord.agreedRefund ? afterServiceRecord.agreedRefund : afterServiceRecord.refund}}</text> <text>{{afterServiceRecord.agreedRefund ? afterServiceRecord.agreedRefund : afterServiceRecord.refund}}</text>
</view> </view>
<view> <view v-if="afterServiceRecord.workerFeedbackResult !== 2">
<text>师傅反馈：</text> <text>师傅反馈：</text>
<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text> <text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text> <text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>
@ -241,9 +243,11 @@
<view v-else-if="afterServiceRecord.operType === 2"> <view v-else-if="afterServiceRecord.operType === 2">
<view class="margin-top-xs"> <view class="margin-top-xs">
<text>师傅反馈结果：</text> <text>师傅反馈结果：</text>
<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text> <text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
</view> </view>
<view> <view v-if="afterServiceRecord.workerFeedbackResult !== 2">
<text>师傅反馈：</text> <text>师傅反馈：</text>
<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text> <text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text> <text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>
@ -432,13 +436,15 @@
<view v-if="afterServiceRecord.operType === 1"> <view v-if="afterServiceRecord.operType === 1">
<view class="margin-top-xs"> <view class="margin-top-xs">
<text>师傅反馈结果：</text> <text>师傅反馈结果：</text>
<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text> <text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
</view> </view>
<view v-if="afterServiceRecord.workerFeedbackResult === 1"> <view v-if="afterServiceRecord.workerFeedbackResult === 1">
<text>同意退款金额：</text> <text>同意退款金额：</text>
<text>{{afterServiceRecord.agreedRefund ? afterServiceRecord.agreedRefund : afterServiceRecord.refund}}</text> <text>{{afterServiceRecord.agreedRefund ? afterServiceRecord.agreedRefund : afterServiceRecord.refund}}</text>
</view> </view>
<view> <view v-if="afterServiceRecord.workerFeedbackResult !== 2">
<text>师傅反馈：</text> <text>师傅反馈：</text>
<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text> <text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text> <text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>
@ -457,9 +463,11 @@
<view v-else-if="afterServiceRecord.operType === 2"> <view v-else-if="afterServiceRecord.operType === 2">
<view class="margin-top-xs"> <view class="margin-top-xs">
<text>师傅反馈结果：</text> <text>师傅反馈结果：</text>
<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text> <text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
</view> </view>
<view> <view v-if="afterServiceRecord.workerFeedbackResult !== 2">
<text>师傅反馈：</text> <text>师傅反馈：</text>
<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text> <text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text> <text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>