From 76f07714afbbd4d405d8d454174eba0e099f7533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?21=E4=B8=96=E7=BA=AA=E5=B0=8F=E5=85=AB=E8=B7=AF?=
 <2529156631@qq.com>
Date: Sun, 3 Nov 2024 14:10:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E8=B0=83=E6=95=B4navbar=E5=B1=9E=E6=80=A7=E5=8F=AF?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E8=A7=A3=E5=86=B3App=E7=9C=9F?=
 =?UTF-8?q?=E6=9C=BA=E8=B0=83=E8=AF=95=E5=87=BA=E7=8E=B0=E5=BE=88=E5=A4=9A?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E5=B1=9E=E6=80=A7=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

uniapp【修复】： 调整navbar属性可为空，解决App真机调试出现很多必须属性警告
---
 .../coreshop-advert/coreshop-advert.vue       |  4 +-
 .../coreshop-article/coreshop-article.vue     |  2 +-
 .../coreshop-button/coreshop-button.vue       |  4 +-
 .../coreshop-empty/coreshop-empty.vue         |  8 ++--
 .../coreshop-goods-card.vue                   | 14 +++----
 .../coreshop-login-modal.vue                  |  4 +-
 .../coreshop-navbar/coreshop-navbar.vue       | 14 +++----
 .../coreshop-page-content.vue                 | 22 +++++-----
 .../coreshop-page/coreshop-page.vue           | 40 +++++++++----------
 .../coreshop-select-city.vue                  |  6 +--
 .../coreshop-share/coreshop-share.vue         |  6 +--
 .../coreshop-tabs/coreshop-tabs.vue           |  6 +--
 .../coreshop-view-more/coreshop-view-more.vue |  4 +-
 .../classify-five/classify-five.vue           | 12 +++---
 .../classify-four/classify-four.vue           |  6 +--
 .../classify-one/classify-one.vue             |  2 +-
 .../classify-three/classify-three.vue         |  4 +-
 .../classify-two/classify-two.vue             |  2 +-
 .../home-article-classify.vue                 |  2 +-
 .../components/home-article/home-article.vue  |  2 +-
 .../components/home-blank/home-blank.vue      |  2 +-
 .../components/home-content/home-content.vue  |  2 +-
 .../components/home-coupon/home-coupon.vue    |  2 +-
 .../home-goods-tab-bar/home-goods-tab-bar.vue |  2 +-
 .../components/home-goods/home-goods.vue      |  2 +-
 .../components/home-goods/point.vue           |  6 +--
 .../home-group-purchase.vue                   |  2 +-
 .../home-img-window/home-img-window.vue       |  2 +-
 .../components/home-img/home-img.vue          |  2 +-
 .../components/home-nav-bar/home-nav-bar.vue  |  2 +-
 .../home-notice-bar/home-notice-bar.vue       |  2 +-
 .../components/home-pinTuan/home-pinTuan.vue  |  2 +-
 .../components/home-record/home-record.vue    |  2 +-
 .../components/home-search/home-search.vue    |  2 +-
 .../components/home-seckill/home-seckill.vue  |  2 +-
 .../home-service-good/home-service-good.scss  |  6 +--
 .../home-service-good/home-service-good.vue   |  4 +-
 .../components/home-swiper/home-swiper.vue    | 14 +++----
 .../home-textarea/home-textarea.vue           |  2 +-
 .../components/home-video/home-video.vue      |  2 +-
 .../pages/components/custom-page/index.vue    |  2 +-
 .../goods-detail-agent/goods-detail-agent.vue |  4 +-
 .../goods-detail-bottom-tabbar.vue            |  2 +-
 .../goods-detail-common-problem.vue           |  2 +-
 .../goods-detail-content.vue                  |  2 +-
 .../goods-detail-evaluate.vue                 |  6 +--
 .../goods-detail-info/goods-detail-info.vue   |  6 +--
 .../goods-detail-params.vue                   |  2 +-
 .../goods-detail-picture.vue                  |  4 +-
 .../goods-detail-recommend.vue                |  2 +-
 .../goods-detail-service.vue                  | 10 ++---
 .../goods-detail-sku/goods-detail-sku.vue     | 23 ++++++-----
 .../pages/components/goods-detail/index.vue   | 26 ++++++------
 .../pages/components/pay-method/index.vue     | 12 +++---
 54 files changed, 163 insertions(+), 166 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-advert/coreshop-advert.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-advert/coreshop-advert.vue
index eaa2ee15..81e9883e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-advert/coreshop-advert.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-advert/coreshop-advert.vue
@@ -16,8 +16,8 @@
 	import { handleAdvertiseDetail } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		code : string,
-		height : string
+		code ?: string,
+		height ?: string
 	}>(), {
 		code: '',
 		height: '200rpx'
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.vue
index 1435824d..904805b1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-article/coreshop-article.vue
@@ -18,7 +18,7 @@
 	import { handleStaticResources } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-button/coreshop-button.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-button/coreshop-button.vue
index f92058ca..3c695860 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-button/coreshop-button.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-button/coreshop-button.vue
@@ -10,11 +10,11 @@
 	const emits = defineEmits(['onClick']);
 
 	const props = withDefaults(defineProps<{
-		title : string;
+		title ?: string;
 		radius ?: number;
 		backgroundColor ?: string;
 		color ?: string;
-		loading : boolean;
+		loading ?: boolean;
 		customStyle ?: { [key : string] : any }
 	}>(), {
 		title: '保存',
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-empty/coreshop-empty.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-empty/coreshop-empty.vue
index fc5ec4f7..0d0ebad3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-empty/coreshop-empty.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-empty/coreshop-empty.vue
@@ -2,15 +2,15 @@
 	<uv-empty :mode="props.mode" :text="props.text" :textColor="props.textColor" :icon="computedSrc"></uv-empty>
 
 </template>
-<script setup lang="ts"> 
+<script setup lang="ts">
 	import { computed } from 'vue';
 	import { EmptyEnum } from '@/core/enum';
 	import { cdnFilesUrl } from '@/core/consts';
 
 	const props = withDefaults(defineProps<{
-		mode : EmptyEnum;
-		text : string;
-		textColor : string;
+		mode ?: EmptyEnum;
+		text ?: string;
+		textColor ?: string;
 	}>(), {
 		mode: EmptyEnum.data,
 		text: '数据为空',
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-goods-card/coreshop-goods-card.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-goods-card/coreshop-goods-card.vue
index b664afe2..37a2835d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-goods-card/coreshop-goods-card.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-goods-card/coreshop-goods-card.vue
@@ -1,5 +1,5 @@
 <template>
-	<view :class="props.type == 'horizontal' ? 'horizontal-good-card-box' : 'vertical-good-card-box'">
+	<view :class="props.type == 'horizontal' ? 'horizontal-good-card-box' : 'vertical-good-card-box'" >
 		<view class="img-box" :style="{ 'width': props.imgWidth, 'height': props.imgHeight }" @click="hanldeClickGoods">
 			<image class="good-img" :src="props.goodsData.image"></image>
 			<view class="recommend" v-if="props.goodsData.isRecommend">推荐</view>
@@ -38,12 +38,12 @@
 </template>
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		type : 'vertical' | 'horizontal',
-		imgWidth : string,
-		imgHeight : string,
-		nameOverflow : number,
-		briefOverflow : number,
-		goodsData : any,
+		type ?: 'vertical' | 'horizontal',
+		imgWidth ?: string,
+		imgHeight ?: string,
+		nameOverflow ?: number,
+		briefOverflow ?: number,
+		goodsData ?: any,
 	}>(), {
 		type: 'horizontal',  // vertical 垂直   horizontal 水平
 		imgWidth: '190rpx',
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
index 470b2cb6..d35d1c40 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
@@ -69,8 +69,8 @@
 	const userInfoStore = useUserInfoStore();
 
 	const props = withDefaults(defineProps<{
-		show : boolean,
-		goodsDetailData : any,
+		show ?: boolean,
+		goodsDetailData ?: any,
 	}>(), {
 		show: false,
 		goodsDetailData: {},
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
index c8e95ba0..63525227 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
@@ -26,13 +26,13 @@
 	const { menuButtonHeight } = useSystemInfo();
 
 	const props = withDefaults(defineProps<{
-		isBack : boolean,
-		bgColor : string,
-		titleColor : string,
-		mode : string,
-		title : string,
-		handleCustomRouteJump : () => void | null,
-		placeholder : boolean;
+		isBack ?: boolean,
+		bgColor ?: string,
+		titleColor ?: string,
+		mode ?: string,
+		title ?: string,
+		handleCustomRouteJump ?: () => void | null,
+		placeholder ?: boolean;
 	}>(), {
 		isBack: true,
 		bgColor: '#eef2f6',
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
index fe47bd78..10a1f3fa 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
@@ -19,17 +19,17 @@
 	const _useLoginStore = useLoginStore();
 
 	const props = withDefaults(defineProps<{
-		isBack : boolean,
-		bgColor : string,
-		titleColor : string,
-		mode : string,
-		title : string,
-		isShowStatusBarHeight : boolean;
-		customStyle : any;
-		contentStyle : any;
-		handleCustomRouteJump : () => void | null,
-		showLoginModalDom : boolean;
-		placeholder : boolean;
+		isBack ?: boolean,
+		bgColor ?: string,
+		titleColor ?: string,
+		mode ?: "left" | "center",
+		title ?: string,
+		isShowStatusBarHeight ?: boolean;
+		customStyle ?: any;
+		contentStyle ?: any;
+		handleCustomRouteJump ?: () => void | null,
+		showLoginModalDom ?: boolean;
+		placeholder ?: boolean;
 	}>(), {
 		isBack: true,
 		bgColor: '#eef2f6',
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
index f654c01a..900ed986 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
@@ -20,26 +20,26 @@
 </template>
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		isBack : boolean,
-		bgColor : string,
-		titleColor : string,
-		mode : string,
-		title : string;
-		isShowStatusBarHeight : boolean;
-		customStyle : any;
-		contentStyle : any;
-		handleCustomRouteJump : () => void | null,
-		showLoginModalDom : boolean;
-		needSkeleton : boolean;
+		isBack ?: boolean,
+		bgColor ?: string,
+		titleColor ?: string,
+		mode ?: "left" | "center",
+		title ?: string;
+		isShowStatusBarHeight ?: boolean;
+		customStyle ?: any;
+		contentStyle ?: any;
+		handleCustomRouteJump ?: () => void | null,
+		showLoginModalDom ?: boolean;
+		needSkeleton ?: boolean;
 		skeleton ?: Array<{ [key : string] : any }>;
-		skeletonLoading : boolean;
-		placeholder : boolean;
-		loadingPage : boolean;
-		needLoadingPage : boolean;
-		loadingText : string;
-		loadingTextFontSize : string;
-		loadingBgColor : string;
-		loadingColor : string;
+		skeletonLoading ?: boolean;
+		placeholder ?: boolean;
+		loadingPage ?: boolean;
+		needLoadingPage ?: boolean;
+		loadingText ?: string;
+		loadingTextFontSize ?: string;
+		loadingBgColor ?: string;
+		loadingColor ?: string;
 	}>(), {
 		isBack: true,
 		bgColor: '#eef2f6',
@@ -67,4 +67,4 @@
 	.coreshop-skeleton {
 		background-color: #fff;
 	}
-</style> 
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-select-city/coreshop-select-city.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-select-city/coreshop-select-city.vue
index a35e97f1..61324736 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-select-city/coreshop-select-city.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-select-city/coreshop-select-city.vue
@@ -8,9 +8,9 @@
 	import { queryAreas } from '@/core/api';
 
 	const props = withDefaults(defineProps<{
-		show : boolean,
-		cityList : Array<CityAddressType>,
-		pickerValue : string,
+		show ?: boolean,
+		cityList ?: Array<CityAddressType>,
+		pickerValue ?: string,
 	}>(), {
 		show: false,
 		cityList: () => [],
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/coreshop-share.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/coreshop-share.vue
index 249746ef..427e10cd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/coreshop-share.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/coreshop-share.vue
@@ -28,9 +28,9 @@
 	const sharePpopup = ref();
 
 	const props = withDefaults(defineProps<{
-		goodsDetailData : any,
-		show : boolean,
-		shareType : number,
+		goodsDetailData ?: any,
+		show ?: boolean,
+		shareType ?: number,
 	}>(), {
 		goodsDetailData: {},
 		show: false,
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-tabs/coreshop-tabs.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-tabs/coreshop-tabs.vue
index 832525b7..4bef5e7c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-tabs/coreshop-tabs.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-tabs/coreshop-tabs.vue
@@ -17,9 +17,9 @@
 	const instance = getCurrentInstance();
 
 	const props = withDefaults(defineProps<{
-		current : number,
-		keyNname : string,
-		list : Array<any>,
+		current ?: number,
+		keyNname ?: string,
+		list ?: Array<any>,
 	}>(), {
 		current: 0,
 		keyNname: 'name',
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-view-more/coreshop-view-more.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-view-more/coreshop-view-more.vue
index c3d19512..6642b5a0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-view-more/coreshop-view-more.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-view-more/coreshop-view-more.vue
@@ -8,8 +8,8 @@
 </template>
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		title : string,
-		color : string,
+		title ?: string,
+		color ?: string,
 	}>(), {
 		title: '查看更多',
 		color: '#6E737D'
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
index bcf597ea..c52fe325 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
@@ -139,9 +139,9 @@
 	const _useLoginStore = useLoginStore();
 
 	const props = withDefaults(defineProps<{
-		data : Array<CategoriesType>,
-		height : number,
-		statusBarHeight : number,
+		data ?: Array<CategoriesType>,
+		height ?: number,
+		statusBarHeight ?: number,
 	}>(), {
 		data: () => [],
 		height: 0,
@@ -225,16 +225,16 @@
 		})
 
 		nextTick(async () => {
-			state.bigClassifyH = ((await getDomInfo('.big-classify', instance.proxy)) as { height : number }).height; 
+			state.bigClassifyH = ((await getDomInfo('.big-classify', instance.proxy)) as { height : number }).height;
 			setTimeout(async () => {
-				state.rightTabH = ((await getDomInfo('.right-tab-box', instance.proxy)) as { height : number }).height; 
+				state.rightTabH = ((await getDomInfo('.right-tab-box', instance.proxy)) as { height : number }).height;
 			}, 100)
 		})
 	})
 
 	// 获取商品列表数据
 	const getGoodsPageList = async () => {
-		
+
 		const goodsPageList : Response<GoodsListType> = await queryGoodsPageList({
 			page: state.page,
 			limit: 10,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
index 485bf70c..542a2c13 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
@@ -89,8 +89,8 @@
 	const _useLoginStore = useLoginStore();
 
 	const props = withDefaults(defineProps<{
-		data : Array<CategoriesType>,
-		height : number,
+		data ?: Array<CategoriesType>,
+		height ?: number,
 	}>(), {
 		data: () => [],
 		height: 0,
@@ -158,7 +158,7 @@
 
 	/** 获取商品列表数据 */
 	const getGoodsPageList = async () => {
-		
+
 		const goodsPageList : Response<GoodsListType> = await queryGoodsPageList({
 			page: state.page,
 			limit: 10,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-one/classify-one.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-one/classify-one.vue
index 6f50e475..b0c36780 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-one/classify-one.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-one/classify-one.vue
@@ -12,7 +12,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : Array<CategoriesType>,
+		data ?: Array<CategoriesType>,
 	}>(), {
 		data: () => [],
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-three/classify-three.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-three/classify-three.vue
index 5839280f..ffeaa133 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-three/classify-three.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-three/classify-three.vue
@@ -35,8 +35,8 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : Array<CategoriesType>,
-		height : number,
+		data ?: Array<CategoriesType>,
+		height ?: number,
 	}>(), {
 		data: () => [],
 		height: 0,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-two/classify-two.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-two/classify-two.vue
index 660775a9..f2f8f4a8 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-two/classify-two.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-two/classify-two.vue
@@ -12,7 +12,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : Array<CategoriesType>,
+		data ?: Array<CategoriesType>,
 	}>(), {
 		data: () => [],
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article-classify/home-article-classify.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article-classify/home-article-classify.vue
index 3325528d..c1aa3b4c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article-classify/home-article-classify.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article-classify/home-article-classify.vue
@@ -16,7 +16,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {}
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article/home-article.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article/home-article.vue
index 706e7aa7..d613a40b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article/home-article.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-article/home-article.vue
@@ -16,7 +16,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {}
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-blank/home-blank.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-blank/home-blank.vue
index 2619a05b..f49b6586 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-blank/home-blank.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-blank/home-blank.vue
@@ -5,7 +5,7 @@
 </template>
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {}
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-content/home-content.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-content/home-content.vue
index 3bc89fdf..adb83d11 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-content/home-content.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-content/home-content.vue
@@ -5,7 +5,7 @@
 </template>
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		data : string,
+		data ?: string,
 	}>(), {
 		data: ''
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue
index f7ad1ab3..058c08f9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-coupon/home-coupon.vue
@@ -39,7 +39,7 @@
 	const _useLoginStore = useLoginStore();
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {}
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods-tab-bar/home-goods-tab-bar.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods-tab-bar/home-goods-tab-bar.vue
index 1bbb687f..5ddc6815 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods-tab-bar/home-goods-tab-bar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods-tab-bar/home-goods-tab-bar.vue
@@ -51,7 +51,7 @@
 	import { handleRouteNavigateTo, splitArrayByStep } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/home-goods.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/home-goods.vue
index e6e41039..9ce27d82 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/home-goods.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/home-goods.vue
@@ -81,7 +81,7 @@
 	import { handleRouteNavigateTo, toDimensionArray, splitArrayByStep } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {}
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/point.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/point.vue
index d529dc22..de7e93e1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/point.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/point.vue
@@ -26,9 +26,9 @@
 	const shopConfigStore = useShopConfigStore();
 
 	const props = withDefaults(defineProps<{
-		data : any,
-		flex : boolean,
-		fontSize : string,
+		data ?: any,
+		flex ?: boolean,
+		fontSize ?: string,
 	}>(), {
 		data: {},
 		flex: false,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-group-purchase/home-group-purchase.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-group-purchase/home-group-purchase.vue
index fa7be843..114d2736 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-group-purchase/home-group-purchase.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-group-purchase/home-group-purchase.vue
@@ -51,7 +51,7 @@
 	import { handleStaticResources, handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img-window/home-img-window.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img-window/home-img-window.vue
index 941fa147..8eea2f3e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img-window/home-img-window.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img-window/home-img-window.vue
@@ -47,7 +47,7 @@
 	import { handleStaticResources, handleAdvertiseDetail } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img/home-img.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img/home-img.vue
index d65918ac..722e48e5 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img/home-img.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-img/home-img.vue
@@ -13,7 +13,7 @@
 	import type { PageConfigItemsImgSlideType } from '@/core/models';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-nav-bar/home-nav-bar.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-nav-bar/home-nav-bar.vue
index 599a66e6..e7ba0c16 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-nav-bar/home-nav-bar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-nav-bar/home-nav-bar.vue
@@ -12,7 +12,7 @@
 	import { handleAdvertiseDetail } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-notice-bar/home-notice-bar.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-notice-bar/home-notice-bar.vue
index 98ec7621..8d086749 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-notice-bar/home-notice-bar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-notice-bar/home-notice-bar.vue
@@ -11,7 +11,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue
index b7406c39..827fe35d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-pinTuan/home-pinTuan.vue
@@ -33,7 +33,7 @@
 	import { handleStaticResources, handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-record/home-record.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-record/home-record.vue
index ed1d97b8..8798afff 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-record/home-record.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-record/home-record.vue
@@ -17,7 +17,7 @@
 	import { onHomePageShow } from '@/core/consts';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-search/home-search.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-search/home-search.vue
index 417b6e9e..f9b66715 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-search/home-search.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-search/home-search.vue
@@ -11,7 +11,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-seckill/home-seckill.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-seckill/home-seckill.vue
index db85783c..fec0489c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-seckill/home-seckill.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-seckill/home-seckill.vue
@@ -49,7 +49,7 @@
 	import { handleStaticResources, handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.scss b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.scss
index 37de991b..13c176df 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.scss
@@ -14,11 +14,7 @@
 	}
 
 	.card-box { 
-		margin-top: 35rpx;
-
-		.goods-card {
-			width: 100%;
-		}
+		margin-top: 35rpx; 
 
 		.price-tag-box {
 			display: flex;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.vue
index ca35eb7c..ed7294a0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-service-good/home-service-good.vue
@@ -6,7 +6,7 @@
 		</view>
 
 		<view class="card-box" v-for="item, index in props.data.list" :key="index">
-			<coreshop-goods-card class="goods-card" :goodsData="hanldeCombinationGoodsData(item)"
+			<coreshop-goods-card  :goodsData="hanldeCombinationGoodsData(item)"
 				@hanldeClickGoods="hanldeClickGoods">
 				<template #goodTag>
 					<view class="price-tag-box" @click="hanldeClickGoods(item)">
@@ -43,7 +43,7 @@
 	import { handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-swiper/home-swiper.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-swiper/home-swiper.vue
index 470a9791..a83c36e4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-swiper/home-swiper.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-swiper/home-swiper.vue
@@ -12,13 +12,13 @@
 	import { handleAdvertiseDetail } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
-		data : any,
-		dotsSelect : boolean,
-		autoplaySelect : boolean,
-		intervalSelect : number,
-		circularSelect : boolean,
-		indicatorColor : string,
-		indicatorColorActive : string,
+		data ?: any,
+		dotsSelect ?: boolean,
+		autoplaySelect ?: boolean,
+		intervalSelect ?: number,
+		circularSelect ?: boolean,
+		indicatorColor ?: string,
+		indicatorColorActive ?: string,
 	}>(), {
 		data: {},
 		dotsSelect: true,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-textarea/home-textarea.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-textarea/home-textarea.vue
index 5dff0162..4e2f66ce 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-textarea/home-textarea.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-textarea/home-textarea.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 	import HomeContent from '../home-content/home-content.vue';
 	const props = withDefaults(defineProps<{
-		data : string,
+		data ?: string,
 	}>(), {
 		data: '',
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-video/home-video.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-video/home-video.vue
index d2c5d2c5..c3e793fb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-video/home-video.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-video/home-video.vue
@@ -7,7 +7,7 @@
 	import { ref, onMounted } from 'vue';
 
 	const props = withDefaults(defineProps<{
-		data : any,
+		data ?: any,
 	}>(), {
 		data: {},
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/index.vue
index b6d46ad1..3d1cf204 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/index.vue
@@ -75,7 +75,7 @@
 	// import HomeAdpop from './components/home-adpop/home-adpop.vue';
 
 	const props = withDefaults(defineProps<{
-		coreshopData : Array<PageConfigItemsType>,
+		coreshopData ?: Array<PageConfigItemsType>,
 	}>(), {
 		coreshopData: () => []
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-agent/goods-detail-agent.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-agent/goods-detail-agent.vue
index 60183926..d2496804 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-agent/goods-detail-agent.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-agent/goods-detail-agent.vue
@@ -50,8 +50,8 @@
 	import type { GoodsAgentListType } from "@/core/models";
 
 	const props = withDefaults(defineProps<{
-		userAgentGrade : any,
-		agentProductsList : Array<GoodsAgentListType>,
+		userAgentGrade ?: any,
+		agentProductsList ?: Array<GoodsAgentListType>,
 	}>(), {
 		userAgentGrade: {},
 		agentProductsList: () => [],
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue
index 2e6975b0..270c7d1f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue
@@ -41,7 +41,7 @@
 	import { useCartStore } from '@/core/store';
 
 	const props = withDefaults(defineProps<{
-		price : number,
+		price ?: number,
 	}>(), {
 		price: 0,
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-common-problem/goods-detail-common-problem.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-common-problem/goods-detail-common-problem.vue
index 148cadee..790b635b 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-common-problem/goods-detail-common-problem.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-common-problem/goods-detail-common-problem.vue
@@ -16,7 +16,7 @@
 	import type { CommonQuestionServiceType } from "@/core/models";
 
 	const props = withDefaults(defineProps<{
-		commonQuestion : Array<CommonQuestionServiceType>,
+		commonQuestion ?: Array<CommonQuestionServiceType>,
 	}>(), {
 		commonQuestion: () => [],
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-content/goods-detail-content.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-content/goods-detail-content.vue
index 97896c7c..f95ee521 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-content/goods-detail-content.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-content/goods-detail-content.vue
@@ -12,7 +12,7 @@
 
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		goodsDetailContent : string,
+		goodsDetailContent ?: string,
 	}>(), {
 		goodsDetailContent: '',
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-evaluate/goods-detail-evaluate.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-evaluate/goods-detail-evaluate.vue
index 20d40073..a8b33288 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-evaluate/goods-detail-evaluate.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-evaluate/goods-detail-evaluate.vue
@@ -32,9 +32,9 @@
 	import { handleRouteNavigateTo } from "@/core/utils";
 
 	const props = withDefaults(defineProps<{
-		commentsCount : number,
-		commentsList : Array<GoodsPictureListType>,
-		id : number;
+		commentsCount ?: number,
+		commentsList ?: Array<GoodsPictureListType>,
+		id ?: number;
 	}>(), {
 		commentsCount: 0,
 		commentsList: () => [],
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-info/goods-detail-info.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-info/goods-detail-info.vue
index cf449ca7..f2157c23 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-info/goods-detail-info.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-info/goods-detail-info.vue
@@ -87,9 +87,9 @@
 	const _useLoginStore = useLoginStore();
 
 	const props = withDefaults(defineProps<{
-		goodsDetailData : any,
-		isActivityGoods : boolean,
-		shareType : ShareEnum,
+		goodsDetailData ?: any,
+		isActivityGoods ?: boolean,
+		shareType ?: ShareEnum,
 	}>(), {
 		goodsDetailData: {},
 		isActivityGoods: false,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-params/goods-detail-params.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-params/goods-detail-params.vue
index ca7508d6..e6b1281e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-params/goods-detail-params.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-params/goods-detail-params.vue
@@ -17,7 +17,7 @@
 	import type { GoodsParamsType } from "@/core/models";
 
 	const props = withDefaults(defineProps<{
-		goodsParamsList : Array<GoodsParamsType>,
+		goodsParamsList ?: Array<GoodsParamsType>,
 	}>(), {
 		goodsParamsList: () => [],
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-picture/goods-detail-picture.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-picture/goods-detail-picture.vue
index 0a0e5a4a..6009c6d3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-picture/goods-detail-picture.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-picture/goods-detail-picture.vue
@@ -12,8 +12,8 @@
 
 <script setup lang="ts">
 	const props = withDefaults(defineProps<{
-		swiperBanner : Array<string>,
-		video : string,
+		swiperBanner ?: Array<string>,
+		video ?: string,
 	}>(), {
 		swiperBanner: () => [],
 		video: '',
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue
index 3190d8ba..aa374e4f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue
@@ -35,7 +35,7 @@
 	import Point from '@/pages/components/custom-page/components/home-goods/point.vue';
 
 	const props = withDefaults(defineProps<{
-		queryParams : any,
+		queryParams ?: any,
 	}>(), {
 		queryParams: {
 			id: 10,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-service/goods-detail-service.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-service/goods-detail-service.vue
index 36fc8691..e7b32df7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-service/goods-detail-service.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-service/goods-detail-service.vue
@@ -111,11 +111,11 @@
 	import type { GoodsPromotionType, CommonQuestionServiceType } from "@/core/models";
 
 	const props = withDefaults(defineProps<{
-		isCustomService : boolean,
-		goodsPromotionList : Array<GoodsPromotionType>,
-		delivery : Array<CommonQuestionServiceType>,
-		service : Array<CommonQuestionServiceType>,
-		spesDesc : string,
+		isCustomService ?: boolean,
+		goodsPromotionList ?: Array<GoodsPromotionType>,
+		delivery ?: Array<CommonQuestionServiceType>,
+		service ?: Array<CommonQuestionServiceType>,
+		spesDesc ?: string,
 	}>(), {
 		isCustomService: false,
 		goodsPromotionList: () => [],
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue
index 8d2a8764..7c14b9c8 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue
@@ -32,13 +32,14 @@
 			<view class="btn-box">
 				<!-- 	<view v-if="props.isShowAddCartBtn" class="btn add-cart" @click="handleAddCart">加入购物车</view> -->
 				<view v-if="props.isShowAddCartBtn" class="core-button-confirm add-cart">
-					<coreshop-button :loading="props.addCartloading" class="core-button-confirm_" :radius="0" title="加入购物车"
-						:customStyle="addCartCustomStyle" @onClick="handleAddCart()"></coreshop-button>
+					<coreshop-button :loading="props.addCartloading" class="core-button-confirm_" :radius="0"
+						title="加入购物车" :customStyle="addCartCustomStyle" @onClick="handleAddCart()"></coreshop-button>
 				</view>
 				<!-- <view class="btn buy-now" @click="handleBuyNow">{{ props.btnBuyTitlt }}</view> -->
 				<view class="core-button-confirm">
 					<coreshop-button :loading="props.buyNowNowloading" class="core-button-confirm_" :radius="0"
-						:title="props.btnBuyTitlt" :customStyle="buyNowCustomStyle" @onClick="handleBuyNow()"></coreshop-button>
+						:title="props.btnBuyTitlt" :customStyle="buyNowCustomStyle"
+						@onClick="handleBuyNow()"></coreshop-button>
 				</view>
 			</view>
 		</view>
@@ -69,14 +70,14 @@
 
 
 	const props = withDefaults(defineProps<{
-		showSku : boolean,
-		goodsDetailData : any,
-		isShowAddCartBtn : boolean,
-		btnBuyTitlt : string,
-		safeAreaInsetBottom : boolean;
-		buyNowCustomStyle : { [key : string] : any },
-		buyNowNowloading : boolean,
-		addCartloading : boolean
+		showSku ?: boolean,
+		goodsDetailData ?: any,
+		isShowAddCartBtn ?: boolean,
+		btnBuyTitlt ?: string,
+		safeAreaInsetBottom ?: boolean;
+		buyNowCustomStyle ?: { [key : string] : any },
+		buyNowNowloading ?: boolean,
+		addCartloading ?: boolean
 	}>(), {
 		showSku: false,
 		goodsDetailData: {},
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/index.vue
index 4f3e60ca..bc94caea 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/index.vue
@@ -8,7 +8,7 @@
 		<slot name="tip"></slot>
 
 		<!-- 商品信息 价格名字之类的 -->
-		<GoodsDetailInfo :goodsDetailData="props.goodsDetailData" :shareType="props.shareType" 
+		<GoodsDetailInfo :goodsDetailData="props.goodsDetailData" :shareType="props.shareType"
 			:isActivityGoods="props.isActivityGoods" @handleToggleGoodsCollection="handleToggleGoodsCollection">
 			<template #countDown>
 				<slot name="countDown"></slot>
@@ -68,17 +68,17 @@
 	import type { Response, CommonQuestionServiceType, GoodsPictureType, GoodsPictureListType, GoodsParamsType, GoodsAgentListType, GoodsPromotionType } from "@/core/models";
 
 	const props = withDefaults(defineProps<{
-		isActivityGoods : boolean,
-		goodsId : number,
-		goodsDetailData : any,
-		swiperBanner : Array<any>,
-		goodsDetailContent : string,
-		userAgentGrade : any,
-		agentProductsList : Array<GoodsAgentListType>,
-		goodsPromotionList : Array<GoodsPromotionType>,
-		spesDesc : string,
-		isCustomService : boolean,
-		shareType : ShareEnum,
+		isActivityGoods ?: boolean,
+		goodsId ?: number,
+		goodsDetailData ?: any,
+		swiperBanner ?: Array<any>,
+		goodsDetailContent ?: string,
+		userAgentGrade ?: any,
+		agentProductsList ?: Array<GoodsAgentListType>,
+		goodsPromotionList ?: Array<GoodsPromotionType>,
+		spesDesc ?: string,
+		isCustomService ?: boolean,
+		shareType ?: ShareEnum,
 	}>(), {
 		isActivityGoods: false,        /** 是否是活动商品 */
 		goodsId: 0,                    /** 商品id */
@@ -169,7 +169,7 @@
 	/** 商品收藏 */
 	const handleToggleGoodsCollection = () => {
 		emits('handleToggleGoodsCollection')
-	} 
+	}
 </script>
 
 <style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/pay-method/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/pay-method/index.vue
index 0928c057..516c6d1a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/pay-method/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/pay-method/index.vue
@@ -26,15 +26,15 @@
 	import { queryPay } from '@/core/api';
 
 	const props = withDefaults(defineProps<{
-		payMethodList : Array<PayMethodListType>,
-		orderType : PaymentTypeEnum,
-		orderId : number,
-		recharge : number,
-		userInfo : any,
+		payMethodList ?: Array<PayMethodListType>,
+		orderType ?: PaymentTypeEnum,
+		orderId ?: string,
+		recharge ?: number,
+		userInfo ?: any,
 	}>(), {
 		payMethodList: () => [],
 		orderType: PaymentTypeEnum.common,
-		orderId: 0, /** 如果是商品订单此参数必须 */
+		orderId: '', /** 如果是商品订单此参数必须 */
 		recharge: 0, /** 如果是充值订单此参数必须 */
 		userInfo: {},
 	});

From 1e79463c143ad4fa2c1411a62e1756bba33fddc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?21=E4=B8=96=E7=BA=AA=E5=B0=8F=E5=85=AB=E8=B7=AF?=
 <2529156631@qq.com>
Date: Sun, 3 Nov 2024 15:55:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81icon=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=89=B2=E7=BA=A2=E8=89=B2=EF=BC=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AE=B9=E5=99=A8=E5=B1=9E=E6=80=A7mode=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.scss | 4 ++--
 CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.scss b/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.scss
index 1392c7d1..b8590b1e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.scss
@@ -20,7 +20,7 @@
 		.price {
 			text-align: center;
 			font-size: 40rpx;
-			color: #ff7159;
+			color: #D33123;
 			font-weight: bold;
 		}
 		.desc {
@@ -34,7 +34,7 @@
 			margin-top: 50rpx;
 			width: 100%;
 			line-height: 80rpx;
-			background-color: #5ac725;
+			background-color: #D33123;
 			color: #fff;
 			text-align: center;
 			border-radius: 200px;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue b/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue
index fc97a87b..19c115d9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue
@@ -3,7 +3,7 @@
 		<view class="layout-result-box">
 			<view class="item-box" v-if="state.status && state.paymentInfo?.status === OrderPayStatusEnum.yes">
 				<view class="icon">
-					<uv-icon name="checkmark-circle-fill" color="#5ac725" size="90"></uv-icon>
+					<uv-icon name="checkmark-circle-fill" color="#D33123" size="90"></uv-icon>
 				</view>
 				<view class="title">支付成功</view>
 				<view class="price">￥{{ state.paymentInfo?.money || '' }}</view>
@@ -12,7 +12,7 @@
 				</view>
 				<view class="btn" @click="goOrderDetail()">查看详情</view>
 			</view>
-			<view class="item-box" v-if="state.status && state.paymentInfo?.status === OrderPayStatusEnum.no">
+			<view class="item-box" v-else>
 				<view class="icon">
 					<uv-icon name="close-circle-fill" color="#D33123" size="80"></uv-icon>
 				</view>