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

miaomiao/www/js/controllers/my.js

@@ -74,29 +74,44 @@
                 });
             };
             $scope.$on('$ionicView.beforeEnter', function () {
-
+                msg.loading();
+                myService.myIndex().then(function(result){
+                  // alert(JSON.stringify(result.data.data.user));
+                  $scope.vm = result.data.data.user;
+                  msg.hide();
+                },function(error){
+                  msg.hide();
+                  msg.error(error.data.message);
+                })
             });
-            $scope.vm={
-                //pic:"",
-                sex:"",
-                signture:"",
-                emotion:"",
-                job:"",
-                tall:""
-            };
+            // $scope.vm={
+            //     //pic:"",
+            //     sex:"1",
+            //     signture:"",
+            //     emotion:"1",
+            //     job:"",
+            //     tall:""
+            // };
             $scope.saveMaterial = function(){
                 var data = {
-                    pic:['http://img.taopic.com/uploads/allimg/130103/240435-1301030P33161.jpg'],
+                    pic:'http://img.taopic.com/uploads/allimg/130103/240435-1301030P33161.jpg',
                     sex:$scope.vm.sex,
                     signture:$scope.vm.signture,
                     emotion:$scope.vm.emotion,
                     job:$scope.vm.job,
-                    tall:$scope.vm.tall
+                    tall:$scope.vm.tall,
+                    city:$scope.vm.city
+                }
+                if($scope.vm.birthday1){
+                    data.birthday = $filter('date')($scope.vm.birthday1, "yyyy-MM-dd");
                 }
+                msg.loading('提交中...');
                 myService.saveMaterial(data).then(function(result){
-
+                  msg.hide();
+                  msg.success("保存成功!");
                 },function(error){
-
+                  msg.hide();
+                  msg.error(error.data.message);
                 })
             }
         }]);

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

@@ -10,16 +10,16 @@
              <span class="fl">
                  绑定手机 
              </span>
-             <i style="float:right" class="ng-binding">159****0809</i>
+             <i style="float:right" class="ng-binding">{{vm.tel}}</i>
          </div>
 
          <label class="item item-input item-select item-select-width">
              <span class="input-label">
                  性别
              </span>
-             <select name="sex" ng-model="vm.sex">
-                 <option>男</option>
-                 <option>女</option>
+             <select name="sex" ng-model="vm.sex+''">
+                 <option value="1">男</option>
+                 <option value="2">女</option>
              </select>
          </label>
          <label class="item item-input ">
@@ -30,9 +30,10 @@
              <span class="input-label">
                  情感状态
              </span>
-             <select name="emotion" ng-model="vm.emotion">
-                 <option>未婚</option>
-                 <option>已婚</option>
+             <select name="emotion" ng-model="vm.emotion+''">
+                 <option value="1">未婚</option>
+                 <option value="2">已婚</option>
+                 <option value="3">离异</option>
              </select>
          </label>
 
@@ -44,6 +45,14 @@
              <span class="input-label">身高</span>
              <input name="tail" type="text" placeholder="请输入(单位cm)" ng-model="vm.tall">
          </label>
+         <label class="item item-input ">
+             <span class="input-label">所在城市</span>
+             <input name="tail" type="text" placeholder="请输入" ng-model="vm.city">
+         </label>
+        <label class="item item-input">
+            <em class="fl">出生日期</em>
+            <input type="date" style="text-align: right"  placeholder="出生日期" ng-model="vm.birthday1" >
+        </label>
      </div>
         <div class="padding">
             <button class="button button-full button-calm" ng-click="saveMaterial()">