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

miaomiao/www/js/controllers/my.js

@@ -81,6 +81,16 @@
                     msg.error(JSON.stringify(error));
                 });
             };
+          
+          //保存个人信息
+            $scope.vm={
+                pic:"",
+                sex:"",
+                signture:"",
+                emotion:"",
+                job:"",
+                tall:""
+            };
             $scope.$on('$ionicView.beforeEnter', function () {
                 msg.loading();
                 myService.myIndex().then(function(result){
@@ -96,50 +106,23 @@
                   msg.error(error.data.message);
                 })
             });
-<<<<<<< HEAD
-
-            //保存个人信息
-            $scope.vm={
-                pic:"",
-                sex:"",
-                signture:"",
-                emotion:"",
-                job:"",
-                tall:""
-            };
-            $scope.saveMaterial = function(){
-                var data = {
-                    pic:['http://img.taopic.com/uploads/allimg/130103/240435-1301030P33161.jpg'],
-                    //pic:$scope.vm.user.avatar,
-=======
-            // $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',
->>>>>>> 3e0c5c4a13e68478596981defab0f2f6b69d648b
+                    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,
-<<<<<<< HEAD
-                    tall:$scope.vm.tall
-                };
-=======
-                    tall:$scope.vm.tall,
+                    job:$scope.vm.job, 
+                    tall:$scope.vm.tall, 
                     city:$scope.vm.city
-                }
+                }; 
                 if($scope.vm.birthday1){
                     data.birthday = $filter('date')($scope.vm.birthday1, "yyyy-MM-dd");
                 }
                 msg.loading('提交中...');
->>>>>>> 3e0c5c4a13e68478596981defab0f2f6b69d648b
+ 
                 myService.saveMaterial(data).then(function(result){
                   msg.hide();
                   msg.success("保存成功!");

miaomiao/www/js/services/homeservice.js

@@ -33,25 +33,18 @@
                     method: "get"
                 })
             },
-            news: function () {
+            user_search: function (keyword) {
                 return $http({
-                    url: config.server + 'api/index/new',
+                    url: config.server + 'api/index/user_search?keyword='+keywords,
                     method: "get"
                 })
             },
-            trend: function () {
+            news_info: function (id) {
                 return $http({
-                    url: config.server + 'api/index/trend',
+                    url: config.server + 'api/index/news_info?id=' + id,
                     method: "get"
                 })
             },
-            user_search: function (keyword) {
-                return $http({
-                    url: config.server + 'api/index/user_search?keyword='+keywords,
-                    method: "get"
-                })
-            }
-             
         };
     }]);
 })(angular.module('app.services'));