diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index aad5158b0..4c52357aa 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -230,13 +230,16 @@ 汇总 - + 当页充值:{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))} 今日充值:{$ttotal} 昨日充值:{$ytotal} 累计充值:{$total}(此处只汇总充值成功的订单) - + + 今日充值:今日平台所有推广员的累计充值(包括官方渠道)/ + 昨日充值:昨日平台所有推广员的累计充值(包括官方渠道) + diff --git a/Application/Media/Controller/RechargeController.class.php b/Application/Media/Controller/RechargeController.class.php index d293f70e2..98392f8e6 100644 --- a/Application/Media/Controller/RechargeController.class.php +++ b/Application/Media/Controller/RechargeController.class.php @@ -98,15 +98,15 @@ class RechargeController extends BaseController case 'alipay': //判断是否开启支付宝充值 if (pay_set_status('alipay') == 0) { - $this->error("网站未启用支付宝充值", '', 1); - exit(); +// $this->error("网站未启用支付宝充值", '', 1); +// exit(); } echo $pay->buildRequestForm($vo); break; case 'weixin': if (pay_set_status('wei_xin') == 0 && pay_set_status('weixin') == 0&&pay_set_status('weixin_gf')==0 ) { - $this->error("网站未启用微信充值", '', 1); - exit(); +// $this->error("网站未启用微信充值", '', 1); +// exit(); } if (get_wx_type() == 0) {//微信官方 $data['pay_order_number'] = $data['order_no']; diff --git a/Application/Media/View/default/Index/business.html b/Application/Media/View/default/Index/business.html index db35bcb12..abf06a821 100644 --- a/Application/Media/View/default/Index/business.html +++ b/Application/Media/View/default/Index/business.html @@ -32,7 +32,7 @@
diff --git a/Application/Media/View/default/Recharge/pay.html b/Application/Media/View/default/Recharge/pay.html index 0f5b0c2d4..06610c336 100644 --- a/Application/Media/View/default/Recharge/pay.html +++ b/Application/Media/View/default/Recharge/pay.html @@ -136,20 +136,25 @@
- + + + + + + + + +
支付宝 -
-
- -
微信支付
-
+ +
竣付通
@@ -180,8 +185,8 @@
diff --git a/Application/Media/View/default/Service/detail.html b/Application/Media/View/default/Service/detail.html index 170e43ce9..428fa6459 100644 --- a/Application/Media/View/default/Service/detail.html +++ b/Application/Media/View/default/Service/detail.html @@ -19,7 +19,6 @@ height: 30px; padding-left: 12px; padding-right: 30px; - font-size: 1rem; } .search-icon { diff --git a/Application/Mobile/View/User/userphone.html b/Application/Mobile/View/User/userphone.html index a2a6babdf..e71abec7a 100644 --- a/Application/Mobile/View/User/userphone.html +++ b/Application/Mobile/View/User/userphone.html @@ -100,8 +100,12 @@ $(e).removeClass('g-btn').addClass('g-btntn'); var a = setInterval(function() { r--; - $(e).text('成功'+r + '秒后重发'), - 0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'), $(e).text('获取短信验证码'), clearInterval(a)) + $(e).text(r + '秒'), + $(e).css("background", "rgba(169,169,169)"); + 0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'), + $(e).text('获取短信验证码'), + $(e).css("background", "rgba(33,177,235,1)"), + clearInterval(a)) },1e3) } };