修改品牌顶部自动滚动

Reviewed-on: https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/pulls/6

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.0.0-B.5](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/compare/v1.0.0-B.4...v1.0.0-B.5) (2023-06-15)
+
+
+### Bug Fixes
+
+* 🧩 修改品牌顶部自动滚动 ([265f363](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/commit/265f3632a981cd68a46023848f8c782c0ec3d3c7))
+
 ## [1.0.0-B.4](https://git.1000my.com/project-jiaxinglcpy/jxlcpy_base_daoshi_vue_ts/compare/v1.0.0-B.3...v1.0.0-B.4) (2023-06-14)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.4",
+  "version": "1.0.0-B.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "vue_cli_ts",
-      "version": "1.0.0-B.4",
+      "version": "1.0.0-B.5",
       "dependencies": {
         "@better-scroll/core": "^2.5.0",
         "@better-scroll/observe-image": "^2.5.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.4",
+  "version": "1.0.0-B.5",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

public/static/offline/JSON/getBrandShopList.json

@@ -89,6 +89,41 @@
                 "buildingOrder": 0,
                 "floorCode": "EuMWamqDI1Vd3v-oIYjY5",
                 "floorOrder": 1
+            },{
+                "isSpecial": 0,
+                "industryCode": "",
+                "industryFatherCode": "f0MfRIsC6lXi7Kd1LFz18",
+                "industryFatherName": "濮园三区",
+                "industryFatherNameEn": "",
+                "industryFatherNameJa": "",
+                "industryFatherNameOl": "",
+                "shopCode": "BtUmBL2P6LIz-_NQv48Ps",
+                "shopName": "濮园三区 16幢",
+                "shopNameEn": "",
+                "shopNameJa": "",
+                "shopNameOl": "",
+                "alias": "",
+                "logoCode": "oOellEk4GPD7tLyPIxdry",
+                "logoUrl": "/iotFile/project-odubitlp9mjy2wyuqkpfga/20230608/oOellEk4GPD7tLyPIxdry.png",
+                "building": "濮园未来社区",
+                "floor": "L1",
+                "houseNumber": "濮园三区 16幢",
+                "introJa": "",
+                "introOl": "",
+                "regionCode": "",
+                "businessHours": "",
+                "contact": "",
+                "xaxis": "",
+                "yaxis": "",
+                "spelling": "pu yuan san qu  16chuang ",
+                "initials": "PYSQ 16C",
+                "borderColor": "",
+                "formatColor": "",
+                "activityList": [],
+                "buildingCode": "gAi7ksmAnlR22G8CyLXbI",
+                "buildingOrder": 0,
+                "floorCode": "EuMWamqDI1Vd3v-oIYjY5",
+                "floorOrder": 1
             },
             {
                 "isSpecial": 0,

public/static/qm/MainMap_QM.js

@@ -4139,7 +4139,7 @@ MainMap_QM.prototype = {
 			if (item.hasOwnProperty("wayShop") && item.wayShop) {
 				for (let i = 0; i < item.wayShop.length; i++) {
 					let enTlite = item.wayShop[i].shop.shopNameEn == "" ? item.wayShop[i].shop.shopName : item.wayShop[i].shop.shopNameEn;
-					Map_QM.util.pathStateObj.forShopArr.wayList.push({ isAddPrefix: false, shopName: "经过 " + item.wayShop[i].shop.shopName || item.wayShop[i].shop.name, shopNameEn: "PASS " + enTlite, logoPath: item.wayShop[i].shop.logoPath, code: item.wayShop[i].shop.code, shopNum: iot ? item.wayShop[i].shop.houseNumber : item.wayShop[i].shop.houseNum });
+					Map_QM.util.pathStateObj.forShopArr.wayList.push({ isAddPrefix: false, shopName: "经过 " + item.wayShop[i].shop.shopName || item.wayShop[i].shop.name, shopNameEn: "PASS " + enTlite, logoPath: item.wayShop[i].shop.logoPath || item.wayShop[i].shop.logoUrl, code: item.wayShop[i].shop.code, shopNum: iot ? item.wayShop[i].shop.houseNumber : item.wayShop[i].shop.houseNum });
 				}
 			}
 			if (item.hasOwnProperty("Facilities") && item.Facilities) {  //设施
@@ -5338,10 +5338,10 @@ FloorMap_QM.prototype = {
 								show = shopData[h].shopName || shopData[h].name;
 								showLeb = houseNum;
 								showE = shopData[h].shopNameEn || shopData[h].nameEn;
-								logo = shopData[h].logoPath;
+								logo = shopData[h].logoPath || shopData[h].logoUrl;
 								mapShow = shopData[h].mapShow ?? false;
-								if (shopData[h].navRecommend) {
-									navRecommend = shopData[h].navRecommend;
+								if (shopData[h].navRecommend || shopData[h].isPass) {
+									navRecommend = shopData[h].navRecommend || shopData[h].isPass;
 								} else {
 									navRecommend = false;
 								}
@@ -5354,12 +5354,12 @@ FloorMap_QM.prototype = {
 									mapData.shopArea[i].type = "promotion";
 									this.addTagLabel(mapData.shopArea[i], { "node": mapData.shopArea[i].shopNav, "floor": this.floorOrder, "build": this.buildOrder });
 								}
-								if (shopData[h].formatColor) {
-									entColor = parseInt(shopData[h].formatColor.replace("#", "0x"), 16);
-								}
-								if (shopData[h].borderColor) {
-									borderColor = parseInt(shopData[h].borderColor.replace("#", "0x"), 16);
-								}
+								// if (shopData[h].formatColor) {
+								// 	entColor = parseInt(shopData[h].formatColor.replace("#", "0x"), 16);
+								// }
+								// if (shopData[h].borderColor) {
+								// 	borderColor = parseInt(shopData[h].borderColor.replace("#", "0x"), 16);
+								// }
 								break;
 							}
 						}
@@ -6515,3 +6515,4 @@ FindPath_QM.prototype.playMoveGuide = function () {
 	}
 }
 
+

src/views/Brand/recommendShop.vue

@@ -6,27 +6,42 @@
     </div>
     <!-- 显示当前选择的信息 -->
     <div class="recommand-group animate__animated animate__fadeInRight">
-      <!-- :autoplay="{
-            autoplay: false,
-            delay: 5000
+      <!-- 
           :freeMode="{
             freeMode: false,
             momentumRatio: 0.3,
             momentumVelocityRatio: 0.3
           }"
         direction="vertical"
-          }" -->
+        
+          }" 
+        
+        
+         :observer="true"
+        :observe-parents="true"
+        -->
       <swiper
-        :loop="recList.length >= 4"
+        v-if="showList"
+        :autoplay="
+          recList.length > 3
+            ? {
+                disableOnInteraction: false,
+                delay: 1000
+              }
+            : false
+        "
+        :free-mode="{
+          enabled: true
+        }"
+        :enabled="recList.length > 3"
+        :loop="recList.length > 3"
         :speed="1000"
         :modules="modules"
         :looped-slides="3"
         :loop-additional-slides="3"
         :width="300"
         :height="168"
-        :observer="true"
-        :observe-parents="true"
-        slides-per-view="auto"
+        :slides-per-view="1"
         :space-between="24"
       >
         <!-- 1或则auto -->
@@ -48,7 +63,7 @@
 <script setup lang="ts">
 import { ref, computed, nextTick, shallowRef } from 'vue'
 //Pagination, EffectFade,
-import { Autoplay } from 'swiper'
+import { Autoplay, FreeMode } from 'swiper'
 import { Swiper, SwiperSlide } from 'swiper/vue'
 import 'swiper/css'
 import 'swiper/css/pagination'
@@ -61,16 +76,20 @@ const store = useRootStore()
 
 //推荐店铺
 const recList = ref<Shop[]>([])
-const modules = [Autoplay]
-
+const modules = [Autoplay, FreeMode]
+const showList = ref(false)
 //点击店铺
 function handleShop(item: Shop) {
   store.SET_SHOP(item)
   store.SET_SHOW_DETAIL(true)
 }
-getBrandInfo().then(({ data }) => {
-  recList.value = data.recommendList
-})
+getBrandInfo()
+  .then(({ data }) => {
+    recList.value = data.recommendList
+  })
+  .finally(() => {
+    showList.value = true
+  })
 </script>
 <style lang="scss" scoped>
 :deep(.swiper-wrapper) {
@@ -98,7 +117,7 @@ getBrandInfo().then(({ data }) => {
     // &::before {
     //   content: v-bind(recTitle);
     // }
-    .swiper-slide {
+    :deep(.swiper-slide) {
       width: 300px;
       height: 168px;
     }
@@ -112,7 +131,7 @@ getBrandInfo().then(({ data }) => {
         top: 0;
         left: 0;
         overflow: hidden;
-        width: 100%;
+        width: 300px;
         height: 100%;
         padding: 0;
         background: #fff;
@@ -125,7 +144,7 @@ getBrandInfo().then(({ data }) => {
         left: 0;
         display: flex;
         justify-content: flex-start;
-        width: 100%;
+        width: 300px;
         height: 44px;
         padding: 13px 16px;
         background: rgb(0 0 0 / 20%);