diff --git a/.env b/.env
index 81fcc7b..2f80fbe 100644
--- a/.env
+++ b/.env
@@ -27,12 +27,12 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
 VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
 
 # ******************** start 开发环境 start ********************
-VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
+# VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
 # VITE_APP_DEV_SERVICE = http://192.168.101.60:9999 # 邓-本地
 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
 # VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上
-# VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上
+VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上
 # VITE_APP_DEV_SERVICE = http://localhost:9999
 # ******************** end 开发环境 end ********************
 
diff --git a/src/pages/boxes/list.vue b/src/pages/boxes/list.vue
index b5581eb..fb35c39 100644
--- a/src/pages/boxes/list.vue
+++ b/src/pages/boxes/list.vue
@@ -83,9 +83,9 @@ const doCard = (v: any) => {
 						<view class="m-t-10rpx flex-row items-center">
 							<view class="second-text-32 color-#f63a36!"> ¥{{ v.price }} </view>
 						</view>
-						<view class="flex-row items-center m-t-10rpx">
+						<view class="flex-row items-center justify-between m-t-10rpx">
 							<view class="second-text-26">可容纳{{ v.capacity }}人</view>
-							<view class="w-1px h-20rpx m-x-5rpx bg-#999" />
+							<view class="w-2rpx h-20rpx m-x-5rpx bg-#999" />
 							<view class="flex-row-center">
 								<tm-tag v-if="v.status == 0" size="xs" color="success">
 									{{ hooks.useEnum("boxesBxStatusEnum", v.status.toString()) }}
diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue
index 5ae3314..f4fe0ff 100644
--- a/src/pages/merchant/detail.vue
+++ b/src/pages/merchant/detail.vue
@@ -230,25 +230,25 @@ const doFood = () => {
 					<!-- start 简介 start -->
 					<view class="h-15rpx" />
 					<view flex-row card p-20rpx>
-						<image class="w-160rpx h-160rpx rounded-12rpx" :src="filePath(state.detail.logoPic)" mode="aspectFill" />
+						<image class="w-180rpx h-180rpx rounded-12rpx" :src="filePath(state.detail.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-36">
+								<view class="flex-row-center sub-text-34">
 									<text>{{ state.detail.name }}</text>
 								</view>
 								<view>
 									<tm-tag size="s">{{ state.detail.deptName }}</tm-tag>
 								</view>
 							</view>
-							<view class="m-t-10rpx second-text-28">
-								<view>营业时间：</view>
-								<view class="second-text-24">
+							<view class="second-text-24">
+								<view class="second-text-28">营业时间：</view>
+								<view>
 									{{ state.detail.jobTime?.split(",")[0] ? "早：" + state.detail.jobTime?.split(",")[0] : "" }}
 								</view>
-								<view class="second-text-24">
+								<view>
 									{{ state.detail.jobTime?.split(",")[1] ? "中：" + state.detail.jobTime?.split(",")[1] : "" }}
 								</view>
-								<view class="second-text-24">
+								<view>
 									{{ state.detail.jobTime?.split(",")[2] ? "晚：" + state.detail.jobTime?.split(",")[2] : "" }}
 								</view>
 							</view>
diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue
index 7979162..7ccdddc 100644
--- a/src/pages/shop/detail.vue
+++ b/src/pages/shop/detail.vue
@@ -14,24 +14,18 @@
 					<view class="h-15rpx" />
 					<!-- start 简介 start -->
 					<view flex-row card p-20rpx>
-						<image class="w-120rpx h-120rpx rounded-12rpx" :src="filePath(state.detail.logoPic)" mode="aspectFill" />
+						<image class="w-180rpx h-180rpx rounded-12rpx" :src="filePath(state.detail.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-36">
-									<text>{{ state.detail.name }}</text>
-								</view>
-								<view>
-									<tm-tag size="s">{{ state.detail.deptName }}</tm-tag>
-								</view>
+								<view class="flex-row-center sub-text-32">{{ state.detail.name }}</view>
+								<tm-tag size="s">{{ state.detail.deptName }}</tm-tag>
 							</view>
-							<view class="second-text-28">{{ state.detail.phone }}</view>
-							<view class="m-t-10rpx second-text-28">
-								<text>营业时间</text>
-								<text class="m-l-10rpx">
-									{{ state.detail.jobStartTime }}
-									~
-									{{ state.detail.jobEndTime }}
-								</text>
+							<view class="second-text-24">{{ state.detail.phone }}</view>
+							<view class="second-text-24">
+								<view class="second-text-28">营业时间：</view>
+								<view>{{ state.detail.jobTime?.split(",")[0] ? "早：" + state.detail.jobTime?.split(",")[0] : "" }}</view>
+								<view>{{ state.detail.jobTime?.split(",")[1] ? "中：" + state.detail.jobTime?.split(",")[1] : "" }}</view>
+								<view>{{ state.detail.jobTime?.split(",")[2] ? "晚：" + state.detail.jobTime?.split(",")[2] : "" }}</view>
 							</view>
 							<view v-if="state.detail.addressDes" class="m-t-10rpx second-text-28">
 								<text>地址</text>
@@ -47,11 +41,7 @@
 
 			<!-- start 商品 start -->
 			<view class="flex-row">
-				<scroll-view
-					scroll-y
-					:style="{ height: getHeight() }"
-					class="menu w-200rpx h-full p-l-12rpx p-b-20rpx bg-#f6f6f6"
-				>
+				<scroll-view scroll-y :style="{ height: getHeight() }" class="menu w-200rpx h-full p-l-12rpx p-b-20rpx bg-#f6f6f6">
 					<view
 						class="menu_item flex-row-center"
 						v-for="(v, i) in state.classifyList"
@@ -86,12 +76,7 @@
 
 		<template #main-bottom>
 			<view class="car z-200 p-x-30rpx p-y-30rpx bg-white">
-				<product-total
-					:totPrice="state.totPrice"
-					:totCount="state.totCount"
-					@doContainer="doVisibleCar"
-					@doPay="doPay"
-				/>
+				<product-total :totPrice="state.totPrice" :totCount="state.totCount" @doContainer="doVisibleCar" @doPay="doPay" />
 			</view>
 		</template>
 	</crud-layout>
@@ -149,9 +134,22 @@ onLoad((options: any) => {
 	}
 })
 onShow(async () => {
-	await getDetail()
-	await getShopCar()
-	await getClassify()
+	uni.showLoading({
+		title: "加载中...",
+		mask: true,
+	})
+	try {
+		await getDetail()
+		await getShopCar()
+		await getClassify()
+	} catch (error) {
+		uni.showToast({
+			title: "加载失败",
+			icon: "error",
+		})
+	} finally {
+		uni.hideLoading()
+	}
 })
 
 const getDetail = async () => {
diff --git a/src/pages/tabbar/home.vue b/src/pages/tabbar/home.vue
index 6963409..d6b3c3f 100644
--- a/src/pages/tabbar/home.vue
+++ b/src/pages/tabbar/home.vue
@@ -52,21 +52,19 @@ const toDetail = async (v: any) => {
 		>
 			<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-160rpx h-160rpx rounded-12rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+				<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">
-							<text>{{ v.name }}</text>
-						</view>
+						<view class="flex-row-center sub-text-34">{{ v.name }}</view>
 						<view>
 							<tm-tag size="s">{{ v.deptName }}</tm-tag>
 						</view>
 					</view>
-					<view class="m-t-10rpx second-text-28">
-						<view>营业时间：</view>
-						<view class="second-text-24">{{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }}</view>
-						<view class="second-text-24">{{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }}</view>
-						<view class="second-text-24">{{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }}</view>
+					<view class="second-text-24">
+						<view 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>
diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue
index a3ff656..37e43c8 100644
--- a/src/pages/tabbar/shop.vue
+++ b/src/pages/tabbar/shop.vue
@@ -49,22 +49,18 @@ const toDetail = async (v: any) => {
 			<view class="h-20rpx" />
 			<view class="flex-col card p-20rpx m-b-20rpx" v-for="(v, i) in list" :key="i" @tap="toDetail(v)">
 				<view class="flex-row-center">
-					<image class="w-120rpx h-120rpx rounded-12rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+					<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">
-								<text> {{ v.name }}</text>
-							</view>
-							<view>
-								<tm-tag size="s">{{ v.deptName }}</tm-tag>
-							</view>
+							<view class="flex-row-center sub-text-34">{{ v.name }}</view>
+							<tm-tag size="s">{{ v.deptName }}</tm-tag>
 						</view>
-						<view class="second-text-28">{{ v.phone }}</view>
-						<view class="m-t-10rpx second-text-28">
-							<view>营业时间：</view>
-							<view class="second-text-24">{{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }}</view>
-							<view class="second-text-24">{{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }}</view>
-							<view class="second-text-24">{{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }}</view>
+						<view class="second-text-24">{{ v.phone }}</view>
+						<view class="second-text-24">
+							<view 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>