Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/View/Spend/lists.html

@@ -230,13 +230,16 @@
 
 
                     <td>汇总</td>
-                    <td colspan="99">
+                    <td colspan="6">
                         当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
                         今日充值：{$ttotal}
                         昨日充值：{$ytotal}
                         累计充值：{$total}（此处只汇总充值成功的订单）
                     </td>
-                    <td></td>
+                    <td colspan="99" style="color: #a9a9a9;">
+                        今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
+                        昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
+                    </td>
                 </tr>
                 </tbody>
             </table>

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'];

Application/Media/View/default/Index/business.html

@@ -32,7 +32,7 @@
             </div>
             <div class="have_product">
                 <ul >
-                    <volist name="recommend" id="rec" offset="0" length="1">
+                    <volist name="recommend" id="rec">
                     <li>
                         <img src="{:get_cover($rec['cover'],'path')}" onerror="this.src='__IMG__/empty.jpg';this.onerror=null"/>
                         <div class="have_product_box">
@@ -42,6 +42,7 @@
                         </div>
                     </li>
                     </volist>
+
                 </ul>
             </div>
         </div>

Application/Media/View/default/Recharge/pay.html

@@ -136,20 +136,25 @@
         <div class="way-box">
           <div class="way-select">
 
-            <if condition="get_tool_status('alipay') eq 1">
+<!--            <if condition="get_tool_status('alipay') eq 1">-->
+<!--            <div class="wayBg" data-type="alipay">-->
+<!--              <img src="__IMG__/zhifubaozhifu.png" alt="">-->
+<!--              <span>支付宝</span>-->
+<!--            </div>-->
+
+<!--            </if>-->
+
+<!--            <if condition="get_tool_status('weixin') eq 1 or get_tool_status('wei_xin') eq 1 or get_tool_status('weixin_gf') eq 1">-->
             <div class="wayBg" data-type="alipay">
               <img src="__IMG__/zhifubaozhifu.png" alt="">
               <span>支付宝</span>
-
             </div>
-            </if>
-
-            <if condition="get_tool_status('weixin') eq 1 or get_tool_status('wei_xin') eq 1 or get_tool_status('weixin_gf') eq 1">
             <div class="" data-type="weixin">
               <img src="__IMG__/weixin.png" alt="">
               <span>微信支付</span>
             </div>
-            </if>
+
+<!--            </if>-->
 
             <if condition="get_tool_status('jft') eq 1">
               <div class="" data-type="jft"><span class="p1_1 g" id="p1">竣付通</span></div>
@@ -180,8 +185,8 @@
         <img src="__IMG__/foot_logo.png" alt="">
         <div class="foot_top_ri">
           <div class="foot_link">
-            <a>家长监护</a>
-            <a>客服帮助</a>
+            <a href="/media.php?s=/Article/news1/type/supervise.html">家长监护</a>
+            <a href="/media.php?s=/Service/index.html">客服帮助</a>
 <!--            <a href="#">国浩律所</a>-->
           </div>
           <div class="foot_serial">

Application/Media/View/default/Service/detail.html

@@ -19,7 +19,6 @@
       height: 30px;
       padding-left: 12px;
       padding-right: 30px;
-      font-size: 1rem;
     }
 
     .search-icon {

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)
           }
         };