add

miaomiao/www/css/style.css

@@ -597,9 +597,9 @@ a:visited,a:link{
     position: absolute;
     z-index: 11;
     display: block;
-    width: 70%;
-    height: 60%;
-    margin: 30% 15%;
+    width: 80%;
+    height: 55%;
+    margin: 30% 10%;
 }
 .top2{
     margin-top: 20px; text-align: center; float:left; height: 100px; width: 100px;color: #6B6B6B;font-size: 16px;

miaomiao/www/js/controllers/home.js

@@ -380,11 +380,9 @@
             $scope.bigImage = false;
             $scope.showBigImage  = function(imageName){
                 $scope.url = imageName;
-                //$ionicBackdrop.retain();
                 $scope.bigImage = true;
             };
             $scope.hideBigImage = function(){
-                //$ionicBackdrop.release();
                 $scope.bigImage = false;
             };
             $scope.addpict = function () {
@@ -468,6 +466,8 @@
                     msg.hide();
                     console.log(result);
                     $scope.dream = result.data.data;
+                    var reg = new RegExp("\n", "g");
+                    $scope.dream.about = $scope.dream.about.replace(reg, "<br/>");
                     var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));
                     var date = new Date();
                     var inter = (end_time.getTime() - date.getTime()) / 1000;
@@ -530,6 +530,7 @@
             $scope.cancelSupport = function () {
                 $scope.tosupport = false;
                 $scope.toshare = false;
+                $scope.input.show = false;
 
             };
             $scope.toshare = false;
@@ -541,7 +542,7 @@
                 $state.go("app.recharge")
             };
             $scope.shareDream = function(){
-                $state.go("app.my_shareDream",{item:$scope.dream});
+                $state.go("app.shareDream",{item:$scope.dream});
             };
 
             //实时排行
@@ -574,15 +575,13 @@
                 if(day<0 && h<0 && m>0) $scope.timer = m+'分钟';
                 if(day<0 && h<0 && m<0) $scope.timer = '结束';
 
-                /*if(day>0) $scope.timer = day+'天'+ $scope.timer;
-
-                if($scope.leftTimer)$interval.cancel($scope.leftTimer);
-                $scope.leftTimer = $interval(function () {
-                    if (countDown >= 1) leftTimer(countDown - 1);
-                },1000);
-                if(countDown<=0){
-                    $scope.timer='结束';
-                }*/
+                /* if($scope.leftTimer)$interval.cancel($scope.leftTimer);
+                 $scope.leftTimer = $interval(function () {
+                 if (countDown >= 1) leftTimer(countDown - 1);
+                 },1000);*/
+                /* if(countDown<=0){
+                 $scope.timer='结束';
+                 }*/
             };
             $scope.changeIndex = function (index) {
                 $scope.index = index;
@@ -660,12 +659,14 @@
             };
             $scope.input = {
                 placeholder: '评论',
-                focus:false
+                focus: false,
+                show:false
             };
-
             $scope.replay = function ($event, name) {
+
                 $event.stopPropagation();
                 $scope.input.focus = true;
+                $scope.input.show = true;
                 $scope.input.placeholder = "回复" + name;
                 $scope.vm.title='';
             };
@@ -688,6 +689,14 @@
                     $scope.closeModal();
                 })
             };
+            $scope.bigImage = false;
+            $scope.showBigImage  = function(imageName){
+                $scope.url = imageName;
+                $scope.bigImage = true;
+            };
+            $scope.hideBigImage = function(){
+                $scope.bigImage = false;
+            };
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) {
                     common.uploadFiles(img,1).then(function (result) {
@@ -737,7 +746,7 @@
                 $scope.modal.remove();
             });
             $scope.toMessage = function(){
-                $state.go("app.my_message");
+                $state.go("app.message");
             }
         }]);
     app.controller('userDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"

miaomiao/www/js/controllers/my.js

@@ -159,7 +159,7 @@
                 $scope.toshare = true;
             };
             $scope.shareDream = function(){
-                $state.go("app.my_shareDream",{item:$scope.user});
+                $state.go("app.shareDream",{item:$scope.user});
             };
             $scope.toDetail = function (id) {
                 $state.go('app.home_dreamdetail',{id:id});

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

@@ -227,7 +227,7 @@
         </div>
         <!--点击看大图-->
         <div ng-if="bigImage && type==2" ng-click="hideBigImage()" class="popover-backdrop">
-            <img class="img-responsive" src="{{url}}" style="">
+            <img src="{{url}}">
         </div>
      <script id="interaction-modal.html" type="text/ng-template">
       <div class="modal">

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

@@ -51,7 +51,7 @@
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px;">
                         <h2>{{dream.name}}</h2>
-                        <p>{{dream.about}}</p>
+                        <p style="height: 60px; overflow: hidden">{{dream.about}}</p>
                     </div>
                     <div style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
                         已实现<br>