合并冲突解决

pages/product/index.vue

@@ -1104,9 +1104,18 @@ const callChildMethod = () => {
   }
 };
 
-try {
-  const shopExtend = uni.cache.get("shopTable").shopExtendMap.shopinfo_bg;
-} catch (error) {}
+// const shopExtend = ref(uni.cache.get('shopTable').shopExtendMap.shopinfo_bg);
+// console.log('shopExtend', shopExtend);
+
+// 分步取值 + 每层兜底，避免某一环不存在导致 undefined
+const shopExtendShopTable = uni.cache.get('shopTable') || {}; // 兜底空对象
+const shopExtendMap = shopExtendShopTable.shopExtendMap || {}; // 兜底空对象
+// 最终声明：即使 shopinfo_bg 不存在，也兜底为空字符串/默认值
+const shopExtend = ref(shopExtendMap.shopinfo_bg || '');
+
+// try {
+// 	const shopExtend = uni.cache.get('shopTable').shopExtendMap.shopinfo_bg;
+// } catch (error) {}
 
 // 计算高度
 const navScroll = ref(null);
@@ -2691,6 +2700,8 @@ async function getNewUserDiscount() {
   }
 }
 
+
+
 const oldOrder = ref(null);
 onMounted(async () => {
   await proxy.$onLaunched;