Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/config.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.ionicframework.ionictabs121641" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>瞄瞄</name>
   <description>
@@ -7,87 +7,87 @@
   <author email="you@example.com" href="http://example.com.com/">
       Your Name Here
     </author>
-  <content src="index.html" />
-  <access origin="*" />
-  <preference name="webviewbounce" value="false" />
-  <preference name="UIWebViewBounce" value="false" />
-  <preference name="DisallowOverscroll" value="true" />
-  <preference name="android-minSdkVersion" value="16" />
-  <preference name="BackupWebStorage" value="none" />
-  <preference name="KeepRunning" value="True" />
-  <preference name="ShowTitle" value="True" />
-  <preference name="InAppBrowserStorageEnabled" value="True" />
-  <preference name="SuppressesIncrementalRendering" value="True" />
-  <preference name="windows-target-version" value="10.0" />
-  <preference name="SplashScreen" value="screen" />
-  <preference name="SplashScreenDelay" value="3000" />
+  <content src="index.html"/>
+  <access origin="*"/>
+  <preference name="webviewbounce" value="false"/>
+  <preference name="UIWebViewBounce" value="false"/>
+  <preference name="DisallowOverscroll" value="true"/>
+  <preference name="android-minSdkVersion" value="16"/>
+  <preference name="BackupWebStorage" value="none"/>
+  <preference name="KeepRunning" value="True"/>
+  <preference name="ShowTitle" value="True"/>
+  <preference name="InAppBrowserStorageEnabled" value="True"/>
+  <preference name="SuppressesIncrementalRendering" value="True"/>
+  <preference name="windows-target-version" value="10.0"/>
+  <preference name="SplashScreen" value="screen"/>
+  <preference name="SplashScreenDelay" value="3000"/>
   <feature name="StatusBar">
-    <param name="ios-package" onload="true" value="CDVStatusBar" />
+    <param name="ios-package" onload="true" value="CDVStatusBar"/>
   </feature>
   <platform name="ios">
-    <icon height="57" src="resources/ios/icon/icon.png" width="57" />
-    <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
-    <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
-    <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
-    <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
-    <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
-    <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
-    <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
-    <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
-    <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
-    <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
-    <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
-    <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
-    <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
-    <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
-    <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
-    <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
-    <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
-    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
-    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
-    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
-    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
-    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
-    <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
-    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
-    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
-    <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
-    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
-    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
-    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
+    <icon height="57" src="resources/ios/icon/icon.png" width="57"/>
+    <icon height="114" src="resources/ios/icon/icon@2x.png" width="114"/>
+    <icon height="40" src="resources/ios/icon/icon-40.png" width="40"/>
+    <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80"/>
+    <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120"/>
+    <icon height="50" src="resources/ios/icon/icon-50.png" width="50"/>
+    <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100"/>
+    <icon height="60" src="resources/ios/icon/icon-60.png" width="60"/>
+    <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120"/>
+    <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180"/>
+    <icon height="72" src="resources/ios/icon/icon-72.png" width="72"/>
+    <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144"/>
+    <icon height="76" src="resources/ios/icon/icon-76.png" width="76"/>
+    <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152"/>
+    <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167"/>
+    <icon height="29" src="resources/ios/icon/icon-small.png" width="29"/>
+    <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58"/>
+    <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87"/>
+    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640"/>
+    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750"/>
+    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242"/>
+    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208"/>
+    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048"/>
+    <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732"/>
+    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024"/>
+    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536"/>
+    <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048"/>
+    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768"/>
+    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640"/>
+    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320"/>
   </platform>
   <platform name="android">
-    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi" />
-    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi" />
-    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi" />
-    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi" />
-    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi" />
-    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi" />
-    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi" />
-    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi" />
-    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi" />
-    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi" />
-    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi" />
-    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi" />
-    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi" />
-    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi" />
-    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi" />
-    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi" />
-    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi" />
-    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi" />
+    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
+    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
+    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
+    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
+    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
+    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
+    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
+    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
+    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
+    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
+    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
+    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
+    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
+    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
+    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
+    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
+    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
+    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
   </platform>
-  <plugin name="cordova-plugin-device" spec="~1.1.1" />
-  <plugin name="cordova-plugin-console" spec="~1.0.2" />
-  <plugin name="cordova-plugin-whitelist" spec="~1.2.1" />
-  <plugin name="cordova-plugin-statusbar" spec="~2.1.0" />
-  <plugin name="ionic-plugin-keyboard" spec="~1.0.9" />
-  <plugin name="cordova-plugin-file-transfer" version="1.6.2" />
-  <plugin name="cordova-plugin-file" version="4.3.2" />
-  <plugin name="cordova-plugin-camera" version="2.4.0" />
-  <plugin name="cordova-plugin-actionsheet" version="2.3.3" />
-  <plugin name="cordova-plugin-media-capture" version="1.4.3" />
-  <plugin name="cordova-plugin-compat" version="1.1.0" />
-  <plugin name="cordova-plugin-splashscreen" version="4.0.3" />
+  <plugin name="cordova-plugin-device" spec="~1.1.1"/>
+  <plugin name="cordova-plugin-console" spec="~1.0.2"/>
+  <plugin name="cordova-plugin-whitelist" spec="~1.2.1"/>
+  <plugin name="cordova-plugin-statusbar" spec="~2.1.0"/>
+  <plugin name="ionic-plugin-keyboard" spec="~1.0.9"/>
+  <plugin name="cordova-plugin-file-transfer" version="1.6.2"/>
+  <plugin name="cordova-plugin-file" version="4.3.2"/>
+  <plugin name="cordova-plugin-camera" version="2.4.0"/>
+  <plugin name="cordova-plugin-actionsheet" version="2.3.3"/>
+  <plugin name="cordova-plugin-media-capture" version="1.4.3"/>
+  <plugin name="cordova-plugin-compat" version="1.1.0"/>
+  <plugin name="cordova-plugin-splashscreen" version="4.0.3"/>
   <chcp>
     <config-file url="http://i.9026.com/miaomiao/chcp.json"/>
   </chcp>

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

@@ -64,57 +64,59 @@
     app.controller('dreamDetailCtrl', ["$scope", "$state", "msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
         , function ($scope, $state, msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
             var id = $stateParams.id;
-            // id=6;
+            id=5;
             $scope.load = function (id) {
+                msg.loading();
                 homeService.dreamDetail(id).then(function (result) {
+                    msg.hide();
                     console.log(result);
-                    $scope.dream = result.data.data.dream
+                    $scope.dream = result.data.data
                     console.log();
-                    leftTimer($scope.dream.time- 1);
-                    $scope.number = result.data.data.number
+                    var date = new Date();
+                    var inter = (date.getTime() - new Date($scope.dream.created_at).getTime())/1000
+                    leftTimer($scope.dream.time-inter);
+                    $scope.multi = {
+                        a: $scope.dream.a,
+                        b: new Date($scope.dream.created_at),
+                        c: $scope.dream.c,
+                        result: 1,
+                        promise:null,
+                    }
+                    $scope.calcmultiplier();
                 }, function (error) {
-                    msg.error(error.data.message);
+                    msg.hide();
                 });
             }
-            $scope.load(id);
 
             $scope.type = 1;//tab切换
             $scope.tosupport = false;
-            $scope.support = function ($event) {
+            $scope.support = function ($event) { 
                 $event.stopPropagation();
-                //测试动画切换
-                $scope.sort.first = 'img/demo/head7.jpg';
-                $scope.sort.second = 'img/demo/head6.jpg';
-                $scope.sort.third = 'img/demo/head5.jpg';
-                $scope.sort.slide1 = 'list-grow-animation';
-                $scope.sort.slide2 = 'slide-in-both-ways';
-                $scope.sort.slide3 = 'bounce-animation';
-                $interval.cancel($scope.multi.promise);
-                return;
                 $scope.tosupport = true;
                 $scope.vm.coin = 0;
                 $scope.index = 0;
             }
-            $scope.cancelsupport = function () {
+            $scope.cancelSupport = function () {
                 $scope.tosupport = false;
             }
-            $scope.changetype = function (type) {
+            $scope.changeType = function (type) {
                 $ionicScrollDelegate.scrollTop(true);
                 $scope.type = type;
             }
             $scope.index = 0;
             $scope.$on('$ionicView.beforeEnter', function () {
-                $scope.calcmultiplier();
+                $scope.load(id);
                 $ionicTabsDelegate.showBar(false);
             });
             $scope.$on('$ionicView.leave', function () {
                 $ionicTabsDelegate.showBar(true);
-                $interval.cancel($scope.multi.promise);
+                if($scope.multi.promise)$interval.cancel($scope.multi.promise);
+                if($scope.leftTimer)$interval.cancel($scope.leftTimer);
             });
 
             $scope.vm = {
                 coin:"",
-                comment:""
+                title:""
             }
             $scope.timer = '';
             var leftTimer = function (countDown) {
@@ -124,16 +126,16 @@
                 var s=parseInt(countDown%60); 
                 $scope.timer=(h<10?'0'+h:h)+'时'+(m<10?'0'+m:m)+'分'+(s<10?'0'+s:s)+'秒';
                 if(day>0) $scope.timer = day+'天'+ $scope.timer;
-
-                $timeout(function () {
-                if (countDown >= 1)
-                    leftTimer(countDown - 1);
-                }, 1000);
+                
+                if($scope.leftTimer)$interval.cancel($scope.leftTimer);
+                $scope.leftTimer = $interval(function () {
+                    if (countDown >= 1) leftTimer(countDown - 1);
+                },1000);
                 if(countDown<=0){
                   $scope.timer='结束'; 
                 }
             }
-            $scope.changeindex = function (index) {
+            $scope.changeIndex = function (index) {
                 $scope.index = index;
                 $scope.vm.coin = index*5;
             }
@@ -144,13 +146,6 @@
                 third: 'img/demo/head7.jpg',
                 slide: ''
             }
-            $scope.multi = {
-                a: 0.5,
-                b:new Date('2017-03-03'),
-                c: 20,
-                result: 0,
-                promise:null,
-            }
             $scope.vidEnded = function () {
                 alert('播放完毕');
             }
@@ -164,12 +159,11 @@
                     if (number<=1) {
                         number = 1;
                     }
-                    $scope.multi.result = number;
+                    $scope.multi.result = Math.round(number * 100) / 100;
                 },1000);
                 //  点击支持取消   $interval.cancel($scope.multi.promise); 获取数据后重新开始执行
             }
             $scope.supportDream = function (data) {
-                
                 if(!$scope.vm.coin){
                     msg.error("请选择梦想币数量！");
                     return ;
@@ -181,14 +175,35 @@
 
                 homeService.supportDream(data).then(function(result){
                     $scope.tosupport = false;
-                    number = result.data.data;
-                    //最新支持乘数
+
+                    $scope.load(id);
+                    //
+                    //测试动画切换
+                    $scope.sort.first = 'img/demo/head7.jpg';
+                    $scope.sort.second = 'img/demo/head6.jpg';
+                    $scope.sort.third = 'img/demo/head5.jpg';
+                    $scope.sort.slide1 = 'list-grow-animation';
+                    $scope.sort.slide2 = 'slide-in-both-ways';
+                    $scope.sort.slide3 = 'bounce-animation';
+                    $interval.cancel($scope.multi.promise);
                 })
             };
 
-            $scope.collectionDream = function(){
-                homeService.collectionDream(id).then(function(result){
-                    //最新支持乘数
+            $scope.collectionDream = function(is_collection){
+                homeService.collectionDream(id,is_collection).then(function(result){
+                    $scope.dream.is_collection=result.data.data;
+                })
+            }
+
+             $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();
                 })
             }
 
@@ -210,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/js/services/homeservice.js

@@ -14,9 +14,9 @@
                     data:data
                 })
             },
-            collectionDream:function(id){
+            collectionDream:function(id,is_collection){
                 return $http({
-                    url:config.server + "api/dream/collection?id=" + id,
+                    url:config.server + "api/dream/collection?id=" + id+"&is_collection="+is_collection,
                     method:"get",
                 })
             },
@@ -57,6 +57,13 @@
                     method: "get"
                 })
             },
+            add_interaction: function (data) {
+                return $http({
+                    url: config.server + 'api/interaction/store',
+                    method:"post",
+                    data:data
+                })
+            },
         };
     }]);
 })(angular.module('app.services'));

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

@@ -3,17 +3,17 @@
         <button class="button button-clear icon ion-email-unread"></button>
         <!-- <button class="button button-clear icon ion-ios-compose-outline" style="padding-left:10px"></button> -->
     </ion-nav-buttons>
-    <ion-content style="background-color:#F3F3F3" ng-click="cancelsupport()">
+    <ion-content style="background-color:#F3F3F3" ng-click="cancelSupport()">
      
         <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="changeType(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="changeType(2)">
                     互动
                 </a>
-                <a ng-class="type==3?'tab-item active':'tab-item'" ng-click="changetype(3)">
+                <a ng-class="type==3?'tab-item active':'tab-item'" ng-click="changeType(3)">
                     排行榜
                 </a>
             </div>
@@ -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" >
@@ -51,7 +51,7 @@
                 </div>
                 <div class="item" style="padding:0">
                     <div class="reply-bar">
-                        <div style="width: 30%;">
+                        <div style="width: {{100*dream.get_coin/dream.coin}}%;">
                         </div>
                     </div>
                     <div class="row" >
@@ -73,7 +73,8 @@
                 <div class="item">
                     <button class="button button-assertive" style="width:25%;white-space:normal;line-height:20px">支持乘数×{{multi.result}}</button>
                     <button class="button button-calm" style="width:50%" ng-click="support($event)">支持</button>
-                    <button class="button button-outline button-calm" style="width:25%" ng-click="collectionDream()">＋收藏</button>
+                    <button class="button button-outline button-calm" style="width:25%" ng-click="collectionDream(1)" ng-if="dream.is_collection==0">＋收藏</button>
+                    <button class="button button-outline" style="width:25%" ng-if="dream.is_collection==1" ng-click="collectionDream(0)">取消收藏</button>
                 </div>
             </div>
        
@@ -87,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>
@@ -243,7 +157,7 @@
           <div class="addcontent list">
             <div class="item">我的梦想互动信息</div>
             <div class="item itemjs">
-                <textarea rows="4" cols="50" placeholder="添加梦想互动信息" ng-model="ivm.content" style="border: 1px solid #FF4B82;padding: 10px;width: 98%;"></textarea>
+                <textarea rows="4" cols="50" placeholder="添加梦想互动信息" ng-model="vm.title" style="border: 1px solid #FF4B82;padding: 10px;width: 98%;"></textarea>
             </div>
             <div class="item">上传图片，让别人更好的了解你的梦想</div>
             <div class="item itemjs">
@@ -303,29 +217,29 @@
     <div class="detail-like" ng-if="tosupport">
         <div>
             <div class="row">
-                <div class="col box {{index==1?'selected':''}}" ng-click="changeindex(1)" ng-model="coin">
+                <div class="col box {{index==1?'selected':''}}" ng-click="changeIndex(1)" ng-model="coin">
                     <h2 class="calm">5个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
-                <div class="col box {{index==2?'selected':''}}" ng-click="changeindex(2)" ng-model="coin">
+                <div class="col box {{index==2?'selected':''}}" ng-click="changeIndex(2)" ng-model="coin">
                     <h2 class="calm">10个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
-                <div class="col box {{index==3?'selected':''}}" ng-click="changeindex(3)" ng-model="coin">
+                <div class="col box {{index==3?'selected':''}}" ng-click="changeIndex(3)" ng-model="coin">
                     <h2 class="calm">15个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
             </div>
             <div class="row">
-                <div class="col box {{index==4?'selected':''}}" ng-click="changeindex(4)" ng-model="coin">
+                <div class="col box {{index==4?'selected':''}}" ng-click="changeIndex(4)" ng-model="coin">
                     <h2 class="calm">20个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
-                <div class="col box {{index==5?'selected':''}}" ng-click="changeindex(5)" ng-model="coin">
+                <div class="col box {{index==5?'selected':''}}" ng-click="changeIndex(5)" ng-model="coin">
                     <h2 class="calm">25个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
-                <div class="col box {{index==6?'selected':''}}" ng-click="changeindex(6)" ng-model="coin">
+                <div class="col box {{index==6?'selected':''}}" ng-click="changeIndex(6)" ng-model="coin">
                     <h2 class="calm">30个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i> 虚拟币</p>
                 </div>
@@ -333,7 +247,7 @@
             
         </div>
         <div class="send">
-            <span>余额：<i class="calm">20000</i> 梦想币</span> 
+            <span>余额：<i class="calm">{{dream.user.coin}}</i> 梦想币</span> 
             <span class="calm" ng-click="openRechargeModal()"><i class="icon ion-card"></i>充值</span>
             <span style="height:100%;float: right;">
             <a style="border-radius:0;width:80px;font-size:1.2em;" class="button button-calm"  ng-click="supportDream()">发送</a>

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

@@ -23,7 +23,7 @@ class DreamController extends Controller
      * @apiGroup Dream
      * @apiPermission Passport
      * @apiVersion 0.1.0
-     * @apiParam {int} type home interaction paihang  默认home
+     * @apiParam {int} type home interaction paihang  默认all
      * @apiParam {int} id 梦想ID
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
@@ -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,24 +148,28 @@ class DreamController extends Controller
                 }
             }
         }
-        if ($type == 'interaction') return $this->api(compact('interactios'));
+        if ($type == 'interaction') return $this->api($interactions);
 //            梦想  图片  支持者前三    支持乘数参数    用户余额   梦想分数
 
 //            $money = $user->money;
         $dream_info = DreamInfoModel::find($id);
-        $setting = BaseSettingsModel::where('category','score')->select('key','value')->first()->moey;
-        $a = count($setting) > 0 ? $setting->key : '';
+        $setting = BaseSettingsModel::where('category','score')->select('key','value')->first();
+        $a = count($setting) > 0 ? $setting->key : 0;
         $created_at = $dream_info ? $dream_info->created_at : 0;
         $b =  intval((time()-strtotime($created_at))/60) ;
-        $c = count($setting) > 0 ? $setting->value : '';
+        $c = count($setting) > 0 ? $setting->value : 0;
         //Todo 支持乘数目公式
         $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->interactions = $interactions;
         $dream->number = $number;
         $dream->is_collection = $is_collection;
-        return $this->api(compact('dream'));
+        $dream->a = $a;
+        $dream->c = $c;
+        return $this->api($dream);
     }
 
     /**
@@ -183,7 +187,6 @@ class DreamController extends Controller
         "status_code": 0,
         "message": "",
         "data": {
-            "dream": {
                 "id": 12,
                 "user_id": 2,
                 "name": "用户2梦想标题166",
@@ -226,8 +229,6 @@ class DreamController extends Controller
                         "score": 5062
                     }
                 ]
-            },
-            "user_coin": 596,
             "number": 4.8
             "is_collection" : 1              1已收藏   0未收藏
 
@@ -336,7 +337,7 @@ class DreamController extends Controller
             $dream->top3user = $top3user;
             $dream->is_collection = $is_collection;
             $user_coin = $user->coin;
-            return $this->api(compact('dream','user_coin','number'));
+            return $this->api(compact('dream','user_coin'));
         }
     }
 
@@ -385,10 +386,14 @@ class DreamController extends Controller
         if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
 
         $user = $this->getUser();
+        if(!$dream = DreamInfoModel::find($request->id)){
+            $this->error(ErrorCode::CLIENT_WRONG_PARAMS);
+        }
+
         $data = [
             'user_id' =>$user->id,
             'dream_id' =>$request->id,
-            'dream_user_id' =>DreamInfoModel::find($request->id)->user_id,
+            'dream_user_id' =>$dream->user_id,
         ];
         $is_collection = $request->is_collection;
         $user_care_dream = UserCareDream::where('user_id',$user->id)->
@@ -401,7 +406,7 @@ class DreamController extends Controller
             UserCareDream::where('user_id',$user->id)->
             where('dream_id',$request->id)->delete();
         }
-        return $this->api(compact('is_collection'));
+        return $this->api($is_collection);
 
     }
 

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

@@ -3,8 +3,11 @@
 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;
+
 class InteractionController extends Controller
 {
     //    发布关于梦想的动态
@@ -15,7 +18,7 @@ class InteractionController extends Controller
      * @apiPermission Passport
      * @apiVersion 0.1.0
      * @apiParam {int} id                 梦想ID
-     * @apiParam {string} title           梦想标题
+     * @apiParam {string} title           互动标题
      * @apiParam {array} pics[]           图片数组
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
@@ -49,13 +52,14 @@ class InteractionController extends Controller
         );
 
         if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
+        $data = [];
         $pics = $request->pics;
         if (empty($pics) || !is_array($pics)) {
-            return $this->error(ErrorCode::ATTACHMENT_NOT_EXIST);
-        }
-        $data = [];
-        foreach ($pics as $k => $pic) {
-            $data['pic'.($k+1)] = $pic;
+//            return $this->error(ErrorCode::ATTACHMENT_NOT_EXIST);
+        }else{
+            foreach ($pics as $k => $pic) {
+                $data['pic'.($k+1)] = $pic;
+            }
         }
         $dream_id = $request->id;
         $title = $request->title;

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'));
     }
 
     /**