解决冲突

src/components/Introduce/ContactMap.vue

@@ -36,11 +36,7 @@ export default {
     marker.setAnimation(Animation);
 
     //添加地图类型控件
-    map.addControl(
-      new BMap.MapTypeControl({
-        mapTypes: [BMAP_NORMAL_MAP, BMAP_HYBRID_MAP],
-      }),
-    );
+    map.addControl(new BMap.MapTypeControl({ mapTypes: [BMAP_NORMAL_MAP, BMAP_HYBRID_MAP] }));
     map.setCurrentCity('太原'); // 设置地图显示的城市 此项是必须设置的
     map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放
   },

src/components/Introduce/DeriveEnterprise.vue

@@ -27,11 +27,11 @@
           </span>
         </div>
       </div>
-      <company-profile :showProfile="showProfile" @closeProfile="closeProfile" v-if="showProfile" />
+      <company-profile :show-profile="showProfile" @closeProfile="closeProfile" v-if="showProfile" />
     </div>
     <div class="inner d-flex flex-row-reverse pb-10 enterprise-page">
       <a-pagination
-        :defaultPageSize="6"
+        :default-page-size="6"
         :total="newPartners.length"
         @change="onChange"
         show-less-items
@@ -45,8 +45,8 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import CompanyProfile from './CompanyProfile.vue';
 export default {
-  components: { CompanyProfile },
   name: 'DeriveEnterprise',
+  components: { CompanyProfile },
   props: {
     title: {
       type: String,
@@ -81,6 +81,7 @@ export default {
         }
         return arr;
       }
+      return arr;
     },
   },
 

src/components/Introduce/PartnerShip.vue

@@ -9,7 +9,7 @@
     <div :key="index" class="mb-4" v-for="(item,index) in partners">
       <p
         class="font-bold-24 title-color"
-      >{{ item.typeOfTech===0 ? '高校' : item.typeOfTech===1 ? '院所' : '企业'}}</p>
+      >{{ item.typeOfTech===0 ? '高校' : item.typeOfTech===1 ? '院所' : '企业' }}</p>
       <div
         class="d-flex flex-wrap"
         v-if="item.backendSearchList && item.backendSearchList.length > 0"
@@ -26,7 +26,7 @@
         </div>
       </div>
     </div>
-    <company-profile :showProfile="showProfile" @closeProfile="closeProfile" v-if="showProfile" />
+    <company-profile :show-profile="showProfile" @closeProfile="closeProfile" v-if="showProfile" />
   </div>
 </template>
 
@@ -34,8 +34,8 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import CompanyProfile from './CompanyProfile.vue';
 export default {
-  components: { CompanyProfile },
   name: 'PartnerShip',
+  components: { CompanyProfile },
   props: {
     title: {
       type: String,
@@ -48,9 +48,7 @@ export default {
   },
 
   data() {
-    return {
-      showProfile: false, // 显示公司介绍
-    };
+    return { showProfile: false };
   },
 
   computed: mapState('home', ['partners', 'profile']),

src/views/About/Children/SpinOffs.vue

@@ -5,7 +5,7 @@
       <bread-crumb :arr="arr" />
     </div>
     <div>
-      <derive-enterprise :title="title" :typeOfPlatform="typeOfPlatform" />
+      <derive-enterprise :title="title" :type-of-platform="typeOfPlatform" />
     </div>
   </div>
 </template>

src/views/Cart/Cart.vue

@@ -98,13 +98,11 @@ export default {
   created() {},
   methods: {
     ...mapMutations('home', []),
-    // 获取活动公告列表
+    // 获取购物车列表
     async getData() {
       try {
         this.setActIpCon(this.iptCon);
-        const params = {
-          param: {},
-        };
+        const params = { param: {} };
         // const res = await front(params);
         // const { data, msg, code } = res.data;
         // if (code === 200) {