|
|
@@ -119,6 +119,14 @@
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
+ <tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
+ <view class="tui-title">配送方式</view>
|
|
|
+ <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
|
|
|
+ <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
|
|
|
+ <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
|
|
|
+ <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>
|
|
|
+ </tui-list-cell>
|
|
|
+
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
<view class="tui-title">结账方式</view>
|
|
|
<view class="payment-buttons">
|
|
|
@@ -150,6 +158,11 @@
|
|
|
<button @click="form.needPrint = 1" class="admin-button-com middle" style="width:140upx;" :class="form.needPrint == 1 ? 'blue' : 'default'">打印</button>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
+ <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 2">
|
|
|
+ <view class="tui-title">运费</view>
|
|
|
+ <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
|
|
|
+ </tui-list-cell>
|
|
|
+
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
|
|
|
<view class="tui-title">
|
|
|
<text>合计金额</text>
|
|
|
@@ -358,7 +371,8 @@ export default {
|
|
|
getStaffName:'',
|
|
|
dealPrice:0,
|
|
|
forward:0,
|
|
|
- forwardStock:1
|
|
|
+ forwardStock:1,
|
|
|
+ fromType:1//门店来的订单
|
|
|
},
|
|
|
showCustomer: false,
|
|
|
customInfo:{discount:1,balance:0},
|
|
|
@@ -455,6 +469,9 @@ export default {
|
|
|
finalPrice(){
|
|
|
let totalPrice = this.allPrice.toFixed(2)
|
|
|
let finalPrice = Number(totalPrice)
|
|
|
+ if(this.form.sendType == 2){
|
|
|
+ finalPrice = Number(finalPrice) + Number(this.form.sendCost)
|
|
|
+ }
|
|
|
finalPrice = Number(finalPrice).toFixed(2)
|
|
|
let currentPrice = parseFloat(finalPrice)
|
|
|
this.modifyPrice = currentPrice
|
|
|
@@ -471,6 +488,12 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
...mapActions(["initMerchantInfo"]),
|
|
|
+ setSendType (type) {
|
|
|
+ this.form.sendType = type
|
|
|
+ if (type !== 2) {
|
|
|
+ this.form.sendCost = ""
|
|
|
+ }
|
|
|
+ },
|
|
|
bindHistoryDateChange(){
|
|
|
this.showPicker = true
|
|
|
},
|
