add

miaomiao/www/css/style.css

@@ -152,6 +152,7 @@ overflow:auto;
     }
 .mysecond {
     color:#9A9A9A;
+    margin-top:5px;
 }
 .mainitem .iheart {
     width: 1.5rem;

miaomiao/www/js/config/router.js

@@ -12,15 +12,15 @@
               templateUrl: "templates/tabs.html",
               controller: 'tabsCtrl'
           })
-        .state('app.home', {
-            url: '/home',
-            views: {
-                'app-home': {
-                    templateUrl: 'templates/home/index.html',
-                    controller: 'homeCtrl'
+            .state('app.home', {
+                url: '/home',
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/home/index.html',
+                        controller: 'homeCtrl'
+                    }
                 }
-            }
-        })
+            })
             .state('app.home_dreamdetail', {
                 url: '/home/dreamdetail',
                 views: {
@@ -30,6 +30,15 @@
                     }
                 }
             })
+            .state('app.home_interactionadd', {
+                url: '/home/interactionadd',
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/home/interaction-add.html',
+                        controller: 'interactionAddCtrl'
+                    }
+                }
+            })
             .state('app.home_search', {
                 url: '/home/search',
                 views: {

miaomiao/www/js/controllers/add.js

@@ -13,20 +13,6 @@
             $scope.closeModal = function () {
                 $scope.modal.hide();
             };
-            $scope.$on('$ionicView.beforeEnter', function () {
-                $scope.vm={
-                    dream:'',
-                    about:'',
-                    money:''
-                };
-                $scope.imgServer = config.imgServer;
-                $scope.imgs = [];
-                $scope.video = {
-                    isOK: false,
-                    path: '',
-                    server:''
-                };
-            });
             
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) {
@@ -80,10 +66,7 @@
                     msg.error(error.data.message);
                 });
             };
-            $scope.$on('$ionicView.beforeEnter', function (viewResult) {
-                $ionicTabsDelegate.showBar(false);
-                $ionicNavBarDelegate.showBackButton(true);
-            });
+            
             $scope.$on('$ionicView.leave', function () {
                 $ionicTabsDelegate.showBar(true);
             });

miaomiao/www/js/controllers/home.js

@@ -142,6 +142,38 @@
                 });
             };
         }]);
+    app.controller('interactionAddCtrl', ["$scope","homeService", "$state", "msg","config","common", "$ionicTabsDelegate", "$ionicNavBarDelegate"
+        , function ($scope,homeService, $state, msg,config,common, $ionicTabsDelegate, $ionicNavBarDelegate) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+                $ionicNavBarDelegate.showBackButton(false);
+                $scope.vm={
+                    dream:'',
+                    about:'',
+                    money:''
+                };
+                $scope.imgServer = config.imgServer;
+                $scope.imgs = [];
+            });
+
+            $scope.addpict = function () {
+                common.chooseImage().then(function (img) {
+                    common.uploadFiles(img,1).then(function (result) {
+                        var response = JSON.parse(result.response);
+                        var file = response.data.file;
+                        $scope.imgs.push(file);
+                    }, function (error) {
+                        msg.error('图片上传失败');
+                    });
+                }, function (error) {
+                    console.log('图片选择失败');
+                });
+            };
+
+            $scope.add = function () {
+            };
+
+    }]);
    
     
 })(angular.module('app.controllers'));

miaomiao/www/templates/add/index.html

@@ -43,23 +43,4 @@
             </button>
         </div>
     </ion-content>
-    <script id="my-modal.html" type="text/ng-template">
-        <ion-modal-view>
-            <ion-header-bar class="bar-calm">
-                <button class="button button-clear icon ion-ios-arrow-back" ng-click="closeModal()">返回</button>
-                <h1 class="title">梦想介绍</h1>
-                <button class="button button-clear" ng-click="closeModal()">确定</button>
-            </ion-header-bar>
-            <ion-content>
-                <div class="addmodal" style="border-bottom: 2px solid #EEEEEE">
-                    <textarea placeholder="请输入梦想介绍"></textarea>
-                </div>
-                <a ng-repeat="item in files" ng-click="showImages(item)" class="img-file-up">
-                    <b style="background-image:url({{item}});"><em ng-click="deletePicture(item)" class="ion-ios-close-outline"></em></b>
-                </a>
-                <a class="btn-file-up" ng-click="addfile()"><i class="ion-image"></i>添加图片</a>
-            </ion-content>
-        
-        </ion-modal-view>
-    </script>
 </ion-view>

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

@@ -87,9 +87,10 @@
             <div style="border-bottom:5px solid #FAF2F5;">
                 <div class="list">
                     <div class="item itemjs" style="padding: 10px">
-                        <a class="button button-outline button-block button-calm button-icon" ng-click="openModal()">
+                    <!-- 梦想发布者可以发布梦想互动 -->
+                        <a class="button button-outline button-block button-calm button-icon" ui-sref='app.home_interactionadd'>
                         <i class="icon ion-plus"></i>
-                        发布梦想动态</a>
+                        发布梦想互动</a>
                     </div>
                     <div class="item"> 
                         <img class="head" src="../../img/demo/head2.jpg" />

miaomiao/www/templates/home/index.html

@@ -46,10 +46,10 @@
                 <div class="item mainitem" ng-click="todetail()" ng-repeat="item in index.dreams">
                     <div class="row">
                         <div class="col">
-                            <img ng-src="{{item.dream_find_user.pic}}" />
+                            <img ng-src="{{item.dream_user.pic}}" />
                             <div  class="myblock">
-                               <div>{{item.dream_find_user.nickname}}<span class="calm">{{item.dream_find_user.birthday | getage}}岁</span></div>
-                                <div class="mysecond">{{item.dream_find_user.city}}></div>
+                               <div>{{item.dream_user.nickname}}<span class="calm">{{item.dream_user.birthday | getage}}岁</span></div>
+                                <div class="mysecond">{{item.dream_user.city}}></div>
                             </div>
                         </div>
                         <div class="col" style="text-align:right">
@@ -58,10 +58,10 @@
                                 <span class="calm">{{item.care_num}}</span>
                                 <span>人关注</span>
                             </div>
-                            <div class="mysecond">剩余{{item.time}}天</div>
+                            <div  class="mysecond">剩余{{item.time}}天</div>
                         </div>
                     </div>
-                        <img ng-src="{{item.dream_first_pic.pic}}" />
+                        <img ng-src="{{item.dream_imgs_first.pic}}" />
                     </div>
             </div>
         </div>

miaomiao/www/templates/home/interaction-add.html

@@ -0,0 +1,31 @@
+<ion-view view-title="发布梦想互动" >
+    <ion-nav-buttons side="left">
+        <button class="button button-clear icon ion-ios-arrow-back" ng-click="$ionicGoBack()">返回</button>
+    </ion-nav-buttons>
+    <ion-nav-buttons side="right">
+        <button class="button button-clear"  ng-click="doSomething()">
+           发布说明
+        </button>
+    </ion-nav-buttons>
+    <ion-content>
+        <div class="addcontent list">
+            <div class="item">我的梦想互动信息</div>
+            <div class="item itemjs">
+                <textarea rows="4" cols="50" placeholder="添加梦想互动信息" ng-model="vm.about" style="border: 1px solid #FF4B82;padding: 10px;width: 98%;"></textarea>
+            </div>
+            <div class="item">上传图片，让别人更好的了解你的梦想</div>
+            <div class="item itemjs">
+                <a ng-repeat="item in imgs" ng-click="showImages(imgServer+item)" class="img-file-up">
+                    <b style="background-image:url({{imgServer+item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
+                </a>
+                <a class="btn-file-up" ng-click="addpict()"><i class="ion-image"></i>添加图片</a>
+            </div>
+
+        </div>
+        <div class="padding">
+            <button type="submit"  class="button button-full button-calm" ng-click="add()">
+                发布梦想互动
+            </button>
+        </div>
+    </ion-content>
+</ion-view>