diff --git a/package.json b/package.json index c6ad29b..134d371 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "@dcloudio/vite-plugin-uni": "3.0.0-4070620250821001", "@vue/runtime-core": "^3.4.21", "@vue/tsconfig": "^0.1.3", - "sass": "^1.93.0", + "sass": "1.58.3", "vite": "5.2.8" } } diff --git a/src/components/AddCarCrad/index.vue b/src/components/AddCarCrad/index.vue index ac6afc5..ba776cd 100644 --- a/src/components/AddCarCrad/index.vue +++ b/src/components/AddCarCrad/index.vue @@ -25,5 +25,5 @@ const props = defineProps({ diff --git a/src/components/Calender/index.vue b/src/components/Calender/index.vue index 3f2ad7f..b1f9fa9 100644 --- a/src/components/Calender/index.vue +++ b/src/components/Calender/index.vue @@ -474,5 +474,5 @@ onBeforeUnmount(() => { diff --git a/src/components/CheckBox/index.vue b/src/components/CheckBox/index.vue index d8a708c..9bf97cc 100644 --- a/src/components/CheckBox/index.vue +++ b/src/components/CheckBox/index.vue @@ -40,5 +40,5 @@ const onChange = () => { \ No newline at end of file diff --git a/src/components/CommandWrapper/index.vue b/src/components/CommandWrapper/index.vue index 1edc12f..ce69a39 100644 --- a/src/components/CommandWrapper/index.vue +++ b/src/components/CommandWrapper/index.vue @@ -14,5 +14,5 @@ defineProps({ diff --git a/src/components/CommandWrapper/styles/index.scss b/src/components/CommandWrapper/styles/index.scss index 4a80159..8f7ff1c 100644 --- a/src/components/CommandWrapper/styles/index.scss +++ b/src/components/CommandWrapper/styles/index.scss @@ -7,5 +7,5 @@ .command-text { color: #fff; - font-size: 14px; + font-size: $uni-font-size-base; } diff --git a/src/components/CreateServiceOrder/index.vue b/src/components/CreateServiceOrder/index.vue index 24ddb3f..9df5d89 100644 --- a/src/components/CreateServiceOrder/index.vue +++ b/src/components/CreateServiceOrder/index.vue @@ -252,5 +252,5 @@ onMounted(() => { diff --git a/src/components/CreateServiceOrder/styles/index.scss b/src/components/CreateServiceOrder/styles/index.scss index 76cac94..ac99653 100644 --- a/src/components/CreateServiceOrder/styles/index.scss +++ b/src/components/CreateServiceOrder/styles/index.scss @@ -3,10 +3,10 @@ } .order-header { - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 500; margin-bottom: 10px; - color: #333; + color: $uni-text-color; } .order-content { @@ -36,9 +36,9 @@ } .order-description { - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 500; - color: #333; + color: $uni-text-color; } .order-line { @@ -75,8 +75,8 @@ display: flex; align-items: center; margin-bottom: 10px; - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; } .detail-label { @@ -85,15 +85,15 @@ } .detail-value { - color: #333; + color: $uni-text-color; } .detail-input { border: none; outline: none; width: calc(100% - 80px); - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; border-bottom: 1px solid #ddd; } @@ -101,8 +101,8 @@ border: none; outline: none; width: 100%; - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; } .order-button { @@ -110,7 +110,7 @@ height: 42px; background: linear-gradient(90deg, #ff7e00, #ffba00); color: #fff; - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 600; border-radius: 20px; margin-top: 20px; @@ -131,9 +131,9 @@ .order-button-secondary { flex: 1; height: 42px; - background: linear-gradient(90deg, #0256FF, #00A6FF); + background: linear-gradient(90deg, #0256ff, #00a6ff); color: #fff; - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 600; border: none; border-radius: 20px; @@ -148,7 +148,7 @@ height: 42px; background: linear-gradient(90deg, #ff7e00, #ffba00); color: #fff; - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 600; border-radius: 20px; display: flex; @@ -160,7 +160,7 @@ margin-bottom: 12px; display: flex; align-items: center; - font-size: 14px; + font-size: $uni-font-size-base; color: #ed6a0c; } diff --git a/src/components/Divider/index.vue b/src/components/Divider/index.vue index 6967d6e..a7a2bb3 100644 --- a/src/components/Divider/index.vue +++ b/src/components/Divider/index.vue @@ -3,5 +3,5 @@ \ No newline at end of file diff --git a/src/components/Feedback/index.vue b/src/components/Feedback/index.vue index 6001aec..5cc7aff 100644 --- a/src/components/Feedback/index.vue +++ b/src/components/Feedback/index.vue @@ -141,5 +141,5 @@ onMounted(() => { diff --git a/src/components/Feedback/styles/index.scss b/src/components/Feedback/styles/index.scss index 6d1b2dd..4d42eaf 100644 --- a/src/components/Feedback/styles/index.scss +++ b/src/components/Feedback/styles/index.scss @@ -3,10 +3,10 @@ } .order-header { - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 500; margin-bottom: 10px; - color: #333; + color: $uni-text-color; } .order-content { @@ -22,8 +22,8 @@ display: flex; align-items: start; margin-bottom: 12px; - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; } .detail-label { @@ -32,14 +32,14 @@ } .detail-value { - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; } .detail-textarea { width: 100%; - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; border-radius: 4px; border: 1px solid #ddd; padding: 8px; @@ -49,8 +49,8 @@ border: none; outline: none; width: 100%; - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; border-bottom: 1px solid #ddd; padding-left: 8px; } @@ -59,7 +59,7 @@ width: 300px; height: 42px; color: #fff; - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 600; border-radius: 21px; margin-top: 24px; @@ -80,7 +80,7 @@ margin-bottom: 12px; display: flex; align-items: center; - font-size: 14px; + font-size: $uni-font-size-base; color: #ed6a0c; } diff --git a/src/components/FormCard/index.vue b/src/components/FormCard/index.vue index e866884..2688748 100644 --- a/src/components/FormCard/index.vue +++ b/src/components/FormCard/index.vue @@ -175,5 +175,5 @@ defineExpose({ diff --git a/src/components/FormCard/styles/index.scss b/src/components/FormCard/styles/index.scss index cabf346..acb676e 100644 --- a/src/components/FormCard/styles/index.scss +++ b/src/components/FormCard/styles/index.scss @@ -1,7 +1,7 @@ // SASS 变量定义 $form-primary-color: #00a6ff; $form-error-color: #ff4d4f; -$form-text-color: #333; +$form-text-color: $uni-text-color; $form-label-color: #86909c; $form-border-color: #ddd; $form-input-border-color: #ddd; @@ -85,7 +85,7 @@ $form-transition: all 0.2s ease; } .form-label { - font-size: 14px; + font-size: $uni-font-size-base; color: $form-label-color; width: 50px; flex-shrink: 0; @@ -95,7 +95,7 @@ $form-transition: all 0.2s ease; .form-input { flex: 1; - font-size: 14px; + font-size: $uni-font-size-base; color: $form-text-color; border: none; border-bottom: 1px solid $form-input-border-color; @@ -127,7 +127,7 @@ $form-transition: all 0.2s ease; } .form-error { - font-size: 12px; + font-size: $uni-font-size-sm; color: $form-error-color; margin-top: 6px; margin-left: 60px; diff --git a/src/components/GoodDetail/index.vue b/src/components/GoodDetail/index.vue index 7ecc451..aa54ebf 100644 --- a/src/components/GoodDetail/index.vue +++ b/src/components/GoodDetail/index.vue @@ -58,5 +58,5 @@ const props = defineProps({ diff --git a/src/components/GoodDetail/styles/index.scss b/src/components/GoodDetail/styles/index.scss index dd50d74..314fc74 100644 --- a/src/components/GoodDetail/styles/index.scss +++ b/src/components/GoodDetail/styles/index.scss @@ -23,8 +23,8 @@ flex-shrink: 0; .module-title { - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; text-align: center; word-wrap: break-word; margin-left: 4px; @@ -33,7 +33,7 @@ .module-desc { flex: 1; - font-size: 12px; + font-size: $uni-font-size-sm; color: #666; line-height: 1.5; margin-top: 4px; diff --git a/src/components/ImageSwiper/index.vue b/src/components/ImageSwiper/index.vue index 288eb1d..f6154c7 100644 --- a/src/components/ImageSwiper/index.vue +++ b/src/components/ImageSwiper/index.vue @@ -47,7 +47,11 @@ :id="`thumbnail-${index}`" @click="handleThumbnailClick(index)" > - + {{ thumb.photoName }} @@ -159,5 +163,5 @@ const handleSwiperChange = (e) => { diff --git a/src/components/LocationCard/index.vue b/src/components/LocationCard/index.vue index 3b3b479..9695135 100644 --- a/src/components/LocationCard/index.vue +++ b/src/components/LocationCard/index.vue @@ -48,5 +48,5 @@ const openMap = () => { diff --git a/src/components/LocationCard/styles/index.scss b/src/components/LocationCard/styles/index.scss index 6115ef8..d08f118 100644 --- a/src/components/LocationCard/styles/index.scss +++ b/src/components/LocationCard/styles/index.scss @@ -7,8 +7,8 @@ background-size: cover; background-position: center; border-radius: 20px; - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; position: relative; overflow: hidden; @@ -30,15 +30,15 @@ } .location-label { - color: #333; - font-size: 14px; + color: $uni-text-color; + font-size: $uni-font-size-base; font-weight: 500; } .address-text { margin-top: 4px; color: #666; - font-size: 12px; + font-size: $uni-font-size-sm; font-weight: 400; } diff --git a/src/components/LocationInfo/index.vue b/src/components/LocationInfo/index.vue index 5eefb25..7e02f22 100644 --- a/src/components/LocationInfo/index.vue +++ b/src/components/LocationInfo/index.vue @@ -42,5 +42,5 @@ const openMap = () => { \ No newline at end of file diff --git a/src/components/LocationInfo/styles/index.scss b/src/components/LocationInfo/styles/index.scss index 2f46e10..aa5c6ea 100644 --- a/src/components/LocationInfo/styles/index.scss +++ b/src/components/LocationInfo/styles/index.scss @@ -1,8 +1,8 @@ .store-address { display: flex; align-items: center; - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; text { flex: 1; diff --git a/src/components/ModuleTitle/index.vue b/src/components/ModuleTitle/index.vue index c2b577d..2007aec 100644 --- a/src/components/ModuleTitle/index.vue +++ b/src/components/ModuleTitle/index.vue @@ -1,7 +1,7 @@ @@ -9,11 +9,11 @@ defineProps({ title: { type: String, - default: '图片详情' - } + default: "图片详情", + }, }); \ No newline at end of file diff --git a/src/components/OrderCardItem/index.vue b/src/components/OrderCardItem/index.vue index 5287658..7ce305c 100644 --- a/src/components/OrderCardItem/index.vue +++ b/src/components/OrderCardItem/index.vue @@ -48,5 +48,5 @@ const orderStatusText = computed(() => { diff --git a/src/components/OrderCardItem/styles/index.scss b/src/components/OrderCardItem/styles/index.scss index bec8c99..67e2139 100644 --- a/src/components/OrderCardItem/styles/index.scss +++ b/src/components/OrderCardItem/styles/index.scss @@ -25,11 +25,11 @@ .order-title { font-size: 16px; - color: #333; + color: $uni-text-color; } .order-status { - font-size: 14px; + font-size: $uni-font-size-base; padding: 5px 10px; border-radius: 15px; } @@ -70,12 +70,12 @@ } .detail-label { - font-size: 14px; + font-size: $uni-font-size-base; color: #666; margin-right: 10px; } .detail-value { - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; } diff --git a/src/components/Privacy/index.vue b/src/components/Privacy/index.vue index 1182cb4..0bddccd 100644 --- a/src/components/Privacy/index.vue +++ b/src/components/Privacy/index.vue @@ -3,14 +3,23 @@ 隐私保护指引 - 请您仔细阅读并充分理解{{ privacyContractName }} - ,如您同意前述协议的全部内容,请点击“同意”开始使用。如您不同意,将被限制使用部分功能,或将在您使用具体功能前再次询问以取得您的授权同意。 + 请您仔细阅读并充分理解{{ privacyContractName }} + ,如您同意前述协议的全部内容,请点击“同意”开始使用。如您不同意,将被限制使用部分功能,或将在您使用具体功能前再次询问以取得您的授权同意。 - @@ -19,11 +28,11 @@ diff --git a/src/components/ResponseIntro/index.vue b/src/components/ResponseIntro/index.vue index 6b9a288..e67b9db 100644 --- a/src/components/ResponseIntro/index.vue +++ b/src/components/ResponseIntro/index.vue @@ -17,5 +17,5 @@ defineProps({ diff --git a/src/components/ResponseIntro/styles/index.scss b/src/components/ResponseIntro/styles/index.scss index 4a61ff8..c32ef5d 100644 --- a/src/components/ResponseIntro/styles/index.scss +++ b/src/components/ResponseIntro/styles/index.scss @@ -4,8 +4,8 @@ .response-intro-text { font-weight: 500; - font-size: 14px; - color: #333333; + font-size: $uni-font-size-base; + color: $uni-text-color; line-height: 20px; text-align: justify; } diff --git a/src/components/ResponseWrapper/index.vue b/src/components/ResponseWrapper/index.vue index 0c941bf..f47b591 100644 --- a/src/components/ResponseWrapper/index.vue +++ b/src/components/ResponseWrapper/index.vue @@ -7,5 +7,5 @@ diff --git a/src/components/ServiceTipsWord/index.vue b/src/components/ServiceTipsWord/index.vue index c7d4aa1..a56d718 100644 --- a/src/components/ServiceTipsWord/index.vue +++ b/src/components/ServiceTipsWord/index.vue @@ -36,5 +36,5 @@ const handleClick = (type) => { diff --git a/src/components/ServiceTipsWord/styles/index.scss b/src/components/ServiceTipsWord/styles/index.scss index 4006842..d9ad4e7 100644 --- a/src/components/ServiceTipsWord/styles/index.scss +++ b/src/components/ServiceTipsWord/styles/index.scss @@ -9,7 +9,7 @@ } .header-text { - font-size: 12px; + font-size: $uni-font-size-sm; color: #6b84a2; } @@ -46,7 +46,7 @@ rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 1) ); - font-size: 12px; + font-size: $uni-font-size-sm; font-weight: 500; color: #00a6ff; border-radius: 50px; diff --git a/src/components/Stepper/index.vue b/src/components/Stepper/index.vue index de89633..158f288 100644 --- a/src/components/Stepper/index.vue +++ b/src/components/Stepper/index.vue @@ -59,5 +59,5 @@ const increase = () => { diff --git a/src/components/Stepper/styles/index.scss b/src/components/Stepper/styles/index.scss index 82abf65..e573e69 100644 --- a/src/components/Stepper/styles/index.scss +++ b/src/components/Stepper/styles/index.scss @@ -6,6 +6,6 @@ .stepper-text { width: 40px; font-size: 16px; - color: #333; + color: $uni-text-color; text-align: center; } diff --git a/src/components/SumCard/index.vue b/src/components/SumCard/index.vue index 961c077..05ab9b2 100644 --- a/src/components/SumCard/index.vue +++ b/src/components/SumCard/index.vue @@ -25,5 +25,5 @@ defineProps({ diff --git a/src/components/SumCard/styles/index.scss b/src/components/SumCard/styles/index.scss index a41f8f6..da86267 100644 --- a/src/components/SumCard/styles/index.scss +++ b/src/components/SumCard/styles/index.scss @@ -19,15 +19,15 @@ .sum-label { font-size: 15px; - color: #333; + color: $uni-text-color; } .sum-value { - font-size: 14px; + font-size: $uni-font-size-base; color: #999; } .sum-discount { - font-size: 14px; + font-size: $uni-font-size-base; color: #ff5722; } diff --git a/src/components/TagsGroup/index.vue b/src/components/TagsGroup/index.vue index 65b9951..a1eca47 100644 --- a/src/components/TagsGroup/index.vue +++ b/src/components/TagsGroup/index.vue @@ -11,5 +11,5 @@ const tags = ["门票套餐", "民俗活动", "车程路况"]; \ No newline at end of file diff --git a/src/components/TagsGroup/styles/index.scss b/src/components/TagsGroup/styles/index.scss index bec1f26..0523182 100644 --- a/src/components/TagsGroup/styles/index.scss +++ b/src/components/TagsGroup/styles/index.scss @@ -7,7 +7,7 @@ background-color: #fff; border-radius: 10px; padding: 8px 16px; - font-size: 12px; - color: #00A6FF; + font-size: $uni-font-size-sm; + color: #00a6ff; white-space: nowrap; -} \ No newline at end of file +} diff --git a/src/components/TopNavBar/index.vue b/src/components/TopNavBar/index.vue index f7041e3..a6dc28d 100644 --- a/src/components/TopNavBar/index.vue +++ b/src/components/TopNavBar/index.vue @@ -140,5 +140,5 @@ const handleBack = () => { diff --git a/src/components/TopNavBar/styles/index.scss b/src/components/TopNavBar/styles/index.scss index 15dc069..7a7bd7e 100644 --- a/src/components/TopNavBar/styles/index.scss +++ b/src/components/TopNavBar/styles/index.scss @@ -1,7 +1,7 @@ // TopNavBar 组件样式 .top-nav-bar { width: 100%; - background-color: #ffffff; + background-color: $uni-bg-color; &.has-shadow { box-shadow: 0 1px 6px rgba(0, 0, 0, 0.1); @@ -75,7 +75,7 @@ .nav-bar-title { font-size: 18px; font-weight: 500; - color: #333333; + color: $uni-text-color; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/pages-order/order/components/CustomEmpty/index.vue b/src/pages-order/order/components/CustomEmpty/index.vue index 9f34240..819722f 100644 --- a/src/pages-order/order/components/CustomEmpty/index.vue +++ b/src/pages-order/order/components/CustomEmpty/index.vue @@ -22,5 +22,5 @@ const props = defineProps({ diff --git a/src/pages-order/order/components/CustomEmpty/styles/index.scss b/src/pages-order/order/components/CustomEmpty/styles/index.scss index 359c684..fc3dd66 100644 --- a/src/pages-order/order/components/CustomEmpty/styles/index.scss +++ b/src/pages-order/order/components/CustomEmpty/styles/index.scss @@ -14,6 +14,6 @@ .empty-text { margin-top: 10px; - font-size: 14px; + font-size: $uni-font-size-base; color: #666666; -} \ No newline at end of file +} diff --git a/src/pages-order/order/components/GoodsInfo/index.vue b/src/pages-order/order/components/GoodsInfo/index.vue index 5959da5..d53e07e 100644 --- a/src/pages-order/order/components/GoodsInfo/index.vue +++ b/src/pages-order/order/components/GoodsInfo/index.vue @@ -123,5 +123,5 @@ const formatServiceAmount = (amount) => { diff --git a/src/pages-order/order/components/NoticeInfo/index.vue b/src/pages-order/order/components/NoticeInfo/index.vue index da35e98..5f011c2 100644 --- a/src/pages-order/order/components/NoticeInfo/index.vue +++ b/src/pages-order/order/components/NoticeInfo/index.vue @@ -26,5 +26,5 @@ const props = defineProps({ diff --git a/src/pages-order/order/components/NoticeInfo/styles/index.scss b/src/pages-order/order/components/NoticeInfo/styles/index.scss index 73c6e1b..ad851db 100644 --- a/src/pages-order/order/components/NoticeInfo/styles/index.scss +++ b/src/pages-order/order/components/NoticeInfo/styles/index.scss @@ -9,5 +9,5 @@ align-items: center; font-size: 16px; font-weight: 500; - color: #333; + color: $uni-text-color; } diff --git a/src/pages-order/order/components/OrderCard/InfoRow.vue b/src/pages-order/order/components/OrderCard/InfoRow.vue index dea93f0..2f650e8 100644 --- a/src/pages-order/order/components/OrderCard/InfoRow.vue +++ b/src/pages-order/order/components/OrderCard/InfoRow.vue @@ -31,15 +31,15 @@ const props = defineProps({ } .label { - font-size: 12px; + font-size: $uni-font-size-sm; color: #666666; flex-shrink: 0; margin-right: 8px; } .value { - font-size: 14px; - color: #333333; + font-size: $uni-font-size-base; + color: $uni-text-color; flex: 1; } diff --git a/src/pages-order/order/components/OrderCard/index.vue b/src/pages-order/order/components/OrderCard/index.vue index 0dc1aad..4c5708b 100644 --- a/src/pages-order/order/components/OrderCard/index.vue +++ b/src/pages-order/order/components/OrderCard/index.vue @@ -117,5 +117,5 @@ const handleCardClick = () => { diff --git a/src/pages-order/order/components/OrderCard/styles/index.scss b/src/pages-order/order/components/OrderCard/styles/index.scss index 5f1b4dc..a339be3 100644 --- a/src/pages-order/order/components/OrderCard/styles/index.scss +++ b/src/pages-order/order/components/OrderCard/styles/index.scss @@ -41,9 +41,9 @@ } .order-title { - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 500; - color: #333333; + color: $uni-text-color; line-height: 1.4; } @@ -56,7 +56,7 @@ box-sizing: border-box; padding: 6px 16px; border-radius: 20px; - font-size: 12px; + font-size: $uni-font-size-sm; font-weight: 500; &.tag-0 { diff --git a/src/pages-order/order/components/OrderInfo/index.vue b/src/pages-order/order/components/OrderInfo/index.vue index 80fef17..6841222 100644 --- a/src/pages-order/order/components/OrderInfo/index.vue +++ b/src/pages-order/order/components/OrderInfo/index.vue @@ -160,5 +160,5 @@ const openFeedback = () => { diff --git a/src/pages-order/order/components/OrderInfo/styles/index.scss b/src/pages-order/order/components/OrderInfo/styles/index.scss index ccc8b2c..26d2f3f 100644 --- a/src/pages-order/order/components/OrderInfo/styles/index.scss +++ b/src/pages-order/order/components/OrderInfo/styles/index.scss @@ -1,14 +1,9 @@ -@use "sass:color"; - -// SASS变量定义,提高可维护性和编译性能 - // 颜色系统 $order-bg-color: #fff; $text-color-primary: #333; $text-color-secondary: #666; $text-color-accent: #ff5722; $button-color: #00a6ff; -$button-hover-color: color.scale($button-color, $lightness: -16%); $button-disabled-color: #ccc; $border-color: #ececec; $shadow-color: rgba(0, 0, 0, 0.08); diff --git a/src/pages-order/order/components/OrderQrcode/index.vue b/src/pages-order/order/components/OrderQrcode/index.vue index ed9cb5c..9bf810f 100644 --- a/src/pages-order/order/components/OrderQrcode/index.vue +++ b/src/pages-order/order/components/OrderQrcode/index.vue @@ -31,5 +31,5 @@ const props = defineProps({ \ No newline at end of file diff --git a/src/pages-order/order/components/OrderQrcode/styles/index.scss b/src/pages-order/order/components/OrderQrcode/styles/index.scss index fb026af..413780c 100644 --- a/src/pages-order/order/components/OrderQrcode/styles/index.scss +++ b/src/pages-order/order/components/OrderQrcode/styles/index.scss @@ -1,5 +1,5 @@ .order-qrcode { - background: #ffffff; + background-color: $uni-bg-color; border-radius: 10px; box-sizing: border-box; display: flex; @@ -10,7 +10,7 @@ margin-bottom: 12px; text { - font-size: 12px; + font-size: $uni-font-size-sm; color: #666666; line-height: 17px; margin-top: 4px; diff --git a/src/pages-order/order/components/OrderStatusInfo/index.vue b/src/pages-order/order/components/OrderStatusInfo/index.vue index 8f6b8ee..64d1c9e 100644 --- a/src/pages-order/order/components/OrderStatusInfo/index.vue +++ b/src/pages-order/order/components/OrderStatusInfo/index.vue @@ -85,5 +85,5 @@ const statusDescription = computed(() => { diff --git a/src/pages-order/order/components/OrderStatusInfo/styles/index.scss b/src/pages-order/order/components/OrderStatusInfo/styles/index.scss index 6b8b865..18b842e 100644 --- a/src/pages-order/order/components/OrderStatusInfo/styles/index.scss +++ b/src/pages-order/order/components/OrderStatusInfo/styles/index.scss @@ -24,5 +24,5 @@ } .status-description { - font-size: 12px; -} \ No newline at end of file + font-size: $uni-font-size-sm; +} diff --git a/src/pages-order/order/components/RefundPopup/index.vue b/src/pages-order/order/components/RefundPopup/index.vue index 8c68978..4f6c85a 100644 --- a/src/pages-order/order/components/RefundPopup/index.vue +++ b/src/pages-order/order/components/RefundPopup/index.vue @@ -150,5 +150,5 @@ const handleConfirmClick = (text) => { diff --git a/src/pages-order/order/components/RefundPopup/styles/index.scss b/src/pages-order/order/components/RefundPopup/styles/index.scss index c7a3939..7920114 100644 --- a/src/pages-order/order/components/RefundPopup/styles/index.scss +++ b/src/pages-order/order/components/RefundPopup/styles/index.scss @@ -27,7 +27,7 @@ &__title { font-size: 16px; font-weight: 500; - color: #333; + color: $uni-text-color; line-height: 22px; margin-bottom: 12px; text-align: center; @@ -40,7 +40,7 @@ margin-bottom: 4px; .amount-symbol { - font-size: 12px; + font-size: $uni-font-size-sm; color: #ff6a00; } @@ -51,14 +51,14 @@ } .amount-unit { - font-size: 12px; + font-size: $uni-font-size-sm; color: #ff6a00; } } &__amount-label { - font-size: 12px; - color: #333; + font-size: $uni-font-size-sm; + color: $uni-text-color; margin-bottom: 16px; } @@ -67,15 +67,15 @@ margin-bottom: 16px; .policy-title { - font-size: 14px; + font-size: $uni-font-size-base; color: #007aff; font-weight: 600; margin-bottom: 8px; } .policy-content { - font-size: 12px; - color: #333333; + font-size: $uni-font-size-sm; + color: $uni-text-color; line-height: 22px; text-align: justify; } diff --git a/src/pages-order/order/components/Tabs/index.vue b/src/pages-order/order/components/Tabs/index.vue index 7105ce7..62625d6 100644 --- a/src/pages-order/order/components/Tabs/index.vue +++ b/src/pages-order/order/components/Tabs/index.vue @@ -271,5 +271,5 @@ defineExpose({ \ No newline at end of file diff --git a/src/pages-order/order/components/Tabs/styles/index.scss b/src/pages-order/order/components/Tabs/styles/index.scss index d1dacdc..5fdb066 100644 --- a/src/pages-order/order/components/Tabs/styles/index.scss +++ b/src/pages-order/order/components/Tabs/styles/index.scss @@ -21,7 +21,7 @@ } .tab-text { - font-size: 14px; + font-size: $uni-font-size-base; color: #666; font-weight: 400; transition: all 0.3s ease; @@ -29,14 +29,14 @@ } .tab-text-active { - color: #333; + color: $uni-text-color; font-size: 16px; font-weight: 600; } .tab-item-active { .tab-text { - color: #333; + color: $uni-text-color; font-weight: 600; } } @@ -46,13 +46,14 @@ bottom: 0; height: 3px; min-height: 3px; /* 确保最小高度 */ - background-color: #007AFF; + background-color: #007aff; border-radius: 10px; - transition: left 0.3s cubic-bezier(0.4, 0, 0.2, 1), width 0.3s cubic-bezier(0.4, 0, 0.2, 1); + transition: left 0.3s cubic-bezier(0.4, 0, 0.2, 1), + width 0.3s cubic-bezier(0.4, 0, 0.2, 1); z-index: 1; transform: translateZ(0); /* 启用硬件加速 */ will-change: left, width; /* 优化动画性能 */ - + /* 初始状态:未初始化时隐藏 */ opacity: 0; width: 15px; /* 默认宽度15px */ @@ -64,7 +65,6 @@ opacity: 1; } - /* 点击效果 */ .tab-item:active { opacity: 0.7; @@ -97,4 +97,4 @@ .tab-indicator.animating { animation: tabSwitch 0.3s ease-out; -} \ No newline at end of file +} diff --git a/src/pages-order/order/components/UserInfo/index.vue b/src/pages-order/order/components/UserInfo/index.vue index 7a6d98f..f6ba159 100644 --- a/src/pages-order/order/components/UserInfo/index.vue +++ b/src/pages-order/order/components/UserInfo/index.vue @@ -92,5 +92,5 @@ const formatPhone = (phone) => { diff --git a/src/pages-order/order/components/UserInfo/styles/index.scss b/src/pages-order/order/components/UserInfo/styles/index.scss index 632ae63..1bc97ba 100644 --- a/src/pages-order/order/components/UserInfo/styles/index.scss +++ b/src/pages-order/order/components/UserInfo/styles/index.scss @@ -17,12 +17,12 @@ } .label { - font-size: 14px; + font-size: $uni-font-size-base; color: #666; margin-right: 8px; } .value { - font-size: 14px; - color: #333; -} \ No newline at end of file + font-size: $uni-font-size-base; + color: $uni-text-color; +} diff --git a/src/pages-order/order/detail.vue b/src/pages-order/order/detail.vue index 4a4b078..27ef63b 100644 --- a/src/pages-order/order/detail.vue +++ b/src/pages-order/order/detail.vue @@ -108,5 +108,5 @@ const handleRefundConfirm = async ({ orderId }) => { diff --git a/src/pages/goods/components/DateSelector/index.vue b/src/pages/goods/components/DateSelector/index.vue index 6ec278c..f2277e2 100644 --- a/src/pages/goods/components/DateSelector/index.vue +++ b/src/pages/goods/components/DateSelector/index.vue @@ -63,5 +63,5 @@ const props = defineProps({ diff --git a/src/pages/goods/components/DateSelector/styles/index.scss b/src/pages/goods/components/DateSelector/styles/index.scss index 613eeca..91b76ca 100644 --- a/src/pages/goods/components/DateSelector/styles/index.scss +++ b/src/pages/goods/components/DateSelector/styles/index.scss @@ -17,14 +17,14 @@ left: 24rpx; font-size: 20rpx; color: #999999; - background: #ffffff; + background-color: $uni-bg-color; padding: 0 8rpx; z-index: 1; } .date-box { padding: 20rpx 24rpx; - background: #ffffff; + background-color: $uni-bg-color; border-radius: 16rpx; border: 2rpx solid #f0f0f0; display: flex; @@ -41,7 +41,7 @@ .date-text { font-size: 32rpx; font-weight: 500; - color: #333333; + color: $uni-text-color; } .day-text { @@ -61,4 +61,4 @@ .nights-text { font-size: 24rpx; color: #666666; -} \ No newline at end of file +} diff --git a/src/pages/goods/components/GoodConfirm/index.vue b/src/pages/goods/components/GoodConfirm/index.vue index 3cf3581..b8ea00a 100644 --- a/src/pages/goods/components/GoodConfirm/index.vue +++ b/src/pages/goods/components/GoodConfirm/index.vue @@ -369,5 +369,5 @@ defineExpose({ diff --git a/src/pages/goods/components/GoodConfirm/styles/index.scss b/src/pages/goods/components/GoodConfirm/styles/index.scss index 8a76994..6177934 100644 --- a/src/pages/goods/components/GoodConfirm/styles/index.scss +++ b/src/pages/goods/components/GoodConfirm/styles/index.scss @@ -15,7 +15,7 @@ .header-title { font-size: 18px; font-weight: 600; - color: #333; + color: $uni-text-color; flex: 1; text-align: center; } @@ -64,7 +64,7 @@ .goods-title { font-size: 16px; font-weight: 500; - color: #333; + color: $uni-text-color; line-height: 22px; margin-bottom: 8px; display: -webkit-box; @@ -79,7 +79,7 @@ margin-bottom: 12px; .currency { - font-size: 14px; + font-size: $uni-font-size-base; color: #ff6b35; font-weight: 500; } @@ -92,7 +92,7 @@ } .price-desc { - font-size: 14px; + font-size: $uni-font-size-base; color: #999; font-weight: 400; margin-left: 12px; @@ -107,9 +107,9 @@ } .service-title { - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 500; - color: #333; + color: $uni-text-color; } .goods-service-item { @@ -120,12 +120,12 @@ .service-label, .service-value { - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 500; } .service-label { - color: #333; + color: $uni-text-color; } .service-value { @@ -166,8 +166,8 @@ } .total-count { - font-size: 12px; - color: #333; + font-size: $uni-font-size-sm; + color: $uni-text-color; } .total-price { @@ -178,7 +178,7 @@ &::before { content: "¥"; - font-size: 12px; + font-size: $uni-font-size-sm; } } diff --git a/src/pages/goods/components/GoodInfo/index.vue b/src/pages/goods/components/GoodInfo/index.vue index b260556..e88f881 100644 --- a/src/pages/goods/components/GoodInfo/index.vue +++ b/src/pages/goods/components/GoodInfo/index.vue @@ -47,9 +47,8 @@ const facilitiesList = computed(() => { return []; }); - diff --git a/src/pages/goods/components/GoodInfo/styles/index.scss b/src/pages/goods/components/GoodInfo/styles/index.scss index c1719f5..711fb78 100644 --- a/src/pages/goods/components/GoodInfo/styles/index.scss +++ b/src/pages/goods/components/GoodInfo/styles/index.scss @@ -9,7 +9,7 @@ .title { font-size: 16px; - color: #333; + color: $uni-text-color; font-weight: 600; line-height: 1.4; flex: 0 280px; @@ -54,8 +54,8 @@ border-radius: 6px; .facility-text { - font-size: 12px; - color: #333; + font-size: $uni-font-size-sm; + color: $uni-text-color; line-height: 1; white-space: nowrap; overflow: hidden; diff --git a/src/pages/goods/index.vue b/src/pages/goods/index.vue index c9553cd..73342a0 100644 --- a/src/pages/goods/index.vue +++ b/src/pages/goods/index.vue @@ -349,5 +349,5 @@ const handleDateSelect = (data) => { diff --git a/src/pages/goods/styles/index.scss b/src/pages/goods/styles/index.scss index 895d31e..9d85cf8 100644 --- a/src/pages/goods/styles/index.scss +++ b/src/pages/goods/styles/index.scss @@ -1,7 +1,4 @@ -@use "sass:color"; - $button-color: #00a6ff; -$button-hover-color: color.scale($button-color, $lightness: -16%); .goods-container { display: flex; @@ -37,8 +34,8 @@ $button-hover-color: color.scale($button-color, $lightness: -16%); flex-shrink: 0; .module-title { - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; text-align: center; word-wrap: break-word; margin-left: 4px; @@ -47,7 +44,7 @@ $button-hover-color: color.scale($button-color, $lightness: -16%); .module-desc { flex: 1; - font-size: 12px; + font-size: $uni-font-size-sm; color: #666; line-height: 1.5; margin-top: 4px; @@ -94,8 +91,8 @@ $button-hover-color: color.scale($button-color, $lightness: -16%); } .label { - font-size: 14px; - color: #333; + font-size: $uni-font-size-base; + color: $uni-text-color; } .price { @@ -106,7 +103,7 @@ $button-hover-color: color.scale($button-color, $lightness: -16%); &::before { content: "¥"; - font-size: 12px; + font-size: $uni-font-size-sm; } } @@ -121,51 +118,12 @@ $button-hover-color: color.scale($button-color, $lightness: -16%); justify-content: center; border-radius: 50px; height: 42px; - font-size: 14px; + font-size: $uni-font-size-base; font-weight: 500; position: relative; overflow: hidden; transition: all 0.3s ease; letter-spacing: 0.5px; margin-left: auto; - - // 按钮波纹效果 - &::before { - content: ""; - position: absolute; - top: 50%; - left: 50%; - width: 0; - height: 0; - background: rgba(255, 255, 255, 0.3); - border-radius: 50%; - transform: translate(-50%, -50%); - transition: width 0.6s, height 0.6s; - } - - &:hover { - background: linear-gradient( - 135deg, - $button-hover-color 0%, - color.scale($button-hover-color, $lightness: -11.9%) 100% - ); - transform: translateY(-2px); - box-shadow: 0 4px 16px rgba($button-color, 0.4); - - &::before { - width: 300px; - height: 300px; - } - } - - &:active { - transform: translateY(-1px); - box-shadow: 0 2px 8px rgba($button-color, 0.3); - } - - &:focus { - outline: none; - box-shadow: 0 0 0 3px rgba($button-color, 0.3); - } } } diff --git a/src/pages/index/components/chat/ChatCardAi/index.vue b/src/pages/index/components/chat/ChatCardAi/index.vue index 6a07c79..aa390e8 100644 --- a/src/pages/index/components/chat/ChatCardAi/index.vue +++ b/src/pages/index/components/chat/ChatCardAi/index.vue @@ -66,5 +66,5 @@ watch( diff --git a/src/pages/index/components/chat/ChatCardMine/index.vue b/src/pages/index/components/chat/ChatCardMine/index.vue index 1f3b60d..b24b0b2 100644 --- a/src/pages/index/components/chat/ChatCardMine/index.vue +++ b/src/pages/index/components/chat/ChatCardMine/index.vue @@ -16,5 +16,5 @@ defineProps({ diff --git a/src/pages/index/components/chat/ChatCardOther/index.vue b/src/pages/index/components/chat/ChatCardOther/index.vue index ea99703..ab3f85f 100644 --- a/src/pages/index/components/chat/ChatCardOther/index.vue +++ b/src/pages/index/components/chat/ChatCardOther/index.vue @@ -16,5 +16,5 @@ defineProps({ diff --git a/src/pages/index/components/chat/ChatCardOther/styles/index.scss b/src/pages/index/components/chat/ChatCardOther/styles/index.scss index fe3dd06..d2d13a1 100644 --- a/src/pages/index/components/chat/ChatCardOther/styles/index.scss +++ b/src/pages/index/components/chat/ChatCardOther/styles/index.scss @@ -8,7 +8,7 @@ overflow-x: hidden; // ✅ 防止横向撑开 text { - font-size: 14px; - color: #333333; + font-size: $uni-font-size-base; + color: $uni-text-color; } } diff --git a/src/pages/index/components/chat/ChatInputArea/index.vue b/src/pages/index/components/chat/ChatInputArea/index.vue index 057ef4a..85493ef 100644 --- a/src/pages/index/components/chat/ChatInputArea/index.vue +++ b/src/pages/index/components/chat/ChatInputArea/index.vue @@ -244,5 +244,5 @@ defineExpose({ focusInput }); diff --git a/src/pages/index/components/chat/ChatInputArea/styles/index.scss b/src/pages/index/components/chat/ChatInputArea/styles/index.scss index 31b9793..eeaf46f 100644 --- a/src/pages/index/components/chat/ChatInputArea/styles/index.scss +++ b/src/pages/index/components/chat/ChatInputArea/styles/index.scss @@ -2,7 +2,7 @@ display: flex; align-items: center; border-radius: 22px; - background-color: #ffffff; + background-color: $uni-bg-color; box-shadow: 0px 0px 20px 0px rgba(52, 25, 204, 0.05); margin: 0 12px; margin-bottom: 8px; @@ -29,12 +29,12 @@ .hold-to-talk-button { width: 100%; height: 44px; - color: #333333; + color: $uni-text-color; font-size: 16px; display: flex; justify-content: center; align-items: center; - background-color: #ffffff; + background-color: $uni-bg-color; transition: all 0.2s ease; user-select: none; -webkit-user-select: none; diff --git a/src/pages/index/components/chat/ChatMainList/index.vue b/src/pages/index/components/chat/ChatMainList/index.vue index bad29be..2309fab 100644 --- a/src/pages/index/components/chat/ChatMainList/index.vue +++ b/src/pages/index/components/chat/ChatMainList/index.vue @@ -802,5 +802,5 @@ const resetConfig = () => { diff --git a/src/pages/index/components/chat/ChatMoreTips/index.vue b/src/pages/index/components/chat/ChatMoreTips/index.vue index 4c2214c..ff414db 100644 --- a/src/pages/index/components/chat/ChatMoreTips/index.vue +++ b/src/pages/index/components/chat/ChatMoreTips/index.vue @@ -39,5 +39,5 @@ const sendReply = (text) => { diff --git a/src/pages/index/components/chat/ChatMoreTips/styles/index.scss b/src/pages/index/components/chat/ChatMoreTips/styles/index.scss index 918d3d3..ccc2dc6 100644 --- a/src/pages/index/components/chat/ChatMoreTips/styles/index.scss +++ b/src/pages/index/components/chat/ChatMoreTips/styles/index.scss @@ -15,7 +15,7 @@ border-radius: 8px; margin: 4px; box-shadow: 0 2px 5px 0px rgba(0, 0, 0, 0.1); - background-color: #ffffff; + background-color: $uni-bg-color; padding: 2px 12px; display: flex; flex-direction: column; @@ -25,7 +25,7 @@ .more-tips-item-title { font-weight: 500; - font-size: 12px; + font-size: $uni-font-size-sm; color: #00a6ff; line-height: 24px; text-align: center; diff --git a/src/pages/index/components/chat/ChatQuickAccess/index.vue b/src/pages/index/components/chat/ChatQuickAccess/index.vue index ae16ee4..d00db8f 100644 --- a/src/pages/index/components/chat/ChatQuickAccess/index.vue +++ b/src/pages/index/components/chat/ChatQuickAccess/index.vue @@ -96,5 +96,5 @@ const initData = () => { diff --git a/src/pages/index/components/chat/ChatQuickAccess/styles/index.scss b/src/pages/index/components/chat/ChatQuickAccess/styles/index.scss index 038f7e0..f02e716 100644 --- a/src/pages/index/components/chat/ChatQuickAccess/styles/index.scss +++ b/src/pages/index/components/chat/ChatQuickAccess/styles/index.scss @@ -50,7 +50,7 @@ text { font-weight: 500; - font-size: 12px; + font-size: $uni-font-size-sm; color: #201f32; line-height: 16px; } diff --git a/src/pages/index/components/chat/ChatTopBgImg/index.vue b/src/pages/index/components/chat/ChatTopBgImg/index.vue index bac72fd..6cf812c 100644 --- a/src/pages/index/components/chat/ChatTopBgImg/index.vue +++ b/src/pages/index/components/chat/ChatTopBgImg/index.vue @@ -5,5 +5,5 @@ diff --git a/src/pages/index/components/chat/ChatTopNavBar/index.vue b/src/pages/index/components/chat/ChatTopNavBar/index.vue index 978fc9e..22f10a0 100644 --- a/src/pages/index/components/chat/ChatTopNavBar/index.vue +++ b/src/pages/index/components/chat/ChatTopNavBar/index.vue @@ -33,5 +33,5 @@ const closeDrawer = (e) => { diff --git a/src/pages/index/components/chat/ChatTopWelcome/index.vue b/src/pages/index/components/chat/ChatTopWelcome/index.vue index 0af1f6d..e219f05 100644 --- a/src/pages/index/components/chat/ChatTopWelcome/index.vue +++ b/src/pages/index/components/chat/ChatTopWelcome/index.vue @@ -49,5 +49,5 @@ const backgroundStyle = computed(() => { diff --git a/src/pages/index/components/drawer/DrawerHome/index.vue b/src/pages/index/components/drawer/DrawerHome/index.vue index 6c255ab..bac43da 100644 --- a/src/pages/index/components/drawer/DrawerHome/index.vue +++ b/src/pages/index/components/drawer/DrawerHome/index.vue @@ -50,5 +50,5 @@ onUnmounted(() => { diff --git a/src/pages/index/components/drawer/DrawerHome/styles/index.scss b/src/pages/index/components/drawer/DrawerHome/styles/index.scss index 2cb0da1..b494117 100644 --- a/src/pages/index/components/drawer/DrawerHome/styles/index.scss +++ b/src/pages/index/components/drawer/DrawerHome/styles/index.scss @@ -15,7 +15,7 @@ .title { font-size: 18px; text-align: center; - color: #333333; + color: $uni-text-color; } .close-icon { diff --git a/src/pages/index/components/drawer/MineSetting/index.vue b/src/pages/index/components/drawer/MineSetting/index.vue index 90bf083..6e5fd80 100644 --- a/src/pages/index/components/drawer/MineSetting/index.vue +++ b/src/pages/index/components/drawer/MineSetting/index.vue @@ -115,5 +115,5 @@ const handleLogout = () => { diff --git a/src/pages/index/components/drawer/MineSetting/styles/index.scss b/src/pages/index/components/drawer/MineSetting/styles/index.scss index 657783d..16d999e 100644 --- a/src/pages/index/components/drawer/MineSetting/styles/index.scss +++ b/src/pages/index/components/drawer/MineSetting/styles/index.scss @@ -32,7 +32,7 @@ .label { font-size: 28rpx; - color: #333; + color: $uni-text-color; } .value { @@ -59,7 +59,7 @@ height: 42px; margin-top: 40px; background-color: #fff; - color: #333; + color: $uni-text-color; border-radius: 8rpx; border: none; } diff --git a/src/pages/index/components/module/ActivityListComponent/index.vue b/src/pages/index/components/module/ActivityListComponent/index.vue index 6e92d5f..6f0df32 100644 --- a/src/pages/index/components/module/ActivityListComponent/index.vue +++ b/src/pages/index/components/module/ActivityListComponent/index.vue @@ -45,5 +45,5 @@ const handleClick = (item) => { diff --git a/src/pages/index/components/module/ActivityListComponent/styles/index.scss b/src/pages/index/components/module/ActivityListComponent/styles/index.scss index 2178be5..86bf593 100644 --- a/src/pages/index/components/module/ActivityListComponent/styles/index.scss +++ b/src/pages/index/components/module/ActivityListComponent/styles/index.scss @@ -27,8 +27,8 @@ right: 12px; bottom: 12px; background-color: #ffeb00; - color: #333; - font-size: 14px; + color: $uni-text-color; + font-size: $uni-font-size-base; font-weight: 500; padding: 4px 12px; border-radius: 20px; diff --git a/src/pages/index/components/module/AttachListComponent/index.vue b/src/pages/index/components/module/AttachListComponent/index.vue index 36ef3c6..68dc3df 100644 --- a/src/pages/index/components/module/AttachListComponent/index.vue +++ b/src/pages/index/components/module/AttachListComponent/index.vue @@ -41,5 +41,5 @@ onMounted(() => { diff --git a/src/pages/index/components/module/AttachListComponent/styles/index.scss b/src/pages/index/components/module/AttachListComponent/styles/index.scss index 722796a..80727d6 100644 --- a/src/pages/index/components/module/AttachListComponent/styles/index.scss +++ b/src/pages/index/components/module/AttachListComponent/styles/index.scss @@ -5,7 +5,7 @@ } .tag-item { - background-color: #ffffff; + background-color: $uni-bg-color; border-radius: 8px; padding: 4px 10px; margin-right: 8px; @@ -17,5 +17,5 @@ .tag-text { color: #00a6ff; /* 蓝色文字,可根据设计调整 */ - font-size: 14px; + font-size: $uni-font-size-base; } diff --git a/src/pages/index/components/module/DetailCardCompontent/index.vue b/src/pages/index/components/module/DetailCardCompontent/index.vue index 81c1963..051f60d 100644 --- a/src/pages/index/components/module/DetailCardCompontent/index.vue +++ b/src/pages/index/components/module/DetailCardCompontent/index.vue @@ -26,5 +26,5 @@ const props = defineProps({ diff --git a/src/pages/index/components/module/DetailCardGoodsContentList/index.vue b/src/pages/index/components/module/DetailCardGoodsContentList/index.vue index dea8327..b61782c 100644 --- a/src/pages/index/components/module/DetailCardGoodsContentList/index.vue +++ b/src/pages/index/components/module/DetailCardGoodsContentList/index.vue @@ -69,5 +69,5 @@ const placeOrderHandle = (item) => { diff --git a/src/pages/index/components/module/DetailCardGoodsContentList/styles/index.scss b/src/pages/index/components/module/DetailCardGoodsContentList/styles/index.scss index 37c8b31..c86c26f 100644 --- a/src/pages/index/components/module/DetailCardGoodsContentList/styles/index.scss +++ b/src/pages/index/components/module/DetailCardGoodsContentList/styles/index.scss @@ -15,7 +15,7 @@ flex-direction: column; align-items: start; width: 188px; - background-color: #ffffff; + background-color: $uni-bg-color; border-radius: 10px; margin-right: 8px; padding-bottom: 12px; @@ -26,7 +26,7 @@ left: 8px; background: #ffe7b2; color: #b97a00; - font-size: 12px; + font-size: $uni-font-size-sm; padding: 2px 8px; border-radius: 4px; z-index: 2; diff --git a/src/pages/index/components/module/DiscoveryCardComponent/index.vue b/src/pages/index/components/module/DiscoveryCardComponent/index.vue index eab55a2..8a4089c 100644 --- a/src/pages/index/components/module/DiscoveryCardComponent/index.vue +++ b/src/pages/index/components/module/DiscoveryCardComponent/index.vue @@ -33,5 +33,5 @@ onMounted(() => { diff --git a/src/pages/index/components/module/DiscoveryCradContentList/index.vue b/src/pages/index/components/module/DiscoveryCradContentList/index.vue index 2aea934..4016b80 100644 --- a/src/pages/index/components/module/DiscoveryCradContentList/index.vue +++ b/src/pages/index/components/module/DiscoveryCradContentList/index.vue @@ -38,5 +38,5 @@ const sendReply = (item) => { diff --git a/src/pages/index/components/module/DiscoveryCradContentList/styles/index.scss b/src/pages/index/components/module/DiscoveryCradContentList/styles/index.scss index 16723f6..e4f6fb6 100644 --- a/src/pages/index/components/module/DiscoveryCradContentList/styles/index.scss +++ b/src/pages/index/components/module/DiscoveryCradContentList/styles/index.scss @@ -11,7 +11,7 @@ align-items: start; width: 188px; height: 154px; - background-color: #ffffff; + background-color: $uni-bg-color; border-radius: 10px; margin-right: 8px; position: relative; @@ -25,8 +25,8 @@ padding: 12px; text-align: center; font-weight: 500; - font-size: 12px; - color: #333333; + font-size: $uni-font-size-sm; + color: $uni-text-color; } } } diff --git a/src/pages/index/components/module/QuickBookingCalender/index.vue b/src/pages/index/components/module/QuickBookingCalender/index.vue index 270cb2c..a581b98 100644 --- a/src/pages/index/components/module/QuickBookingCalender/index.vue +++ b/src/pages/index/components/module/QuickBookingCalender/index.vue @@ -71,5 +71,5 @@ onMounted(() => { diff --git a/src/pages/index/components/module/QuickBookingComponent/index.vue b/src/pages/index/components/module/QuickBookingComponent/index.vue index 510edba..9c1c373 100644 --- a/src/pages/index/components/module/QuickBookingComponent/index.vue +++ b/src/pages/index/components/module/QuickBookingComponent/index.vue @@ -62,5 +62,5 @@ onMounted(() => { diff --git a/src/pages/index/components/module/QuickBookingContentList/index.vue b/src/pages/index/components/module/QuickBookingContentList/index.vue index e9a0af5..b9a5635 100644 --- a/src/pages/index/components/module/QuickBookingContentList/index.vue +++ b/src/pages/index/components/module/QuickBookingContentList/index.vue @@ -67,5 +67,5 @@ const placeOrderHandle = (item) => { diff --git a/src/pages/index/components/module/QuickBookingContentList/styles/index.scss b/src/pages/index/components/module/QuickBookingContentList/styles/index.scss index 959d981..786f432 100644 --- a/src/pages/index/components/module/QuickBookingContentList/styles/index.scss +++ b/src/pages/index/components/module/QuickBookingContentList/styles/index.scss @@ -14,7 +14,7 @@ align-items: start; width: 188px; // height: 244px; - background-color: #ffffff; + background-color: $uni-bg-color; border-radius: 10px; margin-right: 8px; padding-bottom: 12px; @@ -25,7 +25,7 @@ left: 8px; background: #ffe7b2; color: #b97a00; - font-size: 12px; + font-size: $uni-font-size-sm; padding: 2px 8px; border-radius: 4px; z-index: 2; diff --git a/src/pages/index/components/module/RecommendPostsComponent/index.vue b/src/pages/index/components/module/RecommendPostsComponent/index.vue index e0e33c9..20466a8 100644 --- a/src/pages/index/components/module/RecommendPostsComponent/index.vue +++ b/src/pages/index/components/module/RecommendPostsComponent/index.vue @@ -22,5 +22,5 @@ const props = defineProps({ diff --git a/src/pages/index/components/module/RecommendPostsList/index.vue b/src/pages/index/components/module/RecommendPostsList/index.vue index ebe0183..e76aa5b 100644 --- a/src/pages/index/components/module/RecommendPostsList/index.vue +++ b/src/pages/index/components/module/RecommendPostsList/index.vue @@ -37,5 +37,5 @@ const sendReply = (item) => { diff --git a/src/pages/index/components/module/RecommendPostsList/styles/index.scss b/src/pages/index/components/module/RecommendPostsList/styles/index.scss index 57721ce..b7a29be 100644 --- a/src/pages/index/components/module/RecommendPostsList/styles/index.scss +++ b/src/pages/index/components/module/RecommendPostsList/styles/index.scss @@ -46,8 +46,8 @@ .overlay-text { color: #fff; font-weight: 500; - font-size: 12px; + font-size: $uni-font-size-sm; text-align: left; width: 100%; } -} \ No newline at end of file +} diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 758f998..7aeecc4 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -65,6 +65,6 @@ onUnmounted(() => { .container { width: 100vw; height: 100vh; - background-color: #ffffff; + background-color: $uni-bg-color; } diff --git a/src/pages/login/components/AgreePopup/demo.vue b/src/pages/login/components/AgreePopup/demo.vue index f399cf1..459cd13 100644 --- a/src/pages/login/components/AgreePopup/demo.vue +++ b/src/pages/login/components/AgreePopup/demo.vue @@ -3,19 +3,19 @@ AgreePopup 组件演示 - + - + 组件状态: 弹窗可见:{{ popupVisible }} 用户操作:{{ userAction }} - + - \ No newline at end of file diff --git a/src/pages/login/components/AgreePopup/styles/index.scss b/src/pages/login/components/AgreePopup/styles/index.scss index da4fefe..3fb3e36 100644 --- a/src/pages/login/components/AgreePopup/styles/index.scss +++ b/src/pages/login/components/AgreePopup/styles/index.scss @@ -1,83 +1,83 @@ // AgreePopup 组件样式 .agree-popup { - width: 327px; - background: #ffffff; - border-radius: 12px; - overflow: hidden; - box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1); + width: 327px; + background-color: $uni-bg-color; + border-radius: 12px; + overflow: hidden; + box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1); - // 弹窗头部 - .popup-header { - position: relative; - padding: 20px 20px 0 20px; + // 弹窗头部 + .popup-header { + position: relative; + padding: 20px 20px 0 20px; - .popup-title { - font-size: 18px; - font-weight: 600; - color: #333333; - text-align: center; - line-height: 24px; - } - - .close-btn { - position: absolute; - top: 16px; - right: 16px; - width: 28px; - height: 28px; - display: flex; - align-items: center; - justify-content: center; - cursor: pointer; - - &:hover { - background: #f5f5f5; - border-radius: 50%; - } - } + .popup-title { + font-size: 18px; + font-weight: 600; + color: $uni-text-color; + text-align: center; + line-height: 24px; } - // 弹窗内容 - .popup-content { - padding: 12px; - max-height: 400px; // 设置最大高度 - overflow-y: auto; // 启用垂直滚动 + .close-btn { + position: absolute; + top: 16px; + right: 16px; + width: 28px; + height: 28px; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; - // 自定义滚动条样式 - &::-webkit-scrollbar { - display: none; - } + &:hover { + background: #f5f5f5; + border-radius: 50%; + } } + } - // 按钮区域 - .button-area { - padding: 20px; - box-sizing: border-box; - display: flex; - justify-content: center; - align-items: center; + // 弹窗内容 + .popup-content { + padding: 12px; + max-height: 400px; // 设置最大高度 + overflow-y: auto; // 启用垂直滚动 - .confirm-btn { - width: 148px; - height: 44px; - background: linear-gradient(90deg, #22a7ff 0%, #2567ff 100%); - display: flex; - align-items: center; - justify-content: center; - color: #ffffff; - border-radius: 50px; - font-size: 16px; - font-weight: 500; - transition: all 0.3s ease; - - &:hover { - background: #0056cc; - } - - &:active { - background: #004499; - transform: scale(0.98); - } - } + // 自定义滚动条样式 + &::-webkit-scrollbar { + display: none; } + } + + // 按钮区域 + .button-area { + padding: 20px; + box-sizing: border-box; + display: flex; + justify-content: center; + align-items: center; + + .confirm-btn { + width: 148px; + height: 44px; + background: linear-gradient(90deg, #22a7ff 0%, #2567ff 100%); + display: flex; + align-items: center; + justify-content: center; + color: #ffffff; + border-radius: 50px; + font-size: 16px; + font-weight: 500; + transition: all 0.3s ease; + + &:hover { + background: #0056cc; + } + + &:active { + background: #004499; + transform: scale(0.98); + } + } + } } diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index c6cbd1f..6fff2c2 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -146,7 +146,7 @@ getPrivacyAgreementData();