add

miaomiao/www/js/controllers/account.js

@@ -21,9 +21,13 @@
         }
         //获取验证码
         $scope.getVerifyCode = function () {
-            if (!util.isMobile($scope.vm.mobile)) {
-                msg.text('请输入正确的手机号');
-                return;
+            // if (!util.isMobile($scope.vm.mobile)) {
+            //     msg.text('请输入正确的手机号');
+            //     return;
+            // }
+            if ($scope.vm.waitSeconds!="获取验证码") {
+               msg.text('请稍后再试', true);
+               return;
             }
             $scope.vm.waitSeconds = "正在发送";
             userService.getVerifyCode($scope.vm.mobile).then(function (result) {

miaomiao/www/js/controllers/home.js

@@ -99,7 +99,7 @@
             $scope.cancelSupport = function () {
                 $scope.tosupport = false;
             }
-            $scope.changetype = function (type) {
+            $scope.changeType = function (type) {
                 $ionicScrollDelegate.scrollTop(true);
                 $scope.type = type;
             }
@@ -116,7 +116,7 @@
 
             $scope.vm = {
                 coin:"",
-                comment:""
+                title:""
             }
             $scope.timer = '';
             var leftTimer = function (countDown) {
@@ -135,7 +135,7 @@
                   $scope.timer='结束'; 
                 }
             }
-            $scope.changeindex = function (index) {
+            $scope.changeIndex = function (index) {
                 $scope.index = index;
                 $scope.vm.coin = index*5;
             }
@@ -195,6 +195,18 @@
                 })
             }
 
+             $scope.add = function(is_collection){
+                var data = {
+                    id:id,
+                    title:$scope.vm.title,
+                    // pics:$scope.vm.content,
+                };
+                homeService.add_interaction(data).then(function(){
+                    $scope.load(id);
+                    $scope.closeModal();
+                })
+            }
+
             $scope.showText = function(){ 
                 $scope.aboutStyle = {
                     "white-space" : "normal"
@@ -213,13 +225,13 @@
             //$event.stopPropagation();
             $scope.input.placeholder = "回复" + name;
             
-            $scope.vm.comment='';
+            $scope.vm.title='';
         }
         $scope.comment = function(){
           //  $event.stopPropagation();
             $scope.input.placeholder = "评论";
             $scope.input.focus = true;
-            $scope.vm.comment='';
+            $scope.vm.title='';
         }
         $scope.addpict = function () {
             $scope.imgs=new Array();

miaomiao/www/js/controllers/my.js

@@ -7,9 +7,6 @@
               $scope.user = result.data.data
             });
         });
-
-
-        
         $scope.setAvator = function () {
             common.setAvator().then(function (result) {
                 var response = JSON.parse(result.response);
@@ -18,14 +15,8 @@
                 });
             });
         };
-        $scope.toprofile = function () {
-            $state.go('app.my_profile');
-        };
-
-       
-  
-        }]);
 
+    }]);
     app.controller('profileCtrl', ["$scope", "$state","$filter", "storage", "myService", "msg", "common"
       , function ($scope, $state, $filter, storage, myService, msg, common) {
             $scope.setAvator = function () {
@@ -161,10 +152,14 @@
        , function ($scope, $state, myService, msg) {
       $scope.$on('$ionicView.beforeEnter', function () {
           myService.collect().then(function(result){
-              console.log(result.data.data);
+              $scope.dreams = result.data.data.dreams;
+              $scope.users = result.data.data.users;
           });
       });
-       }]);
+      $scope.toDetail = function (id) {
+          $state.go('app.my_dreamdetail',{id:id});
+      };
+    }]);
     app.controller('messageSysCtrl', ["$scope", "$state", "myService", "msg"
        , function ($scope, $state, myService, msg) {
            $scope.$on('$ionicView.beforeEnter', function () {

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

@@ -22,7 +22,7 @@
             <ion-slides slider="data.slider">
                 <ion-slide-page ng-if="dream.video">
                     <div class="box banner">
-                        <video ng-src="http://i.9026.com/miaomiao/video.mp4" height="300px" width="300px"  class="centerme" controls="controls" autoplay></video>
+                        <video ng-src="{{dream.video}}" height="300px" width="300px"  class="centerme" controls="controls" autoplay></video>
                     </div>
                 </ion-slide-page>
                 <ion-slide-page ng-repeat="img in dream.imgs" >
@@ -88,148 +88,61 @@
                         <i class="icon ion-plus"></i>
                         发布梦想互动</a>
                     </div>
-                    <div class="item" ng-click="comment()"> 
-                        <img class="head" src="../../img/demo/head2.jpg" />
-                        <span class="utitle">瞄瞄喵酱</span>
-                        <span class="utitle kz">剩余5天</span>
-                        <p class="subtile" style="white-space:normal">在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
+                    <div class="item" ng-click="comment()" ng-repeat="interaction in dream.interactions"> 
+                        <img class="head" src="{{dream.user.avatar}}" />
+                        <span class="utitle">{{dream.user.nickname}}</span>
+                        <span class="utitle kz">{{interaction.created_at}}</span>
+                        <p class="subtile" style="white-space:normal">{{interaction.title}}</p>
                         <div class="picts">
-                            <img class="slt" src="img/demo/pict.png" />
-                            <img class="slt" src="img/demo/pict.png" />
-                            <img class="slt" src="img/demo/pict.png" />
-                            <img class="slt" src="img/demo/pict.png" />
-                            <img class="slt" src="img/demo/pict.png" />
-                            <img class="slt" src="img/demo/pict.png" />
-                            <img class="slt" src="img/demo/pict.png" />
-                            <img class="slt" src="img/demo/pict.png" />
-                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="{{interaction.pic1}}" ng-if="interaction.pic1"/>
+                            <img class="slt" src="{{interaction.pic2}}" ng-if="interaction.pic2"/>
+                            <img class="slt" src="{{interaction.pic3}}" ng-if="interaction.pic3"/>
+                            <img class="slt" src="{{interaction.pic4}}" ng-if="interaction.pic4"/>
+                            <img class="slt" src="{{interaction.pic5}}" ng-if="interaction.pic5"/>
+                            <img class="slt" src="{{interaction.pic6}}" ng-if="interaction.pic6"/>
+                            <img class="slt" src="{{interaction.pic7}}" ng-if="interaction.pic7"/>
+                            <img class="slt" src="{{interaction.pic8}}" ng-if="interaction.pic8"/>
                         </div>
                     </div>
-                </div>
-                <div class="list" style="margin-top:-22px;" ng-click="showForm=true; focusInput=true">
-                    <div class="item subitem" ng-click="replay($event,'百川1')">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川1</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
-                    <div class="item subitem" ng-click="replay($event,'百川2')">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川2</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <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;">
-                     </div>
- 
-                </div>
-            </div>
-            <div style="border-bottom:5px solid #FAF2F5;">
-                <div class="list">
                     <div class="item">
-                        <img class="head" src="../../img/demo/head2.jpg" />
-                        <span class="utitle">瞄瞄喵酱</span>
-                        <span class="utitle kz">剩余5天</span>
-                        <p class="subtile" style="white-space:normal">在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
-                        <div class="picts">
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
+                        <div class="list" ng-click="showForm=true; focusInput=true">
+                            <div class="item subitem" ng-click="replay($event,'百川1')">
+                                <img ng-src="img/demo/head4.jpg" />
+                                <span>百川1</span>
+                                <span class="kz">2016-08-08 11:11</span>
+                                <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
+                            </div>
+                            <div class="item subitem" ng-click="replay($event,'百川2')">
+                                <img ng-src="img/demo/head4.jpg" />
+                                <span>百川2</span>
+                                <span class="kz">2016-08-08 11:11</span>
+                                <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;">
+                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="list" style="margin-top:-22px;">
-                    <div class="item subitem">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
-                    <div class="item subitem">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
-                    <div class="item subitem">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
+
+
+
                 </div>
             </div>
         </div>
         
         <div ng-if="type==3" class="phbcontent">
             <div class="list">
-                <div class="item">
-                    <img style="width:30px" src="../../img/king.png" />
-                    <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
-                    </span>
-                    <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
-                        <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
-                    </span>
-                </div>
-                <div class="item">
+                <div class="item" ng-repeat="user in dream.topuser">
                     <img style="width:30px" src="../../img/king.png" />
                     <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
+                        <img style="width:40px;border-radius:100%" src="{{user.avatar}}" />
+                        <span style="position:relative;top:-20px">{{user.nickname}}</span>
                     </span>
                     <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
+                        <span style="position:relative;top:-20px;font-weight:500">{{user.score}}</span>
                         <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
                     </span>
-                </div>
-                <div class="item">
-                    <img style="width:30px" src="../../img/king.png" />
-                    <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
-                    </span>
-                    <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
-                        <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
-                    </span>
-                </div>
-                <div class="item">
-                    <img style="width:30px" src="../../img/king.png" />
-                    <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
-                    </span>
-                    <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
-                        <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
-                    </span>
-                </div>
-                <div class="item">
-                    <img style="width:30px" src="../../img/king.png" />
-                    <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
-                    </span>
-                    <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
-                        <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
-                    </span>
-                </div>
+                </div> 
             </div>
             
         </div>

miaomiao/www/templates/home/index.html

@@ -26,14 +26,13 @@
             </div>
         </div>
         <div class="icontent">
-            <a ui-sref="app.my_dreamdetail">ttest</a>
             <ion-slides   options="data.sliderOptions" slider="data.sliderDelegate">
                 <ion-slide-page ng-repeat="banner in index.banners">
                     <div class="box banner"><img ng-src="{{banner.value}}" /></div>  
                 </ion-slide-page>
             </ion-slides>
              
-            <div class="item item-image" style="margin: 20px 0; border: none;">
+            <div class="item item-image" style="margin: 20px 0; border: none;" ng-if="index.users.length>0">
                 <!-- <i class="icon ion-ios-arrow-left" style="font-size: 1.5rem;"></i> -->
                 <span class="subcontent">
                     <img ng-src="{{user.user.avatar}}" ng-repeat="user in index.users"/>

miaomiao/www/templates/my/index.html

@@ -45,22 +45,22 @@
                 <i class="icon ion-email"></i>
                 <em class="fl">我的消息</em>
             </a>
-            <a class="item item-icon-left" ui-sref="app.my_profile" ng-click="myMaterial()">
+            <a class="item item-icon-left" ui-sref="app.my_profile">
                 <i class="icon ion-document"></i>
                 <em class="fl">我的资料</em>
           
             </a>
-            <a class="item item-icon-left" ui-sref="app.my_dream" ng-click="myDream()">
+            <a class="item item-icon-left" ui-sref="app.my_dream">
                 <i class="icon ion-ios-lightbulb-outline"></i>
                 <em class="fl">我的梦想</em>
              
             </a>
-            <a class="item item-icon-left" ui-sref="app.my_collect" ng-click="collect()">
+            <a class="item item-icon-left" ui-sref="app.my_collect">
                 <i class="icon ion-ios-star-outline"></i>
                 <em class="fl">我的收藏</em>
                
             </a>
-            <a class="item item-icon-left" ui-sref="app.my_setting" ng-click="setting()">
+            <a class="item item-icon-left" ui-sref="app.my_setting">
                 <i class="icon ion-ios-gear-outline"></i>
                 <em class="fl">设置</em>
             </a>

miaomiao/www/templates/my/my-collect.html

@@ -6,33 +6,20 @@
                 <input type="text" placeholder="搜索" ng-model="vm.keyword">
             </div>
         </div>
-        <div class="subcontent">
-            <i class="icon ion-ios-arrow-left"></i>
+        <div class="subcontent" ng-if="users.length>0">
+            <!-- <i class="icon ion-ios-arrow-left"></i> -->
             <span style="padding:15px">
-                <img ng-src="img/demo/head1.jpg" />
-                <img ng-src="img/demo/head2.jpg" />
-                <img ng-src="img/demo/head3.jpg" />
-                <img ng-src="img/demo/head4.jpg" />
-                <img ng-src="img/demo/head5.jpg" />
+                <div ng-repeat="user in users" ng-click="toUser()">
+                    <img src="{{user.avatar}}" />
+                </div>
             </span>
-            <i class="icon ion-ios-arrow-right"></i>
+            <!-- <i class="icon ion-ios-arrow-right"></i> -->
         </div>
         <div class="collect-main">
-            <div>
-                <img  src="../../img/demo/pict.png" />
-            </div>
-            <div>
-                <img ng-src="img/demo/pict.png" />
-            </div>
-            <div>
-                <img ng-src="img/demo/pict.png" />
-            </div>
-            <div>
-                <img ng-src="img/demo/pict.png" />
-            </div>
-            <div>
-                <img ng-src="img/demo/pict.png" />
+            <div ng-repeat="dream in dreams" ng-click="toDetail(dream.id)">
+                <img src="{{dream.img.pic}}" />
             </div>
+            
        
         </div>
     </ion-content>

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

@@ -73,7 +73,7 @@ class AuthController extends Controller
 //                'verify_code'      => 'required',
             ],
             [
-                'phone.required'        => '手机号码必填',
+                'phone.required'        => '请输入手机号码',
                 'phone.regex'           => '手机号码格式不正确',
 //                'verify_code.required'      => '短信验证码必填',
             ]

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

@@ -137,8 +137,8 @@ class DreamController extends Controller
             if(count($top3user) <= 2) $top3user[] = $user ;
         }
         if ($type == 'paihang') return $this->api($topuser);
-        $interactios = InteractionInfo::where('dream_id',$id)->orderBy('id','desc')->get();
-        foreach ($interactios as $item) {
+        $interactions = InteractionInfo::where('dream_id',$id)->orderBy('id','desc')->get();
+        foreach ($interactions as $item) {
             $item->comments;
             foreach ($item->comments as $comment) {
                 $comment->pic = UserInfoModel::find($comment->user_id)->pic;
@@ -148,7 +148,7 @@ class DreamController extends Controller
                 }
             }
         }
-        if ($type == 'interaction') return $this->api($interactios);
+        if ($type == 'interaction') return $this->api($interactions);
 //            梦想  图片  支持者前三    支持乘数参数    用户余额   梦想分数
 
 //            $money = $user->money;
@@ -162,8 +162,9 @@ class DreamController extends Controller
         $number =round( -$a * $b + $c,1);
         if ($number <= 1) $number = 1;
         $dream = DreamInfoModel::with(['imgs','user'])->find($id);
+        $dream->topuser = $topuser;
         $dream->top3user = $top3user;
-        $dream->interactios = $interactios;
+        $dream->interactions = $interactions;
         $dream->number = $number;
         $dream->is_collection = $is_collection;
         $dream->a = $a;

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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Models\CommentInfoModel;
 use App\Models\InteractionInfo;
+use App\Models\UserCareDream;
 use Illuminate\Http\Request;
 use App\Services\Base\ErrorCode;
 

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

@@ -366,9 +366,9 @@ class MyController extends Controller
     public function collection()
     {
         $user = $this->getUser();
-        $data = $user->collection;
+        $dreams = $user->collection;
         $users = [];
-        foreach ($data as $item) {
+        foreach ($dreams as $item) {
             if ($item->pivot->interaction_number > 0) {
                 $user_info = UserInfoModel::find($item->pivot->dream_user_id);
                 $avatar = $user_info ?  $user_info->avatar : '';
@@ -378,7 +378,7 @@ class MyController extends Controller
             }
            $item->img;
         }
-        return $this->api(compact('data','users'));
+        return $this->api(compact('dreams','users'));
     }
 
     /**