Merge branch 'dev' of http://101.201.78.203/cfld-front/liyeyun into dev

src/components/common/CommonImage.vue

 <!-- 图片展示，方便修改占位图、错误图 -->
 <template>
-  <ElImage :src="src">
+  <ElImage :src="src" @click="handleClick">
     <template #placeholder>
-      <img class="h-full w-full" :src="currentdefault" />
+      <img class="h-full w-full" :src="currentdefault" @click.stop="handleClick" />
+    </template>
+    <template #error>
+      <img class="h-full w-full" :src="currentdefault" @click.stop="handleClick" />
     </template>
-    <template #error><img class="h-full w-full" :src="currentdefault" /></template>
   </ElImage>
 </template>
 
@@ -30,6 +32,8 @@ const props = withDefaults(
   },
 );
 
+const emit = defineEmits(['click']);
+
 const currentdefault = computed(() => {
   const config: Record<DetailType, string> = {
     [DetailType.carrier]: defaultCarrierPic,
@@ -40,4 +44,8 @@ const currentdefault = computed(() => {
   };
   return props.type ? config[props.type] : defaultPicIcon;
 });
+
+const handleClick = () => {
+  emit('click');
+};
 </script>

src/components/common/ImageList.vue

@@ -19,6 +19,7 @@
           <div
             v-if="image?.href"
             class="vr-icon absolute left-1/2 top-1/2 z-20 -translate-x-1/2 -translate-y-1/2 cursor-pointer"
+            @click="handleClick(image?.href)"
           ></div>
         </SwiperSlide>
       </Swiper>

src/components/detail/MiniListItem.vue

 <!-- 产业园、开发区内的载体、土地项 -->
 <template>
   <div v-if="detail" class="w-[274px]">
-    <div @click="handleDetail">
+    <div class="relative text-[0px]" @click="handleDetail">
       <CommonImage
         class="h-[204px] w-full cursor-pointer rounded-sm"
         :src="detail.imgUrl"
         :type="detailType"
       />
+      <div v-if="detail.isVr" class="absolute bottom-2 left-2">
+        <img class="h-[45px] w-[45px] rounded-[50%]" src="@/assets/images/vr-icon.png" />
+      </div>
     </div>
     <div
       class="ell2 mt-3 cursor-pointer font-yahei text-lg leading-6 text-[#1A1A1A]"
@@ -28,6 +31,7 @@ export interface MiniDetail {
   name: string;
   info: string;
   id: number;
+  isVr?: number;
 }
 withDefaults(
   defineProps<{

src/views/develop/DevelopZoneDetail.vue

@@ -325,8 +325,10 @@ const industryFund = computed(() => {
 /** 产业园列表 */
 const industrials = computed(() => {
   if (detail.value) {
-    return detail.value.parkPageList.map(({ imgUrl, name, levelName, coverArea, id }) => {
+    return detail.value.parkPageList.map((item) => {
+      const { imgUrl, name, levelName, coverArea, id } = item;
       return {
+        ...item,
         imgUrl,
         name,
         info: [levelName, coverArea ? `${coverArea}亩` : ''].filter(haveValue).join(' | '),
@@ -341,8 +343,10 @@ const industrials = computed(() => {
 /** 开发区列表 */
 const lands = computed(() => {
   if (detail.value) {
-    return detail.value.landPageList.map(({ name, imgUrl, area, type, id }) => {
+    return detail.value.landPageList.map((item) => {
+      const { name, imgUrl, area, type, id } = item;
       return {
+        ...item,
         imgUrl,
         name,
         info: [type, area ? `${area}亩` : ''].filter(haveValue).join(' | '),

src/views/home/HomeView.vue

@@ -162,14 +162,19 @@
           class="relative w-[272px] cursor-pointer"
           @click="toDetail(item)"
         >
+          <div class="relative text-[0px]">
             <CommonImage
               :type="currentListType"
               class="h-[205px] w-[272px] rounded-sm"
               :src="item.imgUrl"
               alt=""
             />
+            <div v-if="!item.isVr" class="absolute bottom-2 left-2">
+              <img class="h-[45px] w-[45px] rounded-[50%]" src="@/assets/images/vr-icon.png" />
+            </div>
+          </div>
           <span
-            v-if="item.isSuper"
+            v-if="item!.isSuper"
             class="absolute left-0 top-0 block rounded-tl-sm bg-[#C0322B] px-3 text-sm font-semibold leading-[26px] text-white"
           >
             {{ item.isSuperName }}
@@ -245,7 +250,11 @@
           <img class="small-logo" src="../../assets/images/partner/partner-logo11.png" alt="" />
           <img class="small-logo" src="../../assets/images/partner/partner-logo15.png" alt="" />
           <img class="small-logo" src="../../assets/images/partner/partner-logo16.png" alt="" />
-          <img class="large-logo h40" src="../../assets/images/partner/partner-footer1.png" alt="" />
+          <img
+            class="large-logo h40"
+            src="../../assets/images/partner/partner-footer1.png"
+            alt=""
+          />
         </div>
         <div class="flex w-[180px] flex-wrap justify-between">
           <img class="small-logo" src="../../assets/images/partner/partner-logo2.png" alt="" />
@@ -253,7 +262,11 @@
           <img class="small-logo" src="../../assets/images/partner/partner-logo9.png" alt="" />
           <img class="small-logo" src="../../assets/images/partner/partner-logo12.png" alt="" />
           <img class="large-logo" src="../../assets/images/partner/partner-logo17.png" alt="" />
-          <img class="large-logo h40" src="../../assets/images/partner/partner-footer2.png" alt="" />
+          <img
+            class="large-logo h40"
+            src="../../assets/images/partner/partner-footer2.png"
+            alt=""
+          />
         </div>
         <div class="flex w-[180px] flex-wrap justify-between">
           <img class="small-logo" src="../../assets/images/partner/partner-logo3.png" alt="" />
@@ -261,7 +274,11 @@
           <img class="small-logo" src="../../assets/images/partner/partner-logo13.png" alt="" />
           <img class="small-logo" src="../../assets/images/partner/partner-logo26.png" alt="" />
           <img class="large-logo" src="../../assets/images/partner/partner-logo18.png" alt="" />
-          <img class="large-logo h40" src="../../assets/images/partner/partner-footer3.png" alt="" />
+          <img
+            class="large-logo h40"
+            src="../../assets/images/partner/partner-footer3.png"
+            alt=""
+          />
         </div>
         <div class="flex w-[180px] flex-wrap justify-between">
           <img class="small-logo" src="../../assets/images/partner/partner-logo4.png" alt="" />
@@ -269,20 +286,32 @@
           <img class="small-logo" src="../../assets/images/partner/partner-logo10.png" alt="" />
           <img class="small-logo" src="../../assets/images/partner/partner-logo24.png" alt="" />
           <img class="large-logo" src="../../assets/images/partner/partner-logo19.png" alt="" />
-          <img class="large-logo h40" src="../../assets/images/partner/partner-footer4.png" alt="" />
+          <img
+            class="large-logo h40"
+            src="../../assets/images/partner/partner-footer4.png"
+            alt=""
+          />
         </div>
         <div class="flex w-[180px] flex-wrap justify-between">
           <img class="large-logo" src="../../assets/images/partner/partner-logo22.png" alt="" />
           <img class="large-logo" src="../../assets/images/partner/partner-logo20.png" alt="" />
           <img class="large-logo" src="../../assets/images/partner/partner-logo27.png" alt="" />
-          <img class="large-logo h40" src="../../assets/images/partner/partner-footer5.png" alt="" />
+          <img
+            class="large-logo h40"
+            src="../../assets/images/partner/partner-footer5.png"
+            alt=""
+          />
         </div>
         <div class="flex w-[180px] flex-wrap justify-between">
           <img class="large-logo" src="../../assets/images/partner/partner-logo23.png" alt="" />
           <img class="small-logo" src="../../assets/images/partner/partner-logo14.png" alt="" />
           <img class="small-logo" src="../../assets/images/partner/partner-logo25.png" alt="" />
           <img class="large-logo" src="../../assets/images/partner/partner-logo21.png" alt="" />
-          <img class="large-logo h40" src="../../assets/images/partner/partner-footer6.png" alt="" />
+          <img
+            class="large-logo h40"
+            src="../../assets/images/partner/partner-footer6.png"
+            alt=""
+          />
         </div>
       </div>
     </div>
@@ -541,7 +570,8 @@ watchEffect(async () => {
 </script>
 <style lang="scss" scoped>
 .header-bg {
-  background: url('https://cfld-obs-pro01.obs.cn-north-4.myhuaweicloud.com/img/system/%E7%AB%8B%E4%B8%9A%E4%BA%91%E9%A6%96%E9%A1%B5%E8%83%8C%E6%99%AF%E5%9B%BE1%20.png?x-image-process=image/quality,q_80') center center no-repeat;
+  background: url('https://cfld-obs-pro01.obs.cn-north-4.myhuaweicloud.com/img/system/%E7%AB%8B%E4%B8%9A%E4%BA%91%E9%A6%96%E9%A1%B5%E8%83%8C%E6%99%AF%E5%9B%BE1%20.png?x-image-process=image/quality,q_80')
+    center center no-repeat;
   background-size: cover;
   color: #ffffff;
   .text-\[\#333333\],

src/views/industrial-park/IndustrialParkDetail.vue

@@ -269,8 +269,10 @@ const enterprises = computed(() => {
 /** 产业园内载体列表 */
 const carriers = computed<MiniDetail[]>(() => {
   if (detail.value) {
-    return detail.value.parkCarrier.map(({ imgUrl, type, area, name, id }) => {
+    return detail.value.parkCarrier.map((item) => {
+      const { imgUrl, type, area, name, id } = item;
       return {
+        ...item,
         imgUrl,
         name,
         info: [area ? `${area}㎡` : '', type].filter(haveValue).join(' | '),