Merge branch 'master' of http://git.9026.com/roobe/miao

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-  "release": "2017.09.26-14.08.05"
+  "release": "2017.09.26-14.18.34"
 }

miaomiao/www/chcp.manifest

@@ -765,7 +765,7 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "6ae0706ac9d345ab099c54b892dd5395"
+    "hash": "c4caae8bc500f1fdc952ba431a61e5da"
   },
   {
     "file": "templates/home/index.html",

miaomiao/www/js/config/config.js

@@ -1,12 +1,12 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-          server: 'http://q8.9026.com/',
-          imgServer: 'http://q8.9026.com/attachment/'
+         server: 'http://q8.9026.com/',
+         imgServer: 'http://q8.9026.com/attachment/'
         //server: 'http://localhost:8092/',
         //imgServer: 'http://localhost:8092/attachment/'
 
-        //server: 'http://miao.beiyuesi.com/',
-        //imgServer: 'http://miao.beiyuesi.com/attachment/'
+        // server: 'http://miao.beiyuesi.com/',
+        // imgServer: 'http://miao.beiyuesi.com/attachment/'
     });
 })(angular.module('app'));

miaomiao/www/js/controllers/home.js

@@ -641,7 +641,6 @@
                 content:$scope.vm.comment,
                 comment_user_id:to_userid
             };
-            debugger;
             console.log($scope.vm.comment+" "+iid);
             homeService.add_comment(data).then(function(){
                 $scope.vm.comment = '' ;

miaomiao/www/templates/home/dream-detail.html

@@ -185,10 +185,13 @@
                                         <img class="head" ng-src="{{c.user_avatar | avator}}" />
                                     </div>
                                     <div class="col-80" style="border-bottom: 1px solid #E6E6E6">
-                                        <span style="margin-top: 10px; display: inline-block">{{c.user_nickname}}</span>
-                                        <span class="utitle kz">{{c.updated_at}}</span>
-                                        <p style="white-space:normal; color: #666666">
-                                            回复<span style="color:#333333">{{c.to_user_nickname}}</span>：{{c.content}}
+                                        <span style="margin-top: 10px; display: inline-block;font-size: 12px">{{c.user_nickname}}</span>
+                                        <span style="font-size: 12px" class="utitle kz">{{c.updated_at}}</span>
+                                        <p style="white-space:normal; color: #666666;font-size: 12px">
+                                            <span ng-if="c.to_user_nickname&&c.to_user_nickname!=' '&&c.to_user_nickname!=dream.user.nickname" style="font-size: 12px">
+                                                回复<span style="color:#333333;font-size: 12px">{{c.to_user_nickname}}</span>：
+                                            </span>
+                                            {{c.content}}
                                         </p>
                                     </div>
                                 </div>

miaomiao/www/templates/home/index.html

@@ -117,7 +117,7 @@
   <label class="item item-select item-select-width">
     <span class="input-label">地区</span>
     <select name="city" ng-model="filter.city">
-        <!-- <option value="" selected>所有</option> -->
+        <option value="" selected>所有</option>
         <option value="北京">北京</option>
         <option value="上海">上海</option>
         <option value="广州">广州</option>

server/app/Http/Controllers/Api/V1/InteractionController.php

@@ -146,9 +146,19 @@ class InteractionController extends Controller
         if (!empty($request->input('comment_user_id'))) {
             $to_user = UserInfoModel::find($request->input('comment_user_id'));
             if (!empty($to_user)){
-                $data['comment_info_id'] = $request->input('comment_user_id');
+                $data['to_user_id'] = $request->input('comment_user_id');
                 $data['to_user_avatar'] = $to_user->avatar;
                 $data['to_user_nickname'] = $to_user->nickname;
+
+                $message = $user->nickname.'在你的互动上留言啦！点击去看看！';
+                $info = [
+                    'user_id' => $data['to_user_id'],
+                    'message' => $message,
+                ];
+                SystemInfoModel::create($info);
+
+//            长连接
+                $this->jPush($message,'',$data['to_user_id']);
             }
         }
 
@@ -160,15 +170,7 @@ class InteractionController extends Controller
         $data['is_read'] = 1;
         $ok = CommentInfoModel::create($data);
 
-        $message = $user->nickname.'在你的互动上留言啦！点击去看看！';
-        $info = [
-            'user_id' => $data['to_user_id'],
-            'message' => $message,
-        ];
-        SystemInfoModel::create($info);
 
-//            长连接
-        $this->jPush($message,'',$data['to_user_id']);
         if ($ok) {
             return $this->api('');
         }else{