Merge branch 'sl_dev' into dev

src/api/url/index.js

@@ -26,4 +26,6 @@ export default {
   queryInvestInfos: '/postcard/api/investClueInfo/page',
   // 联系我们列表
   queryContacts: '/postcard/api/scSourceInfo/contact',
+  // 获取查询条件列表
+  queryFiltersList: '/postcard/api/sysDictData/listByCodes'
 }

src/components/dropdown/dropdown.vue

@@ -135,7 +135,7 @@ export default {
       deep: true,
       immediate: true,
       handler(obj) {
-        if (obj.itemList1) {
+        if (obj?.itemList1) {
           this.canChoose = true;
         }
       },
@@ -253,7 +253,7 @@ export default {
           newList.forEach((res) => {
             res.child.forEach((item) => {
               item.child.forEach((e) => {
-                arr.push(e.description);
+                arr.push(e.dictLabel);
               });
             });
           });
@@ -267,7 +267,7 @@ export default {
         if (newList.length > 0) {
           let arr = [];
           newList.forEach((item) => {
-            arr.push(item.description);
+            arr.push(item.dictLabel);
           });
           this.menuList[this.selectIndex].showName = arr.toString();
         } else {

src/components/dropdown/item1.vue

@@ -12,7 +12,7 @@
               : ''
           "
           @click.stop="selectLeft(index)"
-          >{{ item.description }}
+          >{{ item.dictLabel }}
         </view>
       </scroll-view>
       <scroll-view class="item-middle" scroll-y="true">
@@ -34,7 +34,7 @@
             @click.stop="selectMiddle(inx)"
           >
             <view class="item-middle-list-name">
-              {{ mess.description }}
+              {{ mess.dictLabel }}
             </view>
             <!-- <image
               v-if="mess.chooseState"
@@ -63,7 +63,7 @@
             @click.stop="selectRight(mess)"
           >
             <view class="item-right-list-name">
-              {{ mess.description }}
+              {{ mess.dictLabel }}
             </view>
             <image
               v-if="mess.chooseState"

src/components/dropdown/item2.vue

@@ -14,7 +14,7 @@
               : ''
           "
           @click.stop="chooseLeft(index)"
-          >{{ item.name }}
+          >{{ item.dictLabel }}
         </view>
       </scroll-view>
       <scroll-view
@@ -41,7 +41,7 @@
               class="item-right-list-name-info"
               :style="mess.chooseState ? 'color:' + themeColor : ''"
             >
-              {{ mess.name }}
+              {{ mess.dictLabel }}
             </view>
             <image
               v-if="mess.chooseState"

src/components/dropdown/item3.vue

@@ -9,7 +9,7 @@
         @click.stop="selectRight(item)"
         :style="item.chooseState ? 'background: #F2F2F2' : ''"
       >
-        <view class="item-right-list-name">{{ item.description }} </view>
+        <view class="item-right-list-name">{{ item.dictLabel }} </view>
         <image
           v-if="item.chooseState"
           class="item-right-list-img"

src/components/media/card.vue

@@ -10,11 +10,12 @@
             <div>
               <slot name="title">
                 <p :style="{ maxWidth: titleWidth }" class="ell2">
-                  <um-texthighlight
+                  {{title}}
+                  <!-- <um-texthighlight
                     :text="title || '--'"
                     :keyword="keyWords"
                     color="#4374EF"
-                  ></um-texthighlight>
+                  ></um-texthighlight> -->
                 </p>
               </slot>
             </div>

src/components/media/carrier-card.vue

 <template>
   <media-card
-    :img="areaInfo.imgUrl"
-    :title="areaInfo.name"
+    :img="areaInfo.imgUrl || ''"
+    :title="areaInfo.name || ''"
     :cardId="areaInfo.id"
     @click="toDetail"
   >

src/components/media/land-card.vue

 <template>
  <media-card
-    :img="detail.imgUrl"
-    :title="detail.name"
+    :img="detail.imgUrl || ''"
+    :title="detail.name || ''"
     :keyWords="keyWords"
     :cardId="detail.id"
     @click="toDetail"
@@ -26,13 +26,16 @@
 <script>
 import mediaCard from "./card.vue";
 export default {
-  name: "AreaCard",
   components: {mediaCard},
   props: {
     detail: {
       type: Object,
       default: () => ({}),
     },
+    keyWords: {
+      type: String,
+      default: "",
+    },
   },
   methods: {
     toDetail() {

src/components/media/park-card.vue

 <template>
   <media-card
-    :img="parkInfo.imgUrl"
-    :title="parkInfo.name"
+    :img="parkInfo.imgUrl || ''"
+    :title="parkInfo.name || ''"
     :keyWords="keyWords"
     :cardId="parkInfo.id"
     @click="toDetail"
@@ -40,20 +40,6 @@ export default {
       type: String,
       default: "",
     },
-    hideCollect: {
-      default: false,
-    },
-    showUpdateTime: {
-      default: false,
-    },
-    showBtn: {
-      type: Boolean,
-      default: false,
-    },
-    from: {
-      type: String,
-      default: '',
-    },
   },
   data() {
     return {

src/pages/index/index.vue

@@ -16,7 +16,7 @@
             </div>
             <img class="honor-icon" :class="item.iconClass" :src="item.icon" alt="">
           </div>
-          <div class="honor-item flex flex-column align-center" style="width: 100%;text-align: center;padding-top: 14rpx;background-image: url(/static/img/home/bg10.png)">
+          <div class="honor-item flex flex-column align-center" style="width: 100%;text-align: center;padding-top: 14rpx;background-image: url(https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg10.png)">
             <img src="/static/img/home/icon-home10.png" style="width: 49rpx;height: 45rpx;margin-bottom: 10rpx;flex-shrink: 0;" alt="">
             <p>国家生态文明建设示范区</p>
           </div>
@@ -80,49 +80,49 @@ export default{
       honorList: [
         {
           icon: '/static/img/home/icon-home1.png',
-          bg: '/static/img/home/bg1.png',
+          bg: 'https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg1.png',
           name: '全国环境百强县'
         },
         {
           icon: '/static/img/home/icon-home2.png',
-          bg: '/static/img/home/bg2.png',
+          bg: 'https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg2.png',
           name: '安徽省制造业发展增速十快县'
         },
         {
           icon: '/static/img/home/icon-home3.png',
-          bg: '/static/img/home/bg3.png',
+          bg: 'https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg3.png',
           name: '安徽省民营经济发展先进县'
         },
         {
           icon: '/static/img/home/icon-home4.png',
-          bg: '/static/img/home/bg4.png',
+          bg: 'https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg4.png',
           name: '国家卫生县城'
         },
         {
           icon: '/static/img/home/icon-home5.png',
-          bg: '/static/img/home/bg5.png',
+          bg: 'https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg5.png',
           name: '中国未来投资热点百佳县'
         },
         {
           icon: '/static/img/home/icon-home6.png',
-          bg: '/static/img/home/bg6.png',
+          bg: 'https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg6.png',
           name: '全国科技进步先进县'
         },
         {
           icon: '/static/img/home/icon-home10.png',
-          bg: '/static/img/home/bg7.png',
+          bg: 'https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg7.png',
           name: '全国交通运输一体化创建示范县',
           iconClass: 'w49'
         },
         {
           icon: '/static/img/home/icon-home8.png',
-          bg: '/static/img/home/bg8.png',
+          bg: 'https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg8.png',
           name: '全国电子商务进农村综合示范县',
           iconClass: 'w49'
         },
         {
           icon: '/static/img/home/icon-home9.png',
-          bg: '/static/img/home/bg9.png',
+          bg: 'https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/shucheng/bg9.png',
           name: '安徽省质量认证示范县',
           iconClass: 'w49'
         },
@@ -178,7 +178,14 @@ export default{
     //     this.allowScroll = false
     //   }
     // }
-  }
+  },
+  // onShareAppMessage() {
+  //     return {
+  //       title: '',
+  //       path: `/pages/index/index`,
+  //       imageUrl: ""
+  //     }
+  // },
 }
 </script>
 <style lang="scss" scoped>

src/store/index.js

 import Vue from 'vue'
 import Vuex from 'vuex'
+import fetch from '@/utils/request.js'
+import API from "@/api/url";
 
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
   state: {
     policyList: [],
-    primaryIndustryList: []
+    primaryIndustryList: [],
+    filterEnum: []
+  },
+  actions: {
+    getFilterEnum({commit}) {
+      const queryStr =
+      'park_level,park_direction,park_area,park_resources,land_price,industry_policy,development_level,development_type,development_direction,development_area,industry_policy,land_type,land_area,carrier_area,carrier_type,carrier_construction,floor_height,load_bearing,pillar_distance';
+
+      return new Promise((resolve, reject) => {
+        fetch({
+          url: API.queryFiltersList,
+          headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+          },
+          data: {
+            code: queryStr
+          },
+          success: res => {
+            commit('setFilterEnum', res)
+            resolve(res)
+          }
+        })
+      })
+    }
   },
   mutations: {
     setPolicyList(state, provider) {
@@ -14,6 +39,9 @@ const store = new Vuex.Store({
 		},
     setPrimaryIndustryList(state, provider) {
       state.primaryIndustryList = provider
+    },
+    setFilterEnum(state, provider) {
+      state.filterEnum = provider;
     }
 
   }