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

问题修复

This commit is contained in:
donqi 2022-10-21 00:37:07 +08:00
parent 1723b975b9
commit c29727b626
4 changed files with 79 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/js/request.js
View File

@ -13,8 +13,8 @@ export default {
})
let userInfo = _this.getCurUserInfo();
// request 触发前拼接 url
args.url = 'https://www.opsoul.com' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'https://www.opsoul.com' + args.url;
args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url;
if (!args.data) {
@ -650,5 +650,12 @@ export default {
}
})
return res[1].data;
}
},
async wxGetLocation() {
let res = await wx.getLocation({
type: 'gcj02'
})
// res.latitude, res.longitude
return res;
},
}

18
pages/order-manage/modal/new-serv-price-offline.vue
View File

@ -23,7 +23,7 @@
<text>加单总额：</text>
<input class="radius-input inline-input" type="digit" v-model="newPriceForA1"></input>
<text class="margin-left-xs">元</text>
<view class="cu-btn line-main-color sm margin-left" v-if="priceObj && priceObj.changeMoney"
<view class="cu-btn line-main-color sm margin-left" v-if="priceObj && priceObj.type == 1"
@click="changeOrderPrice(newPriceForA1)">修改报价</view>
<view class="cu-btn line-main-color sm margin-left" v-else
@click="changeOrderPrice(newPriceForA1)">确认报价</view>
@ -38,7 +38,7 @@
<text>报价总额：</text>
<input class="radius-input inline-input" type="digit" v-model="newPriceForA2"></input>
<text class="margin-left-xs">元</text>
<view class="cu-btn line-main-color sm margin-left" v-if="priceObj && priceObj.changeMoney"
<view class="cu-btn line-main-color sm margin-left" v-if="priceObj && priceObj.type == 2"
@click="changeOrderPrice(newPriceForA2)">修改报价</view>
<view class="cu-btn line-main-color sm margin-left" v-else
@click="changeOrderPrice(newPriceForA2)">确认报价</view>
@ -96,6 +96,9 @@
},
methods: {
init(priceObj) {
if (!priceObj || priceObj.payStatus == 1) {
return;
}
this.priceObj = priceObj;
if (priceObj && priceObj.type) {
this.remark = priceObj.remark;
@ -130,7 +133,16 @@
changePayAction(payAction) {
this.payAction = payAction;
},
async changeOrderPrice(newPrice) {
async changeOrderPrice(newPrice) {
if (this.payAction != this.priceObj.type) {
uni.showToast({
icon: 'none',
title: '你有加价未付款，请客户支付后再加或在原加价上增加金额！',
duration: 3500
})
return;
}
let res = await this.$request.changeOrderPrice({
orderDetailId: this.data.orderDetailId,
changeMoney: newPrice,

18
pages/order-manage/modal/new-serv-price-online.vue
View File

@ -23,7 +23,7 @@
<text>加单总额：</text>
<input class="radius-input inline-input" type="digit" v-model="newPriceForA1"></input>
<text class="margin-left-xs">元</text>
<view class="cu-btn line-main-color sm margin-left" v-if="priceObj && priceObj.changeMoney"
<view class="cu-btn line-main-color sm margin-left" v-if="priceObj && priceObj.type == 1"
@click="changeOrderPrice(newPriceForA1)">修改报价</view>
<view class="cu-btn line-main-color sm margin-left" v-else
@click="changeOrderPrice(newPriceForA1)">确认报价</view>
@ -38,7 +38,7 @@
<text>报价总额：</text>
<input class="radius-input inline-input" type="digit" v-model="newPriceForA2"></input>
<text class="margin-left-xs">元</text>
<view class="cu-btn line-main-color sm margin-left" v-if="priceObj && priceObj.changeMoney"
<view class="cu-btn line-main-color sm margin-left" v-if="priceObj && priceObj.type == 2"
@click="changeOrderPrice(newPriceForA2)">修改报价</view>
<view class="cu-btn line-main-color sm margin-left" v-else
@click="changeOrderPrice(newPriceForA2)">确认报价</view>
@ -96,6 +96,9 @@
},
methods: {
init(priceObj) {
if (!priceObj || priceObj.payStatus == 1) {
return;
}
this.priceObj = priceObj;
if (priceObj && priceObj.type) {
this.remark = priceObj.remark;
@ -130,7 +133,16 @@
changePayAction(payAction) {
this.payAction = payAction;
},
async changeOrderPrice(newPrice) {
async changeOrderPrice(newPrice) {
if (this.payAction != this.priceObj.type) {
uni.showToast({
icon: 'none',
title: '你有加价未付款，请客户支付后再加或在原加价上增加金额！',
duration: 4500
})
return;
}
let res = await this.$request.changeOrderPrice({
orderDetailId: this.data.orderDetailId,
changeMoney: newPrice,

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

@ -94,6 +94,11 @@
<view v-else-if="order.orderStatus === 4" class="right-tag padding-lr-sm padding-tb-xs bg-orange">确</view>
<view v-else-if="order.orderStatus === 5" class="right-tag padding-lr-sm padding-tb-xs bg-green">完</view>
</view>
<view class="float-left">
<view v-if="order.payType === 1" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>到付单</view>
<view v-if="order.changeMoney || order.payStatus != 1" class='cu-tag margin-right-xs radius line-red margin-top-xs'>有待付款</view>
<view v-else class='cu-tag margin-right-xs radius line-red margin-top-xs'>款已付清</view>
</view>
<view>
<view v-if="order.isOverTime" class="float-left">
<view v-if="order.orderStatus === 0" class='cu-tag margin-right-xs radius line-red margin-top-xs'>超时未接单</view>
@ -108,7 +113,7 @@
<view v-else-if="timeoutRecord.orderStatus === 3" class='cu-tag margin-right-xs radius line-red margin-top-xs'>超时未完单</view>
</view>
</view>
<view v-for="(afterServiceRecord, afterServiceRecordIndex) in order.afterServiceRecordList">
<view class="float-left" v-for="(afterServiceRecord, afterServiceRecordIndex) in order.afterServiceRecordList">
<view v-if="afterServiceRecord.createBy && !afterServiceRecord.updateBy" class='cu-tag margin-right-xs radius line-red margin-top-xs'>售后发起中</view>
<view v-if="afterServiceRecord.workerFeedbackResult == 1 && afterServiceRecord.customerFinalCheck == null" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>售后已同意</view>
<view v-if="afterServiceRecord.workerFeedbackResult == 0 && afterServiceRecord.customerFinalCheck == null" class='cu-tag margin-right-xs radius line-red margin-top-xs'>售后已拒绝</view>
@ -182,8 +187,9 @@
</view>
<view v-if="order.orderStatus === 3">
<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" @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" @click="recordClockInLocation(order)" v-show="order.orderDetailId != null && !order.clockInLocation">打卡到达</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.clockInLocation && 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.clockInLocation && 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" 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> -->
@ -311,9 +317,12 @@
<view class="text-red" v-if="afterServiceRecord.customerFinalCheck === 0">订单交由平台协商处理</view>
<view v-else-if="afterServiceRecord.customerFinalCheck === 1">
<view v-if="afterServiceRecord.originalRefund > 0">
<text>本单退款，系统已发起原路退回</text>
<text class="text-red">{{afterServiceRecord.originalRefund}}</text>
<text>元，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。</text>
<view>
<text>本单退款，系统已发起原路退回</text>
<text class="text-red">{{afterServiceRecord.originalRefund}}</text>
<text>元，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。</text>
</view>
<view>支付时间：{{afterServiceRecord.refundApplyTime}}</view>
</view>
<view v-else-if="afterServiceRecord.originalRefund == 0 && order.payStatus == 0">
<text>本单未支付，实际退回0.00元</text>
@ -1038,7 +1047,30 @@
urls: imgList,
current: e.currentTarget.dataset.url
});
},
},
async recordClockInLocation(order) {
let res = await this.$request.wxGetLocation();
if (!res || !res.latitude) {
uni.showToast({
title: '定位获取失败，打卡失败，请稍后重试',
icon: 'error',
duration: 2500
})
} else {
let params = {
id: order.orderDetailId,
clockInLocation: res.longitude + "," + res.latitude
}
let updateOrderRes = await this.$request.updateDetailOrder(params);
if (updateOrderRes && updateOrderRes.code === 0) {
this.reloadMasterOrderPage();
uni.showToast({
icon: 'success',
duration: 1000
})
}
}
}
}
}
</script>