diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 5d4547d60..fe75474ee 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/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, diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index d1a6986e1..367ffbac5 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/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"] = "--"; diff --git a/Application/Home/View/default/Promote/addPromote.html b/Application/Home/View/default/Promote/addPromote.html index e718cc779..b80c232fe 100644 --- a/Application/Home/View/default/Promote/addPromote.html +++ b/Application/Home/View/default/Promote/addPromote.html @@ -36,19 +36,19 @@