api

miaomiao/www/css/ionic.app.css

@@ -4478,7 +4478,8 @@ a.subdued {
   margin-top: -2px;
   border-style: solid;
   border-width: 2px 0 0 0;
-  border-color: #444; }
+  /*border-color: #444; */
+}
   .tabs-striped .tab-item.tab-item-active .badge, .tabs-striped .tab-item.active .badge, .tabs-striped .tab-item.activated .badge {
     top: 2px;
     opacity: 1; }

miaomiao/www/js/config/config.js

@@ -4,7 +4,7 @@
         // server: 'http://localhost:8092/',
         // imgServer: 'http://localhost:8092/api/attachment/download/'
         // server: 'http://q8.9026.com/',
-        // imgServer: 'http://q8.9026.com/attachment/',
+        // imgServer: 'http://q8.9026.com/attachment/'
         
         server: 'http://miao.beiyuesi.com/',
         imgServer: 'http://miao.beiyuesi.com/attachment/'

miaomiao/www/js/config/router.js

@@ -43,7 +43,11 @@
             })
             .state('app.home_userDetail', {
                 url: '/home/userDetail',
-                params:{id:null},
+                params:{
+                    id:null,
+                    dream_id:null,
+                    items:null
+                },
                 views: {
                     'app-home': {
                         templateUrl: 'templates/home/userDetail.html',
@@ -53,7 +57,11 @@
             })
             .state('app.attention_Detail', {
                 url: '/my/attention/userDetail',
-                params:{id:null},
+                params:{
+                    id:null,
+                    dream_id:null,
+                    items:null
+                },
                 views: {
                     'app-my': {
                         templateUrl: 'templates/home/userDetail.html',
@@ -77,7 +85,7 @@
                 views: {
                     'app-my': {
                         templateUrl: 'templates/home/oldDream.html',
-                        controller: 'oldDreamCtrl'
+                        controller: 'myOldDreamCtrl'
                     }
                 }
             })

miaomiao/www/js/controllers/home.js

@@ -37,8 +37,13 @@
         $scope.toDetail = function (id) {
             $state.go('app.home_dreamdetail',{id:id});
         };
-        $scope.toUserDetail = function (id) {
-            $state.go('app.home_userDetail',{id:id});
+        $scope.toUserDetail = function (id,dream_id) {
+            homeService.toUserDetail(id,dream_id).then(function(result){
+                $scope.items = result.data.data;
+                $state.go('app.home_userDetail',{id:id,dream_id:dream_id,items:$scope.items});
+            },function(error){
+                //msg.error(msg.data.error)
+            })
         };
         $scope.changeFilter = function (input) {
             switch (input) {
@@ -102,7 +107,7 @@
 
             }
               
-        }
+        };
         $scope.filter = {
             hasMore: false,
             pageIndex: 1,
@@ -861,25 +866,22 @@
                 $scope.modal.remove();
             });
             $scope.toMessage = function(){
-                $state.go("app.my_message");
+                $state.go("app.message");
             }
         }]);
     app.controller('userDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
         , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
             var id = $stateParams.id;
+            $scope.dream_id = $stateParams.dream_id;
+            $scope.items = $stateParams.items;
             $scope.$on('$ionicView.beforeEnter', function () {
                 $ionicTabsDelegate.showBar(false);
             });
-            $scope.load = function (id) {
-                msg.loading();
-                homeService.dreamDetail(id).then(function (result) {
-                    msg.hide();
-                    $scope.user = result.data.data;
-                }, function (error) {
-                    msg.hide();
-                });
+            $scope.attentionUser = function(id,is_care){
+                homeService.attentionUser(id,is_care).then(function(result){
+                    $scope.items.is_care=result.data.data;
+                })
             };
-            $scope.load(id);
 
             $scope.cancelSupport = function () {
                 $scope.tosupport = false;
@@ -894,8 +896,8 @@
             $scope.shareDream = function(){
                 $state.go("app.shareDream",{item:$scope.user});
             };
-            $scope.toDetail = function (id) {
-                $state.go('app.home_dreamdetail',{id:id});
+            $scope.toDetail = function (dream_id) {
+                $state.go('app.home_dreamdetail',{id:dream_id});
             };
             $scope.toOldDream = function(){
                 $state.go("app.oldDream");

miaomiao/www/js/controllers/my.js

@@ -126,27 +126,31 @@
         }]);
     app.controller('attentionCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
-            $scope.toDetail = function(){
-                $state.go("app.attention_Detail");
-            }
+            $scope.$on('$ionicView.beforeEnter', function () {
+                myService.attention().then(function(result){
+                    $scope.users = result.data.data;
+                },function(error){
+
+                })
+            });
+            $scope.toMyUserDetail = function (id) {
+                myService.toMyUserDetail(id).then(function(result){
+                    $scope.items = result.data.data;
+                    $state.go('app.attention_Detail',{id:id,items:$scope.items});
+                },function(error){
+                    //msg.error(msg.data.error)
+                })
+            };
+
         }]);
 
     app.controller('attention_DetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
         , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
             var id = $stateParams.id;
+            $scope. items = $stateParams.items;
             $scope.$on('$ionicView.beforeEnter', function () {
                 $ionicTabsDelegate.showBar(false);
             });
-            $scope.load = function (id) {
-                msg.loading();
-                homeService.dreamDetail(id).then(function (result) {
-                    msg.hide();
-                    $scope.user = result.data.data;
-                }, function (error) {
-                    msg.hide();
-                });
-            };
-            $scope.load(id);
 
             $scope.cancelSupport = function () {
                 $scope.tosupport = false;
@@ -183,7 +187,7 @@
                 $state.go("app.attention_Detail")
             }
         }]);
-    app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
+    app.controller('myOldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
             $scope.toDetail = function(){
                 $state.go("app.attention_Detail")

miaomiao/www/js/services/homeservice.js

@@ -77,6 +77,18 @@
                     method:"get"
                 })
             },
+            toUserDetail:function(id){
+                return $http({
+                    url:config.server + "api/user/show?user_id=" + id ,
+                    method:"get"
+                })
+            },
+            attentionUser:function(id,is_care){
+                return $http({
+                    url:config.server + "api/user/care?id=" + id+"&is_care="+is_care,
+                    method:"get"
+                })
+            }
         };
     }]);
 })(angular.module('app.services'));

miaomiao/www/js/services/myservice.js

@@ -81,6 +81,18 @@
                     method:"post",
                     data:data
                 })
+            },
+            attention:function(){
+                return $http({
+                    url:config.server + "api/my/care",
+                    method:"get"
+                })
+            },
+            toMyUserDetail:function(id){
+                return $http({
+                    url:config.server + "api/user/show?user_id=" + id ,
+                    method:"get"
+                })
             }
         };
     }]);

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

@@ -19,10 +19,10 @@
                 <button class="button button-calm" ng-click="support($event)">支持</button>
             </div>
             <div class="col dreamButton" ng-if="dream.is_collection==0">
-                <button class="button button-outline button-calm" style="border: 1px solid #00C3DA" ng-click="collectionDream(1)">＋关注</button>
+                <button class="button button-outline button-calm" style="border: 1px solid #00C3DA" ng-click="collectionDream(1)">＋收藏</button>
             </div>
             <div class="col dreamButton" ng-if="dream.is_collection==1">
-                <button class="button button-outline" style="background: #fff; border: 1px solid #A3A3A3"  ng-click="collectionDream(0)">已关注</button>
+                <button class="button button-outline" style="background: #fff; border: 1px solid #A3A3A3"  ng-click="collectionDream(0)">已收藏</button>
             </div>
         </div>
     </div>

miaomiao/www/templates/home/index.html

@@ -61,7 +61,7 @@
                                 <div class="row">
                                     <div class="col avatarCol">
                                         <div class="fl" style="width: 27%">
-                                            <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.id)" />
+                                            <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.user.id,item.id)" />
                                         </div>
                                         <div class="myblock">
                                             <div>{{item.user.nickname}}<span>{{item.user.birthday | getage}}岁</span></div>

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/userDetail.html

@@ -5,61 +5,61 @@
     <ion-content ng-click="cancelSupport()">
         <div class="user-box">
             <div class="myinfo">
-                <img ng-src="{{user.user.avatar | avator }}" />
+                <img ng-src="{{items.user.avatar | avator }}" />
                 <div>
-                    {{user.user.nickname}}
+                    {{items.user.nickname}}
                 </div>
-                <div style="font-size:0.7rem; margin-bottom: 10px"> {{user.user.city}}</div>
-                <div ng-if="user.is_collection==0">
-                    <span style="background: #fff; color: #00C3DA; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="collectionDream(1)">关注</span>
+                <div style="font-size:0.7rem; margin-bottom: 10px"> {{items.user.city}}</div>
+                <div ng-if="items.is_care==0">
+                    <span style="background: #fff; color: #00C3DA; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="attentionUser(1)">关注</span>
                 </div>
-                <div ng-if="user.is_collection==1">
-                    <span style="background: #fff; color: #B3B3B3; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="collectionDream(0)">已关注</span>
+                <div ng-if="items.is_care==1">
+                    <span style="background: #fff; color: #B3B3B3; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="attentionUser(0)">已关注</span>
                 </div>
             </div>
             <div class="row user-row">
                 <div class="col">
                     <div style="border-right: 1px solid #80E1ED">
-                        {{user.score}}<br>
+                        {{items.score}}<br>
                         收到的支持分
                     </div>
                 </div>
                 <div class="col">
                     <div style="border-right: 1px solid #80E1ED">
-                    {{user.score}}<br>
+                    {{items.user.care}}<br>
                     关注
                     </div>
                 </div>
                 <div class="col">
-                    {{user.score}}<br>
+                    {{items.user.fens}}<br>
                     粉丝
                 </div>
             </div>
         </div>
-        <div class="user-dz" style="text-align: left">
-            <img ng-repeat="item in user.imgs" style="width: 80px; height: 80px;margin: 0 10px 0 0" ng-src="{{item.pic}}">
+        <div class="user-dz" style="text-align: left; padding-left: 0; padding-right: 0">
+            <img ng-repeat="item in items.imgs" style="width: 75px; height: 75px;margin: 5px 0 10px 15px" ng-src="{{item.pic}}">
         </div>
-        <div class="list padding" style="font-size: 18px; color: #828282">
+        <div class="list padding" style="font-size: 18px; color: #828282;">
             <div class="row" style="padding: 20px 0; border-bottom: 1px solid #E6E6E6">
                 <div class="col">
-                    年龄：{{user.user.birthday | getage}}
+                    年龄：{{items.user.birthday | getage}}
                 </div>
                 <div class="col">
-                    身高：{{user.user.height}}cm
+                    身高：{{items.user.height}}cm
                 </div>
             </div>
             <div class="row" style="padding: 20px 0 0 0">
                 <div class="col">
-                    情感：{{user.user.emotion}}
+                    情感：{{items.user.emotion}}
                 </div>
                 <div class="col">
-                    职业：{{user.user.work}}
+                    职业：{{items.user.work}}
                 </div>
             </div>
         </div>
-        <div class="user-dz"></div>
+        <div style="border-bottom:10px solid #F2F2F2;"></div>
         <div class="list list-user-set list-set-arrow" style="color: #818181;">
-            <a class="item" ng-click="toDetail(user.id)">
+            <a class="item" ng-click="toDetail(dream_id)">
                 <em class="fl">当前梦想</em>
             </a>
             <a class="item" ng-click="toOldDream()">

miaomiao/www/templates/my/attention.html

@@ -2,37 +2,14 @@
     <ion-content>
         <div class="list padding">
             <div class="item reply-item" >
-                <div class="item" style="height:90px; border-bottom: 1px solid #EFEFEF" ng-click="toDetail(dream.id)">
+                <div ng-repeat="user in users" class="item" style="height:90px; border-bottom: 1px solid #EFEFEF" ng-click="toMyUserDetail(user.id)">
                     <div style="float:left;">
-                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avatar }}" />-->
-                        <img style="width: 45px; height: 45px;border-radius: 100%;"  />
+                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{ user.avatar | avator }}" />
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>瞄喵</h2>
-                        <p>成都市</p>
-                        <p>个性签名</p>
-                    </div>
-                </div>
-                <div class="item" style="height:90px; border-bottom: 1px solid #EFEFEF" ng-click="toDetail(dream.id)">
-                    <div style="float:left;">
-                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avatar }}" />-->
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" />
-                    </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>瞄喵</h2>
-                        <p>成都市</p>
-                        <p>个性签名</p>
-                    </div>
-                </div>
-                <div class="item" style="height:90px; border-bottom: 1px solid #EFEFEF" ng-click="toDetail(dream.id)">
-                    <div style="float:left;">
-                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avatar }}" />-->
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" />
-                    </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>瞄喵</h2>
-                        <p>成都市</p>
-                        <p>个性签名</p>
+                        <h2> {{user.nickname}} </h2>
+                        <p> {{user.city}} </p>
+                        <p> {{user.signture}} </p>
                     </div>
                 </div>
             </div>