add

miaomiao/www/css/style.css

@@ -486,6 +486,7 @@ a:visited,a:link{
 .detail-like .box {
     border:2px solid  #EAEAEA;
     background: #fff;
+    min-height: 55px;
     padding: 5px 2%;
     margin:2%;
     border-radius: 20px;
@@ -614,10 +615,21 @@ a:visited,a:link{
     height: 13%;
 }
 .top2{
-    margin-top: 15px; text-align: center; float:left; height: 100px; width: 100px;color: #6B6B6B;font-size: 16px;
+    margin-top: 13.5px;
+    text-align: center;
+    float:left;
+    height: 97px;
+    width: 97px;
+    color: #6B6B6B;
+    font-size: 14px;
 }
 .top1{
-    text-align: center; float:left; height: 111px; width: 111px;color: #6B6B6B;font-size: 14px;
+    text-align: center;
+    float:left;
+    height: 111px;
+    width: 111px;
+    color: #6B6B6B;
+    font-size: 14px;
 }
 .dreamButton{
     /*border: 1px solid red;*/
@@ -643,6 +655,7 @@ a:visited,a:link{
     padding:3px;
     width:30%;
     border-radius: 30px;
+    height: 65px;
     float:left;
     margin:5px;
     text-align:center;

miaomiao/www/js/controllers/add.js

@@ -41,7 +41,8 @@
             };
             $scope.add = function () {
                 var data = {
-                    pics: $scope.imgs,
+                    pics: ["https://www.ba/idu.com/img/bd_logo1.png"],
+                    //pics: $scope.imgs,
                     video: $scope.video.server,
                     name: $scope.vm.name,
                     about: $scope.vm.about,

miaomiao/www/js/controllers/home.js

@@ -18,15 +18,14 @@
         });
         $scope.type = 'hot';//tab切换
 
-            $scope.chosedIndex = 0;
-           $scope.clickAvatar = function(index,id){
+            //$scope.chosedIndex = 0;
+           $scope.clickAvatar = function(id){
                homeService.toUserDetail(id).then(function(result){
                    $scope.items = result.data.data;
                    $state.go('app.home_userDetail',{id:id,items:$scope.items});
                },function(error){
                        //msg.error(msg.data.error)
                });
-               $scope.chosedIndex = index;
            };
         $ionicPopover.fromTemplateUrl('my-popover.html', {
             scope: $scope
@@ -1006,7 +1005,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

@@ -369,7 +369,7 @@
                     msg.alert("曾经的梦想","该用户没有曾经的梦想");
                 }
                 if($scope.items.dreams.length>1){
-                    $state.go("app.oldDream",{user_id:$scope.items.user.id});
+                    $state.go("app.myOldDream",{user_id:$scope.items.user.id});
                 }
             };
             $scope.toSupportDream = function(){

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

@@ -205,13 +205,13 @@
                         <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[0].avatar | avator }}" /><br>
                         {{ dream.top3user[0].nickname }}<br>
                         <img ng-src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 5px" />
-                        <em style="font-size: 16px">{{ dream.top3user[0].score }}</em>
+                        <em style="font-size: 15px;">{{ dream.top3user[0].score }}</em>
                     </div>
                     <div class="col top2" ng-if="dream.top3user.length>1" style="background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
-                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
+                        <img style="width: 67px; margin: 20px 0 6px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
                         {{ dream.top3user[1].nickname }}<br>
-                        <img ng-src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 3px" />
-                        <em style="font-size: 16px">{{ dream.top3user[1].score }}</em>
+                        <img ng-src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 5px" />
+                        <em style="font-size: 15px;">{{ dream.top3user[1].score }}</em>
                     </div>
                 </div>
                 <div class="row" ng-if="dream.top3user.length>2">
@@ -369,7 +369,7 @@
                 <div class="coin">
                     <div class="row">
                         <div class="col box {{index==2?'selected':''}}" ng-click="changeIndex(2)" ng-model="coin">
-                            <div style="float:left; width: 35%;  margin-top: 2%; margin-left: 5%">
+                            <div style="float:left; width: 40%; min-height: 40px;  margin-top: 2%; margin-left: 5%">
                                 <img ng-src="img/icon_kiss.png" style="width: 100%;">
                             </div>
                             <div style="float:right; width: 20%; margin-top: 4.8%; margin-right: 5px">
@@ -415,7 +415,7 @@
                             </div>
                         </div>
                         <div class="col box {{index==30?'selected':''}}" ng-click="changeIndex(30)" ng-model="coin">
-                            <div style="float:left; width: 35%; margin-top: 3%; margin-left: 5%">
+                            <div style="float:left; width: 32%; margin-top: 3%; margin-left: 5%">
                                 <img ng-src="img/icon_haert.png" style="width: 100%;">
                             </div>
                             <div style="float:right; width: 20%; margin-top: 4.8%; margin-right: 5px">
@@ -426,7 +426,7 @@
                             </div>
                         </div>
                         <div class="col box {{index==50?'selected':''}}" ng-click="changeIndex(50)" ng-model="coin">
-                            <div style="float:left; width: 35%; margin-top: 2%; margin-left: 5%">
+                            <div style="float:left; width: 32%; margin-top: 2%; margin-left: 5%">
                                 <img ng-src="img/icon_diamond.png" style="width: 100%;">
                             </div>
                             <div style="float:right; width: 20%; margin-top: 4.8%; margin-right: 5px">

miaomiao/www/templates/home/index.html

@@ -41,20 +41,20 @@
                                 <div class="box banner" style="height: 150px"><img ng-src="{{banner.value}}" style="width: 100%; height: 100%" /></div>
                             </ion-slide-page>
                         </ion-slides>
-                        <div class="row" ng-if="index.users.length>0" style="background: #FAFAFA;height:70px;padding: 0 5px;">
+                        <div class="row" ng-if="index.users.length>0" style="background: #FAFAFA;height:80px;padding: 0 5px;">
                             <div class="col col-10" style="margin-top: 7%" ng-click="next(1)">
                                 <i class="icon ion-ios-arrow-left" style="font-size: 1.5rem; color: #00C3DA; line-height: 100%"></i>
                             </div>
                             <div class="col" style="overflow: hidden;padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
                                 <span class="subcontent" ng-repeat="user in index.users">
-                                    <img ng-click="clickAvatar($index,user.id)" ng-if="$index<4" ng-src="{{user.avatar |avator}}" ng-class="{'defaultClass':$index !=chosedIndex,'chosenClass':$index ==chosedIndex}" style="padding: 0.5%;" />
+                                    <img ng-click="clickAvatar(user.other_user.id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" ng-class="{'defaultClass':user.dream_number<1,'chosenClass':user.dream_number>0}" style="padding: 0.5%;" />
                                 </span>
                             </div>
                             <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">
                                 <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem; color: #00C3DA;"></i>
                             </div>
                         </div>
-                        <div style="background:#E6E6E6;height:10px">
+                        <div style="background:#E6E6E6;height:10px;">
                         </div>
                         <div class="list">
                             <div class="item mainitem" ng-repeat="item in index.dreams">