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 @@
-
\ 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,
- orderType : PaymentTypeEnum,
- orderId : number,
- recharge : number,
- userInfo : any,
+ payMethodList ?: Array,
+ orderType ?: PaymentTypeEnum,
+ orderId ?: string,
+ recharge ?: number,
+ userInfo ?: any,
}>(), {
payMethodList: () => [],
orderType: PaymentTypeEnum.common,
- orderId: 0, /** 如果是商品订单此参数必须 */
+ orderId: '', /** 如果是商品订单此参数必须 */
recharge: 0, /** 如果是充值订单此参数必须 */
userInfo: {},
});
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 @@
-
+
支付成功
¥{{ state.paymentInfo?.money || '' }}
@@ -12,7 +12,7 @@
查看详情
-
+