member_message fix

mobile/control/member_message.php

@@ -51,11 +51,15 @@ class member_messageControl extends mbMemberControl
         if (empty($message_array)) {
             return self::outsuccess(null, 'nomessage');
         } else {
-            $messager = new member_message($message_array);
-            $message_array = $messager->format();
-            $newnum = $this->countnewnum();
+            $messages = [];
+            foreach ($message_array as $item)
+            {
+                $messager = new member_message($item);
+                $messages[] = $messager->format();
+            }
 
-            return self::outsuccess(array('newnum'=>$newnum, 'message_array'=>$message_array));
+            $newnum = $this->countnewnum();
+            return self::outsuccess(array('newnum'=>$newnum, 'message_array'=>$messages));
         }
     }
 
@@ -76,10 +80,18 @@ class member_messageControl extends mbMemberControl
                 $v['from_member_name'] = Language::get('home_message_system_message');
                 $message_array[$k]	= $v;
             }
-            $messager = new member_message($message_array);
-            $message_array = $messager->format();
-            $newnum = $this->countnewnum();
-            self::outsuccess(array('newnum'=>$newnum, 'message_array'=>$message_array));
+            $message_array = array_slice($message_array, 0, 20);
+            $messages = [];
+            foreach ($message_array as $item)
+            {
+                $messager = new member_message($item);
+                $message = $messager->format();
+                $messages[] = $message;
+            }
+
+      //      $newnum = $this->countnewnum();
+            $newnum = intval($model_message->countNewMessage($_SESSION['member_id']));
+            return self::outsuccess($messages);
         } else {
             return self::outsuccess(null, 'nomessage');
         }
@@ -91,7 +103,7 @@ class member_messageControl extends mbMemberControl
         $drop_type = trim($_GET['drop_type']);
         $referer_url = getReferer();
         if(!in_array($drop_type,array('msg_system','msg_seller')) || $message_id<=0){
-            showMessage(Language::get('wrong_argument'),$referer_url,'html','error');
+         //   showMessage(Language::get('wrong_argument'),$referer_url,'html','error');
         }
         //查询站内信
         $param = array();
@@ -100,7 +112,7 @@ class member_messageControl extends mbMemberControl
         $param['no_del_member_id'] = "{$_SESSION['member_id']}";
         $message_info = $model_message->getRowMessage($param);
         if (empty($message_info)){
-            showMessage(Language::get('home_message_no_record'),$referer_url,'html','error');
+           // showMessage(Language::get('home_message_no_record'),$referer_url,'html','error');
         }
         if ($drop_type == 'msg_system'){
             $message_info['from_member_name'] =  Language::get('home_message_system_message');
@@ -141,13 +153,16 @@ class member_messageControl extends mbMemberControl
 
         // 新消息数量
         $newnum = $this->countnewnum();
-        self::outsuccess(array('message_list'=>$message_list, 'newnum' => $newnum));
+        return self::outsuccess(array('message_list'=>$message_list, 'newnum' => $newnum));
 
         // Tpl::output('drop_type',$drop_type);
         //  $this->profile_menu('showmsg');
         //  Tpl::showpage('member_message.view');
     }
 
+    /**
+     * 删除普通信
+     */
     public function dropcommonmsgOp() {
         $message_id = trim($_GET['message_id']);
         $drop_type = trim($_GET['drop_type']);
@@ -208,11 +223,11 @@ class member_messageControl extends mbMemberControl
             //更新未读站内信数量cookie值
             //  $cookie_name = 'msgnewnum'.$_SESSION['member_id'];
             $countnum = $model_message->countNewMessage($_SESSION['member_id']);
-            self::outsuccess(array('drop_state'=>true, 'newnum' => $countnum));
+            return self::outsuccess(array('drop_state'=>true, 'newnum' => $countnum));
             //  setNcCookie($cookie_name,$countnum,2*3600);//保存2小时
             // showDialog(Language::get('home_message_delete_success'),'reload','succ');
         }else {
-            self::outerr(array('drop_state' => false));
+            return self::outerr(array('drop_state' => false));
         }
     }
 
@@ -260,7 +275,7 @@ class member_messageControl extends mbMemberControl
                 $setting_array[$val['mmt_code']] = intval($val['is_receive']);
             }
         }
-        self::outsuccess(array('setting_array'=>$setting_array, 'newnum'=>$newnum));
+        return self::outsuccess(array('setting_array'=>$setting_array, 'newnum'=>$newnum));
     }
 
     private function countnewnum()

test/jamestest/jsonTest.php

@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: james
+ * Date: 2017/4/24
+ * Time: 下午8:52
+ */
+class jsonTest extends PHPUnit_Framework_TestCase
+{
+
+}