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

Application/Home/Controller/PromoteController.class.php

@@ -362,10 +362,10 @@ class PromoteController extends BaseController
                     if ( !preg_match( $pattern, $_REQUEST['email'] ) ){
                         $this->error('邮箱地址错误', U('Promote/base_info'));exit;
                     }
-                    if (empty($_REQUEST['alipay_account']) ) {
-                        $this->error('请输入支付宝账号', U('Promote/base_info'));
-                        exit();
-                    }
+//                    if (empty($_REQUEST['alipay_account']) ) {
+//                        $this->error('请输入支付宝账号', U('Promote/base_info'));
+//                        exit();
+//                    }
                     $se['nickname'] = $_REQUEST['nickname'];
                     $se['real_name'] = $_REQUEST['real_name'];
                     $se['email'] = $_REQUEST['email'];

Application/Home/View/default/Promote/base_info.html

@@ -82,13 +82,13 @@
                         <span id="email_tip"></span>
                     </td>
                   </tr>
-									<tr>
-                    <td class="l"><span class="req">*</span>支付宝账号：</td>
-                    <td class="r">
-                      <input type="text" class="input txt" name="alipay_account" id="alipay_account" value="{$data.alipay_account}" placeholder="请输入支付宝账号">
-                      <span class="notice_tip">用于自动打款</span>
-                    </td>
-                  </tr>
+<!--									<tr>-->
+<!--                    <td class="l"><span class="req">*</span>支付宝账号：</td>-->
+<!--                    <td class="r">-->
+<!--                      <input type="text" class="input txt" name="alipay_account" id="alipay_account" value="{$data.alipay_account}" placeholder="请输入支付宝账号">-->
+<!--                      <span class="notice_tip">用于自动打款</span>-->
+<!--                    </td>-->
+<!--                  </tr>-->
 									<!-- <tr>
                     <td class="l"><span class="req">*</span>微信账号：</td>
                     <td class="r">

Application/Home/View/default/Query/dailySummary.html

@@ -294,8 +294,15 @@
           var data2 = [];
           var dataName1 = '';
           var dataName2 = '';
+          var xLabelInterval = 0;
+          var sdate = Date.parse($('#sdate').val()) / 1000;
+          var edate = Date.parse($('#edate').val()) / 1000;
           var chartBox = echarts.init(document.getElementById('chart_box'));
 
+          if ((edate - sdate) > 1555200) {
+              xLabelInterval = 1;
+          }
+
           switch (dataType) {
               case 1:
                   data1 = roleNum;
@@ -338,7 +345,7 @@
                   top: "13%",
                   containLabel: true
               },
-              color: ["#72b332", '#35a9e0'],
+              color: ["#b32106", '#143f53'],
               legend: {
                   data: [dataName1, dataName2],
                   show: true,
@@ -377,7 +384,7 @@
                               color: "#808080"
                           },
                           alignWithLabel: true,
-                          interval: 1,
+                          interval: xLabelInterval,
                       },
                       axisLine: {
                           lineStyle: {
@@ -408,7 +415,8 @@
                               color: '#fff',
                           }
                       },
-                      min: 0
+                      min: 0,
+                      minInterval:1,
                   }
               ],
               series: [
@@ -416,14 +424,12 @@
                       name: dataName1,
                       type: 'line',
                       smooth: true,
-                      symbol: 'circle',
                       data: data1
                   },
                   {
                       name: dataName2,
                       type: 'line',
                       smooth: true,
-                      symbol: 'circle',
                       data: data2
                   }
               ],