YanaDH há 7 anos atrás
pai
commit
f865dcb22c

+ 32 - 1
miaomiao/www/js/controllers/home.js

xqd xqd
@@ -520,6 +520,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) {
@@ -924,14 +937,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) {

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

xqd xqd xqd
@@ -158,21 +158,21 @@
                         </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>
                             <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>
@@ -271,6 +271,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>
@@ -495,4 +498,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>