合作商家tabbar

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: "订单",

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

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>

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>