From 1bc49b3a86fc2fad827d2c9b7469a836347daa06 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Sat, 29 Mar 2025 18:29:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E4=BA=8C=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                    |  20 +++++
 src/pages/shop/brandDetail.vue    | 144 ++++++++++++++++++++++++++++++
 src/pages/shop/detail.vue         |   8 +-
 src/pages/tabbar/coopMerchant.vue |  10 ++-
 src/pages/tabbar/userRole.vue     |   3 +
 src/sheep/api/merchant.ts         |  49 +++++-----
 6 files changed, 208 insertions(+), 26 deletions(-)
 create mode 100644 src/pages/shop/brandDetail.vue
 create mode 100644 src/pages/tabbar/userRole.vue

diff --git a/src/pages.json b/src/pages.json
index 6e78d20..191b91e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -9,6 +9,13 @@
 		}
 	},
 	"pages": [
+		// {
+		// 	"path": "pages/tabbar/userRole",
+		// 	"style": {
+		// 		"navigationBarTitleText": "用户角色",
+		// 		"disableScroll": true
+		// 	}
+		// },
 		{
 			"path": "pages/tabbar/canteen",
 			"style": {
@@ -74,6 +81,13 @@
 						"disableScroll": true
 					}
 				},
+				{
+					"path": "brandDetail",
+					"style": {
+						"navigationBarTitleText": "",
+						"disableScroll": true
+					}
+				},
 				{
 					"path": "product-detail",
 					"style": {
@@ -307,6 +321,12 @@
 	},
 	"tabBar": {
 		"list": [
+			// {
+			// 	"pagePath": "pages/tabbar/userRole",
+			// 	"text": "",
+			// 	"iconPath": "",
+			// 	"selectedIconPath": ""
+			// },
 			{
 				"pagePath": "pages/tabbar/canteen",
 				"text": "",
diff --git a/src/pages/shop/brandDetail.vue b/src/pages/shop/brandDetail.vue
new file mode 100644
index 0000000..edd1b4d
--- /dev/null
+++ b/src/pages/shop/brandDetail.vue
@@ -0,0 +1,144 @@
+<script setup lang="ts">
+import { ref, reactive } 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>({
+	pa: {
+		pagesize: 10,
+		type: "2",
+		parentId: "",
+	},
+})
+const pageHook = hooks.usePage(pageRef, merchantApi.childrenPage, null, "data.records")
+
+const query = (page: number, pagesize: number) => {
+	pageHook.startPage(page, pagesize, false, state.pa)
+}
+
+onLoad((options: any) => {
+	const app = getApp()
+	app._initTabbar()
+
+	if (options.parentId) {
+		state.pa.parentId = options.parentId
+	}
+})
+onShow(async () => {
+	pageRef.value && pageRef.value.reload(false)
+	uni.showLoading({
+		title: "加载中...",
+		mask: true,
+	})
+	try {
+		await getDetail()
+	} catch (error) {
+		uni.showToast({
+			title: "加载失败",
+			icon: "error",
+		})
+	} finally {
+		uni.hideLoading()
+	}
+})
+
+const getDetail = async () => {
+	const { data } = await merchantApi.detail({ id: state.pa.parentId })
+	state.detail = data
+}
+
+const toDetail = async (v: any) => {
+	const isLogin = await hooks.useCheckLogin()
+	if (isLogin) {
+		router.jump("/pages/shop/detail", { id: v.id })
+	}
+}
+</script>
+
+<template>
+	<crud-layout bg="/static/page/blue-bg.png">
+		<z-paging
+			ref="pageRef"
+			height="100%"
+			:fixed="false"
+			v-model="pageHook.list"
+			:default-page-size="3"
+			safe-area-inset-bottom
+			:loading-more-enabled="true"
+			:show-scrollbar="false"
+			@query="query"
+			:auto-clean-list-when-reload="false"
+			:auto-scroll-to-top-when-reload="false"
+			@scroll="pageHook.scroll"
+		>
+			<z-swiper>
+				<z-swiper-item v-for="(v, i) in state.detail.swiperPic?.split(',')" :key="i">
+					<image class="w-100vw h-400rpx" :src="filePath(v)" mode="aspectFill" />
+				</z-swiper-item>
+			</z-swiper>
+
+			<view class="h-20rpx" />
+			<view class="flex-row card p-20rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="toDetail(v)">
+				<image class="w-180rpx h-180rpx rounded-12rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+				<view class="flex-1 flex-col m-l-20rpx">
+					<view class="flex-row items-center justify-between">
+						<view class="flex-row-center sub-text-34">{{ v.name.length > 7 ? v.name.substring(0, 7) + "..." : v.name }}</view>
+						<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">
+							<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 class="second-text-24">
+							<view v-if="v.jobTime != ',,'" class="second-text-28">营业时间：</view>
+							<view>{{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }}</view>
+							<view>{{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }}</view>
+							<view>{{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }}</view>
+						</view>
+						<view v-if="v.addressDes" class="second-text-28">
+							<svg
+								t="1743075857752"
+								class="icon"
+								viewBox="0 0 1024 1024"
+								version="1.1"
+								xmlns="http://www.w3.org/2000/svg"
+								p-id="3808"
+								width="12"
+								height="11"
+							>
+								<path
+									d="M512 1012.8c-253.6 0-511.2-54.4-511.2-158.4 0-92.8 198.4-131.2 283.2-143.2h3.2c12 0 22.4 8.8 24 20.8 0.8 6.4-0.8 12.8-4.8 17.6-4 4.8-9.6 8.8-16 9.6-176.8 25.6-242.4 72-242.4 96 0 44.8 180.8 110.4 463.2 110.4s463.2-65.6 463.2-110.4c0-24-66.4-70.4-244.8-96-6.4-0.8-12-4-16-9.6-4-4.8-5.6-11.2-4.8-17.6 1.6-12 12-20.8 24-20.8h3.2c85.6 12 285.6 50.4 285.6 143.2 0.8 103.2-256 158.4-509.6 158.4z m-16.8-169.6c-12-11.2-288.8-272.8-288.8-529.6 0-168 136.8-304.8 304.8-304.8S816 145.6 816 313.6c0 249.6-276.8 517.6-288.8 528.8l-16 16-16-15.2zM512 56.8c-141.6 0-256.8 115.2-256.8 256.8 0 200.8 196 416 256.8 477.6 61.6-63.2 257.6-282.4 257.6-477.6C768.8 172.8 653.6 56.8 512 56.8z m0 392.8c-80 0-144.8-64.8-144.8-144.8S432 160 512 160c80 0 144.8 64.8 144.8 144.8 0 80-64.8 144.8-144.8 144.8zM512 208c-53.6 0-96.8 43.2-96.8 96.8S458.4 401.6 512 401.6c53.6 0 96.8-43.2 96.8-96.8S564.8 208 512 208z"
+									fill="#707070"
+									p-id="3809"
+								></path>
+							</svg>
+							<text class="ml-1">地址:</text>
+							<text class="m-l-10rpx">{{ v.addressDes }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</z-paging>
+	</crud-layout>
+</template>
diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue
index 8c40f02..8f02293 100644
--- a/src/pages/shop/detail.vue
+++ b/src/pages/shop/detail.vue
@@ -18,10 +18,10 @@
 						<view class="flex-1 flex-col m-l-20rpx">
 							<view class="flex-row items-center justify-between">
 								<view class="flex-row-center sub-text-34">
-									{{ state.detail.name.length > 7 ? state.detail.name.substring(0, 7) + "..." : state.detail.name }}
+									{{ state.detail.name?.length > 7 ? state.detail.name.substring(0, 7) + "..." : state.detail.name }}
 								</view>
 								<tm-tag size="s">
-									{{ state.detail.deptName.length > 5 ? state.detail.deptName.substring(0, 5) + "..." : state.detail.deptName }}
+									{{ state.detail.deptName?.length > 5 ? state.detail.deptName.substring(0, 5) + "..." : state.detail.deptName }}
 								</tm-tag>
 							</view>
 							<view class="m-t-10rpx">
@@ -86,7 +86,7 @@
 			<!-- start 商品 start -->
 			<view class="flex-row">
 				<scroll-view
-					v-if="state.classifyList.length > 0"
+					v-if="state.classifyList?.length > 0"
 					scroll-y
 					:style="{ height: getHeight() }"
 					class="menu w-200rpx h-full p-l-12rpx p-b-20rpx bg-#f6f6f6"
@@ -104,7 +104,7 @@
 					</view>
 				</scroll-view>
 
-				<scroll-view v-if="state.shopList.length > 0" scroll-y :style="{ height: getHeight() }" class="flex-1 p-b-20rpx">
+				<scroll-view v-if="state.shopList?.length > 0" scroll-y :style="{ height: getHeight() }" class="flex-1 p-b-20rpx">
 					<view class="m-x-15rpx">
 						<product-row
 							v-for="goodsItem in state.goodsList"
diff --git a/src/pages/tabbar/coopMerchant.vue b/src/pages/tabbar/coopMerchant.vue
index 7439278..d8b966a 100644
--- a/src/pages/tabbar/coopMerchant.vue
+++ b/src/pages/tabbar/coopMerchant.vue
@@ -29,7 +29,9 @@ onShow(() => {
 const toDetail = async (v: any) => {
 	const isLogin = await hooks.useCheckLogin()
 	if (isLogin) {
-		router.jump("/pages/shop/detail", { id: v.id })
+		if (v.supType && v.supType == "10") return router.jump("/pages/shop/brandDetail", { parentId: v.id })
+		if (v.supType && v.supType == "20") return router.jump("/pages/shop/detail", { id: v.id })
+		uni.showToast({ title: "合作商户类型未知" })
 	}
 }
 </script>
@@ -55,7 +57,11 @@ const toDetail = async (v: any) => {
 				<image class="w-180rpx h-180rpx rounded-12rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
 				<view class="flex-1 flex-col m-l-20rpx">
 					<view class="flex-row items-center justify-between">
-						<view class="flex-row-center sub-text-34">{{ v.name.length > 7 ? v.name.substring(0, 7) + "..." : v.name }}</view>
+						<view class="flex items-center">
+							<view class="flex-row-center sub-text-34">{{ v.name.length > 7 ? v.name.substring(0, 6) + "..." : v.name }}</view>
+							<tm-tag v-if="v.supType == '10' && Number(v.mchCount) > 0" size="xs" skin="thin">共{{ v.mchCount }}家店铺</tm-tag>
+						</view>
+
 						<tm-tag size="s">{{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }}</tm-tag>
 					</view>
 					<view class="m-t-10rpx">
diff --git a/src/pages/tabbar/userRole.vue b/src/pages/tabbar/userRole.vue
new file mode 100644
index 0000000..bf91dd0
--- /dev/null
+++ b/src/pages/tabbar/userRole.vue
@@ -0,0 +1,3 @@
+<template>aaa</template>
+
+<script setup lang="ts"></script>
diff --git a/src/sheep/api/merchant.ts b/src/sheep/api/merchant.ts
index 524cb0f..95e872a 100644
--- a/src/sheep/api/merchant.ts
+++ b/src/sheep/api/merchant.ts
@@ -1,22 +1,31 @@
-import request from "@/sheep/utils/request";
+import request from "@/sheep/utils/request"
 
 export default {
-  page: (params: any) =>
-    request({
-      url: "/wallet/mch-manage/app/page-join",
-      method: "GET",
-      params,
-      custom: {
-        showLoading: false,
-      },
-    }),
-  detail: (params: any) =>
-    request({
-      url: "/wallet/mch-manage/app/detail",
-      method: "GET",
-      params,
-      custom: {
-        showLoading: false,
-      },
-    }),
-};
+	page: (params: any) =>
+		request({
+			url: "/wallet/mch-manage/app/page-join",
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+	childrenPage: (params: any) =>
+		request({
+			url: "/wallet/mch-manage/app/children-page-join",
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+	detail: (params: any) =>
+		request({
+			url: "/wallet/mch-manage/app/detail",
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+}