YanaDH пре 7 година
родитељ
комит
ab08498c15

+ 14 - 1
miaomiao/www/css/style.css

xqd xqd
@@ -588,6 +588,19 @@ a:visited,a:link{
     padding-top:49px;
 }
 /*dreamDetail*/
+.popover-backdrop{
+    background: rgba(50, 50, 50, 0.5);
+    height: -webkit-fill-available;
+    /*height: 100%;*/
+}
+.popover-backdrop img{
+    position: absolute;
+    z-index: 11;
+    display: block;
+    width: 70%;
+    height: 60%;
+    margin: 30% 15%;
+}
 .top2{
     margin-top: 20px; text-align: center; float:left; height: 100px; width: 100px;color: #6B6B6B;font-size: 16px;
 }
@@ -605,7 +618,7 @@ a:visited,a:link{
     border-radius:30px;
 }
 .button{
-    min-width: 100px;
+    min-width: 90px;
     min-height: 10px;
 }
 /*seach.html*/

+ 12 - 5
miaomiao/www/js/controllers/home.js

xqd xqd
@@ -125,8 +125,8 @@
         });
     }]);
 
-    app.controller('dreamDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
-        , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
+    app.controller('dreamDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams","$ionicBackdrop", "$timeout", "$ionicScrollDelegate", "$interval"
+        , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams,$ionicBackdrop, $timeout, $ionicScrollDelegate, $interval) {
         var id = $stateParams.id;
         var top3user = '';
             $scope.chosedIndex = 0;
@@ -377,10 +377,17 @@
                 $scope.closeModal();
             })
         };
-            $scope.seePic = function(){
-
+            $scope.bigImage = false;
+            $scope.showBigImage  = function(imageName){
+                $scope.url = imageName;
+                //$ionicBackdrop.retain();
+                $scope.bigImage = true;
             };
-        $scope.addpict = function () {
+            $scope.hideBigImage = function(){
+                //$ionicBackdrop.release();
+                $scope.bigImage = false;
+            };
+            $scope.addpict = function () {
             common.chooseImage().then(function (img) {
                 common.uploadFiles(img,1).then(function (result) {
                     var response = JSON.parse(result.response);

+ 9 - 8
miaomiao/www/templates/home/dream-detail.html

xqd xqd xqd xqd xqd xqd
@@ -7,7 +7,7 @@
             <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
         </button>
     </ion-nav-buttons>
-    <div ng-if="type==1 && user.id != dream.user_id" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
+    <div ng-if="type==1 && user.id == dream.user_id" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
         <div class="row">
             <div class="col dreamButton">
                 <button ng-click="openSupport()" class="button button-outline button-calm" style="border: 1px solid #00C3DA">
@@ -113,9 +113,8 @@
                     </div>
                 </div>
             </div>
-            <div>
-                <a class="btn-file-up" style="margin: 0 0 10px 37%">
-                    <!--<img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>-->
+            <div style="width: 100px; margin: 0 auto">
+                <a class="btn-file-up" style="margin-left: -1px">
                     <em style="font-size: 16px">二维码</em>
                 </a>
             </div>
@@ -135,7 +134,7 @@
                         <span class="utitle kz">剩余{{dream.end_time | lastDate}}天</span>
                         <p ng-click="replay($event,dream.user.nickname)" class="subtile"  style="white-space:normal; color: #666666">{{interaction.title}}</p>
                         <div class="picts item">
-                            <img class="slt" ng-click="seePic()" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1"/>
+                            <img class="slt" ng-click="showBigImage('{{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"/>
@@ -163,7 +162,6 @@
                 </div>
             </div>
         </div>
-        
         <div ng-if="type==3" class="phbcontent">
             <div class="detail-head" style="height: 180px" ng-if="dream.top3user.length>0">
                 <div class="row">
@@ -227,7 +225,10 @@
             </div>
             
         </div>
-
+        <!--点击看大图-->
+        <div ng-if="bigImage && type==2" ng-click="hideBigImage()" class="popover-backdrop">
+            <img class="img-responsive" src="{{url}}" style="">
+        </div>
      <script id="interaction-modal.html" type="text/ng-template">
       <div class="modal">
         <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
@@ -404,7 +405,7 @@
                         <em>&nbsp;充值</em>
                     </div>
                     <span style="height:100%;float: right;">
-                        <a style="border-radius:90px; width:70px; height: 30px; min-height: 30px; font-size:1.1em; padding: 0; line-height: 24px; margin-top: 9px" class="button button-calm"  ng-click="supportDream()">发送</a>
+                        <a style="border-radius:90px; min-width: 60px; height: 30px; min-height: 30px; font-size:1.1em; padding: 0; line-height: 24px; margin-top: 9px" class="button button-calm"  ng-click="supportDream()">发送</a>
                     </span>
                 </div>
             </div>

+ 1 - 1
miaomiao/www/templates/home/index.html

xqd
@@ -89,7 +89,7 @@
                     </div>
                     <!--上拉更多-->
                     <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>
-</ion-content> 
+            </ion-content>
         </ion-side-menu-content>
         <!-- Left menu -->
         <ion-side-menu side="left" width="200">