From 3451ce3dd42db97cd703870a0cf93d56eaa725b8 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 26 Mar 2025 10:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E4=BD=9C=E5=95=86=E5=AE=B6tabbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                           |   7 +++
 src/pages.json                        |  21 ++++++-
 src/pages/pay/scanPay.vue             |   2 +-
 src/pages/tabbar/coopShop.vue         |  79 ++++++++++++++++++++++++++
 src/static/tabbar/coopShop-select.png | Bin 0 -> 498 bytes
 src/static/tabbar/coopShop.png        | Bin 0 -> 493 bytes
 6 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/tabbar/coopShop.vue
 create mode 100644 src/static/tabbar/coopShop-select.png
 create mode 100644 src/static/tabbar/coopShop.png

diff --git a/src/App.vue b/src/App.vue
index 69941a5..dde7a33 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -20,6 +20,13 @@ const tabbar = [
 		selectedIconPath: "/static/tabbar/shop-select.png",
 		auth: ["zhezhengding", "shihua"],
 	},
+	{
+		pagePath: "pages/tabbar/coopShop",
+		text: "合作商家",
+		iconPath: "/static/tabbar/coopShop.png",
+		selectedIconPath: "/static/tabbar/coopShop-select.png",
+		auth: ["zhezhengding"],
+	},
 	{
 		pagePath: "pages/tabbar/order",
 		text: "订单",
diff --git a/src/pages.json b/src/pages.json
index fafaefb..277aa80 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -23,6 +23,13 @@
 				"disableScroll": true
 			}
 		},
+		{
+			"path": "pages/tabbar/coopShop",
+			"style": {
+				"navigationBarTitleText": "合作商家",
+				"disableScroll": true
+			}
+		},
 		{
 			"path": "pages/tabbar/order",
 			"style": {
@@ -277,7 +284,7 @@
 				{
 					"path": "scanPay",
 					"style": {
-						"navigationBarTitleText": "",
+						"navigationBarTitleText": "支付",
 						"disableScroll": true
 					}
 				}
@@ -305,6 +312,12 @@
 				"iconPath": "",
 				"selectedIconPath": ""
 			},
+			{
+				"pagePath": "pages/tabbar/coopShop",
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
+			},
 			{
 				"pagePath": "pages/tabbar/order",
 				"text": "",
@@ -343,6 +356,12 @@
 			// 	"selectedIconPath": "static/tabbar/shop-select.png"
 			// },
 			// {
+			// 	pagePath: "pages/tabbar/coopShop",
+			// 	text: "合作商家",
+			// 	iconPath: "static/tabbar/coopShop.png",
+			// 	selectedIconPath: "static/tabbar/coopShop-select.png",
+			// },
+			// {
 			// 	"pagePath": "pages/tabbar/order",
 			// 	"text": "订单",
 			// 	"iconPath": "static/tabbar/order.png",
diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue
index ffc974f..19ee234 100644
--- a/src/pages/pay/scanPay.vue
+++ b/src/pages/pay/scanPay.vue
@@ -1,7 +1,7 @@
 <template>
 	<crud-layout bg="/static/page/blue-bg.png">
 		<view class="h-screen flex flex-col position-relative">
-			<view class="mx-auto text-34 py-2">支付</view>
+			<view class="mx-auto text-34 py-2">{{ scanData.name }}</view>
 
 			<tm-sheet class="flex flex-row">
 				<span class="text-2xl text-[#333] mr-1 line-height-normal">¥</span>
diff --git a/src/pages/tabbar/coopShop.vue b/src/pages/tabbar/coopShop.vue
new file mode 100644
index 0000000..86d2b2c
--- /dev/null
+++ b/src/pages/tabbar/coopShop.vue
@@ -0,0 +1,79 @@
+<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"
+
+const pageRef = ref<any>(null)
+const state = reactive<any>({
+	pa: {
+		pagesize: 10,
+		type: "3",
+	},
+})
+const pageHook = hooks.usePage(pageRef, merchantApi.page, null, "data.records")
+
+const query = (page: number, pagesize: number) => {
+	pageHook.startPage(page, pagesize, false, state.pa)
+}
+
+onLoad(() => {
+	const app = getApp()
+	app._initTabbar()
+})
+onShow(() => {
+	pageRef.value && pageRef.value.reload(false)
+})
+
+const toDetail = async (v: any) => {
+	return
+	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="10"
+			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"
+		>
+			<view class="h-20rpx" />
+			<view class="flex-col card p-20rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="toDetail(v)">
+				<view class="flex-row-center">
+					<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 }}</view>
+							<tm-tag size="s">{{ v.deptName }}</tm-tag>
+						</view>
+						<view class="second-text-24">{{ v.phone }}</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="m-t-10rpx second-text-28">
+							<text>地址</text>
+							<text class="m-l-10rpx">{{ v.addressDes }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</z-paging>
+	</crud-layout>
+</template>
diff --git a/src/static/tabbar/coopShop-select.png b/src/static/tabbar/coopShop-select.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa72a06bb16623c0f044a14645ed5251c42622cb
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq001@s001xu1^@s6S{#YM00001b5ch_0Itp)
z=>Px$tVu*cRA@u(n6XO4KoExix!jdjT9`ZG-oVnrLKNS?#zM5Q)J{kgdr2&;^Z~R`
zJ6}LhE3x(kEQFkJo!y!2$R%PDygN5X;M_P{C6Ha_n}7D-><}`;b|cQdoA%74Rytne
zz8^OUm;v&MVg`tm3-SLcW|~5y;?23DfEkd1Z^dSv-U5;JWI)VALu6pL<6CFB1G?$*
z4nv)q3<mIJ;MX^DV742b1K2Vf3@;yCo9`aedt8b$4o@|po<V3E4h9gf1z!Co25ULI
zsz}`$50wC%1irNwgV|1W0K!ofz?kT<<JA@uFgJVvXsHTd2}7+-bBElDLiJi5D1eB!
zsktAnGt+gIz`%S(wi8}}XtPpaz#G|a)CDkIF);MOjP7#`6GXsFD^;>xb(aRs%aZ}1
zxMfys42m^f=TEfXvb_o&xI~PfV1;`gfp3*^)7A+{z(le5XL#_LCZ+hx29Z5hLV~pH
zUP`fqOpD!%-HYAp?1I7Hh~1Z9LSpyh7hpP5N>NHNpMk;`%`(bx)EX1JK?~TJ84$(3
o5~t&?TIbl9LTFDD#R@3)2_!Ez4-omWsQ>@~07*qoM6N<$f>GMrssI20

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/coopShop.png b/src/static/tabbar/coopShop.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffb65d11d23c5b5725e8333c98d0dcfd93f168ce
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq001@s001xu1^@s6S{#YM00001b5ch_0Itp)
z=>Px$r%6OXRA@u(n4wO@KoExiX=+hO#JvF$fgljx0D~Z4Dz*(c6fb~8acQ?n1qi_L
z0wjPUXkGw;A;Dpr4%tFUo0RKbuF0{zsk-L2oBx}CX0{zd?b2Fv{ob|TMNw=;QS@MR
zlYlv3pE%}#NezjM=a_2_P14)wiUQ_91b!Wh<9N;Uyk`eAPm*|~lo~e<Xsz`jfOE&e
zu9Q-H4X`v#FPQnjaj;k4_g8};_$*T~%d(|B&tCwH90x;D6gyEA-IicUl57*vo$F9W
zKQo_&VR&4Doe<IK5WoODDW%p+Fs=0?fQ^BG8H^FdalGPr-rInnKtus0NwP~sH$wtr
z=4;YgUjo=45*UDY1NH%6d0=2LU{23D{xU?sTuW6-)AYU)&CHwg03f1rWH!y!rnSD$
zzZk#OXB9SZ#*8+wsb?Nasb0RcZ3GEeOWBBHRa!_Yb`*%zSPucRYWI?gJw#gCy|nx9
z*+=UqjMSLaSTh3h68sYnn}c4?F`M(HYmH5$yY?{u+w8O0j@d+UmNj#09<zwHc~-#s
j?us^1pJk0WCXNAL9X`N5aK>CO00000NkvXXu0mjfVrJJ7

literal 0
HcmV?d00001