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

miaomiao/platforms/android/build/intermediates/assets/debug/www/css/ionic.app.css

@@ -5921,7 +5921,8 @@ ion-tabs.tabs-color-active-dark .tab-item {
 .item-content p {
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap; }
+  white-space: nowrap;
+}
 
 a.item {
   color: inherit;

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/config/router.js

@@ -21,12 +21,12 @@
                 }
             }
         })
-            .state('app.home_userdetail', {
-                url: '/home/userdetail',
+            .state('app.home_dreamdetail', {
+                url: '/home/dreamdetail',
                 views: {
                     'app-home': {
-                        templateUrl: 'templates/home/user-detail.html',
-                        controller: 'userDetailCtrl'
+                        templateUrl: 'templates/home/dream-detail.html',
+                        controller: 'dreamDetailCtrl'
                     }
                 }
             })

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/controllers/account.js

@@ -28,7 +28,8 @@
             $scope.vm.waitSeconds = "正在发送";
             userService.getVerifyCode($scope.vm.mobile).then(function (result) {
                 wait(50);
-                $scope.returncode = result.data;
+                // $scope.returncode = result.data;
+                msg.success(result.data.data.verify_code);
             }, function (error) {
                 $scope.vm.waitSeconds = "获取验证码";
                 wait(0);

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/controllers/add.js

@@ -24,7 +24,7 @@
                 isOK: false,
                 path: '',
                 server:''
-            }
+            };
             
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) {
@@ -36,31 +36,30 @@
                         msg.error('图片上传失败');
                     });
                 }, function (error) {
-                    msg.error('图片选择失败');
+                    console.log('图片选择失败');
                 });
-            }
+            };
             $scope.addvideo = function () {
-                var options = { limit: 1, duration:20};
-                navigator.device.capture.captureVideo(function (videos) {
-                    $scope.video.path = videos[0].fullPath;
-                    $scope.video.isOK = true;
-                    common.uploadFiles(videos[0].fullPath, 2).then(function (result) {
+                common.chooseVideo().then(function (file) {
+                        $scope.video.path = file;
+                        $scope.video.isOK = true;
+                        common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = response.data.file;
                         $scope.video.server = file;
                     }, function (error) {
                         msg.error('视频上传失败');
                     });
-                }, function (error) {
-                    msg.error('视频上传失败');
-                }, options);
-            }
+                }, function (erro) {
+                    msg.error('选择视频失败');
+                });
+            };
             $scope.deletefile = function (file) {
                 var index = $scope.imgs.indexOf(file);
                 $scope.imgs.splice(index, 1);
                 common.deletefile(file).then(function () {
                 })
-            }
+            };
             $scope.add = function () {
                 var data = {
                     pics: $scope.imgs,
@@ -78,7 +77,7 @@
                     msg.hide();
                     msg.error(error.data.message);
                 });
-            }
+            };
             $scope.$on('$ionicView.beforeEnter', function (viewResult) {
                 $ionicTabsDelegate.showBar(false);
                 $ionicNavBarDelegate.showBackButton(true);

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/controllers/home.js

@@ -1,12 +1,7 @@
 (function (app) {
-    app.controller('homeCtrl', ["$scope", "$state", "msg", "$ionicPopover"
-        , function ($scope, $state, msg, $ionicPopover) {
-            $scope.type = 1;//tab切换
-            $scope.changetype = function (type) {
-                $scope.type = type;
-            }
-          
-           
+    app.controller('homeCtrl', ["$scope", "$http", 'config', "$state", "msg", "$ionicPopover", "homeService"
+        , function ($scope, $http, config, $state, msg, $ionicPopover, homeService) {
+            $scope.type = 'hot';//tab切换
             $ionicPopover.fromTemplateUrl('my-popover.html', {
                 scope: $scope
             }).then(function (popover) {
@@ -18,14 +13,52 @@
             $scope.closePopover = function () {
                 $scope.popover.hide();
             };
-        $scope.$on('$ionicView.beforeEnter', function () {
-
-        });
-        $scope.todetail = function () {
-            $state.go('app.home_userdetail');
-        };
+            $scope.changetype = function (type) {
+                $scope.type = type;
+                $scope.load(true);
+            }
+            $scope.todetail = function () {
+                $state.go('app.home_dreamdetail');
+            };
+            $scope.filter = {
+                hasMore: false,
+                pageIndex: 1,
+                pageSize: 20,
+            }
+            $scope.index = {
+                banner: [],
+                users: [],
+                dreams:[]
+            };
+            $scope.load = function (init) {
+                if (init) {
+                    $scope.filter.pageIndex = 1;
+                    $scope.index.dreams = [];
+                }
+                homeService.index($scope.type, $scope.filter.pageIndex).then(function (result) {
+                    $scope.index.banner = result.data.data.banner;
+                    $scope.index.users = result.data.data.users;
+                    $scope.filter.pageIndex++;
+                    var more = (result.data.data.dreams.data.length >= $scope.filter.pageSize);
+                    $scope.filter.hasMore = more;
+                    $scope.index.dreams = $scope.index.dreams.concat(result.data.data.dreams.data);
+                    if (init) {
+                        $scope.$broadcast('scroll.refreshComplete');
+                    } else {
+                        $scope.$broadcast('scroll.infiniteScrollComplete');
+                    }
+                }, function (erro) {
+                    msg.error(erro.data.Message);
+                });
+            }
+            $scope.data = {};
+            $scope.load(true);
+            //$scope.$on('$ionicView.enter', function () {
+              
+          
+            //});
         }]);
-    app.controller('userDetailCtrl', ["$scope", "$state", "msg","homeService", "$ionicTabsDelegate"
+    app.controller('dreamDetailCtrl', ["$scope", "$state", "msg", "homeService", "$ionicTabsDelegate"
         , function ($scope, $state, msg, homeService, $ionicTabsDelegate) {
             $scope.type = 1;//tab切换
             $scope.tosupport = false;
@@ -63,6 +96,10 @@
                 },function(erro){
 
                 })
+            };
+            $scope.show = function(){
+                var obj = document.getElementById("box");
+                obj.style = "white-space: normal;";
             }
         }]);
     app.controller('searchCtrl', ["$scope","homeService", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"
@@ -96,17 +133,14 @@
             $scope.$on('$ionicView.leave', function () {
                 $ionicTabsDelegate.showBar(true);
             });
-            $scope.searchContent=function ()
+            $scope.searchContent = function ()
             {
-                var data={
-                    keyword:$scope.vm.keyword
-                };
-                homeService.searchContent($scope.vm.keyword).then(function(result){
+                homeService.searchContent($scope.vm.keywords).then(function(result){
 
-                },function(erro){
+                },function(error){
 
                 });
-            }
+            };
         }]);
    
     

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/controllers/my.js

@@ -26,10 +26,12 @@
                 console.log("attachment upload error:"+JSON.stringify(error));
 
             })
-        }
+        };
             $scope.toprofile = function () {
                 $state.go('app.my_profile');
             };
+
+            //我的设置
         $scope.setting = function(){
             myService.setting().then(function(result){
 
@@ -37,21 +39,33 @@
 
             });
         };
+
+            //我的收藏
             $scope.collect = function(){
                 myService.collect().then(function(result){
 
-                },function(erro){
+                },function(error){
 
                 });
             };
+
+            //我的梦想
             $scope.myDream = function(){
                 myService.myDream().then(function(result){
 
-                },function(erro){
+                },function(error){
 
                 });
-            }
+            };
 
+            //修改个人信息
+            $scope.myMaterial = function(){
+                myService.myMaterial().then(function(result){
+
+                },function(error){
+
+                })
+            }
         }]);
 
     app.controller('profileCtrl', ["$scope", "$state", "storage", "myService", "msg", "common"
@@ -67,26 +81,63 @@
                     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){
+                  // alert(JSON.stringify(result.data.data.user));
+                  $scope.vm = result.data.data.user;
+                  if($scope.vm.birthday){
+                      var arr1 = $scope.vm.birthday.split("-");  
+                      $scope.vm.birthday1 = new Date(arr1[0],parseInt(arr1[1])-1,arr1[2]); 
+                  }
+                  msg.hide();
+                },function(error){
+                  msg.hide();
+                  msg.error(error.data.message);
+                })
             });
-            $scope.reset = function(){
+ 
+            $scope.saveMaterial = function(){
+               
                 var data = {
-                    pic:'http://img.taopic.com/uploads/allimg/130103/240435-1301030P33161.jpg',
-                };
-                myService.reset(data).then(function(result){
-
+                    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, 
+                    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);
+                })
             }
-
-      }]);
+        }]);
     app.controller('settingCtrl', ["$scope", "$state", "myService", "msg","storage"
      , function ($scope, $state,myService, msg, storage) {
          $scope.$on('$ionicView.beforeEnter', function () {
 
          });
+            //退出登陆
             $scope.logout = function(){
                 storage.remove("token");
                 storage.remove("user");
@@ -99,6 +150,7 @@
       $scope.$on('$ionicView.beforeEnter', function () {
 
       });
+            //充值
             $scope.recharge = function(){
                 myService.recharge().then(function(result){
 
@@ -113,6 +165,7 @@
       $scope.$on('$ionicView.beforeEnter', function () {
 
       });
+            //系统消息
             $scope.systemInfo = function(){
                 myService.systemInfo().then(function(result){
 
@@ -120,9 +173,10 @@
 
                 });
             };
+            //回复我的
             $scope.replyMy = function(){
                 myService.replyMy().then(function(result){
-
+                    //$scope.comments = result;
                 },function(error){
 
                 });
@@ -169,19 +223,21 @@
 
            });
 
+            //我的回复
             $scope.vm={
-                content:""
+                content:"",
+                comment_id:""
             };
             $scope.myReplay = function(){
                 var data = {
                     content:$scope.vm.content,
-                    comment_id:'11'
+                    comment_id:$scope.vm.id
                 };
                 myService.myReplay(data).then(function(result){
 
-                },function(erro){
+                },function(error){
 
-                })
+                });
                 $scope.modal.hide();
             }
        }]);

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/controllers/tabs.js

@@ -8,24 +8,21 @@
         $scope.vm={
 
         };
-        $scope.userMes = function(){
-            /*var data={
-                user_id:"111"
-            };
-            myService.userMes(data).then(function(result){
+        $scope.myMes = function(){
+            myService.myMes().then(function(result){
 
-            },function(erro){
+            },function(error){
 
-            });*/
+            });
             $scope.go("app.my")
         };
 
         $scope.myIndex = function(){
-           /* myService.userMes().then(function(result){
+            myService.myIndex().then(function(result){
 
-            },function(erro){
+            },function(error){
 
-            });*/
+            });
             $scope.go("app.home")
         };
     }]);

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/services/commonservice.js

@@ -53,6 +53,51 @@
                 });
                 return deferred.promise;
             },
+            //选择视频
+            chooseVideo: function () {
+                var deferred = $q.defer();
+                var sheetOptions = {
+                    title: '选择视频方式',
+                    buttonLabels: ['拍摄视频', '从图库选择'],
+                    addCancelButtonWithLabel: '取消',
+                    androidEnableCancelButton: true
+                };
+                window.plugins.actionsheet.show(sheetOptions, function (index) {
+                    switch (index) {
+                        case 1: //拍摄视频
+                            var options1 = { limit: 1, duration:20};
+                            navigator.device.capture.captureVideo(function (videos) {
+                                if (videos[0]) {
+                                    deferred.resolve(videos[0].fullPath);
+                                } else {
+                                    deferred.reject("视频未找到");
+                                }
+                            }, function (error) {
+                                deferred.reject(error);
+                            }, options1);
+                            break;
+                        case 2://从图库选择
+                            var options2 = {
+                                sourceType: 0,
+                                mediaType: 1
+                            };
+                            navigator.camera.getPicture(function (imageUri) {
+                                if (imageUri) {
+                                    deferred.resolve(imageUri);
+                                } else {
+                                    deferred.reject('视频未找到');
+                                }
+                            }, function (error) {
+                                deferred.reject(error);
+                            }, options2);
+                            break;
+                        default:
+                            deferred.resolve();
+                            break;
+                    }
+                });
+                return deferred.promise;
+            },
             uploadFiles: function (imageUri,type) {//通用上传,type:1图片,2视频
                 var deferred = $q.defer();
                 if (imageUri) {

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/services/homeservice.js

@@ -16,11 +16,35 @@
             },
             searchContent:function (data){
                 return $http({
-                    url:config.server + 'api/index/search',
-                    method:"get",
-                    data:data
+                    url: config.server + 'api/index/search?' + data,
+                    method:"get"
+                })
+            },
+            index: function (type, page) {
+                var url = util.format('{0}/api/index/index?type={1}&page={2}', config.server,type,page);
+                return $http({
+                    url: url,
+                    method: "get"
+                })
+            },
+            news_info: function (id) {
+                return $http({
+                    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"
+                })
+            },
+            news_info: function (id) {
+                return $http({
+                    url: config.server + 'api/index/news_info?id=' + id,
+                    method: "get"
+                })
+            },
         };
     }]);
 })(angular.module('app.services'));

miaomiao/platforms/android/build/intermediates/assets/debug/www/js/services/myservice.js

@@ -8,10 +8,9 @@
                     data: { password: password }
                 })
             },
-           
-            reset:function(data){
+            add:function (data){
                 return $http({
-                    url:config.server + "api/auth/avatar",
+                    url:config.server + 'api/my/add_dream',
                     method:"post",
                     data:data
                 })
@@ -59,11 +58,10 @@
                     data: data
                 })
             },
-            userMes:function(data){
+            myMes:function(){
                 return $http({
-                    url:config.server + "api/user/index/",
-                    method:"get",
-                    data:data
+                    url:config.server + "api/my/persona",
+                    method:"get"
                 })
             },
             myIndex:function(){
@@ -77,6 +75,19 @@
                     url:config.server + "api/my/persona",
                     method:"get"
                 })
+            },
+            myMaterial:function(){
+                return $http({
+                    url:config.server + "api/my/edit_user_info",
+                    method:"get"
+                })
+            },
+            saveMaterial:function(data){
+                return $http({
+                    url:config.server + "api/my/update_user_info",
+                    method:"post",
+                    data:data
+                })
             }
         };
     }]);

miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/add/index.html

@@ -17,12 +17,7 @@
             </div>
             <div class="item">我的梦想介绍</div>
             <div class="item itemjs">
-                <!--<a class="button button-outline button-block button-calm button-icon" ng-model="vm.about" ng-click="openModal()">
-                    <i class="icon ion-plus"></i>
-                    添加梦想介绍
-                </a>-->
                 <textarea rows="4" cols="50" placeholder="添加梦想介绍" ng-model="vm.about" style="border: 1px solid #FF4B82;padding: 10px;width: 98%;"></textarea>
-
             </div>
             <div class="item">上传图片和视频，让别人更好的了解你</div>
             <div class="item itemjs">

miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/home/index.html

@@ -8,31 +8,29 @@
         <button class="button button-clear icon ion-email-unread" style="padding-left:10px"></button>
     </ion-nav-buttons>
     <ion-content>
+        <!--下拉刷新-->
+        <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
+        </ion-refresher>
         <div class="tabs-striped tabs-top">
             <div class="tabs" style="top:0">
-                <a  ng-class="type==1?'tab-item active':'tab-item'" ng-click="changetype(1)">
+                <a  ng-class="type=='hot'?'tab-item active':'tab-item'" ng-click="changetype('hot')">
                    热门
                 </a>
-                <a ng-class="type==2?'tab-item active':'tab-item'" ng-click="changetype(2)">
+                <a ng-class="type=='trend'?'tab-item active':'tab-item'" ng-click="changetype('trend')">
                     潮流
                 </a>
-                <a ng-class="type==3?'tab-item active':'tab-item'" ng-click="changetype(3)">
+                <a ng-class="type=='news'?'tab-item active':'tab-item'" ng-click="changetype('news')">
                     最新
                 </a>
             </div>
         </div>
         <div class="icontent">
-            <ion-slides slider="data.slider">
-                <ion-slide-page>
-                    <div class="box banner"><img ng-src="img/demo/banner1.jpg" /></div>  
-                </ion-slide-page>
-                <ion-slide-page>
-                    <div class="box banner"><img ng-src="img/demo/banner2.jpg" /></div>  
-                </ion-slide-page>
-                <ion-slide-page>
-                    <div class="box banner"><img ng-src="img/demo/banner3.jpg" /></div>  
+            <ion-slides   options="data.sliderOptions" slider="data.sliderDelegate">
+                <ion-slide-page ng-repeat="img in index.banner">
+                    <div class="box banner"><img ng-src="{{img.value}}" /></div>  
                 </ion-slide-page>
             </ion-slides>
+             
             <div class="item item-image" style="margin: 20px 0; border: none;">
                 <i class="icon ion-ios-arrow-left" style="font-size: 1.5rem;"></i>
                 <span class="subcontent">
@@ -45,88 +43,30 @@
                 <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem"></i>
             </div>
             <div class="list">
-                <div class="item mainitem" ng-click="todetail()">
+                <div class="item mainitem" ng-click="todetail()" ng-repeat="item in index.dreams">
                     <div class="row">
                         <div class="col">
-                            <img ng-src="img/demo/head6.jpg" />
+                            <img ng-src="{{item.dream_find_user.pic}}" />
                             <div  class="myblock">
-                               <div>喵喵喵喵酱<span class="calm">20岁</span></div>
-                                <div class="mysecond">上海市></div>
-                            </div>
-                        </div>
-                        <div class="col" style="text-align:right">
-                            <div style="margin-top:8px">
-                                <img ng-src="img/heart.png" class="iheart" />
-                                <span class="calm">20123</span>
-                                <span>人关注</span>
-                            </div>
-                            <div class="mysecond">剩余5天</div>
-                        </div>
-                    </div>
-                        <img ng-src="img/demo/pict.png" />
-                    </div>
-                <div class="item mainitem" ng-click="todetail()">
-                    <div class="row">
-                        <div class="col">
-                            <img ng-src="img/demo/head6.jpg" />
-                            <div class="myblock">
-                                <div>喵喵喵喵酱<span class="calm">20岁</span></div>
-                                <div class="mysecond">上海市></div>
+                               <div>{{item.dream_find_user.nickname}}<span class="calm">20岁</span></div>
+                                <div class="mysecond">{{item.dream_find_user.address}}></div>
                             </div>
                         </div>
                         <div class="col" style="text-align:right">
                             <div style="margin-top:8px">
                                 <img ng-src="img/heart.png" class="iheart" />
-                                <span class="calm">20123</span>
+                                <span class="calm">{{item.care_num}}</span>
                                 <span>人关注</span>
                             </div>
-                            <div class="mysecond">剩余5天</div>
+                            <div class="mysecond">剩余{{item.time}}天</div>
                         </div>
                     </div>
-                    <img ng-src="img/demo/pict.png" />
-                </div>
-                <div class="item mainitem" ng-click="todetail()">
-                    <div class="row">
-                        <div class="col">
-                            <img ng-src="img/demo/head6.jpg" />
-                            <div class="myblock">
-                                <div>喵喵喵喵酱<span class="calm">20岁</span></div>
-                                <div class="mysecond">上海市></div>
-                            </div>
-                        </div>
-                        <div class="col" style="text-align:right">
-                            <div style="margin-top:8px">
-                                <img ng-src="img/heart.png" class="iheart" />
-                                <span class="calm">20123</span>
-                                <span>人关注</span>
-                            </div>
-                            <div class="mysecond">剩余5天</div>
-                        </div>
-                    </div>
-                    <img ng-src="img/demo/pict.png" />
-                </div>
-                <div class="item mainitem" ng-click="todetail()">
-                    <div class="row">
-                        <div class="col">
-                            <img ng-src="img/demo/head6.jpg" />
-                            <div class="myblock">
-                                <div>喵喵喵喵酱<span class="calm">20岁</span></div>
-                                <div class="mysecond">上海市></div>
-                            </div>
-                        </div>
-                        <div class="col" style="text-align:right">
-                            <div style="margin-top:8px">
-                                <img ng-src="img/heart.png" class="iheart" />
-                                <span class="calm">20123</span>
-                                <span>人关注</span>
-                            </div>
-                            <div class="mysecond">剩余5天</div>
-                        </div>
+                        <img ng-src="{{item.dream_first_pic.pic}}" />
                     </div>
-                    <img ng-src="img/demo/pict.png" />
-                </div>
             </div>
         </div>
+        <!--上拉更多-->
+        <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>
     </ion-content>
     <script id="my-popover.html" type="text/ng-template">
         <ion-popover-view class="pview">

miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/home/search.html

@@ -1,9 +1,9 @@
 <ion-view view-title="">
     <ion-nav-buttons side="primary">
-        <label class="item item-input" style="width:315px">
+        <lable class="item item-input" style="width:315px">
             <i class="icon ion-search placeholder-icon" ng-click="searchContent()"></i>
             <input type="text" style="width: 100%" placeholder="搜索内容" ng-change="keychange()" ng-model="vm.keywords">
-        </label>
+        </lable>
         <button class="button button-calm" style="width: 30%; padding: 0;" ng-click="$ionicGoBack()">取消</button>
     </ion-nav-buttons>
      <ion-content>

miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/home/user-detail.html

@@ -1,266 +0,0 @@
-<ion-view view-title="喵喵"> 
-    <ion-nav-buttons side="right">
-        <button class="button button-clear icon ion-email-unread"></button>
-        <button class="button button-clear icon ion-ios-compose-outline" style="padding-left:10px"></button>
-    </ion-nav-buttons>
-    <ion-content style="background-color:#F3F3F3" ng-click="cancelsupport()">
-        <div class="tabs-striped tabs-top">
-            <div class="tabs" style="top:0">
-                <a ng-class="type==1?'tab-item active':'tab-item'" ng-click="changetype(1)">
-                    主页
-                </a>
-                <a ng-class="type==2?'tab-item active':'tab-item'" ng-click="changetype(2)">
-                    互动
-                </a>
-                <a ng-class="type==3?'tab-item active':'tab-item'" ng-click="changetype(3)">
-                    排行榜
-                </a>
-            </div>
-        </div>
-        <div class="icontent" ng-if="type==1">
-            <ion-slides slider="data.slider">
-                <ion-slide-page>
-                    <div class="box banner"><img ng-src="img/demo/pict.png" /></div>
-                </ion-slide-page>
-                <ion-slide-page>
-                    <div class="box banner"><img ng-src="img/demo/pict.png" /></div>
-                </ion-slide-page>
-                <ion-slide-page>
-                    <div class="box banner"><img ng-src="img/demo/pict.png" /></div>
-                </ion-slide-page>
-            </ion-slides>
-            <div class="list detail-list">
-                <div class="item">
-                    <h2>斯德哥尔摩奇遇</h2>
-                    <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
-                </div>
-                <div class="item row detail-item2">
-                    <div class="col" style="text-align:left">
-                        <h2>1天</h2>
-                        <p><i class="icon ion-clock"></i> 剩余时间</p>
-                    </div>
-                    <div class="col" style="text-align:right">
-                        <h2>17000</h2>
-                        <p><i class="icon ion-social-usd-outline"></i> 当前获得梦想分数</p>
-                    </div>
-                </div>
-                <div class="item" style="padding:0">
-                    <div class="reply-bar">
-                        <div style="width: 30%;">
-                        </div>
-                    </div>
-                    <div class="row" >
-                        <div class="col" style="text-align:left">
-                            <h2>3200</h2>
-                            <p>目前以获梦想币</p>
-                        </div>
-                        <div class="col" style="text-align:right">
-                            <h2>5000</h2>
-                            <p>我要求的梦想币</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="item row detail-head">
-                    <div class="col"><img ng-src="img/demo/head7.jpg" /></div>
-                    <div class="col"><img ng-src="img/demo/head6.jpg" /></div>
-                    <div class="col"><img ng-src="img/demo/head5.jpg" /></div>
-                </div>
-                <div class="item">
-                    <button class="button button-assertive" style="width:25%;white-space:normal;line-height:20px">支持乘数×2.8</button>
-                    <button class="button button-calm" style="width:50%" ng-click="support($event)">支持</button>
-                    <button class="button button-outline button-calm" style="width:25%">＋关注</button>
-                </div>
-            </div>
-       
-        </div>
-        <div ng-if="type==2" class="hdcontent">
-            <div style="border-bottom:5px solid #FAF2F5;">
-                <div class="list">
-                    <div class="item">
-                        <img class="head" src="../../img/demo/head2.jpg" />
-                        <span class="utitle">喵喵喵酱</span>
-                        <span class="utitle kz">剩余5天</span>
-                        <p class="subtile" style="white-space:normal">在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
-                        <div class="picts">
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                        </div>
-                    </div>
-                </div>
-                <div class="list" style="margin-top:-22px;">
-                    <div class="item subitem">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
-                    <div class="item subitem">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
-                    <div class="item subitem">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
-                </div>
-            </div>
-            <div style="border-bottom:5px solid #FAF2F5;">
-                <div class="list">
-                    <div class="item">
-                        <img class="head" src="../../img/demo/head2.jpg" />
-                        <span class="utitle">喵喵喵酱</span>
-                        <span class="utitle kz">剩余5天</span>
-                        <p class="subtile" style="white-space:normal">在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
-                        <div class="picts">
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                        </div>
-                    </div>
-                </div>
-                <div class="list" style="margin-top:-22px;">
-                    <div class="item subitem">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
-                    <div class="item subitem">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
-                    <div class="item subitem">
-                        <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
-                        <span class="kz">2016-08-08 11:11</span>
-                        <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <div ng-if="type==3" class="phbcontent">
-            <div class="list">
-                <div class="item">
-                    <img style="width:30px" src="../../img/王冠.png" />
-                    <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
-                    </span>
-                    <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
-                        <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
-                    </span>
-                </div>
-                <div class="item">
-                    <img style="width:30px" src="../../img/王冠.png" />
-                    <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
-                    </span>
-                    <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
-                        <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
-                    </span>
-                </div>
-                <div class="item">
-                    <img style="width:30px" src="../../img/王冠.png" />
-                    <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
-                    </span>
-                    <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
-                        <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
-                    </span>
-                </div>
-                <div class="item">
-                    <img style="width:30px" src="../../img/王冠.png" />
-                    <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
-                    </span>
-                    <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
-                        <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
-                    </span>
-                </div>
-                <div class="item">
-                    <img style="width:30px" src="../../img/王冠.png" />
-                    <span style="padding-left:20px">
-                        <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
-                        <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
-                    </span>
-                    <span style="padding-left:50px;">
-                        <span style="position:relative;top:-20px;font-weight:500">20000</span>
-                        <span style="color:#9E9E9E;position:relative;left:-50px">贡献</span>
-                    </span>
-                </div>
-            </div>
-            
-        </div>
-    </ion-content>
-    <div class="detail-like" ng-if="tosupport">
-        <div>
-            <div class="row">
-                <div class="col box {{index==1?'selected':''}}" ng-click="changeindex(1)" ng-model="coin">
-                    <h2 class="calm">5个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
-                </div>
-                <div class="col box {{index==2?'selected':''}}" ng-click="changeindex(2)" ng-model="coin">
-                    <h2 class="calm">10个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
-                </div>
-                <div class="col box {{index==3?'selected':''}}" ng-click="changeindex(3)" ng-model="coin">
-                    <h2 class="calm">15个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col box {{index==4?'selected':''}}" ng-click="changeindex(4)" ng-model="coin">
-                    <h2 class="calm">20个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
-                </div>
-                <div class="col box {{index==5?'selected':''}}" ng-click="changeindex(5)" ng-model="coin">
-                    <h2 class="calm">25个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
-                </div>
-                <div class="col box {{index==6?'selected':''}}" ng-click="changeindex(6)" ng-model="coin">
-                    <h2 class="calm">30个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i> 虚拟币</p>
-                </div>
-            </div>
-            
-        </div>
-        <div class="send">
-            <span>余额：<i class="calm">20000</i>梦想币</span>
-            <span  style="padding:30px" class="calm"><i class="icon ion-card"></i>充值</span>
-            <a class="button button-calm" style="height:100%;border-radius:0;width:80px;font-size:1.2em " ng-click="supportDream()">发送</a>
-        </div>
-    </div>
-  
-</ion-view>

miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/my/index.html

@@ -44,7 +44,7 @@
                 <i class="icon ion-email"></i>
                 <em class="fl">我的消息</em>
             </a>
-            <a class="item item-icon-left" ui-sref="app.my_profile">
+            <a class="item item-icon-left" ui-sref="app.my_profile" ng-click="myMaterial()">
                 <i class="icon ion-document"></i>
                 <em class="fl">我的资料</em>
           

miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/my/my-message-reply.html

@@ -1,7 +1,7 @@
 <ion-view view-title="回复我的">
     <ion-content>
         <div class="list">
-            <div class="item reply-item">
+            <div class="item reply-item" ng-repeat="item in comments">
                 <div class="row">
                     <div class="col">
                         <img  class="reply-head" src="../../img/demo/head1.jpg" />
@@ -14,10 +14,11 @@
                         <button class="button icon-left ion-ios-redo-outline" ng-click="openModal()">回复</button>
                     </div>
                 </div>
-                <span class="reply-line">回复<span>@韩庚</span>：你确定是去那里吗？ </span>
+                <span class="reply-line">回复<span>@韩庚</span>：你确定是去那里吗？</span>
                 <div class="item item-thumbnail-left reply-content">
-                    <img ng-src="img/demo/head7.jpg" />
-                    <h2>有人能带我去瑞典吗？</h2>
+                    <!--<img ng-src="img/demo/head7.jpg" />-->
+                    <img ng-src="{{item.dream_pic}}">
+                    <h2>{{item.dream_name}}</h2>
                     <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
                 </div>
                 <div class="reply-bar">
@@ -26,7 +27,8 @@
                 </div> 
                 <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
             </div>
-            <div class="item reply-item">
+
+            <!--<div class="item reply-item">
                 <div class="row">
                     <div class="col">
                         <img class="reply-head" src="../../img/demo/head1.jpg" />
@@ -75,7 +77,7 @@
                     </div>
                 </div>
                 <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
-            </div>
+            </div>-->
         </div>
     </ion-content>
     <script id="my-modal.html" type="text/ng-template">
@@ -87,7 +89,7 @@
             </ion-header-bar>
             <ion-content>
                 <div class="addmodal">
-                    <textarea placeholder="回复内容" ng-model="content"></textarea>
+                    <textarea placeholder="回复内容" ng-model="vm.content"></textarea>
                 </div>
                 <div class="addfoot">
                     <img ng-src="img/图片.png" />

miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/my/my-profile.html

@@ -1,55 +1,9 @@
 <ion-view view-title="个人信息" >
     <ion-content>
-<<<<<<< HEAD
-        <div class="list">
-            <a class="item item-avatar-right" ng-click="setAvator()">
-                <img  src="img/demo/head5.jpg" />
-                <h2>头像</h2>
-                <p style="font-size:12px">点击上传</p>
-            </a>
-            <div class="item">
-             <span class="fl">
-                 绑定手机
-             </span>
-                <i style="float:right" class="ng-binding">159****0809</i>
-            </div>
-
-            <label class="item item-input item-select item-select-width">
-             <span class="input-label">
-                 性别
-             </span>
-                <select name="sex">
-                    <option>男</option>
-                    <option>女</option>
-                </select>
-            </label>
-            <label class="item item-input ">
-                <span class="input-label">个性签名</span>
-                <input name="signture" type="text" placeholder="请输入">
-            </label>
-            <label class="item item-input item-select item-select-width">
-             <span class="input-label">
-                 情感状态
-             </span>
-                <select name="emotion">
-                    <option>未婚</option>
-                    <option>已婚</option>
-                </select>
-            </label>
-
-            <label class="item item-input ">
-                <span class="input-label">职业</span>
-                <input name="job" type="text" placeholder="请输入">
-            </label>
-            <label class="item item-input ">
-                <span class="input-label">身高</span>
-                <input name="tail" type="text" placeholder="请输入(单位cm)">
-            </label>
-        </div>
-=======
      <div class="list">
          <a class="item item-avatar-right" ng-click="setAvator()">
-             <img  src="img/demo/head5.jpg" />
+             <img  src="img/demo/head5.jpg"/>
+             <!--<img ng-src="{{ vm.user.avatar | avator }}">-->
              <h2>头像</h2>
              <p style="font-size:12px">点击上传</p>
          </a>
@@ -57,44 +11,62 @@
              <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">
-                 <option>男</option>
-                 <option>女</option>
+<<<<<<< HEAD
+             <select name="sex" ng-model="vm.sex">
+                 <option value="0">男</option>
+                 <option value="1">女</option>
+=======
+             <select name="sex" ng-model="vm.sex+''">
+                 <option value="1">男</option>
+                 <option value="2">女</option>
+>>>>>>> 3e0c5c4a13e68478596981defab0f2f6b69d648b
              </select>
          </label>
          <label class="item item-input ">
              <span class="input-label">个性签名</span>
-             <input name="signture" type="text" placeholder="请输入">
+             <input name="signture" type="text" placeholder="请输入" ng-model="vm.signture">
          </label>
          <label class="item item-input item-select item-select-width">
              <span class="input-label">
                  情感状态
              </span>
-             <select name="emotion">
-                 <option>未婚</option>
-                 <option>已婚</option>
+<<<<<<< HEAD
+             <select name="emotion" ng-model="vm.emotion">
+=======
+             <select name="emotion" ng-model="vm.emotion+''">
+>>>>>>> 3e0c5c4a13e68478596981defab0f2f6b69d648b
+                 <option value="1">未婚</option>
+                 <option value="2">已婚</option>
+                 <option value="3">离异</option>
              </select>
          </label>
 
          <label class="item item-input ">
              <span class="input-label">职业</span>
-             <input name="job" type="text" placeholder="请输入">
+             <input name="job" type="text" placeholder="请输入" ng-model="vm.job">
          </label>
          <label class="item item-input ">
              <span class="input-label">身高</span>
-             <input name="tail" type="text" placeholder="请输入(单位cm)">
+             <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>
->>>>>>> 6206a0f6e0cf3505451a08cfa0521969e3fd9aeb
         <div class="padding">
-            <button class="button button-full button-calm">
+            <button class="button button-full button-calm" ng-click="saveMaterial()">
                 保存
             </button>
         </div>

miaomiao/platforms/android/build/intermediates/assets/debug/www/templates/tabs.html

@@ -5,7 +5,7 @@
     <ion-tab class="tab-item-add" icon="ion-ios-plus"  ui-sref="app.add" >
         <ion-nav-view name="app-add"></ion-nav-view>
     </ion-tab>
-    <ion-tab title="我的" icon-off="ion-ios-person-outline" icon-on="ion-ios-person" ng-click="userMes()">
+    <ion-tab title="我的" icon-off="ion-ios-person-outline" icon-on="ion-ios-person" ng-click="myMes()">
         <ion-nav-view name="app-my"></ion-nav-view>
     </ion-tab>
 </ion-tabs>

miaomiao/www/js/controllers/add.js

@@ -40,20 +40,19 @@
                 });
             };
             $scope.addvideo = function () {
-                var options = { limit: 1, duration:20};
-                navigator.device.capture.captureVideo(function (videos) {
-                    $scope.video.path = videos[0].fullPath;
-                    $scope.video.isOK = true;
-                    common.uploadFiles(videos[0].fullPath, 2).then(function (result) {
+                common.chooseVideo().then(function (file) {
+                        $scope.video.path = file;
+                        $scope.video.isOK = true;
+                        common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = response.data.file;
                         $scope.video.server = file;
                     }, function (error) {
                         msg.error('视频上传失败');
                     });
-                }, function (error) {
-                    console.log('视频选择失败');
-                }, options);
+                }, function (erro) {
+                    msg.error('选择视频失败');
+                });
             };
             $scope.deletefile = function (file) {
                 var index = $scope.imgs.indexOf(file);

miaomiao/www/js/services/commonservice.js

@@ -53,6 +53,51 @@
                 });
                 return deferred.promise;
             },
+            //选择视频
+            chooseVideo: function () {
+                var deferred = $q.defer();
+                var sheetOptions = {
+                    title: '选择视频方式',
+                    buttonLabels: ['拍摄视频', '从图库选择'],
+                    addCancelButtonWithLabel: '取消',
+                    androidEnableCancelButton: true
+                };
+                window.plugins.actionsheet.show(sheetOptions, function (index) {
+                    switch (index) {
+                        case 1: //拍摄视频
+                            var options1 = { limit: 1, duration:20};
+                            navigator.device.capture.captureVideo(function (videos) {
+                                if (videos[0]) {
+                                    deferred.resolve(videos[0].fullPath);
+                                } else {
+                                    deferred.reject("视频未找到");
+                                }
+                            }, function (error) {
+                                deferred.reject(error);
+                            }, options1);
+                            break;
+                        case 2://从图库选择
+                            var options2 = {
+                                sourceType: 0,
+                                mediaType: 1
+                            };
+                            navigator.camera.getPicture(function (imageUri) {
+                                if (imageUri) {
+                                    deferred.resolve(imageUri);
+                                } else {
+                                    deferred.reject('视频未找到');
+                                }
+                            }, function (error) {
+                                deferred.reject(error);
+                            }, options2);
+                            break;
+                        default:
+                            deferred.resolve();
+                            break;
+                    }
+                });
+                return deferred.promise;
+            },
             uploadFiles: function (imageUri,type) {//通用上传,type:1图片,2视频
                 var deferred = $q.defer();
                 if (imageUri) {

miaomiao/www/templates/home/index.html

@@ -48,8 +48,8 @@
                         <div class="col">
                             <img ng-src="{{item.dream_find_user.pic}}" />
                             <div  class="myblock">
-                               <div>{{item.dream_find_user.nickname}}<span class="calm">20岁</span></div>
-                                <div class="mysecond">{{item.dream_find_user.address}}></div>
+                               <div>{{item.dream_find_user.nickname}}<span class="calm">{{item.dream_find_user.birthday | getage}}岁</span></div>
+                                <div class="mysecond">{{item.dream_find_user.city}}></div>
                             </div>
                         </div>
                         <div class="col" style="text-align:right">