|
|
@@ -161,8 +161,8 @@
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click.stop="updateCustomAddress()">
|
|
|
<view class="tui-title" style="width:120rpx;">客户地址</view>
|
|
|
<view class="address-box">
|
|
|
- <view v-if="$util.isEmpty(customInfo.long) || $util.isEmpty(customInfo.lat) || $util.isEmpty(customInfo.address)" class="addr-main" style="color: red; font-size: 28rpx;">
|
|
|
- 客户地址不完善，请修改
|
|
|
+ <view v-if="$util.isEmpty(customInfo.long) || $util.isEmpty(customInfo.lat) || $util.isEmpty(customInfo.address)" class="addr-main" style="color: red; font-size: 29rpx;font-weight:bold;">
|
|
|
+ 地址不完整，请修改
|
|
|
</view>
|
|
|
<view v-else>
|
|
|
<view class="addr-main">{{ customInfo.address }}</view>
|
|
|
@@ -193,8 +193,8 @@
|
|
|
</scroll-view>
|
|
|
</view>
|
|
|
<view v-else class="empty-quotes-view">
|
|
|
- <text>正在获取运费...</text>
|
|
|
- <!-- <text class="error-tips">上面地址缺失或有问题，请修改</text> -->
|
|
|
+ <text v-if="$util.isEmpty(customInfo.long) || $util.isEmpty(customInfo.lat) || $util.isEmpty(customInfo.address)" style="color:red;" @click.stop="updateCustomAddress()">请先修改客户地址</text>
|
|
|
+ <text v-else>正在获取运费...</text>
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
<tui-list-cell class="line-cell" :hover="false">
|
|
|
@@ -213,24 +213,24 @@
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
<view class="tui-title">运费</view>
|
|
|
<view v-if="form.reductionRule == 1 && isHcMapRule()">
|
|
|
- <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:150upx;height:70upx;" />
|
|
|
+ <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:300upx;height:70upx;text-align:center;" />
|
|
|
</view>
|
|
|
<view v-else-if="form.reductionRule == 2">
|
|
|
<view v-if="isHsMapRule()">
|
|
|
- <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:150upx;height:70upx;" />
|
|
|
+ <input type="digit" placeholder="请填写运费" v-model="form.customSendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:300upx;height:70upx;text-align:center;" />
|
|
|
</view>
|
|
|
<view v-else>
|
|
|
- <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:150upx;height:70upx;" />
|
|
|
+ <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:300upx;height:70upx;text-align:center;" />
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-else>
|
|
|
- <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:150upx;height:70upx;" />
|
|
|
+ <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder" style="border:1upx solid #eee;color:#3385FF;width:300upx;height:70upx;text-align:center;" />
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
<view class="tui-title">呼叫跑腿</view>
|
|
|
- <button @tap="form.callErrand = 0" class="admin-button-com middle btn-call" :class="form.callErrand == 0? 'active' : 'default'">晚点呼叫</button>
|
|
|
- <button @tap="form.callErrand = 1" class="admin-button-com middle btn-call" :class="form.callErrand == 1 ? 'active' : 'default'">现在呼叫</button>
|
|
|
+ <button @tap="form.callErrand = 0" class="admin-button-com middle btn-call" :class="form.callErrand == 0? 'active' : 'default'">先不要叫</button>
|
|
|
+ <button @tap="form.callErrand = 1" class="admin-button-com middle btn-call" :class="form.callErrand == 1 ? 'active' : 'default'">现在就叫</button>
|
|
|
</tui-list-cell>
|
|
|
<tui-list-cell v-if="form.callErrand == 1" class="line-cell" :hover="false" :arrow="false">
|
|
|
<view class="tui-title">取件时间</view>
|
|
|
@@ -333,7 +333,7 @@
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="reduceStock == 0">
|
|
|
<view class="tui-title">订单类型</view>
|
|
|
<button @tap="form.forward = 0;" class="admin-button-com middle" style="width:170upx;" :class="form.forward == 0? 'blue' : 'default'">收入订单</button>
|
|
|
- <button @click="form.forward = 1;" class="admin-button-com middle" style="width:170upx;" :class="form.forward == 1 ? 'blue' : 'default'">支出订单</button>
|
|
|
+ <button @click="form.forward = 1;" class="admin-button-com middle" style="width:170upx;" :class="form.forward == 1 ? 'blue' : 'default'">红冲订单</button>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
</view>
|
|
|
@@ -1057,6 +1057,10 @@ export default {
|
|
|
params.pickupTime = this.pickupTime.value
|
|
|
}
|
|
|
}
|
|
|
+ if(this.form.sendType == 2 && this.form.callErrand == 1 && this.form.hasPay == 0){
|
|
|
+ this.$msg('扫码收款，暂不支持马上发跑腿')
|
|
|
+ return false
|
|
|
+ }
|
|
|
|
|
|
//多颜色
|
|
|
let xj = uni.getStorageSync("xj"+this.option.customId)
|
|
|
@@ -1118,7 +1122,6 @@ export default {
|
|
|
getDeliveryQuotes(){
|
|
|
//如果客户地址缺少经纬度或地址，任何一个，则不要请求后端询价接口
|
|
|
if (this.$util.isEmpty(this.customInfo.long) || this.$util.isEmpty(this.customInfo.lat) || this.$util.isEmpty(this.customInfo.address)) {
|
|
|
- this.$msg('客户地址缺少经纬度或地址，无法获取运费', 'none', 2200);
|
|
|
return;
|
|
|
}
|
|
|
this.deliveryQuotes = []
|
|
|
@@ -1756,7 +1759,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.platform-name {
|
|
|
- font-size: 26upx;
|
|
|
+ font-size: 24upx;
|
|
|
color: #333;
|
|
|
font-weight: bold;
|
|
|
margin-bottom: 8upx;
|
|
|
@@ -1773,14 +1776,14 @@ export default {
|
|
|
}
|
|
|
|
|
|
.platform-price {
|
|
|
- font-size: 30upx;
|
|
|
+ font-size: 26upx;
|
|
|
color: #333;
|
|
|
font-weight: bold;
|
|
|
margin-bottom: 4upx;
|
|
|
}
|
|
|
|
|
|
.platform-type {
|
|
|
- font-size: 20upx;
|
|
|
+ font-size: 19upx;
|
|
|
color: #868686;
|
|
|
margin-top: 4upx;
|
|
|
text-align: center;
|
|
|
@@ -1901,7 +1904,7 @@ export default {
|
|
|
border-radius: 8upx;
|
|
|
}
|
|
|
.empty-quotes-view {
|
|
|
- height: 450upx;
|
|
|
+ height: 50upx;
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
justify-content: center;
|
