From bab4a4383baf3353a990d457a3855a5883ac2544 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 5 Jun 2025 16:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=95=86=E5=9F=8E=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  23 ++-
 src/pages.json                                |  15 +-
 src/pages/canteen/detail.vue                  |   2 +-
 .../{product-car.vue => product-cart.vue}     |  14 +-
 src/pages/shop/components/product-total.vue   |  48 ++---
 src/pages/shop/detail.vue                     | 165 ++++++++----------
 src/pages/tabbar/onlineShop.vue               |  82 +++++++++
 src/sheep/utils/app.ts                        |   4 +-
 src/static/tabbar/online-shop-select.png      | Bin 0 -> 5113 bytes
 src/static/tabbar/online-shop.png             | Bin 0 -> 4996 bytes
 10 files changed, 211 insertions(+), 142 deletions(-)
 rename src/pages/shop/components/{product-car.vue => product-cart.vue} (83%)
 create mode 100644 src/pages/tabbar/onlineShop.vue
 create mode 100644 src/static/tabbar/online-shop-select.png
 create mode 100644 src/static/tabbar/online-shop.png

diff --git a/src/App.vue b/src/App.vue
index ac5b9d9..f314ac1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,11 +2,6 @@
 import { isDevEnv, getLaunchParam } from "@/sheep/utils/app"
 import { getAppInfo } from "@@/utils/app"
 
-// import { onLaunch, onShow, onHide } from "@dcloudio/uni-app"
-// onLaunch(() => {})
-// onShow(() => {})
-// onHide(() => {})
-
 interface TabbarItem {
 	pagePath: string
 	text: string
@@ -33,6 +28,14 @@ const tabbar: TabbarItem[] = [
 		launchParam: ["selfMerchant"],
 		auth: ["user"],
 	},
+	{
+		pagePath: "pages/tabbar/onlineShop",
+		text: "在线商城",
+		iconPath: "/static/tabbar/online-shop.png",
+		selectedIconPath: "/static/tabbar/online-shop-select.png",
+		launchParam: ["onlineShop"],
+		auth: ["user"],
+	},
 	{
 		pagePath: "pages/tabbar/coopMerchant",
 		text: "合作商家",
@@ -54,7 +57,7 @@ const tabbar: TabbarItem[] = [
 		text: "订单",
 		iconPath: "/static/tabbar/order.png",
 		selectedIconPath: "/static/tabbar/order-select.png",
-		launchParam: ["canteen", "selfMerchant", "coopMerchant"],
+		launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant"],
 		auth: ["user"],
 	},
 	{
@@ -94,7 +97,7 @@ const tabbar: TabbarItem[] = [
 		text: "我的",
 		iconPath: "/static/tabbar/my.png",
 		selectedIconPath: "/static/tabbar/my-select.png",
-		launchParam: ["canteen", "selfMerchant", "coopMerchant"],
+		launchParam: ["canteen", "selfMerchant", "onlineShop", "coopMerchant"],
 		auth: ["user", "merchant", "doorAdmin"],
 	},
 ]
@@ -149,6 +152,9 @@ export default {
 				case "selfMerchant":
 					uni.switchTab({ url: "/pages/tabbar/selfMerchant" })
 					break
+				case "onlineShop":
+					uni.switchTab({ url: "/pages/tabbar/onlineShop" })
+					break
 				case "coopMerchant":
 					uni.switchTab({ url: "/pages/tabbar/coopMerchant" })
 					break
@@ -169,6 +175,7 @@ export default {
 						return uni.switchTab({ url: "/pages/tabbar/individualOrder" })
 					case "user":
 						if (launchParam === "selfMerchant") return uni.switchTab({ url: "/pages/tabbar/selfMerchant" })
+						if (launchParam === "onlineShop") return uni.reLaunch({ url: "/pages/tabbar/onlineShop" })
 						if (launchParam === "coopMerchant") return uni.reLaunch({ url: "/pages/tabbar/coopMerchant" })
 						return
 					case "doorAdmin":
@@ -179,8 +186,6 @@ export default {
 			}
 		}
 	},
-	onShow() {},
-	onHide() {},
 
 	methods: {
 		async _initTabbar() {
diff --git a/src/pages.json b/src/pages.json
index df22365..669c84a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -23,6 +23,13 @@
 				"disableScroll": true
 			}
 		},
+		{
+			"path": "pages/tabbar/onlineShop",
+			"style": {
+				"navigationBarTitleText": "在线商城",
+				"disableScroll": true
+			}
+		},
 		{
 			"path": "pages/tabbar/coopMerchant",
 			"style": {
@@ -483,6 +490,12 @@
 				"iconPath": "",
 				"selectedIconPath": ""
 			},
+			{
+				"pagePath": "pages/tabbar/onlineShop",
+				"text": "",
+				"iconPath": "",
+				"selectedIconPath": ""
+			},
 			{
 				"pagePath": "pages/tabbar/coopMerchant",
 				"text": "",
@@ -521,7 +534,7 @@
 			},
 			{
 				"pagePath": "pages/tabbar/message",
-				"text": "通知公告",
+				"text": "",
 				"iconPath": "",
 				"selectedIconPath": ""
 			},
diff --git a/src/pages/canteen/detail.vue b/src/pages/canteen/detail.vue
index 01b2f3f..496d130 100644
--- a/src/pages/canteen/detail.vue
+++ b/src/pages/canteen/detail.vue
@@ -156,7 +156,7 @@ const updateFoodCart = async () => {
 }
 
 // 打开购物车
-const doVisibleCart = async () => (state.showCartDialog = true)
+const doVisibleCart = () => (state.showCartDialog = true)
 
 // 购买 打开预订时间段选择对话框
 const doBuy = async () => {
diff --git a/src/pages/shop/components/product-car.vue b/src/pages/shop/components/product-cart.vue
similarity index 83%
rename from src/pages/shop/components/product-car.vue
rename to src/pages/shop/components/product-cart.vue
index d75f2fb..8873087 100644
--- a/src/pages/shop/components/product-car.vue
+++ b/src/pages/shop/components/product-cart.vue
@@ -1,13 +1,5 @@
 <template>
-	<tm-drawer
-		z-index="100"
-		v-model:show="props.modelValue"
-		showFooter
-		title="购物车"
-		position="bottom"
-		size="60%"
-		@close="doClose"
-	>
+	<tm-drawer z-index="100" v-model:show="props.modelValue" showFooter title="购物车" position="bottom" size="60%" @close="doClose">
 		<product-row
 			mode="car"
 			v-for="v in carList"
@@ -38,7 +30,7 @@ import { filePath } from "@/sheep/utils/file"
 import ProductRow from "./product-row.vue"
 import ProductTotal from "./product-total.vue"
 
-const emit = defineEmits(["update:modelValue", "doPay", "add", "remove"])
+const emit = defineEmits(["update:modelValue", "submit", "add", "remove"])
 
 export type Props = {
 	modelValue: any
@@ -58,7 +50,7 @@ const doClose = () => {
 }
 
 const doPay = () => {
-	emit("doPay")
+	emit("submit")
 }
 
 const getHeight = () => {
diff --git a/src/pages/shop/components/product-total.vue b/src/pages/shop/components/product-total.vue
index 76e4e26..41b66f2 100644
--- a/src/pages/shop/components/product-total.vue
+++ b/src/pages/shop/components/product-total.vue
@@ -1,37 +1,37 @@
 <template>
-  <view class="flex-row items-center justify-between" @tap="doContainer">
-    <view class="flex-row-center">
-      <view class="flex-row-center size-80rpx rounded-full bg-#0094ff">
-        <view class="color-white! iconfont icon-biaoqianlanicon_gouwuche-xuanzhong" />
-      </view>
-      <view class="flex-col m-l-30rpx">
-        <view class="second-text-36 color-#f63a36!">¥ {{ hooks.useMoney(props.totPrice) }}</view>
-        <view class="sub-text-28">共{{ props.totCount }}件</view>
-      </view>
-    </view>
-    <view class="bg-#0094ff p-x-30rpx p-y-20rpx text-center rounded-40rpx sub-text-30 color-white!" @tap.stop="doPay">提交订单</view>
-  </view>
+	<view class="flex-row items-center justify-between" @tap="doContainer">
+		<view class="flex-row-center">
+			<view class="flex-row-center size-80rpx rounded-full bg-#0094ff">
+				<view class="color-white! iconfont icon-biaoqianlanicon_gouwuche-xuanzhong" />
+			</view>
+			<view class="flex-col m-l-30rpx">
+				<view class="second-text-36 color-#f63a36!">¥ {{ hooks.useMoney(props.totPrice) }}</view>
+				<view class="sub-text-28">共{{ props.totCount }}件</view>
+			</view>
+		</view>
+		<view class="bg-#0094ff p-x-30rpx p-y-20rpx text-center rounded-40rpx sub-text-30 color-white!" @tap.stop="doPay">提交订单</view>
+	</view>
 </template>
 
 <script setup lang="ts">
-import { hooks } from "@@/index";
+import { hooks } from "@@/index"
 
-const emit = defineEmits(["doPay", "doContainer"]);
+const emit = defineEmits(["submit", "doContainer"])
 
 export type Props = {
-  totPrice: number;
-  totCount: number;
-};
+	totPrice: number
+	totCount: number
+}
 const props = withDefaults(defineProps<Props>(), {
-  totPrice: 0,
-  totCount: 0,
-});
+	totPrice: 0,
+	totCount: 0,
+})
 
 const doPay = () => {
-  emit("doPay");
-};
+	emit("submit")
+}
 
 const doContainer = () => {
-  emit("doContainer");
-};
+	emit("doContainer")
+}
 </script>
diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue
index a2fe252..0a9c511 100644
--- a/src/pages/shop/detail.vue
+++ b/src/pages/shop/detail.vue
@@ -66,9 +66,6 @@
 				:borderColor="['#89c0ff']"
 			>
 				<marquee class="flex items-center">{{ state.detail.discountsPrice }}</marquee>
-				<!-- <view class="w-full overflow-hidden flex">
-					<view class="scroll-text">{{ state.detail.discountsPrice }}</view>
-				</view> -->
 			</tm-alert>
 
 			<!-- start 商品 start -->
@@ -112,24 +109,24 @@
 		<!-- end 商品 end -->
 
 		<template #main-bottom>
-			<view v-if="false" class="car z-200 p-x-30rpx p-y-30rpx bg-white">
-				<product-total :totPrice="state.totPrice" :totCount="state.totCount" @doContainer="doVisibleCar" @doPay="doPay" />
+			<view class="car z-200 p-x-30rpx p-y-30rpx bg-white">
+				<product-total :totPrice="state.totPrice" :totCount="state.totCount" @doContainer="doVisibleCart" @submit="doBuy" />
 			</view>
 		</template>
 	</crud-layout>
 
 	<!-- 购物车弹框 -->
-	<product-car
-		v-model="showCarDialog"
-		:carList="state.carList"
+	<product-cart
+		v-model="state.showCartDialog"
+		:carList="state.cartList"
 		:totPrice="state.totPrice"
 		:totCount="state.totCount"
 		@add="doAdd"
 		@remove="doRemove"
-		@doPay="doPay"
+		@submit="doBuy"
 	/>
 	<!-- 规格与数量弹框 -->
-	<product-sku v-model="showSkuDialog" :productData="curProductData" @onAddToCar="onAddToCar" />
+	<product-sku v-model="state.showSkuDialog" :productData="state.curProductData" @onAddToCar="onAddToCar" />
 </template>
 
 <script setup lang="ts">
@@ -140,7 +137,7 @@ import { router } from "@@/index"
 import { foodApi, merchantApi, payApi, shopApi } from "@@/api"
 import { filePath } from "@@/utils/file"
 import ProductRow from "./components/product-row.vue"
-import ProductCar from "./components/product-car.vue"
+import ProductCart from "./components/product-cart.vue"
 import ProductTotal from "./components/product-total.vue"
 import ProductSku from "./components/product-sku.vue"
 
@@ -148,20 +145,21 @@ import ProductSku from "./components/product-sku.vue"
 const state = reactive<any>({
 	merchantId: null,
 	detail: {},
-	classifyList: [],
-	currentClassifyIndex: 0,
+
 	goodsList: [],
 
-	carList: [],
+	cartList: [],
 	totPrice: 0,
 	totCount: 0,
+
+	classifyList: [],
+	currentClassifyIndex: 0,
+
+	showCartDialog: false,
+	showSkuDialog: false,
+
+	curProductData: {}, // 当前点击加入购物车的商品信息
 })
-// 当前点击加入购物车的商品信息
-const curProductData = ref<any>({})
-// sku 弹框开关
-const showSkuDialog = ref<boolean>(false)
-// 购物车弹框开关
-const showCarDialog = ref<boolean>(false)
 
 onLoad((options: any) => {
 	if (!isEmpty(options.id)) {
@@ -169,57 +167,53 @@ onLoad((options: any) => {
 	}
 })
 onShow(async () => {
-	uni.showLoading({
-		title: "加载中...",
-		mask: true,
-	})
+	uni.showLoading({ title: "加载中...", mask: true })
 	try {
 		await getDetail()
-		await getShopCar()
+		await getShopCart()
 		await getClassify()
-	} catch (error) {
-		uni.showToast({
-			title: "加载失败",
-			icon: "error",
-		})
+	} catch (error: any) {
+		uni.showToast({ title: error, icon: "error" })
 	} finally {
 		uni.hideLoading()
 	}
 })
 
+const getHeight = () => {
+	const rpx = 480
+	return `calc(100vh - ${uni.upx2px(rpx)}px)`
+}
+
 const getDetail = async () => {
 	const { data } = await merchantApi.detail({ id: state.merchantId })
 	state.detail = data
 }
 
-const getShopCar = async () => {
+const getShopCart = async () => {
 	const { data } = await foodApi.getShopCar({ merchantId: state.merchantId, hardType: "SUPERMARKET" })
-	state.carList = data ?? []
-	console.log("car", data)
-
-	state.totPrice = state.carList.map((v) => Number(v.totalPrice)).reduce((pre, next) => pre + next, 0)
-	state.totCount = state.carList.map((v) => v.productCount).reduce((pre, next) => pre + next, 0)
+	state.cartList = data ?? []
+	state.totPrice = state.cartList.map((v) => Number(v.totalPrice)).reduce((pre, next) => pre + next, 0)
+	state.totCount = state.cartList.map((v) => v.productCount).reduce((pre, next) => pre + next, 0)
 }
 
 const getClassify = async () => {
 	if (state.merchantId) {
 		const { data } = await shopApi.getSupermarketSpuCategory({ merchantId: state.merchantId })
-		state.classifyList = [{ id: null, name: "全部" }, ...data]
+		state.classifyList = data ?? []
 		if (!isEmpty(state.classifyList)) {
-			getPorduct()
+			getPorductList()
 		}
 	}
 }
 
-const getPorduct = async () => {
+const getPorductList = async () => {
 	const target = state.classifyList[state.currentClassifyIndex]
 	if (isEmpty(target)) return
 	const { data } = await shopApi.getSupermarketSpuList({
-		// productName: target.name,
 		merchantId: state.merchantId,
 		categoryId: target.id,
 		current: 1,
-		size: 9999,
+		size: 99999,
 	})
 	state.goodsList = data.records
 	state.goodsList.forEach((i) => {
@@ -231,11 +225,11 @@ const getPorduct = async () => {
 		}
 	})
 	const goodsList = [...state.goodsList]
-	if (state.carList && state.carList.length) {
+	if (state.cartList && state.cartList.length) {
 		for (const i of goodsList) {
 			if (i && i.foodSPURespVOList && i.foodSPURespVOList.length) {
 				for (const j of i.foodSPURespVOList) {
-					for (const v of state.carList) {
+					for (const v of state.cartList) {
 						if (j.id == v.productId) {
 							j.productCount = v.productCount
 						}
@@ -249,45 +243,23 @@ const getPorduct = async () => {
 
 const doClassify = async (i: any) => {
 	state.currentClassifyIndex = i
-	await getPorduct()
-}
-
-// 联系商家
-const doPhone = () => {
-	if (isEmpty(state.detail.phone)) {
-		uni.showToast({ title: "该商户没有预留电话", icon: "none" })
-		return
-	}
-	;(window as any).dd
-		.callPhone({
-			phoneNum: state.detail.phone,
-		})
-		.then((res) => {})
-		.catch((err) => {})
-}
-
-const getHeight = () => {
-	const rpx = 480
-	return `calc(100vh - ${uni.upx2px(rpx)}px)`
+	await getPorductList()
 }
 
 // 点击添加到购物车
 const onClickAddToCar = (productData: any) => {
-	showSkuDialog.value = true
-	curProductData.value = productData
+	state.showSkuDialog = true
+	state.curProductData = productData
 }
 
 // 加入到购物车时
 const onAddToCar = (cartGoodsInfo: any) => {
-	console.log("cartGoodsInfo", cartGoodsInfo)
 	chentProductCount(cartGoodsInfo) // 同步购物车中的数据
-	showSkuDialog.value = false
+	state.showSkuDialog = false
 }
 // 同步购物车中的数据
 const chentProductCount = async (item: any, type?: "add" | "remove") => {
 	try {
-		console.log("ccccccc", item)
-
 		uni.showLoading({ title: "加载中", mask: true })
 		let count = item.productCount
 		if (type === "add") {
@@ -298,16 +270,14 @@ const chentProductCount = async (item: any, type?: "add" | "remove") => {
 			count -= 1
 		}
 
-		const target = state.carList.find((v) => v.productId == item.productId)
-		const targetIndex = state.carList.findIndex((v) => v.productId == item.productId)
+		const target = state.cartList.find((v) => v.productId == item.productId)
+		const targetIndex = state.cartList.findIndex((v) => v.productId == item.productId)
 		if (target) {
-			state.carList[targetIndex].productCount = count
-			state.carList[targetIndex].productId = item.productId
-			state.carList[targetIndex].spuId = item.spuId
-			console.log("1", state.carList[targetIndex])
+			state.cartList[targetIndex].productCount = count
+			state.cartList[targetIndex].productId = item.productId
+			state.cartList[targetIndex].spuId = item.spuId
 		} else {
-			state.carList.push(item)
-			console.log("2", item)
+			state.cartList.push(item)
 		}
 
 		nextTick(async () => await updateShopCar()) // 保存购物车数据
@@ -319,10 +289,8 @@ const chentProductCount = async (item: any, type?: "add" | "remove") => {
 }
 // 保存购物车数据
 const updateShopCar = async () => {
-	console.log("carList", state.carList)
-
-	if (isEmpty(state.carList)) return
-	const list = state.carList
+	if (isEmpty(state.cartList)) return
+	const list = state.cartList
 		.filter((v) => v.productCount && v.productCount > 0)
 		.map((v) => {
 			return {
@@ -336,13 +304,11 @@ const updateShopCar = async () => {
 		list,
 		hardType: "SUPERMARKET",
 	})
-	if (code == 0) await getShopCar()
+	if (code == 0) await getShopCart()
 }
 
-// 显示购物车
-const doVisibleCar = async () => {
-	showCarDialog.value = true
-}
+// 打开购物车
+const doVisibleCart = () => (state.showCartDialog = true)
 
 const doAdd = async (item: any) => {
 	chentProductCount(item, "add")
@@ -352,7 +318,7 @@ const doRemove = async (item: any) => {
 }
 
 // 点击提交订单
-const doPay = async () => {
+const doBuy = async () => {
 	uni.showModal({
 		title: "提示",
 		content: "是否确定购买",
@@ -367,25 +333,36 @@ const doPay = async () => {
 // 提交订单
 const submitPay = async () => {
 	try {
-		if (isEmpty(state.carList)) {
+		if (isEmpty(state.cartList)) {
 			uni.showToast({ title: "请至少购买一件商品", icon: "none" })
 			return
 		}
 		uni.showLoading({ title: "支付中...", mask: false })
-		const _createtPa = {
-			carParentId: state.carList[0].parentCarId,
+		const { data, code }: any = await payApi.createHardwareOrder({
+			carParentId: state.cartList[0].parentCarId,
 			hardType: "SUPERMARKET",
-		}
-		const { data: createData, code: createCode }: any = await payApi.createHardwareOrder(_createtPa)
-		if (createCode != 0) throw new Error()
-		uni.hideLoading()
+		})
+		if (code != 0) throw new Error()
 		uni.showToast({ title: "支付成功", icon: "none" })
 		router.jump("/pages/tabbar/order")
 	} catch (error) {
 		console.error(error)
+	} finally {
 		uni.hideLoading()
 	}
 }
+
+// 联系商家
+const doPhone = () => {
+	if (isEmpty(state.detail.phone)) {
+		uni.showToast({ title: "该商户没有预留电话", icon: "none" })
+		return
+	}
+	;(window as any).dd
+		.callPhone({ phoneNum: state.detail.phone })
+		.then((res) => {})
+		.catch((err) => {})
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/tabbar/onlineShop.vue b/src/pages/tabbar/onlineShop.vue
new file mode 100644
index 0000000..f695460
--- /dev/null
+++ b/src/pages/tabbar/onlineShop.vue
@@ -0,0 +1,82 @@
+<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) => {
+	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-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 }}</view>
+						<tm-tag size="s">{{ v.deptName }}</tm-tag>
+					</view>
+					<view class="m-t-10rpx">
+						<view v-if="v.phone" class="flex items-center">
+							<image class="w-24rpx h-24rpx" src="@/static/page/phone.svg" />
+							<view class="second-text-28 ml-1">{{ v.phone }}</view>
+						</view>
+						<view class="second-text-24">
+							<view class="second-text-28">{{ v.jobTime == ",," ? "" : "营业时间：" }}</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">
+							<image class="w-24rpx h-24rpx" src="@/static/page/address.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/sheep/utils/app.ts b/src/sheep/utils/app.ts
index 3fd5d82..eddb7cf 100644
--- a/src/sheep/utils/app.ts
+++ b/src/sheep/utils/app.ts
@@ -3,8 +3,8 @@
 export const isDevEnv = (): boolean => process.env.NODE_ENV === "development"
 
 // 获取启动参数
-export const getLaunchParam = (): "canteen" | "selfMerchant" | "coopMerchant" | "thirdApp" | null => {
-	return new URL(window.location.href).searchParams.get("launchParam") as "canteen" | "selfMerchant" | "coopMerchant" | "thirdApp" | null
+export const getLaunchParam = (): string => {
+	return new URL(window.location.href).searchParams.get("launchParam") || ""
 }
 
 // 检测app信息判断运行环境
diff --git a/src/static/tabbar/online-shop-select.png b/src/static/tabbar/online-shop-select.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ab5fcb512229428aa5a052073d6e8073487bb1c
GIT binary patch
literal 5113
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
Vv24b!lhStppr?b?uGO@Q{2xVl8bJU6

literal 0
HcmV?d00001

diff --git a/src/static/tabbar/online-shop.png b/src/static/tabbar/online-shop.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f7389d4af7e68766abb79ea0de2ff1030f52b1d
GIT binary patch
literal 4996
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
ZAR*ou^VnLw5B#kL=xQ1gi#6;b{tv}U5=Q_4

literal 0
HcmV?d00001