From 4348e9456a7c633553df4f4e5831de3769bf2c9f Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Mon, 8 Jun 2026 15:41:06 +0800
Subject: [PATCH] 1

---
 package2/shop/businessInfo.vue |  6 +++---
 package2/shop/orderDetail.vue  | 10 +++++-----
 package2/shop/shopInfo.vue     |  7 ++++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/package2/shop/businessInfo.vue b/package2/shop/businessInfo.vue
index 85686ba..a3bb3fc 100644
--- a/package2/shop/businessInfo.vue
+++ b/package2/shop/businessInfo.vue
@@ -37,7 +37,7 @@
 					拼团佣金
 				</view>
 				<view class="list-right">
-					{{shop.commissionRateMore}}元
+					{{shop.commissionRateMore}}%
 				</view>
 			</view>
 			<view class="list-1">
@@ -45,7 +45,7 @@
 					单独购买佣金
 				</view>
 				<view class="list-right">
-					{{shop.commissionRateOne}}元
+					{{shop.commissionRateOne}}%
 				</view>
 			</view>
 			<view class="list-1">
@@ -77,7 +77,7 @@
 					排名
 				</view>
 				<view class="list-right">
-					{{shop.shoprank}}名
+					{{shop.shoprank == undefined?'0':shop.shoprank}}名
 				</view>
 			</view>
 			<view class="list-1">
diff --git a/package2/shop/orderDetail.vue b/package2/shop/orderDetail.vue
index a94eb5a..c3c997d 100644
--- a/package2/shop/orderDetail.vue
+++ b/package2/shop/orderDetail.vue
@@ -26,7 +26,7 @@
 				</view>
 				<view v-if="data.deliveryType == 1" style="display: flex;flex: 1;padding-left: 20rpx;">
 					<text style="flex: 1;">配送员：{{(data.deliveryInfo.workerName == 'null' || !data.deliveryInfo.workerName) ?"":data.deliveryInfo.workerName}}</text>
-					<view class="" v-if="!data.deliveryInfo">
+					<view class="" v-if="data.deliveryInfo">
 						<img @tap="makeCall(data.deliveryInfo.workerPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 60rpx;height: 60rpx;margin-top: 20rpx;" />
 					</view>
 				</view>
@@ -57,7 +57,7 @@
 							{{'x'+ item.quantity}}
 						</view>
 						<view style="width: 100rpx;text-align: right;">
-							{{'￥'+ item.price}}
+							{{'￥'+ item.price == undefined ? 0:item.price}}
 						</view>
 					</view>
 				</view>
@@ -67,7 +67,7 @@
 							商品金额
 						</view>
 						<view class="">
-							{{'￥' + data.goodsAmount}}
+							{{'￥' + data.goodsAmount == undefined ? 0:data.goodsAmount}}
 						</view>
 					</view>
 					<view style="display: flex;height: 60rpx;line-height: 60rpx;">
@@ -75,7 +75,7 @@
 							配送费
 						</view>
 						<view class="">
-							{{'￥' + data.deliveryFee}}
+							{{'￥' + data.deliveryFee == undefined ? 0:data.deliveryFee}}
 						</view>
 					</view>
 					<view style="display: flex;height: 60rpx;line-height: 60rpx;">
@@ -83,7 +83,7 @@
 							客户实际支付
 						</view>
 						<view class="">
-							{{'￥'+ data.totalAmount}}
+							{{'￥'+ data.totalAmount == undefined ? 0:data.totalAmount}}
 						</view>
 					</view>
 					<view style="display: flex;height: 60rpx;line-height: 60rpx;">
diff --git a/package2/shop/shopInfo.vue b/package2/shop/shopInfo.vue
index 742b148..b27cf96 100644
--- a/package2/shop/shopInfo.vue
+++ b/package2/shop/shopInfo.vue
@@ -103,7 +103,12 @@
 			}
 		},
 		onLoad() {
-			this.shop = uni.getStorageSync('schoolShop')[0];
+			let shopList = uni.getStorageSync('schoolShop')
+			for(let i=0;i<shopList.length;i++){
+				if(shopList[i].shopName == uni.getStorageSync('shopName')){
+					this.shop = shopList[i]
+				}
+			}
 			this.shopImages = this.shop.shopImages.split('@@')
 			this.huanjing = JSON.parse(this.shopImages[3])[0]