From 823be2a5d0b1491adf3b36f44647fb799435e702 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 8 Apr 2024 09:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=A3=85=E4=BF=AE?=
 =?UTF-8?q?=20-=20=E9=83=A8=E5=88=86=E5=9B=BE=E7=89=87=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E6=B7=BB=E5=8A=A0=E5=A4=A7=E5=9B=BE=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/component/pictureCube.vue | 20 +++++++++++-------
 pages/index/component/swiperBg.vue    | 30 ++++++++++++++-------------
 utils/util.js                         | 17 +++++++++++++++
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/pages/index/component/pictureCube.vue b/pages/index/component/pictureCube.vue
index 0ef4bb9..5d636d7 100644
--- a/pages/index/component/pictureCube.vue
+++ b/pages/index/component/pictureCube.vue
@@ -39,14 +39,14 @@
 			</view>
 		</view>
 	</view>
-	
+
 </template>
 
 <script>
 
-	
+
 	import {merPath} from "@/utils/index"
-	
+
 	export default {
 		name: 'pictureCube',
 		props: {
@@ -91,7 +91,7 @@
 						success: (res) => {
 							if (res && res.height > 0) {
 								let height = res.height * ((that.widthC-that.prConfig*2) / res.width)
-								that.$set(that, 'imageH', height);	
+								that.$set(that, 'imageH', height);
 							} else {
 								that.$set(that, 'imageH', (that.widthC-that.prConfig*2)*2);
 							}
@@ -113,9 +113,15 @@
 				else return url.replace('http://', 'https://');
 			},
 			goDetail(url) {
-				let urls = url.link
-				urls = merPath(urls, this.merId)
-				this.$util.JumpPath(urls);
+        console.log(url)
+        let urls = url.link || '';
+        let image = url.image || '';
+        if(urls){
+          urls = merPath(urls, this.merId)
+          this.$util.JumpPath(urls);
+        }else if(image){
+          this.$util.previewImage(url.image);
+        }
 			}
 		}
 	}
diff --git a/pages/index/component/swiperBg.vue b/pages/index/component/swiperBg.vue
index f08ae86..4bd1d71 100644
--- a/pages/index/component/swiperBg.vue
+++ b/pages/index/component/swiperBg.vue
@@ -1,21 +1,21 @@
 <template>
-	<view class="swiperBg" :style="'padding-top:' + marginTop +'rpx;background: linear-gradient(180deg, '+ bgColor0 +' 50%, '+ bgColor1 +' 100%);'">
+	<view :hidden="is_show" class="swiperBg" :style="'padding-top:' + marginTop +'rpx;background: linear-gradient(180deg, '+ bgColor0 +' 50%, '+ bgColor1 +' 100%);'">
 		<!-- 单图模式 -->
 		<block v-if="swiperType == 0">
 			<view class="item-img" v-for="(item,index) in imgUrls" :key="index" :style="{padding:'0 '+paddinglr+'rpx',marginBottom:itemEdge+'rpx'}">
 				<image @click="goDetail(item)" :src="item.img"></image></view>
 		</block>
 		<block v-else>
-			<view class="swiper page_swiper" :class="[docConfig == 1 ? 'square' : docConfig == 0 ? 'circular' : 'nodoc',imgConfig ? '' : 'fillet','dot'+txtStyle]" 
+			<view class="swiper page_swiper" :class="[docConfig == 1 ? 'square' : docConfig == 0 ? 'circular' : 'nodoc',imgConfig ? '' : 'fillet','dot'+txtStyle]"
 			:style="'padding: 0 '+ paddinglr +'rpx;'"
 			 v-if="imgUrls.length">
 				<swiper
-				 indicator-dots="true" 
-				 :autoplay="true" 
+				 indicator-dots="true"
+				 :autoplay="true"
 				 :circular="circular"
-				 :interval="interval" 
-				 :duration="duration" 
-				 indicator-color="rgba(255,255,255,0.6)" 
+				 :interval="interval"
+				 :duration="duration"
+				 indicator-color="rgba(255,255,255,0.6)"
 				 indicator-active-color="#fff"
 				 :style="'height:'+(imageH+10)+'rpx;'"
 				 :current="swiperCur"
@@ -24,15 +24,15 @@
 					<block v-for="(item,index) in imgUrls" :key="index">
 						<swiper-item :class="{ active: index == swiperCur }">
 							<view @click="goDetail(item)" class='slide-navigator acea-row row-between-wrapper'>
-								<image :src="item.img" class="slide-image aa" :style="'height:'+ imageH +'rpx;'" mode="aspectFill"></image>
+								<image @click="$util.previewImage(item.img)" :src="item.img" class="slide-image aa" :style="'height:'+ imageH +'rpx;'" mode="aspectFill"></image>
 							</view>
 						</swiper-item>
 					</block>
 				</swiper>
 				<!-- <view class="dots" :class="'dot'+txtStyle">
-					<block v-for="(item,index) in imgUrls" :key="index">  
-						<view class="dot" :class="[docConfig == 1 ? 'square' : docConfig == 0 ? 'circular' : 'nodoc',index == swiperCur ? ' active' : '']"></view>  
-					</block>  
+					<block v-for="(item,index) in imgUrls" :key="index">
+						<view class="dot" :class="[docConfig == 1 ? 'square' : docConfig == 0 ? 'circular' : 'nodoc',index == swiperCur ? ' active' : '']"></view>
+					</block>
 				</view> -->
 			</view>
 		</block>
@@ -41,7 +41,7 @@
 
 <script>
 
-	
+
 	import {merPath} from "@/utils/index"
 	export default {
 		name: 'swiperBg',
@@ -70,12 +70,14 @@
 				imageH: 310,
 				swiperCur: 0,
 				swiperType: 1,
+        is_show: true,
 			};
 		},
 		watch: {
 			imageH(nVal, oVal) {
 				let self = this
 				this.imageH = nVal
+        this.is_show = false;
 			}
 		},
 		created() {
@@ -87,9 +89,9 @@
 				uni.getImageInfo({
 					src: that.setDomain(that.imgUrls[0].img),
 					success: function(res) {
-						if (res && res.height > 0) {	
+						if (res && res.height > 0) {
 							let height = res.height * ((750-20) / res.width)
-							that.$set(that, 'imageH', height);	
+							that.$set(that, 'imageH', height);
 						} else {
 							that.$set(that, 'imageH', 375);
 						}
diff --git a/utils/util.js b/utils/util.js
index 0147f26..32b2f8c 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -998,4 +998,21 @@ export default {
 			}
 		}
 	},
+	// 图片预览
+	previewImage(urls, current = ''){
+		// 如果是字符串 则修改为对象
+		if(typeof urls === 'string') urls = [urls];
+		// 预览图片
+		uni.previewImage({
+			urls: urls,
+			current: current
+		});
+	},
+
+
+
+
+
+
+
 }