fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 0a92ca4b7148240c126322d50a1f5884e096faa4 2 parents 986cfd30 59cd57dd

Merge branch 'feature/yohoCoin' into release/5.2

Inline Side-by-side
Showing 2 changed files with 4 additions and 15 deletions
... ... @@ -302,7 +302,7 @@ var Order = {
$('#biprice').find('.num-limit-coin').html(data.yohoCoinCompute.yoho_coin_pay_rule.num_limit);
$('#biprice').find('.totalYohoCoinNum').html(data.yohoCoinCompute.totalYohoCoinNum);
$('#biprice').find('.yohoCoinNum').html(data.yohoCoinCompute.yohoCoinNum);
$('#biprice').find('.yohoCoin').html(data.yohoCoinCompute.yohoCoin);
$('#biprice').find('.yohoCoin').html('￥' + data.yohoCoinCompute.yohoCoin);
//有货币清零状态更新 end
//使用的红包
... ... @@ -574,22 +574,14 @@ var Order = {
// 修改有货币
$(document).on('click', '.bi-modify', function() {
var $pan = $('.play-bi-pan');
c.winShow($pan);
c.winShow($('.play-bi-pan'));
});
// 取消yoho 币
$('.cancel-bi').click(function() {
var $pan = $('.play-bi-pan');
var juanText;
$('.errbitip').html('');
if ($('#biprice').hasClass('is-select')) {
e.$loading.show();
... ...
... ... @@ -197,9 +197,7 @@ var TicketCat = {
// 修改有货币
$(document).on('click', '.bi-modify', function() {
var $pan = $('.play-bi-pan');
c.winShow($pan);
c.winShow($('.play-bi-pan'));
});
// 取消yoho 币
... ... @@ -207,7 +205,6 @@ var TicketCat = {
var $pan = $('.play-bi-pan'),
selectData = {};
$('.errbitip').html('');
el.$loading.show();
selectData = _this.getSelectData();
selectData.yohoCoin = 0;
... ... @@ -334,7 +331,7 @@ var TicketCat = {
$('#biprice').find('.num-limit-coin').html(data.yohoCoinCompute.yoho_coin_pay_rule.num_limit);
$('#biprice').find('.totalYohoCoinNum').html(data.yohoCoinCompute.totalYohoCoinNum);
$('#biprice').find('.yohoCoinNum').html(data.yohoCoinCompute.yohoCoinNum);
$('#biprice').find('.yohoCoin').html(data.yohoCoinCompute.yohoCoin);
$('#biprice').find('.yohoCoin').html('￥' + data.yohoCoinCompute.yohoCoin);
//有货币清零状态更新 end
},
getSelectData: function() {
... ...