修改密码提示信息

application/api/controller/Broker.php

@@ -144,7 +144,7 @@ class Broker extends Basic{
         $data['status'] = 200;
         $data['data']   = array();
         $data['msg']    = '';
-        
+
         if ($params['agent_id']) {
             $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
             $pageSize = empty($params['pageSize']) ? PAGESIZE : $params['pageSize'];
@@ -152,7 +152,7 @@ class Broker extends Basic{
             $evalutate = new Evaluate();
             $journal  = new JournalAccounts();
             
-            $fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,evaluate_sign';
+            $fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,evaluate_sign,a.create_time,record_id,a.source';
             $fields_journal  = 'a.house_id,j.singntime';
             switch ($params['type']) {
                 case 0:

application/api/controller/Member.php

@@ -300,9 +300,14 @@ class Member extends Basic
 
             default :
                 $result['AuthToken'] = $this->authToken;
+                $data['status'] = 101;
+                $data['msg'] = '修改失败';
+
                 if ($user_nick) {
                     $user_data->user_nick  = $user_nick;
                     $result['user_nick'] = $user_nick;
+                    $data['status'] = 200;
+                    $data['msg'] = '修改成功';
                 }
 
                 if ($this->request->param('pwd2')) {
@@ -311,6 +316,8 @@ class Member extends Basic
                     if (md5(md5($pwd2).'+123') == $user_data->user_pswd) {
                         $user_data->user_pswd = $pwd;
                         $result['user_pswd']    = $pwd;
+                        $data['status'] = 200;
+                        $data['msg'] = '修改成功';
                     } else {
                         $data['status'] = 101;
                         $data['msg']    = '原密码错误';
@@ -320,6 +327,8 @@ class Member extends Basic
                 if ($user_pic) {
                     $user_data->user_pic   = $user_pic;
                     $result['user_pic']    = $user_pic;
+                    $data['status'] = 200;
+                    $data['msg'] = '修改成功';
                 }
 
                 $user_data->update_time = $date;
@@ -327,8 +336,6 @@ class Member extends Basic
 
                 if ($user_data->id) {
                     $data['data']   = $result;     //编辑完返回用户信息
-                    $data['status'] = 200;
-                    $data['msg'] = '修改成功';
                 } else {
                     $data['status'] = 101;
                     $data['msg']    = '编辑失败';

application/model/Agents.php

@@ -61,7 +61,13 @@ class Agents extends Model
                     ->field('sum(evaluate_grade) as evaluate_grade, count(*) as evaluate_num')
                     ->where('agents_id',$id)->where('is_show',0)->find();
 
-            $result['evaluate_grade'] = $evaluate_grade['evaluate_grade'];   //评分等级
+            if ($evaluate_grade['evaluate_grade']) {
+                $grade = floor(($evaluate_grade['evaluate_grade']/2)/$evaluate_grade['evaluate_num']);
+            } else {
+                $grade = 0;
+            }
+
+            $result['evaluate_grade'] = $grade;   //评分等级
             $result['evaluate_num']   = $evaluate_grade['evaluate_num'];        //评论数量
             $result['watch_shop']     = Db::table('u_appoint_watch_shop')
                     ->where('agents_id',$id)->count(); //看铺

application/model/Evaluate.php

 <?php
 
 namespace app\model;
-
+use think\Db;
 use think\Model;
 
 class Evaluate extends Model
@@ -21,7 +21,7 @@ class Evaluate extends Model
      * @return type
      */
     public function getEvaluate($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $agent_id = '') {
-    
+
         if ($agent_id) {
             $result = $this->field($field)->alias('a')
                     ->join('u_users b','a.user_id = b.id','left')
@@ -31,7 +31,7 @@ class Evaluate extends Model
                     ->limit($pageSize)
                     ->page($pageNo)
                     ->select();
-      
+
         } else {
             $result = $this->field($field)->alias('a')
                     ->join('u_users b', 'a.user_id = b.id', 'left')
@@ -44,9 +44,11 @@ class Evaluate extends Model
 
         $sign    = new EvaluateSign();
         $applies = new Applies();
+        $watch   = new AppointWatchShop();
+        $journal = new JournalAccounts();
         $house   = new HouseInfos();
-
         foreach ($result as $k=>$v) {
+            $v->evaluate_grade = floor($v->evaluate_grade/2);
             $data[$k]   = $v->getData();
             $data[$k]['user_pic'] = CURRENT_URL.'/static/head_portrait/'.$data[$k]['user_pic'];
             if ($v['evaluate_sign']) {
@@ -56,17 +58,25 @@ class Evaluate extends Model
                          ->select();
             }
 
-            //看铺时间
-            $applies_time = $applies->field('receptiontime,created')
-                    ->where('phpone',$v['user_phone'])
+            if ($v->source == 10) {
+                $applies_time = $watch->alias('a')
+                    ->field('b.receptiontime')
+                    ->join('applies b','b.id = a.apply_id','left')
+                    ->where('a.apply_id',$v->record_id)
+                    ->find();
+            } else {
+                $applies_time = $journal->alias('a')
+                    ->field('b.receptiontime')
+                    ->join('applies b','b.id = a.apply_id','left')
+                    ->where('a.apply_id',$v->record_id)
                     ->find();
-            
-            $house_address = $house->field('address')->where('id',$v['house_id'])->find(); //商铺地址
+            }
 
-            $data[$k]['houserAddress'] = $house_address ? $house_address : '';
-            $data[$k]['receptiontime'] = $applies_time['receptiontime'] ? $applies_time['receptiontime']:'';
-            $data[$k]['created'] = $applies_time['created'] ? $applies_time['created']:'';
+            $house_address = Db::table('HouseInfos')->field('address')->where('id',$v['house_id'])->find();
 
+            $data[$k]['houserAddress'] = $house_address['address'] ? $house_address['address'] : '';
+            $data[$k]['receptiontime'] = $applies_time['receptiontime'];
+            $data[$k]['created'] = $v['create_time'] ? $v['create_time']:'';
         }
                 
         return $data;