Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/www/js/controllers/home.js

@@ -97,9 +97,13 @@
 
                 })
             };
-            $scope.show = function(){
-                var obj = document.getElementById("box");
-                obj.style = "white-space: normal;";
+            $scope.showText = function(){ 
+                $scope.aboutStyle = {
+                    "white-space" : "normal"
+                  }
+                $scope.ionDownStyle = {
+                    "display" : "none"
+                }
             }
         }]);
     app.controller('searchCtrl', ["$scope","homeService", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"

miaomiao/www/js/controllers/my.js

@@ -96,6 +96,8 @@
                 myService.myIndex().then(function(result){
                   // alert(JSON.stringify(result.data.data.user));
                   $scope.vm = result.data.data.user;
+                  $scope.vm.sex = $scope.vm.sex+'';
+                  $scope.vm.emotion = $scope.vm.emotion+'';
                   if($scope.vm.birthday){
                       var arr1 = $scope.vm.birthday.split("-");  
                       $scope.vm.birthday1 = new Date(arr1[0],parseInt(arr1[1])-1,arr1[2]); 

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

@@ -37,11 +37,11 @@
             <div class="list detail-list">
                 <div class="item">
                     <h2>斯德哥尔摩奇遇</h2>
-                    <p id="box">
+                    <p ng-style="aboutStyle">
                         在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！
                     </p>
                     <div style="text-align: center">
-                        <i class="icon ion-chevron-down" style="color: #FE4B82" ng-click="show()"></i>
+                        <i class="icon ion-chevron-down" ng-style="ionDownStyle" style="color: #FE4B82" ng-click="showText()"></i>
                     </div>
                 </div>
                 <div class="item row detail-item2">

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

@@ -32,7 +32,7 @@
              <span class="input-label">
                  情感状态
              </span>
-             <select name="emotion" ng-model="vm.emotion+''">
+             <select name="emotion" ng-model="vm.emotion">
                  <option value="1">未婚</option>
                  <option value="2">已婚</option>
                  <option value="3">离异</option>