add

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,83 +7,85 @@
   <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" /></widget>
+  <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"/>
+</widget>

miaomiao/www/js/config/router.js

@@ -21,6 +21,16 @@
                     }
                 }
             })
+            .state('app.my_dreamdetail', {
+                url: '/my/dreamdetail',
+                params:{id:null},
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/home/dream-detail.html',
+                        controller: 'dreamDetailCtrl'
+                    }
+                }
+            })
             .state('app.home_dreamdetail', {
                 url: '/home/dreamdetail',
                 params:{id:null},

miaomiao/www/js/controllers/add.js

@@ -15,7 +15,8 @@
             };
             
             $scope.addpict = function () {
-                common.chooseImage().then(function (img) {
+                $scope.imgs=new Array();
+                common.chooseImage().then(function (img) { 
                     common.uploadFiles(img,1).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = response.data.file;

miaomiao/www/js/controllers/home.js

@@ -17,7 +17,7 @@
                 $scope.type = type;
                 $scope.load(true);
             }
-            $scope.todetail = function (id) {
+            $scope.toDetail = function (id) {
                 $state.go('app.home_dreamdetail',id);
             };
             $scope.filter = {
@@ -147,6 +147,7 @@
             $scope.vm.comment='';
         }
         $scope.addpict = function () {
+            $scope.imgs=new Array();
             common.chooseImage().then(function (img) {
                 common.uploadFiles(img,1).then(function (result) {
                     var response = JSON.parse(result.response);

miaomiao/www/js/controllers/my.js

@@ -16,8 +16,6 @@
                 $timeout(function () {
                     $scope.vm.user.avatar = response.data.md5;
                 });
-            }, function (erro) {
-                msg.erro(JSON.stringify(erro));
             });
         };
         $scope.toprofile = function () {
@@ -27,36 +25,12 @@
             //我的设置
         $scope.setting = function(){
             myService.setting().then(function(result){
-
-            },function(error){
-
             });
         };
-
-            //我的收藏
-            $scope.collect = function(){
-                myService.collect().then(function(result){
-
-                },function(error){
-
-                });
-            };
-
-            //我的梦想
-            $scope.myDream = function(){
-                myService.myDream().then(function(result){
-
-                },function(error){
-
-                });
-            };
-
+ 
             //修改个人信息
             $scope.myMaterial = function(){
                 myService.myMaterial().then(function(result){
-
-                },function(error){
-
                 })
             }
         }]);
@@ -151,8 +125,7 @@
             //充值
             $scope.recharge = function(money){
                 myService.recharge(money).then(function(result){
-
-            $state.go('app.my');
+                  $state.go('app.my');
                 });
             }
 
@@ -183,14 +156,22 @@
     app.controller('dreamCtrl', ["$scope", "$state", "myService", "msg"
   , function ($scope, $state, myService, msg) {
       $scope.$on('$ionicView.beforeEnter', function () {
-
+            myService.myDream().then(function(result){
+              console.log(result.data.data);
+              $scope.dreams = result.data.data;
+            });
       });
+          $scope.toDetail = function (id) {
+              $state.go('app.my_dreamdetail',id);
+          };
 
   }]);
     app.controller('collectCtrl', ["$scope", "$state", "myService", "msg"
        , function ($scope, $state, myService, msg) {
       $scope.$on('$ionicView.beforeEnter', function () {
-
+          myService.collect().then(function(result){
+              console.log(result.data.data);
+          });
       });
        }]);
     app.controller('messageSysCtrl', ["$scope", "$state", "myService", "msg"

miaomiao/www/js/controllers/tabs.js

@@ -5,24 +5,11 @@
             $state.go(target);
         };
 
-        $scope.vm={
-
-        };
         $scope.myMes = function(){
-            myService.myMes().then(function(result){
-
-            },function(error){
-
-            });
             $scope.go("app.my")
         };
 
         $scope.myIndex = function(){
-            myService.myIndex().then(function(result){
-
-            },function(error){
-
-            });
             $scope.go("app.home")
         };
     }]);

miaomiao/www/templates/home/index.html

@@ -39,7 +39,7 @@
                 <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem"></i>
             </div>
             <div class="list">
-                <div class="item mainitem" ng-click="todetail(item.id)" ng-repeat="item in index.dreams">
+                <div class="item mainitem" ng-click="toDetail(item.id)" ng-repeat="item in index.dreams">
                     <div class="row">
                         <div class="col">
                             <img ng-src="{{item.dream_user.pic}}" />

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

@@ -3,7 +3,7 @@
         <div class="list list-inset collect-search">
             <div class="item item-input">
                 <i class="icon ion-search placeholder-icon"></i>
-                <input type="text" placeholder="Search">
+                <input type="text" placeholder="搜索" ng-model="vm.keyword">
             </div>
         </div>
         <div class="subcontent">

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

@@ -1,54 +1,19 @@
 <ion-view view-title="我的梦想">
     <ion-content>
        <div class="list">
-           <div class="item reply-item">
+           <div class="item reply-item" ng-repeat="dream in dreams" ng-click="toDetail(dream.id)">
                <div class="item item-thumbnail-left reply-content">
-                   <img ng-src="img/demo/head7.jpg" />
-                   <h2>有人能带我去瑞典吗？</h2>
-                   <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
+                   <img ng-src="{{dream.dream_pic}}" />
+                   <h2>{{dream.dream}}</h2>
+                   <p>{{dream.about}}</p>
                </div>
                <div class="reply-bar">
-                   <div style="width: 30%;">
+                   <div style="width: {{dream.progress}}%;">
                    </div>
                </div>
-               <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
-           </div>
-           <div class="item reply-item">
-               <div class="item item-thumbnail-left reply-content">
-                   <img ng-src="img/demo/head7.jpg" />
-                   <h2>有人能带我去瑞典吗？</h2>
-                   <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
-               </div>
-               <div class="reply-bar">
-                   <div style="width: 30%;">
-                   </div>
-               </div>
-               <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
-           </div>
-           <div class="item reply-item">
-               <div class="item item-thumbnail-left reply-content">
-                   <img ng-src="img/demo/head7.jpg" />
-                   <h2>有人能带我去瑞典吗？</h2>
-                   <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
-               </div>
-               <div class="reply-bar">
-                   <div style="width: 30%;">
-                   </div>
-               </div>
-               <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
-           </div>
-           <div class="item reply-item">
-               <div class="item item-thumbnail-left reply-content">
-                   <img ng-src="img/demo/head7.jpg" />
-                   <h2>有人能带我去瑞典吗？</h2>
-                   <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
-               </div>
-               <div class="reply-bar">
-                   <div style="width: 30%;">
-                   </div>
-               </div>
-               <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
+               <div class="reply-sx"><span class="calm">{{dream.progress}}%</span> 目前实现</div>
            </div>
+           
        </div>
     </ion-content>
 </ion-view>

miaomiao/www/templates/tabs.html

@@ -1,11 +1,11 @@
 <ion-tabs class="tabs-icon-top tabs-color-active-calm">
-    <ion-tab title="首页" icon-off="ion-ios-home-outline" icon-on="ion-ios-home" ng-click="myIndex()">
+    <ion-tab title="首页" icon-off="ion-ios-home-outline" icon-on="ion-ios-home" ng-click="go('app.home')">
         <ion-nav-view name="app-home"></ion-nav-view>
     </ion-tab>
     <ion-tab class="tab-item-add" icon="ion-ios-plus"  ui-sref="app.add" >
         <ion-nav-view name="app-add"></ion-nav-view>
     </ion-tab>
-    <ion-tab title="我的" icon-off="ion-ios-person-outline" icon-on="ion-ios-person" ng-click="myMes()">
+    <ion-tab title="我的" icon-off="ion-ios-person-outline" icon-on="ion-ios-person" ng-click="go('app.my')">
         <ion-nav-view name="app-my"></ion-nav-view>
     </ion-tab>
 </ion-tabs>

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

@@ -395,7 +395,7 @@ class MyController extends Controller
             $dream->progress = $dream->money == 0 ? 0 :  floor($dream->get_money/$dream->money);
         }
 
-        return $this->api(compact('dreams'));
+        return $this->api($dreams);
     }
 
     /**