1

application/admin/controller/EmailSend.php

@@ -204,8 +204,19 @@ class EmailSend extends Base
             $yestady = strtotime(date('Y-m-d', strtotime('+1 day')));
 //            $timeNum = 0;
             $uni = md5(time() . uniqid());
+
             foreach ($to_email as $k => $v) {
+                $emailCountAll = $v['email_count_all'];
                 foreach ($v['send_email'] as $m => $n) {
+                    $typeSend = $n['send_type'];
+                    $data['send_time'] = $n['time'];
+                    if ($emailCountAll >= $v['max_num']) {
+//
+                        $typeSend = 1;
+                        $checkTime = self::checkTime($yestady,$to_email[$k]['email']);
+                        $data['send_time'] = $checkTime;
+                        $data['customer_id'] = $n['id'];
+                    }
                     $data['from'] = $to_email[$k]['email'];
                     $data['from_name'] = $v['form_name'];
                     $data['to'] = $n['email'];
@@ -213,14 +224,10 @@ class EmailSend extends Base
                     $data['theme_id'] = $param['theme'];
                     $data['content'] = $param['content'];
                     $data['email_id'] = $v['id'];
-                    $data['send_type'] = $n['send_type'];
+                    $data['send_type'] = $typeSend;
                     $data['spread_id'] = session('uid');
                     $data['create_time'] = time();
-                    if ($v['email_count_all'] >= $v['max_num']) {
-                        $n['send_type'] = 1;
-                        $checkTime = self::checkTime($yestady,$to_email[$k]['email']);
-                        $data['send_time'] = $checkTime;
-                    } elseif ($n['send_type'] == 0) {
+                    if ($typeSend  == 0) {
                         $mail = new PHPMailer();
                         $mail->SMTPDebug = 1;
                         $mail->isSMTP();
@@ -242,7 +249,6 @@ class EmailSend extends Base
                         $data['status'] = 1;
                         // $data['status'] = $n['id'];
                         $data['send_status'] = !$status ? 0 : 1;
-                        // $data['send_status'] =  1;
                         $data['send_time'] = $n['time'];
                         $data['customer_id'] = $n['id'];
                         $customer = new CustomerModel();
@@ -252,9 +258,9 @@ class EmailSend extends Base
                         $data['customer_id'] = $n['id'];
                         $data['send_status'] = 0;
                         $data['status'] = 0;
-                        $data['send_time'] = $n['time'];
                     }
                     $data['uni'] = $uni;
+                    $emailCountAll = $emailCountAll + 1;
                     Db::name('email')->where('id', $v['id'])->setInc('email_count_all', 1); // 今天存入的数量1
                     Db::table('think_email_send')->insertGetId($data);
                 }
@@ -382,8 +388,11 @@ class EmailSend extends Base
         $map['spread_id'] = session('uid');
         $map['is_deleted'] = 0;
         $map['uni'] = $uni;
-        $data = Db::table('think_email_send')->where($map)->field('to')->select();
-        $cellname = [['to', '邮箱', 15, 'LEFT'],];
+        $data = Db::table('think_email_send')->where($map)->field('to,send_time')->select();
+        foreach ($data as &$v) {
+            $v['send_time'] = date('Y-m-d H:i:s',$v['send_time']);
+        }
+        $cellname = [['to', '邮箱', 15, 'LEFT'],['send_time', '发送时间', 20, 'LEFT'],];
         $res = exportExcels('收件邮箱', 'email', $cellname, $data);
         return json($res);
     }

application/admin/controller/EmailSends.php

@@ -44,7 +44,7 @@ class EmailSends extends Base
 
 
             foreach($lists as $k=>&$v){
-                $v['shou']='<a href="export?uni='.$v['uni'].'" style="color:#3BA1FF">下载全部收件人邮箱</a>';
+                $v['shou'] = '<a href="export?uni=' . $v['uni'] . '" style="color:#3BA1FF">下载全部收件人邮箱</a>';
                 $v['count']=Db::table('think_email_send')->where('uni',$v['uni'])->count();//全部
                 $v['count1']=Db::table('think_email_send')->where('uni',$v['uni'])->where('status',1)->count();//已发送
                 $v['count2']=Db::table('think_email_send')->where('uni',$v['uni'])->where('status',0)->count();//未发送
@@ -278,16 +278,16 @@ class EmailSends extends Base
 
     public function export(){
 
-        $id = input('param.id');
-        //$map['spread_id']=session('uid');
-        $map['is_deleted']=0;
-        $map['theme_id']=$id;
-        $data=Db::table('think_email_send')->where($map)->field('to')->select();
-        $cellname = [
-            ['to', '邮箱', 15, 'LEFT'],
-        ];
-
 
+        $uni = input('param.uni');
+//        $map['spread_id'] = session('uid');
+        $map['is_deleted'] = 0;
+        $map['uni'] = $uni;
+        $data = Db::table('think_email_send')->where($map)->field('to,send_time')->select();
+        foreach ($data as &$v) {
+            $v['send_time'] = date('Y-m-d H:i:s',$v['send_time']);
+        }
+        $cellname = [['to', '邮箱', 15, 'LEFT'],['send_time', '发送时间', 20, 'LEFT'],];
         $res = exportExcels('收件邮箱', 'email', $cellname, $data);
         return json($res);
     }

application/admin/view/customer/admin/admin_user_index.html

@@ -221,7 +221,7 @@
             , autoSort: false
             , cellMinWidth: 150
             , height: "full-220"
-            , limits: [100, 200, 500, 1000, 2000]
+            , limits: [10, 200, 500, 1000, 2000]
             , limit: "{:config('pages')}"
             , loading: true
             , id: 'LAY-table'

application/admin/view/customer/admin/admin_user_index_1.html

@@ -210,7 +210,7 @@
 				autoSort: false,
 				cellMinWidth: 150,
 				height: "full-220",
-				limits: [100, 200, 500, 1000, 2000],
+				limits: [10, 200, 500, 1000, 2000],
 				limit: "{:config('pages')}",
 				loading: true,
 				id: 'LAY-table',

application/admin/view/customer/admin/admin_user_index_2.html

@@ -218,7 +218,7 @@
             , autoSort: false
             , cellMinWidth: 150
             , height: "full-220"
-            , limits: [100, 200, 500, 1000, 2000]
+            , limits: [10, 200, 500, 1000, 2000]
             , limit: "{:config('pages')}"
             , loading: true
             , id: 'LAY-table'

application/admin/view/customer/admin/admin_user_index_3.html

@@ -209,7 +209,7 @@
             , autoSort: false
             , cellMinWidth: 150
             , height: "full-220"
-            , limits: [100, 200, 500, 1000, 2000]
+            , limits: [10, 200, 500, 1000, 2000]
             , limit: "{:config('pages')}"
             , loading: true
             , id: 'LAY-table'

application/admin/view/customer/admin/admin_user_index_4.html

@@ -220,7 +220,7 @@
             , autoSort: false
             , cellMinWidth: 150
             , height: "full-220"
-            , limits: [100, 200, 500, 1000, 2000]
+            , limits: [10, 200, 500, 1000, 2000]
             , limit: "{:config('pages')}"
             , loading: true
             , id: 'LAY-table'