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

.env.production

-VITE_BASE_URL=https://prod.api.liyeyun.com
-VITE_BASE_USER_URL=https://prod.user.liyeyun.com
+VITE_BASE_URL=https://www.liyeyun.com
+VITE_BASE_USER_URL=https://www.liyeyun.com

src/assets/styles/reset.scss

@@ -79,15 +79,6 @@ body {
   }
 }
 
-.el-input .el-input__wrapper.el-input__wrapper {
-  &.is-focus.is-focus {
-    box-shadow: 0 0 0 1px rgb(220, 223, 230) inset !important;
-  }
-}
-.el-textarea__inner:focus {
-  box-shadow: 0 0 0 1px rgb(220, 223, 230) inset !important;
-}
-
 $namespace: 'lyy'; // change the 'mx' to 'xmx'. then <date-picker prefix-class="lyy" />
 
 $default-color: #555;

src/components/common/CommonHeader.vue

@@ -69,7 +69,7 @@
               "
             >
               <div
-                class="flex w-[167px] items-center pl-2"
+                class="flex w-[167px] items-center justify-end pl-2"
                 @click="
                   () => {
                     route.name === 'home' && toUserCenter();
@@ -78,7 +78,7 @@
               >
                 <img src="@/assets/images/icon-avatar.png" class="mr-3 h-[26px] w-[26px]" />
                 <span
-                  class="mr-2 cursor-pointer text-base text-[#333333]"
+                  class="cursor-pointer text-base text-[#333333]"
                   :class="route.name !== 'home' ? 'text-[#333333]' : 'text-white'"
                 >
                   {{ userInfo.phone }}
@@ -105,7 +105,7 @@
                 </div>
               </template>
             </ElDropdown>
-            <span class="ml-5 cursor-pointer" @click="handleLogout">退出</span>
+            <span class="ml-3 cursor-pointer" @click="handleLogout">退出</span>
           </div>
           <div v-else class="cursor-pointer">
             <span @click="handleLogin('loginByPhone')">登录</span>

src/components/common/CommonImage.vue

@@ -2,19 +2,42 @@
 <template>
   <ElImage :src="src">
     <template #placeholder>
-      <img class="h-full w-full" src="@/assets/images/default-pic.png" />
+      <img class="h-full w-full" :src="currentdefault" />
     </template>
-    <template #error><img class="h-full w-full" src="@/assets/images/default-pic.png" /></template>
+    <template #error><img class="h-full w-full" :src="currentdefault" /></template>
   </ElImage>
 </template>
 
 <script setup lang="ts">
-withDefaults(
+import defaultPicIcon from '@/assets/images/default-pic.png';
+import defaultParkPic from '@/assets/images/default-pic__park.png';
+import defaultDevelopPic from '@/assets/images/default-pic__develop.png';
+import defaultCarrierPic from '@/assets/images/default-pic__carrier.png';
+import defaultLandPic from '@/assets/images/default-pic__land.png';
+import { DetailType } from '@/types/enum.ts';
+import { computed } from 'vue';
+
+const props = withDefaults(
   defineProps<{
     src?: string | null;
+    defaultPic?: string;
+    type?: DetailType | null;
   }>(),
   {
     src: null,
+    defaultPic: defaultPicIcon,
+    type: null,
   },
 );
+
+const currentdefault = computed(() => {
+  const config: Record<DetailType, string> = {
+    [DetailType.carrier]: defaultCarrierPic,
+    [DetailType.land]: defaultLandPic,
+    [DetailType.industrial]: defaultParkPic,
+    [DetailType.develop]: defaultDevelopPic,
+    [DetailType.startDevelop]: defaultDevelopPic,
+  };
+  return props.type ? config[props.type] : defaultPicIcon;
+});
 </script>

src/components/common/ImageList.vue

@@ -13,6 +13,7 @@
             class="h-[434px] w-full"
             :class="{ 'cursor-pointer': image?.href }"
             :src="image?.url"
+            :type="detailType"
             @click="handleClick(image?.href)"
           />
           <div
@@ -36,6 +37,7 @@
               class="h-[92px] w-[130px] cursor-pointer rounded"
               :class="{ 'border border-[#2878ff] p-1': index === currentIndex }"
               :src="image.url"
+              :type="detailType"
             />
           </SwiperSlide>
         </Swiper>
@@ -65,10 +67,12 @@ import { Swiper, SwiperSlide } from 'swiper/vue';
 import { computed, ref } from 'vue';
 import CommonImage from '@/components/common/CommonImage.vue';
 import type { Swiper as SwiperType } from 'swiper/types';
+import type { DetailType } from '@/types/enum.ts';
 
 const props = withDefaults(
   defineProps<{
     images: { url: string; href?: string }[];
+    detailType: DetailType;
   }>(),
   {
     images: () => [],

src/components/detail/DetailMain.vue

@@ -27,7 +27,7 @@
       <!-- main content -->
       <div class="mt-4 flex">
         <div>
-          <ImageList :images="mainImageList"></ImageList>
+          <ImageList :images="mainImageList" :detail-type="type"></ImageList>
         </div>
         <div class="ml-[30px] mt-4 flex flex-1 flex-col">
           <div>

src/components/detail/MiniListItem.vue

@@ -2,7 +2,11 @@
 <template>
   <div v-if="detail" class="w-[274px]">
     <div @click="handleDetail">
-      <CommonImage class="h-[204px] w-full cursor-pointer rounded-sm" :src="detail.imgUrl" />
+      <CommonImage
+        class="h-[204px] w-full cursor-pointer rounded-sm"
+        :src="detail.imgUrl"
+        :type="detailType"
+      />
     </div>
     <div
       class="ell2 mt-3 cursor-pointer font-yahei text-lg leading-6 text-[#1A1A1A]"
@@ -17,6 +21,7 @@
 </template>
 <script lang="ts" setup>
 import CommonImage from '@/components/common/CommonImage.vue';
+import type { DetailType } from '@/types/enum.ts';
 
 export interface MiniDetail {
   imgUrl: string;
@@ -27,6 +32,7 @@ export interface MiniDetail {
 withDefaults(
   defineProps<{
     detail: MiniDetail;
+    detailType: DetailType;
   }>(),
   {},
 );

src/components/detail/SecretInfo.vue

@@ -166,5 +166,8 @@ const changeShowSelect = (b: boolean) => {
   .el-select {
     width: 100%;
   }
+  .el-input-number {
+    width: 100% !important;
+  }
 }
 </style>

src/components/detail/StarContactInfo.vue

@@ -11,9 +11,10 @@
         <div
           v-if="isShowPhone"
           class="star-contact-info absolute right-[50px] top-0 flex h-[145px] w-[328px] rounded bg-white p-5"
+          :class="{ 'w-[186px]': !detail.contactPerson }"
         >
-          <div class="flex w-[288px]">
-            <div class="flex h-[105px] flex-none flex-col">
+          <div class="flex w-[288px]" :class="{ 'w-[146px]': !detail.contactPerson }">
+            <div v-if="detail.contactPerson" class="flex h-[105px] flex-none flex-col">
               <div>
                 <div class="flex h-5 items-center justify-center">
                   <div

src/components/detail/VideoList.vue

@@ -26,7 +26,12 @@
             :src="item.videourl"
             :cover="item.videoCover!"
           ></CommonVideo>
-          <CommonImage v-else class="h-full w-full" :src="item.videourl"></CommonImage>
+          <CommonImage
+            v-else
+            class="h-full w-full"
+            :src="item.videourl"
+            :type="DetailType.develop"
+          ></CommonImage>
         </SwiperSlide>
       </Swiper>
       <div
@@ -76,6 +81,7 @@ import { Swiper, SwiperSlide } from 'swiper/vue';
 import type { Swiper as SwiperType } from 'swiper/types';
 import { Autoplay } from 'swiper/modules';
 import { computed, ref, nextTick, onMounted } from 'vue';
+import { DetailType } from '@/types/enum.ts';
 import CommonVideo from '../common/CommonVideo.vue';
 import CommonImage from '../common/CommonImage.vue';
 

src/components/filter/filter-view.vue

@@ -483,3 +483,13 @@ watch(
   width: 80px;
 }
 </style>
+
+<style lang="scss">
+.filter-view {
+  .el-input .el-input__wrapper.el-input__wrapper {
+    &.is-focus.is-focus {
+      box-shadow: 0 0 0 1px rgb(220, 223, 230) inset !important;
+    }
+  }
+}
+</style>

src/components/form-modal/FormModal.vue

@@ -146,6 +146,14 @@ const commit = debounce(
   .el-input__wrapper {
     height: 38px;
   }
+  .el-input .el-input__wrapper.el-input__wrapper {
+    &.is-focus.is-focus {
+      box-shadow: 0 0 0 1px rgb(220, 223, 230) inset !important;
+    }
+  }
+  .el-textarea__inner:focus {
+    box-shadow: 0 0 0 1px rgb(220, 223, 230) inset !important;
+  }
 }
 .lyy .el-select-dropdown__item.selected {
   color: #c0322b;

src/components/list/ParkItem.vue

@@ -5,6 +5,7 @@
         <CommonImage
           class="h-[156px] w-[208px] cursor-pointer rounded-sm"
           :src="item.imgUrl"
+          :type="isDevelop ? DetailType.develop : DetailType.industrial"
           :alt="isDevelop ? '开发区' : '产业园'"
         />
         <div
@@ -59,7 +60,7 @@ import type { IndustrialParkItem } from '@/types/api/industrialParkList.ts';
 import { filterAddress, formatNumber } from '@/utils/filters.ts';
 import { computed } from 'vue';
 import type { DevelopZoneItem } from '@/types/api/developZoneList';
-import { ParkItemType } from '@/types/enum.ts';
+import { DetailType, ParkItemType } from '@/types/enum.ts';
 import CommonImage from '@/components/common/CommonImage.vue';
 import ListInfo from './ListInfo.vue';
 

src/components/list/list-carrier-item.vue

 <template>
   <div class="flex">
     <div class="media-left relative mr-4 cursor-pointer" @click="handleDetail">
-      <CommonImage class="h-[156px] w-[208px]" :src="detail.imgUrl" alt="" />
+      <CommonImage
+        class="h-[156px] w-[208px]"
+        :src="detail.imgUrl"
+        :type="DetailType.carrier"
+        alt=""
+      />
       <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>
@@ -36,6 +41,7 @@
 import type { CarrierListItem } from '@/types/api/carrierList';
 import CommonImage from '@/components/common/CommonImage.vue';
 import { formatNumber } from '@/utils/filters.ts';
+import { DetailType } from '@/types/enum.ts';
 
 withDefaults(
   defineProps<{

src/components/list/list-land-item.vue

 <template>
   <div class="flex">
     <div class="media-left relative mr-4 cursor-pointer" @click="handleDetail">
-      <CommonImage class="h-[156px] w-[208px]" :src="detail.imgUrl" alt="" />
+      <CommonImage
+        class="h-[156px] w-[208px]"
+        :type="DetailType.land"
+        :src="detail.imgUrl"
+        alt=""
+      />
       <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>
@@ -42,6 +47,7 @@
 import type { LandListItem } from '@/types/api/landList';
 import CommonImage from '@/components/common/CommonImage.vue';
 import { formatNumber } from '@/utils/filters.ts';
+import { DetailType } from '@/types/enum.ts';
 
 withDefaults(
   defineProps<{

src/components/list/list-policy-item.vue

@@ -18,7 +18,7 @@
         {{ detail.content.trim() }}
       </p>
       <div class="mt-4 flex justify-between text-sm leading-[22px] text-[#4d4d4d]">
-        <div>{{ detail.publisher }} | {{ detail.ctime }}</div>
+        <div class="flex items-center">{{ infos }}</div>
         <div class="read-more flex items-center">
           <span>了解详情</span>
           <img src="@/assets/images/icon-arrow_red.png" class="ml-1 h-4 w-4" alt="" />
@@ -30,8 +30,10 @@
 <script setup lang="ts">
 import type { PolicyListItem } from '@/types/api/policyList';
 import CommonImage from '@/components/common/CommonImage.vue';
+import { computed } from 'vue';
+import { haveValue } from '@/utils/filters.ts';
 
-withDefaults(
+const props = withDefaults(
   defineProps<{
     detail: PolicyListItem;
   }>(),
@@ -45,6 +47,10 @@ const emit = defineEmits<{
 const handleDetail = () => {
   emit('to-detail');
 };
+const infos = computed(() => {
+  const { publisher, publishTime } = props.detail;
+  return [publisher, publishTime].filter(haveValue).join(' | ');
+});
 </script>
 <style lang="scss" scoped>
 .media-main {

src/components/user/MyParkList.vue

 <template>
-  <div>
+  <div class="my-park-list">
     <div class="flex">
       <div class="flex space-x-[10px]">
         <div>
-          <ElSelect v-model="params.isSystem" clearable placeholder="请选择来源方式">
+          <ElSelect
+            v-model="params.isSystem"
+            clearable
+            placeholder="请选择来源方式"
+            popper-class="source-select"
+          >
             <ElOption
               v-for="source of sourceList"
               :key="source.dictCode"
@@ -46,7 +51,12 @@
           ></DatePicker>
         </div>
         <div>
-          <ElSelect v-model="params.status" clearable placeholder="请选择审批状态">
+          <ElSelect
+            v-model="params.status"
+            clearable
+            placeholder="请选择审批状态"
+            popper-class="source-select"
+          >
             <ElOption
               v-for="status of statusList"
               :key="status.dictCode"
@@ -265,3 +275,21 @@ const tableHeaderStyle = {
   // }
 }
 </style>
+
+<style lang="scss">
+.my-park-list {
+  .el-input .el-input__wrapper.el-input__wrapper {
+    &.is-focus.is-focus {
+      box-shadow: 0 0 0 1px rgb(220, 223, 230) inset !important;
+    }
+  }
+  .el-textarea__inner:focus {
+    box-shadow: 0 0 0 1px rgb(220, 223, 230) inset !important;
+  }
+}
+.source-select {
+  .el-select-dropdown__item.selected {
+    color: #c0322b;
+  }
+}
+</style>

src/types/api/policyList.ts

 // 列表
 export interface PolicyListItem {
   content: string;
-  ctime: string;
+  publishTime: string;
   id: number;
   industryList: string;
   publisher: string;

src/views/develop/DevelopZoneDetail.vue

@@ -58,7 +58,7 @@
         <DetailInfoCell v-if="industryFund.length" :infos="industryFund" title="产业基金">
           <DetailInfo :infos="industryFund"></DetailInfo>
         </DetailInfoCell>
-        <DetailInfoCell title="周边配套" title-center v-if="detail.latitude">
+        <DetailInfoCell v-if="detail.latitude" title="周边配套" title-center>
           <MapView :lat="detail.latitude" :lng="detail.longitude"></MapView>
         </DetailInfoCell>
         <DetailInfoCell
@@ -74,6 +74,7 @@
               v-for="item of industrials.slice(0, 4)"
               :key="item.name"
               :detail="item"
+              :detail-type="DetailType.industrial"
               @to-detail="toIndustrialDetail(item)"
             ></MiniListItem>
           </div>
@@ -91,6 +92,7 @@
               v-for="item of lands.slice(0, 4)"
               :key="item.name"
               :detail="item"
+              :detail-type="DetailType.land"
               @to-detail="toLandDetail(item)"
             ></MiniListItem>
           </div>

src/views/home/HomeView.vue

@@ -162,7 +162,12 @@
           class="relative w-[272px] cursor-pointer"
           @click="toDetail(item)"
         >
-          <CommonImage class="h-[205px] w-[272px] rounded-sm" :src="item.imgUrl" alt="" />
+          <CommonImage
+            :type="currentListType"
+            class="h-[205px] w-[272px] rounded-sm"
+            :src="item.imgUrl"
+            alt=""
+          />
           <span
             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"
@@ -298,6 +303,7 @@ import { filterAddress, formatNumber } from '@/utils/filters.ts';
 import ListInfo from '@/components/list/ListInfo.vue';
 import { useMessage } from '@/composable/useMessage.ts';
 import { useSearchParamsStore } from '@/stores/searchParams.ts';
+import { DetailType } from '@/types/enum.ts';
 
 const { open } = useJump();
 const searchParamsStore = useSearchParamsStore();
@@ -336,6 +342,17 @@ const selectedCity = computed(() => {
   return searchParamsStore.globalProvinceName;
 });
 
+/** 当前列表类型 */
+const currentListType = computed(() => {
+  const config: Record<string, DetailType> = {
+    develop: DetailType.develop,
+    carrier: DetailType.carrier,
+    industrial: DetailType.industrial,
+    land: DetailType.land,
+  };
+  return config[activeTab.value]!;
+});
+
 const toList = (type: string = 'search') => {
   let name: RouteName = RouteName.developZoneList;
   let filterType: string = searchType.value;

src/views/industrial-park/IndustrialParkDetail.vue

@@ -91,7 +91,7 @@
           </div>
         </div>
       </DetailInfoCell>
-      <DetailInfoCell title="周边配套" title-center v-if="detail.latitude">
+      <DetailInfoCell v-if="detail.latitude" title="周边配套" title-center>
         <MapView :lat="detail.latitude" :lng="detail.longitude"></MapView>
       </DetailInfoCell>
       <DetailInfoCell
@@ -107,6 +107,7 @@
             v-for="item of carriers.slice(0, 4)"
             :key="item.name"
             :detail="item"
+            :detail-type="DetailType.carrier"
             @to-detail="toCarrierDetail(item)"
           ></MiniListItem>
         </div>

src/views/industry/IndustryCategory.vue

@@ -58,33 +58,35 @@
             <span class="text-[#C0322B]">{{ totalCount }}</span>
             个相关{{ tabList[activeTab].name }}
           </p>
-          <div v-for="item in datas" :key="item.id">
-            <!-- 土地 -->
-            <LandListItemView
-              v-if="activeTab === 2"
-              :detail="item as any"
-              @to-detail="handleDetail(RouteName.landDetail, item)"
-            ></LandListItemView>
-            <!-- 载体 -->
-            <CarrierListItemView
-              v-else-if="activeTab === 3"
-              :detail="item as any"
-              @to-detail="handleDetail(RouteName.carrierDetail, item)"
-            ></CarrierListItemView>
-            <!-- 开发区 -->
-            <ParkItem
-              v-else-if="activeTab === 0"
-              :item="item"
-              :type="ParkItemType.develop"
-              @to-detail="handleDetail(RouteName.developZoneDetail, item)"
-            ></ParkItem>
-            <!-- 产业园 -->
-            <ParkItem
-              v-else
-              :item="item"
-              :type="ParkItemType.industrial"
-              @to-detail="handleDetail(RouteName.industrialParkDetail, item)"
-            ></ParkItem>
+          <div class="space-y-[15px]">
+            <div v-for="item in datas" :key="item.id">
+              <!-- 土地 -->
+              <LandListItemView
+                v-if="activeTab === 2"
+                :detail="item as any"
+                @to-detail="handleDetail(RouteName.landDetail, item)"
+              ></LandListItemView>
+              <!-- 载体 -->
+              <CarrierListItemView
+                v-else-if="activeTab === 3"
+                :detail="item as any"
+                @to-detail="handleDetail(RouteName.carrierDetail, item)"
+              ></CarrierListItemView>
+              <!-- 开发区 -->
+              <ParkItem
+                v-else-if="activeTab === 0"
+                :item="item"
+                :type="ParkItemType.develop"
+                @to-detail="handleDetail(RouteName.developZoneDetail, item)"
+              ></ParkItem>
+              <!-- 产业园 -->
+              <ParkItem
+                v-else
+                :item="item"
+                :type="ParkItemType.industrial"
+                @to-detail="handleDetail(RouteName.industrialParkDetail, item)"
+              ></ParkItem>
+            </div>
           </div>
 
           <ListPagination

src/views/industry/IndustryPolicyDetail.vue

@@ -15,7 +15,7 @@
     <div class="mx-auto w-[800px]">
       <p class="mb-5 text-2xl font-semibold text-[#1a1a1a]">{{ detail.title }}</p>
       <div class="mb-5 mt-4 text-sm leading-[22px] text-[#4d4d4d]">
-        <div>发文机构：{{ detail.publisher }} | 发文时间：{{ detail.ctime }}</div>
+        <div class="flex items-center">{{ infos }}</div>
       </div>
       <div class="mb-[17px] flex flex-wrap">
         <span
@@ -52,7 +52,7 @@ const { request: getDetail } = useRequest<PolicyListItem>(
 );
 const detail = ref<PolicyListItem>({
   title: '',
-  ctime: '',
+  publishTime: '',
   publisher: '',
   content: '',
   id: 0,
@@ -85,6 +85,17 @@ const breadcrumbs = computed(() => {
     },
   ];
 });
+
+const infos = computed(() => {
+  const { publisher, publishTime } = detail.value;
+  return [
+    { name: '发文机构：', value: publisher },
+    { name: '发文时间：', value: publishTime },
+  ]
+    .filter(({ value }) => !!value)
+    .map(({ value, name }) => name + value)
+    .join(' | ');
+});
 </script>
 <style lang="scss">
 .detail-main {

src/views/user/MyDevelopDetail.vue

@@ -36,6 +36,7 @@
                   v-for="img of detail.imgUrlList"
                   :key="img"
                   class="h-[124px] w-[124px]"
+                  :type="DetailType.develop"
                   :src="img"
                 ></CommonImage>
               </div>

src/views/user/MyIndustrialDetail.vue

@@ -37,6 +37,7 @@
                   :key="img"
                   class="h-[124px] w-[124px]"
                   :src="img"
+                  :type="DetailType.industrial"
                 ></CommonImage>
               </div>
             </DetailInfoCell>