From 0e95a9df226fa265662af4949c47ac1d8745cb6a Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Sun, 30 Mar 2025 17:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=AE=E6=92=AD=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shop/brandDetail.vue                | 16 ++++----
 src/pages/tabbar/coopMerchant.vue             | 40 ++++++++++---------
 .../crud/crud-layout/crud-layout.vue          |  2 +-
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/pages/shop/brandDetail.vue b/src/pages/shop/brandDetail.vue
index 45b9097..5090cb8 100644
--- a/src/pages/shop/brandDetail.vue
+++ b/src/pages/shop/brandDetail.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
-import { ref, reactive } from "vue"
+import { ref, reactive, computed } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
 import { merchantApi } from "@@/api"
 import { hooks, router } from "@@/index"
 import { filePath } from "@@/utils/file"
-import zSwiper from "@zebra-ui/swiper/components/z-swiper/z-swiper.vue"
-import zSwiperItem from "@zebra-ui/swiper/components/z-swiper-item/z-swiper-item.vue"
 
 const pageRef = ref<any>(null)
 const state = reactive<any>({
@@ -59,17 +57,21 @@ const toDetail = async (v: any) => {
 		router.jump("/pages/shop/detail", { id: v.id })
 	}
 }
+
+const swiperPic = computed(() => {
+	return state.detail?.swiperPic?.split(",")
+})
 </script>
 
 <template>
 	<view class="h-full overflow-hidden">
-		<swiper class="swiper" circular :autoplay="true">
-			<swiper-item v-for="(v, i) in state.detail.swiperPic?.split(',')" :key="i">
-				<image class="w-100vw h-30vh" :src="filePath(v)" mode="aspectFill" />
+		<swiper class="w-100vw h-30vh" circular :indicator-dots="true" indicator-color="#ffffff" :autoplay="true">
+			<swiper-item v-for="(v, i) in state.detail?.swiperPic?.split(',')" :key="i">
+				<image class="w-full h-full" :src="filePath(v)" mode="aspectFill" />
 			</swiper-item>
 		</swiper>
 
-		<crud-layout bg="/static/page/blue-bg.png" :mainIsScroll="true">
+		<crud-layout>
 			<z-paging
 				ref="pageRef"
 				height="70%"
diff --git a/src/pages/tabbar/coopMerchant.vue b/src/pages/tabbar/coopMerchant.vue
index 2413d3f..bce69d4 100644
--- a/src/pages/tabbar/coopMerchant.vue
+++ b/src/pages/tabbar/coopMerchant.vue
@@ -61,25 +61,27 @@ const toDetail = async (v: any) => {
 						<tm-tag size="s">{{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }}</tm-tag>
 					</view>
 					<view class="m-t-10rpx">
-						<view v-if="v.phone" class="flex items-center justify-between">
-							<view class="flex items-center">
-								<svg
-									t="1743075703202"
-									class="icon"
-									viewBox="0 0 1024 1024"
-									version="1.1"
-									xmlns="http://www.w3.org/2000/svg"
-									p-id="2684"
-									width="12"
-									height="12"
-								>
-									<path
-										d="M575.7 647.1l69.4-69.2 13.3 2.3c1.7 0.3 4.9 0.9 9.4 1.7 7.4 1.3 15.7 2.9 24.6 4.5 25.5 4.8 50.9 9.8 74.8 14.9 17.3 3.7 33.1 7.3 47 10.7 27.6 6.8 47.3 12.9 59.1 18.6 43 20.8 60 65.5 53.4 122-9.7 81.3-97 174.3-204.4 175.4-121 1.2-291.4-87.7-411.9-214.7C165.3 560.4 81.8 406.9 98 278.3c8.5-67.1 40.2-115.9 87.8-147.2 32.4-21.3 69.4-32.5 97.9-34.6 38.2-2.8 69.6 9.6 92.5 38 9.7 12 19.7 36.1 32.2 73.3 3.6 10.9 7.4 22.8 11.3 35.4 7 23 14.1 47.6 20.9 72.2 2.4 8.6 4.5 16.6 6.4 23.7 1.1 4.3 2 7.4 2.4 9.1l3.7 14.2-80.4 81.8c44.5 89 122.6 169.8 203 202.9z m13.5 60l-15.3-5.1c-105.4-35.6-205.4-139.4-256.3-252.3l-7.3-16.2 85-86.4c-1.5-5.6-3.1-11.6-4.9-17.9-6.6-24.1-13.5-48.2-20.4-70.7-3.8-12.3-7.4-23.7-10.9-34.2-10.2-30.5-19.1-52-23.3-57.2-11.8-14.6-26.4-20.4-48.2-18.8-20.2 1.5-48.7 10.1-73.1 26.2-35.2 23.2-58.3 58.6-64.8 110.3-13.8 108.7 63.1 250.2 198.4 392.7C459.5 794.9 617 877 721.8 876c79.2-0.8 146.4-72.5 153.2-129.4 4.3-36.6-4.3-59.4-24.4-69.1-7.5-3.6-24.7-8.9-48.9-14.9-13.4-3.3-28.6-6.8-45.4-10.4-23.3-5-48.4-10-73.5-14.7-7.2-1.3-13.9-2.6-20.1-3.7l-73.5 73.3z"
-										fill="#666666"
-										p-id="2685"
-									></path>
-								</svg>
-								<view class="second-text-28 ml-1">{{ v.phone }}</view>
+						<view class="flex items-center justify-between">
+							<view>
+								<view v-if="v.phone" class="flex items-center">
+									<svg
+										t="1743075703202"
+										class="icon"
+										viewBox="0 0 1024 1024"
+										version="1.1"
+										xmlns="http://www.w3.org/2000/svg"
+										p-id="2684"
+										width="12"
+										height="12"
+									>
+										<path
+											d="M575.7 647.1l69.4-69.2 13.3 2.3c1.7 0.3 4.9 0.9 9.4 1.7 7.4 1.3 15.7 2.9 24.6 4.5 25.5 4.8 50.9 9.8 74.8 14.9 17.3 3.7 33.1 7.3 47 10.7 27.6 6.8 47.3 12.9 59.1 18.6 43 20.8 60 65.5 53.4 122-9.7 81.3-97 174.3-204.4 175.4-121 1.2-291.4-87.7-411.9-214.7C165.3 560.4 81.8 406.9 98 278.3c8.5-67.1 40.2-115.9 87.8-147.2 32.4-21.3 69.4-32.5 97.9-34.6 38.2-2.8 69.6 9.6 92.5 38 9.7 12 19.7 36.1 32.2 73.3 3.6 10.9 7.4 22.8 11.3 35.4 7 23 14.1 47.6 20.9 72.2 2.4 8.6 4.5 16.6 6.4 23.7 1.1 4.3 2 7.4 2.4 9.1l3.7 14.2-80.4 81.8c44.5 89 122.6 169.8 203 202.9z m13.5 60l-15.3-5.1c-105.4-35.6-205.4-139.4-256.3-252.3l-7.3-16.2 85-86.4c-1.5-5.6-3.1-11.6-4.9-17.9-6.6-24.1-13.5-48.2-20.4-70.7-3.8-12.3-7.4-23.7-10.9-34.2-10.2-30.5-19.1-52-23.3-57.2-11.8-14.6-26.4-20.4-48.2-18.8-20.2 1.5-48.7 10.1-73.1 26.2-35.2 23.2-58.3 58.6-64.8 110.3-13.8 108.7 63.1 250.2 198.4 392.7C459.5 794.9 617 877 721.8 876c79.2-0.8 146.4-72.5 153.2-129.4 4.3-36.6-4.3-59.4-24.4-69.1-7.5-3.6-24.7-8.9-48.9-14.9-13.4-3.3-28.6-6.8-45.4-10.4-23.3-5-48.4-10-73.5-14.7-7.2-1.3-13.9-2.6-20.1-3.7l-73.5 73.3z"
+											fill="#666666"
+											p-id="2685"
+										></path>
+									</svg>
+									<view class="second-text-28 ml-1">{{ v.phone }}</view>
+								</view>
 							</view>
 							<tm-tag v-if="v.supType == '10' && Number(v.mchCount) > 0" size="xs" skin="thin">共{{ v.mchCount }}家</tm-tag>
 						</view>
diff --git a/src/sheep/components/crud/crud-layout/crud-layout.vue b/src/sheep/components/crud/crud-layout/crud-layout.vue
index 9a25bde..bba4aef 100644
--- a/src/sheep/components/crud/crud-layout/crud-layout.vue
+++ b/src/sheep/components/crud/crud-layout/crud-layout.vue
@@ -151,7 +151,7 @@ page {
 			flex: 1;
 			overflow: hidden;
 			padding: 0 30rpx;
-			// background: #ecf4f9;
+			background: #ecf4f9;
 		}
 
 		&_bottom {