add

miaomiao/www/js/controllers/add.js

@@ -42,10 +42,10 @@
                 var data = {
                     pics: $scope.imgs,
                     video:$scope.video.server,
-                    dream: $scope.vm.dream,
+                    name: $scope.vm.name,
                     about: $scope.vm.about,
                     time: 21, //默认21
-                    money: $scope.vm.money
+                    coin: $scope.vm.coin
                 };
                 msg.loading('保存中...');
                 dreamService.addDream(data).then(function (result) {
@@ -58,9 +58,9 @@
             };
             $scope.$on('$ionicView.beforeEnter', function () {
                 $scope.vm={
-                    dream:'',
+                    name:'',
                     about:'',
-                    money:""
+                    coin:''
                 };
             });
             $scope.$on('$ionicView.leave', function () {

miaomiao/www/js/controllers/home.js

@@ -233,6 +233,18 @@
             $scope.input.focus = true;
             $scope.vm.title='';
         }
+        $scope.submitComment = function(id){
+            $scope.input.placeholder = "评论";
+            var data = {
+                id:id,
+                content:vm.comment,
+            };
+            homeService.add_comment(data).then(function(){
+                 $scope.vm.comment = '' ;
+                $scope.load(id);
+                $scope.closeModal();
+            })
+        }
         $scope.addpict = function () {
             common.chooseImage().then(function (img) {
                 common.uploadFiles(img,1).then(function (result) {
@@ -284,43 +296,35 @@
         }]);
     app.controller('searchCtrl', ["$scope","homeService", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"
         , function ($scope,homeService, $state, msg, $ionicTabsDelegate, $ionicNavBarDelegate) {
+        $scope.isResult = false;
         $scope.index = 0;
-        $scope.index1 = 0;
         $scope.vm = {
-            keywords : ""
+            keyword : ""
         }
-        $scope.ismore = true;
-        $scope.selectHot = function (index) {
+        $scope.showMore = function (keyword,index) {
             $scope.index = index;
         }
-        $scope.selectHistory = function (index) {
-            $scope.index1 = index;
-        }
-        $scope.showMore = function () {
-            $scope.ismore = true;
-        }
-        $scope.keyChange = function () {
-            $scope.ismore = false;
-        }
-        $scope.type = 1;
-        $scope.changeType = function (type) {
-            $scope.type = type;
+        $scope.search = function (keyword) {
+            $scope.vm.keyword = keyword;
+            homeService.search(keyword).then(function(result){
+                $scope.isResult = true;
+                $scope.dream_infos = result.data.data.dream_infos;
+                $scope.user_infos = result.data.data.user_infos;
+            });
         }
+   
         $scope.$on('$ionicView.beforeEnter', function () {
             $ionicTabsDelegate.showBar(false);
             $ionicNavBarDelegate.showBackButton(false);
+            homeService.search('').then(function(result){
+                $scope.hot_searches = result.data.data.hot_searches;
+                $scope.history_searches = result.data.data.history_searches;
+            });
         });
         $scope.$on('$ionicView.leave', function () {
             $ionicTabsDelegate.showBar(true);
-        });
-        $scope.searchContent = function ()
-        {
-            homeService.searchContent($scope.vm.keywords).then(function(result){
-
-            },function(error){
 
-            });
-        };
+        }); 
     }]);
     app.controller('interactionAddCtrl', ["$scope","homeService", "$state", "msg","config","common", "$ionicTabsDelegate", "$ionicNavBarDelegate"
         , function ($scope,homeService, $state, msg,config,common, $ionicTabsDelegate, $ionicNavBarDelegate) {

miaomiao/www/js/services/dreamservice.js

@@ -3,7 +3,7 @@
         return {
             addDream: function (data) {
                 return $http({
-                    url: config.server + 'api/my/add_dream',
+                    url: config.server + 'api/dream/store',
                     method: "post",
                     data: data
                 })

miaomiao/www/js/services/homeservice.js

@@ -20,9 +20,9 @@
                     method:"get",
                 })
             },
-            searchContent:function (data){
+            search:function (keyword){
                 return $http({
-                    url: config.server + 'api/index/search?' + data,
+                    url: config.server + 'api/index/search?keyword='+keyword,
                     method:"get"
                 })
             },
@@ -64,6 +64,14 @@
                     data:data
                 })
             },
+            add_comment: function (data) {
+                return $http({
+                    url: config.server + '/api/interaction/comment',
+                    method:"post",
+                    data:data
+                })
+            },
+            
         };
     }]);
 })(angular.module('app.services'));

miaomiao/www/js/services/myservice.js

@@ -8,13 +8,6 @@
                     data: { password: password }
                 })
             },
-            add:function (data){
-                return $http({
-                    url:config.server + 'api/my/add_dream',
-                    method:"post",
-                    data:data
-                })
-            },
             recharge:function(money){
                 return $http({
                     url:config.server + "api/my/recharge?coin="+money,

miaomiao/www/templates/add/index.html

@@ -10,7 +10,7 @@
             <div class="item">你想实现的梦想</div>
             <div class="item item-input-inset itemjs">
                 <label class="item-input-wrapper">
-                    <input type="text" ng-model="vm.dream">
+                    <input type="text" ng-model="vm.name">
                 </label>
             </div>
             <div class="item">我的梦想介绍</div>
@@ -20,7 +20,6 @@
             <div class="item">上传图片和视频，让别人更好的了解你</div>
             <div class="item itemjs">
                 <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
-                {{item}}
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                 }
                 </a>
@@ -33,7 +32,7 @@
             <div class="item item-input-inset itemjs">
                 <label class="item-input-wrapper">
                     ￥
-                    <input type="text" ng-model="vm.money">
+                    <input type="text" ng-model="vm.coin">
                 </label>
             </div>
         </div>

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

@@ -119,7 +119,7 @@
                                 <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
                             </div>
                              <div class="item item-input">
-                                 <input name="comment" type="text" focus-me="input.focus"   placeholder="{{input.placeholder}}" ng-model="vm.comment"  style="padding: 0 20px;">
+                                 <input name="comment" type="text" focus-me="input.focus" placeholder="{{input.placeholder}}" ng-model="vm.comment" ng-blur="submitComment(interaction.id)" style="padding: 0 20px;">
                              </div>
                         </div>
                     </div>

miaomiao/www/templates/home/search.html

@@ -2,90 +2,50 @@
     <ion-nav-buttons side="primary">
         <lable class="item item-input" style="width:315px">
             <i class="icon ion-search placeholder-icon" ng-click="searchContent()"></i>
-            <input type="text" style="width: 100%" placeholder="搜索内容" ng-change="keyChange()" ng-model="vm.keywords">
+            <input type="text" style="width: 100%" placeholder="搜索内容" ng-change="search(vm.keyword)" ng-model="vm.keyword">
         </lable>
         <button class="button button-calm" style="width: 30%; padding: 0;" ng-click="$ionicGoBack()">取消</button>
     </ion-nav-buttons>
      <ion-content>
-         <div ng-if="vm.keywords.length==0&&ismore==false">
+         <div ng-if="!isResult">
              <div style="padding:10px;font-size:1.1rem">热门搜索</div>
              <div class="calm search-hot">
-                 <div class="box {{index==1?'keyword':''}}" ng-click="selectHot(1)">
-                     搞笑达人
-                 </div>
-                 <div class="box {{index==2?'keyword':''}}" ng-click="selectHot(2)">
-                     搞笑达人
-                 </div>
-                 <div class="box {{index==3?'keyword':''}}" ng-click="selectHot(3)">
-                     搞笑达人
-                 </div>
-                 <div class="box {{index==4?'keyword':''}}" ng-click="selectHot(4)">
-                     搞笑达人
-                 </div>
-                 <div class="box {{index==5?'keyword':''}}" ng-click="selectHot(5)">
-                     搞笑达人
-                 </div>
-                 <div class="box {{index==6?'keyword':''}}" ng-click="selectHot(6)">
-                     搞笑达人
+
+                 <div class="box {{keyword==key?'keyword':''}}" ng-click="search(key)" ng-repeat="(key, value) in hot_searches">
+                     {{key}}
                  </div>
+               
              </div>
              <div style="padding:10px;font-size:1.1rem;line-height:44px">历史搜索</div>
              <div class="list">
-                 <div class="item {{index1==1?'search-select':''}}" ng-click="selectHistory(1)">
-                     搞笑达人
-                     <i ng-if="index1==1" class="icon ion-close" style="float:right"></i>
-                 </div>
-                 <div class="item {{index1==2?'search-select':''}}" ng-click="selectHistory(2)">
-                     搞笑达人
-                     <i ng-if="index1==2" class="icon ion-close" style="float:right"></i>
-                 </div>
-                 <div class="item {{index1==3?'search-select':''}}" ng-click="selectHistory(3)">
-                     搞笑达人
-                     <i ng-if="index1==3" class="icon ion-close" style="float:right"></i>
-                 </div>
-                 <div class="item {{index1==4?'search-select':''}}" ng-click="selectHistory(4)">
-                     搞笑达人
-                     <i ng-if="index1==4" class="icon ion-close" style="float:right"></i>
-                 </div>
-                 <div class="item {{index1==5?'search-select':''}}" ng-click="selectHistory(5)">
-                     搞笑达人
-                     <i ng-if="index1==5" class="icon ion-close" style="float:right"></i>
-                 </div>
-                 <div class="item {{index1==6?'search-select':''}}" ng-click="selectHistory(6)">
-                     搞笑达人
-                     <i ng-if="index1==6" class="icon ion-close" style="float:right"></i>
+
+                <div class="item {{keyword==history_search.search?'search-select':''}}" ng-click="search(history_search.search)" ng-repeat="history_search in history_searches">
+                     {{history_search.search}}
                  </div>
+
              </div>
          </div>
-         <div ng-if="vm.keywords.length>0&&ismore==false">
+         <div ng-if="isResult&&index==0">
              <div class="list">
                  <div class="item item-divider">
                      用户
                  </div>
-                 <div class="item sarch-item">
-                     <img   src="../../img/demo/head1.jpg" />  
-                     <span style="padding:5px;">哈哈瞄瞄酱</span>
+                 <div class="item sarch-item" ng-repeat="user_info in user_infos" ng-if="$index<3">
+                     <img ng-src="{{user_info.avtar}}" />  
+                     <span style="padding:5px;">{{user_info.nickname}}</span>
                      <span class="level">Lv.3</span>
                  </div>
-                 <div class="item sarch-item">
-                     <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈瞄瞄酱</span>
-                     <span class="level">Lv.3</span>
-                 </div>
-                 <div class="item" style="text-align:center;color:#FF4B82;font-size:1.1rem;padding:10px;" ng-click="showMore()">更多>></div>
+                 <div class="item" style="text-align:center;color:#FF4B82;font-size:1.1rem;padding:10px;" ng-click="showMore(keyword,1)" ng-if="user_infos.length>=3">更多>></div>
                  <div class="item item-divider">
                      梦想
                  </div>
-                 <div class="item item-thumbnail-left">
-                     <img ng-src="img/demo/head2.jpg" />
-                     <h2>哈哈有人能带我去瑞典吗？</h2>
-                     <p style="white-space:normal">在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
-                 </div>
-                 <div class="item item-thumbnail-left">
-                     <img ng-src="img/demo/head2.jpg" />
-                     <h2>哈哈有人能带我去瑞典吗？</h2>
-                     <p style="white-space:normal">在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
+                 <div class="item item-thumbnail-left" ng-repeat="dream_info in dream_infos" ng-if="$index<3">
+                     <img ng-src="{{dream_info.img.pic}}" />
+                     <h2>{{dream_info.name}}</h2>
+                     <p style="white-space:normal">{{dream_info.about}}</p>
                  </div>
+                 <div class="item" style="text-align:center;color:#FF4B82;font-size:1.1rem;padding:10px;" ng-click="showMore(keyword,2)" ng-if="dream_infos.length>=3">更多>></div>
+                 
                  <div class="item item-divider">
                      标签
                  </div>
@@ -111,73 +71,36 @@
                  </div>
              </div>
          </div>
-         <div ng-if="ismore">
+         <div ng-if="index>0">
              <div class="tabs-striped tabs-top">
                  <div class="tabs" style="top:0">
-                     <a ng-class="type==1?'tab-item active':'tab-item'" ng-click="changeType(1)">
+                     <a ng-class="type==1?'tab-item active':'tab-item'" ng-click="showMore(vm.keyword,1)">
                          用户
                      </a>
-                     <a ng-class="type==2?'tab-item active':'tab-item'" ng-click="changeType(2)">
+                     <a ng-class="type==2?'tab-item active':'tab-item'" ng-click="showMore(vm.keyword,2)">
                         梦想
                      </a>
                  </div>
              </div>
-             <div ng-if="type==1" class="list more-userlist">
-                 <div class="item sarch-item">
-                     <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈瞄瞄酱</span>
+             <div ng-if="index==1" class="list more-userlist">
+                 <div class="item sarch-item" ng-repeat="user_info in user_infos">
+                     <img ng-src="{{user_info.avtar}}" />
+                     <span style="padding:5px;">{{user_info.nickname}}</span>
                      <span class="level">Lv.3</span>
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                 </div>
-                 <div class="item sarch-item">
-                     <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈瞄瞄酱</span>
-                     <span class="level">Lv.3</span>
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                 </div>
-                 <div class="item sarch-item">
-                     <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈瞄瞄酱</span>
-                     <span class="level">Lv.3</span>
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                     <img ng-src="img/王冠.png" class="imgitem" />
-                 </div>
-                 <div class="item sarch-item">
-                     <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈瞄瞄酱</span>
-                     <span class="level">Lv.3</span>
-                     <img ng-src="img/王冠.png" class="imgitem" />
+                     <img ng-src="img/king.png" class="imgitem" />
+                     <img ng-src="img/king.png" class="imgitem" />
+                     <img ng-src="img/king.png" class="imgitem" />
+                     <img ng-src="img/king.png" class="imgitem" />
+                     <img ng-src="img/king.png" class="imgitem" />
                  </div>
              </div>
-             <div ng-if="type==2" class="list more-userlist">
-                 <div class="item" style="padding:0">
+             <div ng-if="index==2" class="list more-userlist">
+                 <div class="item" style="padding:0" ng-repeat="dream_info in dream_infos">
                      <img class="reply-head" src="../../img/demo/head1.jpg"  style="margin:5px 15px" />
-                     <span style="position:relative;top:-25px;font-size:1.1rem;">有人能带我去瑞典吗？</span>
-                     <img style="display:block;width:100%" src="../../img/demo/pict.png" />
-                 </div> 
-                 <div class="item" style="padding:0">
-                     <img class="reply-head" src="../../img/demo/head1.jpg" style="margin:5px 15px" />
-                     <span style="position:relative;top:-25px;font-size:1.1rem;">有人能带我去瑞典吗？</span>
-                     <img style="display:block;width:100%" src="../../img/demo/pict.png" />
-                 </div> 
-                 <div class="item" style="padding:0">
-                     <img class="reply-head" src="../../img/demo/head1.jpg" style="margin:5px 15px" />
-                     <span style="position:relative;top:-25px;font-size:1.1rem;">有人能带我去瑞典吗？</span>
-                     <img style="display:block;width:100%" src="../../img/demo/pict.png" />
-                 </div> 
-                 <div class="item" style="padding:0">
-                     <img class="reply-head" src="../../img/demo/head1.jpg" style="margin:5px 15px" />
-                     <span style="position:relative;top:-25px;font-size:1.1rem;">有人能带我去瑞典吗？</span>
+                     <span style="position:relative;top:-25px;font-size:1.1rem;">{{ dream_info.name }}</span>
                      <img style="display:block;width:100%" src="../../img/demo/pict.png" />
                  </div> 
+                
              </div>
          </div>
     </ion-content>

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

@@ -148,7 +148,7 @@ class IndexController extends Controller
         $user_infos = UserInfoModel::where('nickname','like',$keyword)->get();
         $query = DreamInfoModel::where('end_time','<=',time())->where('name','like',$keyword)->
             orWhere('sign','like',$keyword);
-        $dream_infos =$query->with('img')->get();
+        $dream_infos =$query->with(['img','user'])->get();
         $signs  = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->get();
         if (empty($request->keyword)) {
 //            历史搜索

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

@@ -78,7 +78,7 @@ class InteractionController extends Controller
     //    评论互动
 
     /**
-     * @api {post} /api/interaction/comments 评论动态
+     * @api {post} /api/interaction/comment 评论动态
      * @apiDescription 评论动态
      * @apiGroup Interaction
      * @apiPermission Passport
@@ -103,7 +103,7 @@ class InteractionController extends Controller
      * }
      *
      */
-    public function comments(Request $request)
+    public function comment(Request $request)
     {
         $validator = \Validator::make($request->all(),
             [

server/routes/api.php

@@ -180,9 +180,9 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'interaction.store',
         'uses' => 'InteractionController@store',
     ]);
-    $api->post('interaction/comments', [
-        'as' => 'interaction.comments',
-        'uses' => 'InteractionController@comments',
+    $api->post('interaction/comment', [
+        'as' => 'interaction.comment',
+        'uses' => 'InteractionController@comment',
     ]);
     $api->post('interaction/reply', [
         'as' => 'interaction.reply',