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

miaomiao/www/js/controllers/account.js

@@ -29,7 +29,7 @@
                 //}, function (error) {
                 //    console.log("Failed: " + JSON.stringify(error));
                 //})  
-                $state.go("loginAccount");
+                $state.go("loginAccount",{wechat:1231});
                 }
     }]);
     app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",

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

@@ -217,7 +217,8 @@ class DreamController extends Controller
             if(count($top3user) <= 2) $top3user[] = $user ;
         }
         if ($type == 'paihang') return $this->api($topuser);
-        $interactions = InteractionInfo::where('dream_id',$id)->orderBy('id','desc')->get();
+        $interactions = InteractionInfo::where('dream_id',$id)->with('comments')->orderBy('id','desc')->get();
+        /*dd($interactions);
         foreach ($interactions as $item) {
             $item->comments;
             foreach ($item->comments as $comment) {
@@ -227,7 +228,7 @@ class DreamController extends Controller
                     $v1->pic =  UserInfoModel::find($v1->user_id)->pic;
                 }
             }
-        }
+        }*/
         if ($type == 'interaction') return $this->api($interactions);
 //            梦想  图片  支持者前三    支持乘数参数    用户余额   梦想分数
 

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

@@ -43,18 +43,20 @@ class IndexController extends Controller
      *       }
      *   ],
      *   "users": [                  动态用户
-     *       {
-     *           "id": 3,
-     *           "user_id": 1,
-     *           "other_user_id": 2,
-     *           "dream_number": 1,
-     *           "created_at": null,
-     *           "updated_at": null,
-     *            "other_user": {
-     *               "id": 2,
-     *               "avatar": "http://www.miao.com/upload/user/20170630/08e235d7211944e9b6482965b4d7c42e.jpg",
-     *           }
-     *       }
+     *      {
+     *          "id": 3,
+     *          "user_id": 1,
+     *          "other_user_id": 2,
+     *          "dream_number": 1,    >0 表示有最新动态
+     *          "created_at": null,
+     *          "updated_at": null,
+     *          "other_user": {
+     *              "id": 2,
+     *              "phone": "13880642881",
+     *              "nickname": "name2",
+     *              "avatar": "http://www.miao.com/upload/user/20170630/08e235d7211944e9b6482965b4d7c42e.jpg",
+     *          }
+     *      },
      *  ],
      *   "dreams": {
      *       "current_page": 1,
@@ -116,19 +118,18 @@ class IndexController extends Controller
         $id_arr1 = array_column($arr1,'id');
         $arr2 =DreamInfoModel::orderBy('score','desc')->offset(15)->limit(120)->select('id')->get()->toArray();
         $id_arr2 = array_column($arr2,'id');
-        $dtusers =UserCareUser::where('user_id',$id)->with('other_user')->
-        where('dream_number','>',0)->orderBy('created_at')->get()->toArray();
-        $hdusers = CommentInfoModel::where(function ($query) use ($id) {
+        $users =UserCareUser::where('user_id',$id)->with('other_user')->orderBy('dream_number','desc')->get()->toArray();
+      /*  $hdusers = CommentInfoModel::where(function ($query) use ($id) {
 //            $query->where('user_id',$id)->orWhere('to_user_id',$id);
             $query->where('user_id',$id);
-        })->where('is_read',0)->with('to_user')->orderBy('created_at')->get()->toArray();
-        $users = [] ;
+        })->where('is_read',0)->with('to_user')->orderBy('created_at')->get()->toArray();*/
+        /*$users = [] ;
         foreach ($dtusers as $k => $v){
             $users[] = $v['other_user'];
-        }
-        foreach ($hdusers as $k => $v){
+        }*/
+      /*  foreach ($hdusers as $k => $v){
             $users[] = $v['to_user'];
-        }
+        }*/
         $type = $request->type;
         if ($type == 'trend') {
             $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->whereNotIn('id', $id_arr1)->limit(100)->paginate(20);

server/resources/views/admin/share.blade.php

@@ -52,7 +52,7 @@
 </div>
 <div style="padding: 0 10px 20px  10px">
     <div style="background-color:#E6E6E6; width: 100%;">
-        <div style="width: {{($dream->get_coin / $dream->coin)}} %; background: #FF6600; height: 5px">
+        <div style="width: {{($dream->get_coin / $dream->coin)*100}}%; background: #FF6600; height: 5px">
         </div>
     </div>
 </div>

server/routes/admin.php

@@ -23,8 +23,8 @@ Route::get('share/view', 'Share\InfoController@view');
 
 Route::group(['middleware' => ['auth.admin']], function() {
 //参数设置
-    Route::get('setting/banner/index', 'Settings\SettingsController@banner');
     Route::any('setting/pay/edit', 'Settings\SettingsController@payEdit');
+    Route::get('setting/banner/index', 'Settings\SettingsController@banner');
     Route::any('setting/banner/create', 'Settings\SettingsController@bannerCreate');
     Route::any('setting/banner/update', 'Settings\SettingsController@bannerUpdate');
     Route::get('setting/banner/destroy', 'Settings\SettingsController@bannerDestroy');