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

Merge branch 'master' into feitian

This commit is contained in:
donqi 2023-06-05 00:51:33 +08:00
parent 7d26065eff 249961762f
commit 5b52699123
7 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/js/request.js
View File

@ -15,7 +15,7 @@ export default {
// request 触发前拼接 url
args.url = 'https://www.opsoul.com:8881' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'http://192.168.2.43:80' + args.url;
// args.url = 'http://192.168.2.74:80' + args.url;
if (!args.data) {
args.data = {}
@ -756,5 +756,14 @@ export default {
// res.latitude, res.longitude
console.log(res)
return res;
},
async callCustomer(params = {}) {
let res = await uni.request({
url: '/order/master/callCustomer',
method: 'POST',
data: params
})
return res[1].data;
}
}

2
pages/demand-center/accept-demand-center.vue
View File

@ -61,7 +61,7 @@
<view class="flex justify-between">
<view class="text-lg text-bold text-cut" style="width: 70%;">{{task.goodsName}}</view>
<view class="text-right">
<view class="text-lg text-price text-red text-bold">{{task.totalMoney}}</view>
<view class="text-lg text-price text-red text-bold">{{task.serverMoney}}</view>
<view v-if="task.expeditedPrice">
<text>加急：</text><text class="text-price text-red text-bold">{{task.expeditedPrice}}</text>
</view>

2
pages/demand-center/demand-detail.vue
View File

@ -9,7 +9,7 @@
<view class="flex justify-between">
<view class="text-lg text-bold text-cut" style="width: 70%;">{{order.goodsName}}</view>
<view class="text-right">
<view class="text-lg text-price text-red text-bold">{{order.totalMoney}}</view>
<view class="text-lg text-price text-red text-bold">{{order.serverMoney}}</view>
<view v-if="order.expeditedPrice">
<text>加急：</text><text class="text-price text-red text-bold">{{order.expeditedPrice}}</text>
</view>

2
pages/order-manage/modal/edit-time-arrange.vue
View File

@ -10,7 +10,7 @@
<view class="flex justify-between align-center margin-bottom-xs padding-top">
<view>
<text class="text-xxl text-main-color"><text class="cuIcon-phone"></text></text>
<text class="text-bold text-lg margin-lr-xs">{{data.customerPhone}}</text>
<text class="text-bold text-lg margin-lr-xs">{{data.customerPhone.substring(0, 3) + "****" + data.customerPhone.substring(7)}}</text>
</view>
<button class="cu-btn line-main-color" @click="makePhoneCall(data.customerPhone)">拨打</button>
</view>

14
pages/order-manage/modal/time-arrange.vue
View File

@ -10,9 +10,9 @@
<view class="flex justify-between align-center margin-bottom-xs padding-top">
<view>
<text class="text-xxl text-main-color"><text class="cuIcon-phone"></text></text>
<text class="text-bold text-lg margin-lr-xs">{{data.customerPhone}}</text>
<text class="text-bold text-lg margin-lr-xs">{{data.customerPhone.substring(0, 3) + "****" + data.customerPhone.substring(7)}}</text>
</view>
<button class="cu-btn line-main-color" @click="makePhoneCall(data.customerPhone)">拨打</button>
<button class="cu-btn line-main-color" @click="makePhoneCall(data)">拨打</button>
</view>
<view class="text-sm">
拨打电话，按与客户约定的时间填入，完成排单，未完成排单将导致排单超时！
@ -156,9 +156,15 @@
this.$emit('editServTime', this.data.orderMasterId, [this.expectTimeStart, this.expectTimeEnd], false, this.data);
this.hideModal(e);
},
makePhoneCall(phoneNum) {
makePhoneCall(order) {
if (order.orderDetailId == null) {
this.$request.callCustomer({
id: order.orderMasterId,
isCall: '02'
});
}
uni.makePhoneCall({
phoneNumber: phoneNum
phoneNumber: order.customerPhone
})
}
}

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

@ -221,7 +221,7 @@
</view>
<view v-if="order.orderStatus === 2">
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order.customerPhone)">联系客户</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order)">联系客户</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showEditTimeArrangeModal" @tap="showModal($event, order)" v-show="order.orderDetailId != null">修改时间</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showOnDoorNoticeModal" @tap="showModal($event, order)" v-show="order.orderDetailId != null">立即上门</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" v-if="order.orderDetailId != null" @click="rejectDetailOrder(order)">退单</button>
@ -234,7 +234,7 @@
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOnline" data-modal="showNewServPriceOnlineModal" v-show="order.orderDetailId != null && order.clockInLocation && order.payType === 0">报价/完单</button>
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOffline" data-modal="showNewServPriceOfflineModal" v-show="order.orderDetailId != null && order.payType === 1">报价/完单</button> -->
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOnline" data-modal="showNewServPriceOnlineModal" v-show="order.orderDetailId != null && order.payType === 0">报价/完单</button> -->
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order.customerPhone)">联系客户</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order)">联系客户</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showEditTimeArrangeModal" @tap="showModal($event, order)" v-show="order.orderDetailId != null">重新排期</button>
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)" v-if="order.payStatus === 1" v-show="order.orderDetailId != null">发起完单</button> -->
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showPayQrcodeModal" v-if="order.payStatus === 0" @tap="makePayQrcode($event, order)" v-show="order.orderDetailId != null">生成收款码</button> -->
@ -1059,9 +1059,15 @@
changePopupState(e) {
this.ifShowPageMeta = e.show;
},
makePhoneCall(phoneNum) {
makePhoneCall(order) {
if (order.orderDetailId == null) {
this.$request.callCustomer({
id: order.orderMasterId,
isCall: '02'
});
}
uni.makePhoneCall({
phoneNumber: phoneNum
phoneNumber: order.customerPhone
})
},
async makePayQrcode(e, orderInfo) {

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

@ -49,7 +49,7 @@
<view class="margin-top-sm">
<text class="cuIcon-people text-main-color margin-right-xs"></text>
<text class="margin-right-sm">客户：{{servDetail.customerName}}</text>
<text>{{servDetail.customerPhone}}</text>
<text>{{servDetail.customerPhone.substring(0, 3) + "****" + servDetail.customerPhone.substring(7)}}</text>
<button class="cu-btn line-main-color sm" @click="makePhoneCall(servDetail.customerPhone)">拨打</button>
</view>
<view class="margin-top-sm" v-if="servDetail.orderDetailId">
@ -71,7 +71,7 @@
<text class="cuIcon-time text-main-color margin-right-xs"></text>
<text>上门时间：{{servDetail.workBeginTime}}</text>
</view>
<view class="margin-top-sm" v-if="servDetail.orderDetailId == null">
<view class="margin-top-sm" v-if="servDetail.orderDetailId == null && servDetail.orderMode == '02'">
<text class="cuIcon-moneybag text-main-color margin-right-xs"></text>
<text>订单金额：</text>
<text class="text-price">{{servDetail.totalMoney}}</text>