From 02be200b9be74ebbbfa01f2e44aa10528bf51d0f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 1 Nov 2024 16:40:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=85=BC=E5=AE=B9app?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7aee554..6ea2517 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -22,7 +22,7 @@
 				</view>
 			</view>
 			<view class="u-flex u-row-center">
-				<view class="">￥{{totalRevenuedata}}</view>
+				<view class="">￥{{(totalRevenuedata*1).toFixed(2)}}</view>
 			</view>
 			<view>{{shopName}}</view>
 		</view>
@@ -358,12 +358,11 @@
 
 <style lang="scss" scoped>
 	.income {
-		/* #ifdef MP-WEIXIN */
-		padding-top: calc(84rpx + 44px);
-		/* #endif */
 		/* #ifdef H5 */
 		padding-top: calc(84rpx);
-
+		/* #endif */
+		/* #ifndef H5 */
+		padding-top: calc(84rpx + 44px);
 		/* #endif */
 		>view {
 			text-align: center;

From c066341ee61887fe1f6c72fb29023330356fa1e3 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 1 Nov 2024 16:48:32 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4app.vue=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/App.vue b/App.vue
index b2e2342..48bbd2d 100644
--- a/App.vue
+++ b/App.vue
@@ -10,9 +10,6 @@ App.vue本身不是页面，这里不能编写视图元素，也就是没有<tem
 	onLaunch(() => {
 		uni.hideTabBar()
 		// #ifdef MP-WEIXIN
-		uni.setInnerAudioOption({
-			obeyMuteSwitch: false
-		});
 		const updateManager = wx.getUpdateManager() // 小程序版本更新管理器
 		updateManager.onCheckForUpdate(function(res) {
 			// 请求完新版本信息的回调

From f38ff3e3de7ddfb3ffddfea945f2d71652666b78 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 1 Nov 2024 16:55:23 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5nan?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6ea2517..75bfd96 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -22,9 +22,9 @@
 				</view>
 			</view>
 			<view class="u-flex u-row-center">
-				<view class="">￥{{(totalRevenuedata*1).toFixed(2)}}</view>
+				<view class="">￥{{((totalRevenuedata||0)*1).toFixed(2)}}</view>
 			</view>
-			<view>{{shopName}}</view>
+			<view>{{shopName||''}}</view>
 		</view>
 		<!-- 统计 or 快捷扫码 -->
 		<!-- <Stats ref="statsRef" /> -->

From ed6657199a25f56aa5062afb763638f490f01a76 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 1 Nov 2024 17:22:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E5=95=86=E5=93=81=E7=BB=91=E5=AE=9A=E8=87=B3=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E6=97=B6=E5=BC=B9=E7=AA=97=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageProduct/add-Product/components/edit-haocai.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pageProduct/add-Product/components/edit-haocai.vue b/pageProduct/add-Product/components/edit-haocai.vue
index 5232f6f..562e6cf 100644
--- a/pageProduct/add-Product/components/edit-haocai.vue
+++ b/pageProduct/add-Product/components/edit-haocai.vue
@@ -6,7 +6,11 @@
 				<!-- <template v-if="isSku"> -->
 				<view class="u-flex u-font-24 color-666">
 					<view class="u-m-r-20">绑定至规格</view>
-					<up-switch :size="18" v-model="isBindGuige" :disabled="!isSku">绑定至规格</up-switch>
+					<view class="u-flex u-relative">
+						<up-switch :size="18" v-model="isBindGuige" :disabled="!isSku">绑定至规格</up-switch>
+						<view class="u-absolute position-all" style="z-index: 1;" v-if="!isSku"
+							@click="infoBox.showToast('该商品是单规格商品，只有多规格商品可绑定至规格',3)"></view>
+					</view>
 				</view>
 				<!-- </template> -->
 			</view>