商家二级

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">

src/pages/tabbar/userRole.vue

@@ -0,0 +1,3 @@
+<template>aaa</template>
+
+<script setup lang="ts"></script>