From 4a062a98d08029028c01e78f2f344b6620fc02f5 Mon Sep 17 00:00:00 2001
From: 396316021 <396316021@qq.com>
Date: Mon, 30 Oct 2023 14:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=201.?=
 =?UTF-8?q?=E5=AE=A0=E7=89=A9=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F=E5=92=8C?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=8D=E8=83=BD=E4=B8=8A=E4=BC=A0=202.?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E7=9A=84=E8=83=8C=E6=99=AF=E7=99=BD=E6=9D=A1=203.?=
 =?UTF-8?q?=E5=AE=A0=E7=89=A9=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9B=B8?=
 =?UTF-8?q?=E5=86=8C=E5=8F=AF=E7=82=B9=E5=87=BB=E6=94=BE=E5=A4=A7=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/PetPage/index.vue                  | 11 ++-
 pages/FeedLog/index.vue                       | 93 +++++++++++++++++++
 pages/PetDetail/index.vue                     | 15 ++-
 .../uv-preview-video/uv-preview-video.vue     |  2 +-
 4 files changed, 113 insertions(+), 8 deletions(-)

diff --git a/components/PetPage/index.vue b/components/PetPage/index.vue
index 65e1257..928145b 100644
--- a/components/PetPage/index.vue
+++ b/components/PetPage/index.vue
@@ -775,9 +775,9 @@
               this.data.is_health_name = res.name;
             }
           });
-          this.avatarList = res.data.avatar && res.data.avatar.split(',').map(item => {
+          this.avatarList = res.data.avatar ? res.data.avatar.split(',').map(item => {
             return {url:item};
-          });
+          }) : [];
 
           if((res.data.images && res.data.images.length > 0)){
             this.imagesList =  res.data.images.map(item => {
@@ -785,9 +785,9 @@
             });
           }
 
-          this.videoList = res.data.video && res.data.video.split(',').map(item => {
+          this.videoList = res.data.video ? res.data.video.split(',').map(item => {
             return {url:item};
-          });
+          }):[];
           this.backgroundList = res.data.background_image && res.data.background_image.split(',').map(item => {
             return {url:item};
           });
@@ -846,6 +846,7 @@
         }
       },
       async afterAvatarRead  (event){
+        let that = this;
         let lists = [].concat(event.file);
 
         let fileListLen = this.avatarList.length;
@@ -860,7 +861,7 @@
 
           api.uploadOssFile(lists[i].url).then(res => {
             let item = this.avatarList[fileListLen];
-            this.avatarList.splice(fileListLen, 1, {
+            that.avatarList.splice(fileListLen, 1, {
               ...item,
               status: 'success',
               message: '',
diff --git a/pages/FeedLog/index.vue b/pages/FeedLog/index.vue
index d71f0bd..0379063 100644
--- a/pages/FeedLog/index.vue
+++ b/pages/FeedLog/index.vue
@@ -63,6 +63,16 @@
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
               </uv-upload>
+              <view class="row">
+                <view class="col-3" v-for="item in detail.feedlist.meal_imgs">
+                  <view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
+                    <u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                  </view>
+                  <view class="" v-else>
+                    <video :src="item.url" style="height:200rpx;width:100%;"></video>
+                  </view>
+                </view>
+              </view>
             </u-collapse-item>
 
           </u-collapse>
@@ -88,6 +98,16 @@
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
               </uv-upload>
+              <view class="row">
+                <view class="col-3" v-for="item in detail.feedlist.food_imgs">
+                  <view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
+                    <u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                  </view>
+                  <view class="" v-else>
+                    <video :src="item.url" style="height:200rpx;width:100%;"></video>
+                  </view>
+                </view>
+              </view>
             </u-collapse-item>
 
           </u-collapse>
@@ -113,6 +133,16 @@
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
               </uv-upload>
+              <view class="row">
+                <view class="col-3" v-for="item in detail.feedlist.snack_imgs">
+                  <view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
+                    <u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                  </view>
+                  <view class="" v-else>
+                    <video :src="item.url" style="height:200rpx;width:100%;"></video>
+                  </view>
+                </view>
+              </view>
             </u-collapse-item>
 
           </u-collapse>
@@ -138,6 +168,16 @@
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
               </uv-upload>
+              <view class="row">
+                <view class="col-3" v-for="item in detail.feedlist.drug_imgs">
+                  <view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
+                    <u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                  </view>
+                  <view class="" v-else>
+                    <video :src="item.url" style="height:200rpx;width:100%;"></video>
+                  </view>
+                </view>
+              </view>
             </u-collapse-item>
 
           </u-collapse>
@@ -163,6 +203,16 @@
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
               </uv-upload>
+              <view class="row">
+                <view class="col-3" v-for="item in detail.feedlist.note_imgs">
+                  <view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
+                    <u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                  </view>
+                  <view class="" v-else>
+                    <video :src="item.url" style="height:200rpx;width:100%;"></video>
+                  </view>
+                </view>
+              </view>
             </u-collapse-item>
 
           </u-collapse>
@@ -188,6 +238,16 @@
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
               </uv-upload>
+              <view class="row">
+                <view class="col-3" v-for="item in detail.feedlist.goods_imgs">
+                  <view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
+                    <u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                  </view>
+                  <view class="" v-else>
+                    <video :src="item.url" style="height:200rpx;width:100%;"></video>
+                  </view>
+                </view>
+              </view>
             </u-collapse-item>
 
           </u-collapse>
@@ -213,6 +273,16 @@
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
               </uv-upload>
+              <view class="row">
+                <view class="col-3" v-for="item in detail.feedlist.line_imgs">
+                  <view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
+                    <u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                  </view>
+                  <view class="" v-else>
+                    <video :src="item.url" style="height:200rpx;width:100%;"></video>
+                  </view>
+                </view>
+              </view>
             </u-collapse-item>
 
           </u-collapse>
@@ -238,6 +308,16 @@
                 <u-image :src="staticImage.feedUpload"
                        mode="widthFix" width="130rpx" height="130rpx"></u-image>
               </uv-upload>
+              <view class="row">
+                <view class="col-3" v-for="item in detail.feedlist.other_imgs">
+                  <view class="" v-if="item.type === 'image'" style="margin-right:10rpx;">
+                    <u-image mode="aspectFill" width="100%" height="200rpx" :src="item.url" @click="showImage(item.url)"></u-image>
+                  </view>
+                  <view class="" v-else>
+                    <video :src="item.url" style="height:200rpx;width:100%;"></video>
+                  </view>
+                </view>
+              </view>
             </u-collapse-item>
 
           </u-collapse>
@@ -293,6 +373,11 @@
       </MzButton>
     </view>
   </view>
+  <u-overlay :show="imageShow" @click="imageShow = false">
+    <view class="" style="display:flex;align-items: center;justify-content:center;width:100%;height:100vh;">
+      <u-image mode="widthFix" :src="imageUrl" height="auto" width="100vw"></u-image>
+    </view>
+  </u-overlay>
 </template>
 
 <script>
@@ -318,6 +403,8 @@
     },
 		data() {
 			return {
+        imageShow:false,
+        imageUrl:'',
 				title: 'Hello',
 				loading: true,
         type:'detail',
@@ -375,6 +462,10 @@
       this.getFeedLog(options.pet_id);
 		},
 		methods: {
+      showImage(url){
+        this.imageUrl = url;
+        this.imageShow = true;
+      },
       redirtTo(url){
         uni.redirectTo({
           url:url
@@ -439,6 +530,7 @@
             this.detail.feedlist = feedlist;
           }
           this.detail = data.data;
+          if(this.type !== 'detail'){
           let images = [
             'meal_imgs',
             'food_imgs',
@@ -452,6 +544,7 @@
             images.forEach((item,index) => {
               that.uploadShow(data.data.feedlist[item],item);
             });
+          }
         })
       },
 
diff --git a/pages/PetDetail/index.vue b/pages/PetDetail/index.vue
index 3aceec9..f9eb0f0 100644
--- a/pages/PetDetail/index.vue
+++ b/pages/PetDetail/index.vue
@@ -160,8 +160,8 @@
             <view class="video-content row" >
               <view class="photo-item col-4" v-for="(item, index) in pet.images" >
                 <view class="photo-item-container" v-if="item !== ''">
-                  <view class="photo-content">
-                    <image class="img" mode="widthFix" :src="item ? item : staticImage.wallpaperBgImage"/>
+                  <view class="photo-content" @click="showImage(item ? item : staticImage.wallpaperBgImage)">
+                    <u-image height="auto" width="100%" mode="widthFix" :src="item ? item : staticImage.wallpaperBgImage"></u-image>
                   </view>
                   <view class="photo-background"></view>
                 </view>
@@ -197,6 +197,11 @@
     </view>
   </view>
 	<!-- <RightNav></RightNav> -->
+  <u-overlay :show="imageShow" @click="imageShow = false">
+    <view class="" style="display:flex;align-items: center;justify-content:center;width:100%;height:100vh;">
+      <u-image mode="widthFix" :src="imageUrl" height="auto" width="100vw"></u-image>
+    </view>
+  </u-overlay>
 </template>
 
 <script>
@@ -220,6 +225,8 @@
 		},
 		data() {
 			return {
+        imageShow:false,
+        imageUrl:'',
 				title: 'Hello',
 				loading: true,
 				staticImage: {
@@ -275,6 +282,10 @@
         this.getDetail(option.id);
 		},
 		methods: {
+      showImage(url){
+        this.imageUrl = url;
+        this.imageShow = true;
+      },
       delPet(){
         functions.confirm("确认删除该宠物吗？").then(() => {
           delPet(this.id).then((res) => {
diff --git a/uni_modules/uv-upload/components/uv-preview-video/uv-preview-video.vue b/uni_modules/uv-upload/components/uv-preview-video/uv-preview-video.vue
index 327c680..4533425 100644
--- a/uni_modules/uv-upload/components/uv-preview-video/uv-preview-video.vue
+++ b/uni_modules/uv-upload/components/uv-preview-video/uv-preview-video.vue
@@ -1,5 +1,5 @@
 <template>
-	<uv-popup ref="popup" @change="change">
+	<uv-popup ref="popup" @change="change" customStyle="background-color:transparent;">
 		<view class="video-view" v-if="show">
 			<video class="video" :src="getSec" :autoplay="autoplay"></video>
 		</view>