From e971ea090aa1f320f3c3f78c3a2a8d50f16dd4d0 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 15 Jan 2021 23:38:19 +0800
Subject: [PATCH] 小程序预约接口修改
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index a87b6c8..afb0476 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -482,7 +482,7 @@
<el-row type="flex" align="middle" style="padding: 10px 0;">
<el-col :span="5" style="text-align: center;">收款方式</el-col>
- <el-col class="paymethod" :span="15">
+ <el-col class="paymethod" :span="18">
<el-row>
<ul>
<span v-for="(item, index) in payMethods">
@@ -502,7 +502,7 @@
@check="(click, checked,$item)=>{handleCheckChange(click, checked,$item)}"
:props="defaultProps">
</el-tree>
- <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)">{{item.value}}</li>
+ <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)"><div style=" height:30px; line-height: 30px; display: flex; align-items: center"><img style="width: 25px; height: 25px; align-items: center;" :src="item.img"><span style="margin-left: 5px;">{{item.value}}</span></div></li>
</el-popover>
</span>
</ul>
@@ -515,7 +515,7 @@
<el-col :span="15">
<el-row style="line-height: 50px;" v-for="(item, index) in payMoneys">
<el-col :span="6" style="text-align: right; padding-right: 10px; font-size: 12px;">{{item.value}}</el-col>
- <el-col :span="8"><el-input v-model.number="item.money"></el-input></el-col>
+ <el-col :span="8"><el-input v-model="item.money"></el-input></el-col>
<el-col :span="6" style="margin-left: 10px;" v-if="item.type == '储值卡'">{{item.isGift == 1 ? '赠送余额' : '余额' }}：<span class="arrears">¥ {{item.balance}}</span></el-col>
</el-row>
</el-col>
@@ -575,30 +575,37 @@
vipLoading: false,
payMethods: [{
value: '现金支付',
+ img: '/images/pay/cash.png',
isActive: false,
type: '现金支付'
}, {
value: '微信',
+ img: '/images/pay/wechat.png',
isActive: false,
type: '微信'
}, {
value: '支付宝',
+ img: '/images/pay/zhifubao.png',
isActive: false,
type: '支付宝'
}, {
value: '银行卡',
+ img: '/images/pay/yinlian.png',
isActive: false,
type: '银行卡'
}, {
value: '团购',
+ img: '/images/pay/tuan.png',
isActive: false,
type: '团购'
}, {
value: '储值卡',
+ img: '/images/pay/card.png',
isActive: false,
type: '储值卡'
- }, {
+ },{
value: '欠款',
+ img: '/images/pay/qian.png',
isActive: false,
type: '欠款'
},],
@@ -868,10 +875,10 @@
_this.order.payMoney += parseFloat(item.payMoney);
});
//计算欠款
- _this.order.arrears = _this.order.zkTotal - _this.order.payMoney;
- if (_this.order.arrears < 0) {
- _this.$message.error("支付金额不能大于应收金额");
- }
+ // _this.order.arrears = _this.order.zkTotal - _this.order.payMoney;
+ // if (_this.order.arrears < 0) {
+ // _this.$message.error("支付金额不能大于应收金额");
+ // }
}
})
}
@@ -916,12 +923,12 @@
this.$message.warning("请输入" + item.type + "的付款金额");
return false;
}
- flow.amount = item.money;
+ flow.amount = parseFloat(item.money);
if (item.type == '储值卡'){
flow.isGift = item.isGift;
flow.cardId = item.id;
}
- total += item.money;
+ total += parseFloat(item.money);
flows.push(flow)
})
if (total != _this.order.payMoney) {
--
Gitblit v1.9.1