Merge branch 'master' of http://git.9026.com/roobe/miao.git

miaomiao/www/js/config/router.js

@@ -97,7 +97,7 @@
                 views: {
                     'app-my': {
                         templateUrl: 'templates/home/supportDream.html',
-                        controller: 'supportDreamCtrl'
+                        controller: 'mySupportDreamCtrl'
                     }
                 }
             })

miaomiao/www/js/controllers/home.js

@@ -861,7 +861,7 @@
                 $scope.modal.remove();
             });
             $scope.toMessage = function(){
-                $state.go("app.message");
+                $state.go("app.my_message");
             }
         }]);
     app.controller('userDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"

miaomiao/www/js/controllers/my.js

@@ -159,16 +159,16 @@
                 $scope.toshare = true;
             };
             $scope.shareDream = function(){
-                $state.go("app.shareDream",{item:$scope.user});
+                $state.go("app.my_shareDream",{item:$scope.user});
             };
             $scope.toDetail = function (id) {
-                $state.go('app.home_dreamdetail',{id:id});
+                $state.go('app.my_dreamdetail',{id:id});
             };
             $scope.toOldDream = function(){
-                $state.go("app.oldDream");
+                $state.go("app.myOldDream");
             };
             $scope.toSupportDream = function(){
-                $state.go("app.supportDream");
+                $state.go("app.mySupportDream");
             };
             $scope.collectionDream = function(is_collection){
                 homeService.collectionDream(id,is_collection).then(function(result){
@@ -177,6 +177,18 @@
             };
         }]);
 
+    app.controller('mySupportDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
+        , function ($scope,homeService,$stateParams, $state, msg) {
+            $scope.toDetail = function(){
+                $state.go("app.attention_Detail")
+            }
+        }]);
+    app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
+        , function ($scope,homeService,$stateParams, $state, msg) {
+            $scope.toDetail = function(){
+                $state.go("app.attention_Detail")
+            }
+        }]);
     app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 

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

@@ -7,7 +7,7 @@
             <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
         </button>
     </ion-nav-buttons>
-    <div ng-if="type==1 && user.id == dream.user_id" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
+    <div ng-if="type==1 && user.id != dream.user_id" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
         <div class="row">
             <div class="col dreamButton">
                 <button ng-click="openSupport()" class="button button-outline button-calm" style="border: 1px solid #00C3DA">

miaomiao/www/templates/home/oldDream.html

@@ -1,12 +1,12 @@
 <ion-view view-title="瞄喵">
-    <ion-nav-buttons side="right">
+    <!--<ion-nav-buttons side="right">
         <button class="button button-clear homeIcon">
             <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
         </button>
         <button class="button button-clear button-small" style="padding-top: 3px;">
             <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
         </button>
-    </ion-nav-buttons>
+    </ion-nav-buttons>-->
     <ion-content>
         <div class="list">
             <div class="item reply-item" ng-click="toDetail(dream.id)">

miaomiao/www/templates/home/supportDream.html

@@ -1,12 +1,12 @@
 <ion-view view-title="瞄喵">
-    <ion-nav-buttons side="right">
+    <!--<ion-nav-buttons side="right">
         <button class="button button-clear homeIcon">
             <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
         </button>
         <button class="button button-clear button-small" style="padding-top: 3px;">
             <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
         </button>
-    </ion-nav-buttons>
+    </ion-nav-buttons>-->
     <ion-content>
 
         <div class="list">