|
|
@@ -117,18 +117,19 @@
|
|
|
<view class="tui-title">结账方式</view>
|
|
|
<view class="payment-buttons">
|
|
|
<view class="button-row">
|
|
|
- <button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码</button>
|
|
|
- <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
|
|
|
+ <button @click="form.hasPay = 4" class="admin-button-com middle" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
|
|
|
+ <button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码</button>
|
|
|
</view>
|
|
|
<view class="button-row">
|
|
|
+ <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
|
|
|
<button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
|
|
|
- <button @click="form.hasPay = 3" class="admin-button-com middle" :class="form.hasPay == 3 ? 'blue' : 'default'">余额</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
+ <view style="border:1upx solid green;" v-if="form.hasPay == 1">
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.hasPay == 1">
|
|
|
- <view class="tui-title">线下渠道</view>
|
|
|
+ <view class="tui-title special-title">线下渠道</view>
|
|
|
<view class="payment-buttons">
|
|
|
<view class="button-row">
|
|
|
<button @click="setPayWay(0)" class="admin-button-com middle" :class="form.payWay == 0 ? 'blue' : 'default'">微信</button>
|
|
|
@@ -140,6 +141,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
+ </view>
|
|
|
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
<view class="tui-title">打印小票</view>
|
|
|
@@ -359,7 +361,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
//默认欠款是首选项
|
|
|
- this.form.hasPay = 0
|
|
|
+ this.form.hasPay = 4
|
|
|
// #ifdef APP-PLUS
|
|
|
if(this.$util.isScanEnv()){
|
|
|
this.isScanEnv = true
|
|
|
@@ -514,10 +516,10 @@ export default {
|
|
|
if(this.form.hasPay == 0){
|
|
|
name = '确认扫码付?'
|
|
|
}else if(this.form.hasPay == 1){
|
|
|
- name = '确认已付款?'
|
|
|
+ name = '确认线下付款?'
|
|
|
}else if(this.form.hasPay == 2){
|
|
|
name = '确认赊账?'
|
|
|
- }else if(this.form.hasPay == 3){
|
|
|
+ }else if(this.form.hasPay == 4){
|
|
|
name = '确认余额支付?'
|
|
|
}else{
|
|
|
name = '确认提交'
|
|
|
@@ -570,9 +572,6 @@ export default {
|
|
|
const {data: { id, orderSn,actPrice }} = res;
|
|
|
if(this.form.hasPay == 0){
|
|
|
this.$util.pageTo({ url: '/admin/billing/toPay',type:2,query: {orderId:id,orderSn:orderSn,actPrice:actPrice}})
|
|
|
- }else if(this.form.hasPay == 3){
|
|
|
- // 余额支付,可能需要特殊处理
|
|
|
- this.$util.pageTo({ url: '/admin/billing/result?orderId='+id,type:2})
|
|
|
}else{
|
|
|
this.$util.pageTo({ url: '/admin/billing/result?orderId='+id,type:2})
|
|
|
}
|
|
|
@@ -603,6 +602,23 @@ export default {
|
|
|
margin-right: 30upx;
|
|
|
}
|
|
|
|
|
|
+.special-title {
|
|
|
+ color: #ff6b35 !important;
|
|
|
+ font-weight: bold !important;
|
|
|
+ position: relative;
|
|
|
+
|
|
|
+ &::before {
|
|
|
+ content: '';
|
|
|
+ display: inline-block;
|
|
|
+ width: 8upx;
|
|
|
+ height: 8upx;
|
|
|
+ background-color: #ff6b35;
|
|
|
+ border-radius: 50%;
|
|
|
+ margin-right: 10upx;
|
|
|
+ vertical-align: middle;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
.payment-buttons {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|