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

问题修复；需求变动；

This commit is contained in:
donqi 2023-04-23 22:39:35 +08:00
parent 6ca60a9811
commit 6785144775
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages/my/master-occupancy.vue
View File

@ -288,7 +288,9 @@
streetIds: item.streetIds streetIds: item.streetIds
}) })
} }
this.servArea = servArea; if (servArea.length > 0) {
this.servArea = servArea;
}
}, },
async loadServSkills() { async loadServSkills() {
let res = await this.$request.getWorkerGoodsCategoryEdit({ let res = await this.$request.getWorkerGoodsCategoryEdit({
@ -309,7 +311,9 @@
subSubTypeIds: item.categoryIds subSubTypeIds: item.categoryIds
}) })
} }
this.servSkill = servSkill; if (servSkill.length > 0) {
this.servSkill = servSkill;
}
}, },
/* 服务区域 start */ /* 服务区域 start */
async loadProvinceList() { async loadProvinceList() {

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

@ -301,7 +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" @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>
@ -313,7 +313,7 @@
<text>师傅反馈结果：</text> <text>师傅反馈结果：</text>
<text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text> <text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text> <text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</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>
@ -342,7 +342,7 @@
<text>师傅反馈结果：</text> <text>师傅反馈结果：</text>
<text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text> <text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text> <text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text> <text v-else-if="afterServiceRecord.workerFeedbackResult === 2">上门重做/补做</text>
</view> </view>
<view v-if="afterServiceRecord.workerFeedbackResult !== 2"> <view v-if="afterServiceRecord.workerFeedbackResult !== 2">
<text>师傅反馈：</text> <text>师傅反馈：</text>
@ -407,7 +407,7 @@
</view> </view>
</block> </block>
</confirm-modal> </confirm-modal>
<confirm-modal ref="sure2Revisit" :content="'确定重新上门吗？'" @confirm="revisit" @cancel="hideModal"></confirm-modal> <confirm-modal ref="sure2Revisit" :content="'您选择上门重做/补做，请先与客户协商一致，并重新排单！选择上门重做则客户发起退款的默认退额为0元。'" :cancelMsg="'退出'" @confirm="revisit" @cancel="hideModal"></confirm-modal>
<!-- popup --> <!-- popup -->
<uni-popup ref="dispatchOrderPopup" type="bottom" @change="changePopupState"> <uni-popup ref="dispatchOrderPopup" type="bottom" @change="changePopupState">