From 59dd01c0a1fe224977bfbe75318752115e0ae3db Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Mon, 10 Aug 2026 16:48:52 +0800
Subject: [PATCH] 1

---
 package3/shop/merchantCenter.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/package3/shop/merchantCenter.vue b/package3/shop/merchantCenter.vue
index 53635db..dee2a72 100644
--- a/package3/shop/merchantCenter.vue
+++ b/package3/shop/merchantCenter.vue
@@ -13,11 +13,11 @@
 		</view>
 		<view class="shop-title">
 			<view class="title1">
-				<img :src="shop.shopIcon" alt="" />
+				<img :src="shop.shopIcon" alt=""/>
 			</view>
 			<view class="title2">
 				<view class="title22">
-					{{shop.shopName == undefined ?"":shop.shopName}}
+					{{(shop.shopName == undefined || shop.shopName == null) ?"":shop.shopName}}
 				</view>
 				<view class="title33" @tap="updateStatus">
 					{{businessStatus == '1'?'暂停营业':'正常营业'}}
@@ -314,13 +314,17 @@
 			},
 			//获取营业状态
 			getBusinessStatus(){
+				
+				this.shop.shopName = uni.getStorageSync('shopName')
 				return this.tui.request("/app/shoptakeaway/getByShopId", "GET", {
 					shopId: uni.getStorageSync('shopId')
 				}, false, true).then((res) => {
 					if (res.code == 200) {
-						this.shop = res.result
-						uni.setStorageSync('shopTakeaway',res.result)
+						if(res.result != null){
+							this.shop = res.result
+						}
 						this.shop.shopIcon = uni.getStorageSync('shopIcon')
+						uni.setStorageSync('shopTakeaway',res.result)
 						this.businessStatus = res.result.status
 					} else {
 						this.tui.toast(res.message)