Merge branch 'hotfix/task-65'

Application/Base/Service/PromoteService.class.php

@@ -865,12 +865,7 @@ class PromoteService {
                 'message' => '账号只能为数字，字母和下划线',
             ];
         }
-        if ($mobile == '') {
-            return [
-                'status' => false,
-                'message' => '请输入手机号',
-            ];
-        } else {
+        if ($mobile != '') {
             if (!preg_match("/^1[3456789]{1}\d{9}$/", $mobile)) {
                 return [
                     'status' => false,
@@ -878,12 +873,7 @@ class PromoteService {
                 ];
             }
         }
-        if ($idcard == '') {
-            return [
-                'status' => false,
-                'message' => '请输入身份证号',
-            ];
-        } else {
+        if ($idcard != '') {
             if (!IdCard::isIdcard($idcard)) {
                 return [
                     'status' => false,
@@ -891,12 +881,7 @@ class PromoteService {
                 ];
             }
         }
-        if ($realName == '') {
-            return [
-                'status' => false,
-                'message' => '请输入姓名',
-            ];
-        } else {
+        if ($realName != '') {
             if (mb_strlen($realName) < 2 || mb_strlen($realName) > 4) {
                 return [
                     'status' => false,

Application/Home/Controller/DownloadController.class.php

@@ -3456,7 +3456,7 @@ class DownloadController extends BaseController {
              ->where($map)
              ->order('tab_spend.id desc')
              ->find()['income'];
-         $csvData1["user_account"] = "合计";
+         $csvData1["user_account"] = "合计(此数据根据充值状态进行统计)";
          $csvData1["pay_order_number"] = "--";
          $csvData1["pay_amount"] = $income;
          $csvData1["pay_way"] = "--";

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

@@ -36,19 +36,19 @@
                 </td>
               </tr>
               <tr>
-                <td class="l"><span class="req">*</span>姓名：</td>
+                <td class="l">姓名：</td>
                 <td class="r">
                   <input type="text" class="name input-txt txt" name="real_name" id="real_name" maxlength="4" minlength="2" placeholder="请输入姓名">
                 </td>
               </tr>
               <tr>
-                <td class="l"><span class="req">*</span>身份证：</td>
+                <td class="l">身份证：</td>
                 <td class="r">
                   <input type="text" class="name input-txt txt" name="idcard" id="idcard" placeholder="请输入身份证">
                 </td>
               </tr>
               <tr>
-                <td class="l"><span class="req">*</span>手机号：</td>
+                <td class="l">手机号：</td>
                 <td class="r">
                   <input type="text" class="name input-txt txt" name="mobile_phone" id="mobile_phone" placeholder="请输入手机号">
                 </td>
@@ -147,8 +147,10 @@
       if($.trim($('#account').val()).length < 6 || $.trim($('#account').val()).length > 15){
         return json_data = {'status':0,'msg':'子渠道账号长度为6-15位字符'}
       }
-      if($.trim($('#real_name').val()).length < 2 || $.trim($('#real_name').val()).length > 4){
-        return json_data = {'status':0,'msg':'子渠道姓名长度为2-4位字符'}
+      if ($.trim($('#real_name').val()) != '') {
+        if($.trim($('#real_name').val()).length < 2 || $.trim($('#real_name').val()).length > 4){
+          return json_data = {'status':0,'msg':'子渠道姓名长度为2-4位字符'}
+        }
       }
       if($('#password').val()==""){
         return json_data = {'status':0,'msg':'子渠道密码不能为空'}

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

@@ -224,7 +224,7 @@
                 </tr>
               </volist>
               <tr>
-                <td>合计</td>
+                <td>合计(此数据根据充值状态进行统计)</td>
                 <td>--</td>
                 <td>--</td>
                 <td>--</td>

robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /