购买界面优化
This commit is contained in:
@@ -342,7 +342,7 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-4 text-right">
|
||||
应付款
|
||||
总金额:
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
<span class="blueText">{{MoreTotalAmount}}</span>元
|
||||
@@ -463,7 +463,7 @@
|
||||
},
|
||||
OnePayAmount: function () {
|
||||
var restAmout = this.OneBuyModel.UseAccountAmount == 1 ? this.RestAmount : 0;
|
||||
var total = this.OneBuyModel.Price * this.OneBuyModel.ConnectCount - this.OneBuyModel.CouponAmount - restAmout;
|
||||
var total = this.OneBuyModel.Price * this.OneBuyModel.ConnectCount - this.OneBuyModel.CouponAmount ;
|
||||
total = total < 0 ? 0 : total;
|
||||
return total.toFixed(2);
|
||||
},
|
||||
@@ -473,7 +473,7 @@
|
||||
},
|
||||
MorePayAmount: function () {
|
||||
var restAmout = this.MoreBuyModel.UseAccountAmount == 1 ? this.RestAmount : 0;
|
||||
var total = this.MoreBuyModel.Price * this.MoreBuyModel.ConnectCount * this.MoreBuyModel.MaxPostfix - this.MoreBuyModel.CouponAmount - restAmout;
|
||||
var total = this.MoreBuyModel.Price * this.MoreBuyModel.ConnectCount * this.MoreBuyModel.MaxPostfix - this.MoreBuyModel.CouponAmount ;
|
||||
total = total < 0 ? 0 : total;
|
||||
return total.toFixed(2);
|
||||
}
|
||||
@@ -487,6 +487,9 @@
|
||||
if (totalAmount < item.AllowMinAmount) {
|
||||
continue;
|
||||
}
|
||||
if(newValue == '0'){
|
||||
this.OneBuyModel.CouponAmount = 0;
|
||||
}
|
||||
if (item.Id == newValue) {
|
||||
if (item.CouponType == 1) {//满减
|
||||
this.OneBuyModel.CouponAmount = item.CouponValue;
|
||||
@@ -513,6 +516,9 @@
|
||||
if (totalAmount < item.AllowMinAmount) {
|
||||
continue;
|
||||
}
|
||||
if(newValue == '0'){
|
||||
this.OneBuyModel.CouponAmount = 0;
|
||||
}
|
||||
if (item.Id == newValue) {
|
||||
if (item.CouponType == 1) {//满减
|
||||
this.MoreBuyModel.CouponAmount = item.CouponValue;
|
||||
@@ -617,9 +623,12 @@
|
||||
this.OneBuyModel.ConnectCount = parseInt(this.OneBuyModel.ConnectCount)
|
||||
if (!this.isNum(this.OneBuyModel.ConnectCount)) return;
|
||||
if (!this.checkOneAccount() || !this.checkOnePwd()) return;
|
||||
if (this.OnePayAmount > 0 ) {
|
||||
if (this.OneBuyModel.UseAccountAmount){
|
||||
|
||||
if (this.OneBuyModel.UseAccountAmount) {
|
||||
if (this.RestAmount < this.OnePayAmount){
|
||||
alert('余额不足,请充值。您也可以使用微信、支付宝支付。');return;
|
||||
} else {
|
||||
this.RestAmount = this.RestAmount - this.OnePayAmount;
|
||||
}
|
||||
}
|
||||
var that = this;
|
||||
@@ -655,9 +664,11 @@
|
||||
if (!this.isNum(this.MoreBuyModel.ConnectCount)) return;
|
||||
if (!this.checkMoreAccount() || !this.checkMorePwd() || this.MoreBuyModel.MaxPostfix>500) return;
|
||||
var that = this;
|
||||
if (this.MorePayAmount > 0 ) {
|
||||
if (this.MoreBuyModel.UseAccountAmount){
|
||||
if (this.MoreBuyModel.UseAccountAmount) {
|
||||
if (this.RestAmount < this.MorePayAmount){
|
||||
alert('余额不足,请充值。您也可以使用微信、支付宝支付。');return;
|
||||
} else {
|
||||
this.RestAmount = this.RestAmount - this.MorePayAmount;
|
||||
}
|
||||
}
|
||||
if (this.MoreBuyModel.UseAccountAmount === true) this.MoreBuyModel.UseAccountAmount = 1;
|
||||
|
||||
@@ -257,7 +257,7 @@
|
||||
PayAmount: function () {
|
||||
var count = this.OneBuyModel.Account.split(',').length;
|
||||
var restAmout = this.OneBuyModel.UseAccountAmount == 1 ? this.RestAmount : 0;
|
||||
var total = this.OneBuyModel.Price * this.OneBuyModel.ConnectCount * count - this.OneBuyModel.CouponAmount - restAmout;
|
||||
var total = this.OneBuyModel.Price * this.OneBuyModel.ConnectCount * count - this.OneBuyModel.CouponAmount ;
|
||||
total= total < 0 ? 0 : total;
|
||||
return total.toFixed(2);
|
||||
}
|
||||
@@ -271,6 +271,9 @@
|
||||
if (totalAmount < item.AllowMinAmount) {
|
||||
continue;
|
||||
}
|
||||
if(newValue == '0'){
|
||||
this.OneBuyModel.CouponAmount = 0;
|
||||
}
|
||||
if (item.Id == newValue) {
|
||||
if (item.CouponType == 1) {//满减
|
||||
this.OneBuyModel.CouponAmount = item.CouponValue;
|
||||
@@ -316,9 +319,11 @@
|
||||
})
|
||||
},
|
||||
onePay: function () {
|
||||
if (this.PayAmount > 0 ) {
|
||||
if (this.OneBuyModel.UseAccountAmount){
|
||||
if (this.OneBuyModel.UseAccountAmount) {
|
||||
if (this.RestAmount < this.PayAmount){
|
||||
alert('余额不足,请充值。您也可以使用微信、支付宝支付。');return;
|
||||
} else {
|
||||
this.RestAmount = this.RestAmount - this.PayAmount;
|
||||
}
|
||||
}
|
||||
var that = this;
|
||||
|
||||
Reference in New Issue
Block a user