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

miaomiao/debug.log

@@ -0,0 +1,3 @@
+[0904/170037.377:ERROR:process_reader_win.cc(242)] ReadMemory at 0x7fffff9a000 of 5984 bytes failed: 仅完成部分的 ReadProcessMemory 或 WriteProcessMemory 请求。 (0x12B)
+[0904/170037.378:ERROR:crash_report_exception_handler.cc(116)] WriteEverything failed
+[0904/170037.382:ERROR:scoped_process_suspend.cc(39)] NtResumeProcess: 已尝试访问正在退出的过程。  (0xc000010a)

miaomiao/www/css/style.css

@@ -273,6 +273,8 @@ overflow:auto;
 }
 .popup-buttons .button:last-child{
     margin: 0 20%;
+}
+.popup-buttons .button{
     border-radius: 30px;
 }
 
@@ -486,6 +488,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;
@@ -545,6 +548,7 @@ a:visited,a:link{
         width:30%;
         max-height:95px;
         float:left;
+        border: 1px solid #B5B5B5;
         margin:5px 5px 5px 0;
     }
 
@@ -613,10 +617,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;*/
@@ -639,9 +654,10 @@ a:visited,a:link{
 .search-hot .box {
     border:1px solid #EDEDED;
     color: #B7B7B7;
-    padding:3px;
+    padding: 8px 3px 3px 3px;
     width:30%;
     border-radius: 30px;
+    height: 40px;
     float:left;
     margin:5px;
     text-align:center;
@@ -757,8 +773,15 @@ a:visited,a:link{
 }
 .button.button-positive{
     background-color: #00C3DA;
+    color: #ffffff;
+}
+.button-default{
+    background: #00C3DA;
+}
+.button.button-default{
+    color: #ffffff;
 }
-.button.button-balanced.active, .button.button-positive.activated{
+.button.button-balanced.active, .button.button-positive.activated, .button.button-default.activated{
     background-color: #00C3DA;
 }
 .bar.bar-balanced{    

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
@@ -468,17 +467,22 @@
                 $scope.dream.interactions[index].showmore = true;
             }
         }
-        $scope.replay = function ($event, name, index) {
-           
+        $scope.replay = function ($event, name, index,currentindex) {
             $event.stopPropagation();
-            $scope.input.focus = true;
-            $scope.input.show = true;
-            angular.forEach($scope.dream.interactions, function (item) {
-                item.show = false;
-            })
-            $scope.dream.interactions[index].show = true;
-            $scope.input.placeholder = "评论" + name+":";
-            $scope.vm.title='';
+            if($scope.dream.interactions[index].comments[currentindex].user_id!=$scope.user.id){
+                $scope.input.focus = true;
+                $scope.input.show = true;
+                angular.forEach($scope.dream.interactions, function (item) {
+                    item.show = false;
+                })
+                $scope.dream.interactions[index].show = true;
+                $scope.input.placeholder = "评论" + name+":";
+                $scope.vm.title='';
+            }
+            else {
+                msg.confirm("评论","是否删除评论");
+            }
+
         };
       
         $scope.submitComment = function (index) {
@@ -521,6 +525,19 @@
             $scope.closeCode = function() {
                 $scope.qrCodemodal.hide();
             };
+            $ionicModal.fromTemplateUrl('commentPic.html', {
+                scope: $scope,
+                animation: 'slide-in-up'
+            }).then(function(modal) {
+                $scope.CommentPicmodal = modal;
+            });
+            $scope.openCommentPic = function(pic) {
+                $scope.CommentPicmodal.show();
+                $scope.commentPicUrl = pic;
+            };
+            $scope.closeCommentPic = function() {
+                $scope.CommentPicmodal.hide();
+            };
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) {
                     common.uploadFiles(img,1).then(function (result) {
@@ -925,14 +942,32 @@
             }).then(function(modal) {
                 $scope.qrCodemodal = modal;
             });
+            $ionicModal.fromTemplateUrl('commentPic.html', {
+                scope: $scope,
+                animation: 'slide-in-up'
+            }).then(function(modal) {
+                $scope.CommentPicmodal = modal;
+            });
 
             $scope.openCode = function() {
                 $scope.qrCodemodal.show();
-                $scope.vm.money = '';
             };
             $scope.closeCode = function() {
                 $scope.qrCodemodal.hide();
             };
+            $ionicModal.fromTemplateUrl('commentPic.html', {
+                scope: $scope,
+                animation: 'slide-in-up'
+            }).then(function(modal) {
+                $scope.CommentPicmodal = modal;
+            });
+            $scope.openCommentPic = function(pic) {
+                $scope.CommentPicmodal.show();
+                $scope.commentPicUrl = pic;
+            };
+            $scope.closeCommentPic = function() {
+                $scope.CommentPicmodal.hide();
+            };
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) {
                     common.uploadFiles(img,1).then(function (result) {
@@ -1006,7 +1041,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

@@ -158,28 +158,29 @@
                         </a>
                     </div>
                     <div class="item" style="border-bottom:15px solid #F2F2F2;" ng-click="add_comment()" ng-repeat="interaction in dream.interactions">
-                        <div ng-click="replay($event,dream.user.nickname,$index)">
+                        <div>
+                        <!--<div ng-click="replay($event,dream.user.nickname,$index)">-->
                             <img class="head" ng-src="{{dream.user.avatar | avator}}" />
                             <span class="utitle">{{dream.user.nickname}}</span>
                             <!--<span class="utitle kz">{{dream.end_time | lastDate}}</span>-->
                             <span class="utitle kz">{{dream.created_at}}</span>
                             <p class="subtile" style="white-space:normal; color: #666666">{{interaction.title}}</p>
                             <div class="picts item">
-                                <img class="slt" ng-click="showBigImage($event,'{{interaction.pic1}}')" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1" />
-                                <img class="slt" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2" />
-                                <img class="slt" ng-src="{{interaction.pic3}}" ng-if="interaction.pic3" />
-                                <img class="slt" ng-src="{{interaction.pic4}}" ng-if="interaction.pic4" />
-                                <img class="slt" ng-src="{{interaction.pic5}}" ng-if="interaction.pic5" />
-                                <img class="slt" ng-src="{{interaction.pic6}}" ng-if="interaction.pic6" />
-                                <img class="slt" ng-src="{{interaction.pic7}}" ng-if="interaction.pic7" />
-                                <img class="slt" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic1)" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic2)" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic3)" ng-src="{{interaction.pic3}}" ng-if="interaction.pic3" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic4)" ng-src="{{interaction.pic4}}" ng-if="interaction.pic4" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic5)" ng-src="{{interaction.pic5}}" ng-if="interaction.pic5" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic6)" ng-src="{{interaction.pic6}}" ng-if="interaction.pic6" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic7)" ng-src="{{interaction.pic7}}" ng-if="interaction.pic7" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic8)" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8" />
                             </div>
                             <div>
                                 <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls"></video>
                             </div>
                         </div>
                         <div class="list" style="margin-left:50px">
-                            <div class="item" ng-repeat="c in interaction.comments" ng-click="replay($event,c.user_nickname,$parent.$parent.$index)" ng-if="interaction.showmore||$index<4">
+                            <div class="item" ng-repeat="c in interaction.comments" ng-click="replay($event,c.user_nickname,$parent.$parent.$index,$index)" ng-if="interaction.showmore||$index<4">
                                 <img class="head" ng-src="{{c.user_avatar | avator}}" />
                                 <span>{{c.content}}</span>                                
                                 <span class="utitle">{{c.user_nickname}}</span>
@@ -205,13 +206,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">
@@ -271,6 +272,9 @@
         <div ng-if="code && type==1" ng-click="hideCode()" class="popover-backdrop">
             <img class="code" ng-src="{{url}}">
         </div>
+        <div ng-if="code && type==1" ng-click="hideCode()" class="popover-backdrop">
+            <img class="code" ng-src="{{url}}">
+        </div>
         <div ng-if="bigImage && type==2" ng-click="hideBigImage()" class="popover-backdrop">
             <img ng-src="{{url}}">
         </div>
@@ -369,7 +373,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: 35%; 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 +419,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 +430,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">
@@ -495,4 +499,17 @@
             </ion-content>
         </div>
     </script>
+    <script id="commentPic.html" type="text/ng-template">
+        <div class="modal">
+            <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
+                <h1 class="title">评论</h1>
+                <button class="button button-clear" ng-click="closeCommentPic()">关闭</button>
+            </ion-header-bar>
+            <ion-content>
+                <div style="margin: 0 auto">
+                    <img ng-src="{{commentPicUrl}}" style="width: 100%; height: 100%; padding: 10px; margin-top:10%;">
+                </div>
+            </ion-content>
+        </div>
+    </script>
 </ion-view>

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">