From 47e1c2372df5aeb931146ee227f55d36cddc3400 Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Fri, 16 Jan 2026 17:52:33 +0800 Subject: [PATCH] =?UTF-8?q?chore(sass):=20=E7=BC=96=E8=AF=91=E5=99=A8?= =?UTF-8?q?=E4=BB=8Enode-sass=E8=BD=AC=E7=A7=BB=E6=88=90dart-sass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- common/css/diy.scss | 2 +- common/css/goods_detail.scss | 4 +- common/css/main.scss | 22 +- common/css/mp_html_patch.scss | 2 +- common/css/order_parment.scss | 4 +- common/js/config-external.js | 2 +- common/js/util.js | 2 +- components-diy/diy-bargain.vue | 4 +- components-diy/diy-category-item.vue | 6 +- components-diy/diy-category.vue | 4 +- components-diy/diy-channel-list.vue | 8 +- components-diy/diy-coupon.vue | 14 +- components-diy/diy-groupbuy.vue | 4 +- components-diy/diy-img-ads.vue | 14 +- components-diy/diy-index-page.vue | 2 +- components-diy/diy-member-info.vue | 8 +- components-diy/diy-pinfan.vue | 4 +- components-diy/diy-pintuan.vue | 4 +- components-diy/diy-presale.vue | 4 +- components-diy/diy-search.vue | 2 +- components-diy/diy-seckill.vue | 4 +- components-diy/diy-store-label.vue | 4 +- components/chat-message/chat-message.vue | 4 +- .../ns-goods-sku/ns-goods-sku-category.vue | 6 +- components/ns-mp-html/ns-mp-html.vue | 2 +- .../register-reward/register-reward.vue | 6 +- components/to-top/to-top.vue | 2 +- manifest.json | 2 +- node_modules/jweixin-module/README.md | 4 +- node_modules/jweixin-module/out/index.js | 1 - node_modules/jweixin-module/package.json | 80 ++-- package-lock.json | 377 ++++++++++++++++++ package.json | 3 +- pages/index/index.vue | 12 +- pages/index/public/css/index.scss | 2 +- pages_goods/cart.vue | 4 +- pages_goods/category.vue | 16 +- pages_goods/detail.vue | 30 +- pages_goods/list.vue | 2 +- pages_goods/public/css/cart.scss | 6 +- pages_order/detail.vue | 2 +- pages_order/detail_point.vue | 2 +- pages_order/list.vue | 4 +- pages_order/payment.vue | 6 +- pages_order/public/css/detail.scss | 2 +- pages_order/public/css/list.scss | 2 +- pages_promotion/fenxiao/apply.vue | 6 +- pages_promotion/fenxiao/bill.vue | 4 +- pages_promotion/fenxiao/goods_list.vue | 2 +- pages_promotion/fenxiao/index.vue | 6 +- pages_promotion/fenxiao/level.vue | 8 +- pages_promotion/fenxiao/public/css/order.scss | 4 +- pages_promotion/merch/detail.vue | 4 +- pages_promotion/merch/merchcategory.vue | 16 +- pages_promotion/merch/public/category.scss | 8 +- pages_promotion/point/detail.vue | 4 +- pages_promotion/point/order_list.vue | 4 +- pages_promotion/point/payment.vue | 6 +- .../ns-birthday-gift/ns-birthday-gift.vue | 6 +- .../_components/ns-new-gift/ns-new-gift.vue | 6 +- pages_tool/ai-chat/ai-chat-message.vue | 22 +- pages_tool/article/list.vue | 2 +- pages_tool/contact/contact.vue | 4 +- pages_tool/form/form.vue | 2 +- pages_tool/goods/brand.vue | 2 +- pages_tool/goods/search.vue | 4 +- pages_tool/index/diy.vue | 8 +- pages_tool/login/login.vue | 4 +- pages_tool/login/public/css/common.scss | 4 +- pages_tool/member/account.vue | 2 +- pages_tool/member/address.vue | 2 +- pages_tool/member/address_edit.vue | 2 +- pages_tool/member/card.vue | 2 +- pages_tool/member/collection.vue | 6 +- pages_tool/member/footprint.vue | 2 +- pages_tool/member/index.vue | 8 +- pages_tool/member/invite_friends.vue | 2 +- pages_tool/member/point_detail.vue | 2 +- pages_tool/notice/list.vue | 2 +- pages_tool/order/activist.vue | 2 +- pages_tool/order/logistics.vue | 4 +- pages_tool/order/refund.vue | 6 +- pages_tool/order/refund_batch.vue | 6 +- pages_tool/order/refund_type_select.vue | 6 +- pages_tool/pay/result.vue | 4 +- pages_tool/recharge/list.vue | 2 +- store/index.js | 4 +- uni.scss | 82 ++-- 89 files changed, 671 insertions(+), 314 deletions(-) delete mode 100644 node_modules/jweixin-module/out/index.js diff --git a/App.vue b/App.vue index 2625d3c..09f2e4e 100644 --- a/App.vue +++ b/App.vue @@ -314,7 +314,7 @@ @import './common/css/iconfont.css'; @import './common/css/icondiy.css'; // 自定义图标库 @import './common/css/icon/extend.css'; // 扩展图标库 - page{ + page { background: #f4f6fa; } \ No newline at end of file diff --git a/common/css/diy.scss b/common/css/diy.scss index e83aaee..943dbfd 100644 --- a/common/css/diy.scss +++ b/common/css/diy.scss @@ -123,7 +123,7 @@ image { } .choose-store { - /deep/ .uni-popup__wrapper{ + ::v-deep .uni-popup__wrapper{ background: none!important; } } diff --git a/common/css/goods_detail.scss b/common/css/goods_detail.scss index c1a25e1..f34c2bc 100644 --- a/common/css/goods_detail.scss +++ b/common/css/goods_detail.scss @@ -870,13 +870,13 @@ // 海报 // .uni-popup__wrapper-box .poster-layer { - /deep/ .uni-popup__wrapper.center { + ::v-deep .uni-popup__wrapper.center { width: 100vw!important; height: 100vh!important; background: none!important; } - /deep/ .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box { + ::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box { max-width: 100vw!important; max-height: 100vh!important; background: none!important; diff --git a/common/css/main.scss b/common/css/main.scss index a9cc722..b42a25b 100644 --- a/common/css/main.scss +++ b/common/css/main.scss @@ -559,7 +559,7 @@ scroll-view ::-webkit-scrollbar { background-color: transparent; } -/deep/::-webkit-scrollbar { +::v-deep ::-webkit-scrollbar { width: 0; height: 0; background-color: transparent; @@ -609,7 +609,7 @@ scroll-view ::-webkit-scrollbar { font-weight: 500!important; } -/deep/ .reward-popup .uni-popup__wrapper-box { +::v-deep .reward-popup .uni-popup__wrapper-box { background: none !important; max-width: unset !important; max-height: unset !important; @@ -618,7 +618,7 @@ scroll-view ::-webkit-scrollbar { // #ifdef H5 // 下拉加载动画【页面】 -/deep/ body uni-page-refresh div{ +::v-deep body uni-page-refresh div{ width: 14rpx !important; height: 14rpx !important; background-color: #ccc; @@ -626,7 +626,7 @@ scroll-view ::-webkit-scrollbar { clip: rect(-152rpx, 90rpx, 90rpx, -30rpx) !important; animation:.6s backgroundChange linear infinite; } -/deep/ body uni-page-refresh div::after{ +::v-deep body uni-page-refresh div::after{ content: ""; position: absolute; left: -22rpx; @@ -636,7 +636,7 @@ scroll-view ::-webkit-scrollbar { background-color: #ccc; animation:.5s backgroundChange linear infinite; } -/deep/ body uni-page-refresh div::before{ +::v-deep body uni-page-refresh div::before{ content: ""; position: absolute; right: -22rpx; @@ -646,15 +646,15 @@ scroll-view ::-webkit-scrollbar { background-color: #ccc; animation:.7s backgroundChange linear infinite; } -/deep/ body uni-page-refresh > div > div{ +::v-deep body uni-page-refresh > div > div{ display: none !important; } // 下拉加载动画【scroll-view】 -/deep/ body .uni-scroll-view-refresher{ +::v-deep body .uni-scroll-view-refresher{ background-color: transparent !important; } -/deep/ body .uni-scroll-view-refresher div{ +::v-deep body .uni-scroll-view-refresher div{ left: 50%; top: 50%; transform: translate(-50%, -50%); @@ -666,7 +666,7 @@ scroll-view ::-webkit-scrollbar { clip: rect(-152rpx, 90rpx, 90rpx, -30rpx) !important; animation:.6s backgroundChange linear infinite; } -/deep/ body .uni-scroll-view-refresher div::after{ +::v-deep body .uni-scroll-view-refresher div::after{ content: ""; position: absolute; left: -22rpx; @@ -676,7 +676,7 @@ scroll-view ::-webkit-scrollbar { background-color: #ccc; animation:.5s backgroundChange linear infinite; } -/deep/ body .uni-scroll-view-refresher div::before{ +::v-deep body .uni-scroll-view-refresher div::before{ content: ""; position: absolute; right: -22rpx; @@ -686,7 +686,7 @@ scroll-view ::-webkit-scrollbar { background-color: #ccc; animation:.7s backgroundChange linear infinite; } -/deep/ body .uni-scroll-view-refresher > div > div{ +::v-deep body .uni-scroll-view-refresher > div > div{ display: none !important; } @keyframes backgroundChange { diff --git a/common/css/mp_html_patch.scss b/common/css/mp_html_patch.scss index a3bbdbe..9679c0c 100644 --- a/common/css/mp_html_patch.scss +++ b/common/css/mp_html_patch.scss @@ -1,4 +1,4 @@ // 修复图片垂直对齐问题，解决两张图片上下有空白缝隙问题 -/deep/ ._img { +::v-deep ._img { vertical-align: top; } \ No newline at end of file diff --git a/common/css/order_parment.scss b/common/css/order_parment.scss index 0f1bc27..56d9b1b 100644 --- a/common/css/order_parment.scss +++ b/common/css/order_parment.scss @@ -377,7 +377,7 @@ view { } } -/deep/ .goods-form { +::v-deep .goods-form { display: flex; align-items: center; position: relative; @@ -1354,7 +1354,7 @@ view { border-bottom: 2rpx solid #F4F4F6; } - /deep/ .form-wrap { + ::v-deep .form-wrap { margin: 0 24rpx; .icon-right { diff --git a/common/js/config-external.js b/common/js/config-external.js index c1edd73..21735c7 100644 --- a/common/js/config-external.js +++ b/common/js/config-external.js @@ -116,7 +116,7 @@ class ConfigExternal { try { // 动态加载主题配置 const themeData = require(`@/common/js/style_color.js`)['default'][theme]; - console.log('async themeData => ', themeData); + // console.log('async themeData => ', themeData); this.loadedConfigs[`theme_${theme}`] = themeData; resolve(themeData); } catch (error) { diff --git a/common/js/util.js b/common/js/util.js index 8d9cb2f..21b3588 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -1202,7 +1202,7 @@ export default { let _isQuickApp = false; try { const ua = navigator?.userAgent?.toLowerCase(); - console.log('ua = ', ua); + // console.log('ua = ', ua); _isQuickApp = ua.indexOf('quickapp') !== -1; if (!_isQuickApp) { diff --git a/components-diy/diy-bargain.vue b/components-diy/diy-bargain.vue index 373dd8a..a264fee 100644 --- a/components-diy/diy-bargain.vue +++ b/components-diy/diy-bargain.vue @@ -365,7 +365,7 @@ export default { \ No newline at end of file diff --git a/components-diy/diy-index-page.vue b/components-diy/diy-index-page.vue index 5313aad..0f9ea3b 100644 --- a/components-diy/diy-index-page.vue +++ b/components-diy/diy-index-page.vue @@ -732,7 +732,7 @@ export default { margin-top: 100rpx; } -/deep/.uni-scroll-view::-webkit-scrollbar { +::v-deep .uni-scroll-view::-webkit-scrollbar { /* 隐藏滚动条，但依旧具备可以滚动的功能 */ display: none; } diff --git a/components-diy/diy-member-info.vue b/components-diy/diy-member-info.vue index fea7e80..c6b2e2e 100644 --- a/components-diy/diy-member-info.vue +++ b/components-diy/diy-member-info.vue @@ -1380,11 +1380,11 @@ export default { } } -/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { +::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { background: none !important; } -/deep/ .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { +::v-deep .member-info-style4 .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { background: #fff !important; } @@ -1484,8 +1484,8 @@ export default { } \ No newline at end of file diff --git a/components/ns-mp-html/ns-mp-html.vue b/components/ns-mp-html/ns-mp-html.vue index c60d07f..b6c1800 100644 --- a/components/ns-mp-html/ns-mp-html.vue +++ b/components/ns-mp-html/ns-mp-html.vue @@ -17,7 +17,7 @@ diff --git a/components/to-top/to-top.vue b/components/to-top/to-top.vue index 4d53471..3bc1c29 100644 --- a/components/to-top/to-top.vue +++ b/components/to-top/to-top.vue @@ -27,7 +27,7 @@ export default { \ No newline at end of file diff --git a/pages_goods/detail.vue b/pages_goods/detail.vue index 5e7d1f1..7db396b 100644 --- a/pages_goods/detail.vue +++ b/pages_goods/detail.vue @@ -547,18 +547,18 @@ export default { \ No newline at end of file diff --git a/pages_goods/public/css/cart.scss b/pages_goods/public/css/cart.scss index 514e550..ad662ed 100644 --- a/pages_goods/public/css/cart.scss +++ b/pages_goods/public/css/cart.scss @@ -177,18 +177,18 @@ } } - /deep/ .decrease { + ::v-deep .decrease { width: 52rpx; height: 52rpx; line-height: 48rpx; font-size: 40rpx; border-radius: 10rpx 0px 0px 10rpx; } - /deep/ input { + ::v-deep input { height: 52rpx; line-height: 52rpx; } - /deep/ .increase { + ::v-deep .increase { width: 52rpx; height: 52rpx; line-height: 48rpx; diff --git a/pages_order/detail.vue b/pages_order/detail.vue index 43043f3..cb41360 100644 --- a/pages_order/detail.vue +++ b/pages_order/detail.vue @@ -835,7 +835,7 @@ export default { margin-bottom: 30rpx; } -/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { +::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { max-height: unset !important; } \ No newline at end of file diff --git a/pages_order/detail_point.vue b/pages_order/detail_point.vue index de67e82..38046e3 100644 --- a/pages_order/detail_point.vue +++ b/pages_order/detail_point.vue @@ -296,7 +296,7 @@ export default { @import './public/css/detail.scss'; \ No newline at end of file diff --git a/pages_order/list.vue b/pages_order/list.vue index 6587fe6..f7f7573 100644 --- a/pages_order/list.vue +++ b/pages_order/list.vue @@ -460,11 +460,11 @@ export default { \ No newline at end of file diff --git a/pages_order/payment.vue b/pages_order/payment.vue index 8e41120..d45e73e 100644 --- a/pages_order/payment.vue +++ b/pages_order/payment.vue @@ -95,15 +95,15 @@ export default { diff --git a/pages_order/public/css/detail.scss b/pages_order/public/css/detail.scss index a1b1c06..e16e277 100644 --- a/pages_order/public/css/detail.scss +++ b/pages_order/public/css/detail.scss @@ -104,7 +104,7 @@ view { } } -/deep/ #action-date .uni-countdown .uni-countdown__number { +::v-deep #action-date .uni-countdown .uni-countdown__number { border: none !important; padding: 0 !important; margin: 0 !important; diff --git a/pages_order/public/css/list.scss b/pages_order/public/css/list.scss index f90c89f..74b4d2f 100644 --- a/pages_order/public/css/list.scss +++ b/pages_order/public/css/list.scss @@ -353,7 +353,7 @@ $margin-both: 24rpx; } } -/deep/ #action-date .uni-countdown .uni-countdown__number { +::v-deep #action-date .uni-countdown .uni-countdown__number { border: none !important; padding: 0 !important; margin: 0 !important; diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue index cf484cf..d9f1e03 100644 --- a/pages_promotion/fenxiao/apply.vue +++ b/pages_promotion/fenxiao/apply.vue @@ -421,11 +421,11 @@ width: 100%; } - /deep/.uni-scroll-view { + ::v-deep .uni-scroll-view { background-color: #fff; } - /deep/.uni-scroll-view::-webkit-scrollbar { + ::v-deep .uni-scroll-view::-webkit-scrollbar { /* 隐藏滚动条，但依旧具备可以滚动的功能 */ display: none; } @@ -802,7 +802,7 @@ \ No newline at end of file diff --git a/pages_promotion/fenxiao/bill.vue b/pages_promotion/fenxiao/bill.vue index 039f51c..f879171 100644 --- a/pages_promotion/fenxiao/bill.vue +++ b/pages_promotion/fenxiao/bill.vue @@ -84,11 +84,11 @@ export default { \ No newline at end of file diff --git a/pages_promotion/fenxiao/level.vue b/pages_promotion/fenxiao/level.vue index 1aeafd0..fdd8c21 100644 --- a/pages_promotion/fenxiao/level.vue +++ b/pages_promotion/fenxiao/level.vue @@ -299,21 +299,21 @@ @import './public/css/level.scss'; \ No newline at end of file diff --git a/pages_promotion/fenxiao/public/css/order.scss b/pages_promotion/fenxiao/public/css/order.scss index 6a786d9..da1eafd 100644 --- a/pages_promotion/fenxiao/public/css/order.scss +++ b/pages_promotion/fenxiao/public/css/order.scss @@ -1,8 +1,8 @@ -/deep/ .fixed { +::v-deep .fixed { position: relative; top: 0; } -/deep/ .empty { +::v-deep .empty { margin-top: 0 !important; } .cart-empty { diff --git a/pages_promotion/merch/detail.vue b/pages_promotion/merch/detail.vue index acbd9bb..9bd7c7b 100644 --- a/pages_promotion/merch/detail.vue +++ b/pages_promotion/merch/detail.vue @@ -308,7 +308,7 @@ - + @@ -333,7 +333,7 @@ export default { background-color: #f5f5f5 !important; } -/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { +::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { max-height: unset !important; } \ No newline at end of file diff --git a/pages_promotion/merch/merchcategory.vue b/pages_promotion/merch/merchcategory.vue index 91180a8..4895914 100644 --- a/pages_promotion/merch/merchcategory.vue +++ b/pages_promotion/merch/merchcategory.vue @@ -228,38 +228,38 @@ \ No newline at end of file diff --git a/pages_promotion/merch/public/category.scss b/pages_promotion/merch/public/category.scss index c5168d0..e9d5897 100644 --- a/pages_promotion/merch/public/category.scss +++ b/pages_promotion/merch/public/category.scss @@ -261,7 +261,7 @@ z-index: 2; } - /deep/ .template-four { + ::v-deep .template-four { position: relative; z-index: 1; @@ -702,7 +702,7 @@ .right-wrap { display: flex; align-items: center; - justify-content: end; + justify-content: flex-end; .num { width: auto; @@ -856,7 +856,7 @@ } } - /deep/ .uni-popup__wrapper-box { + ::v-deep .uni-popup__wrapper-box { border-radius: 0; } @@ -890,7 +890,7 @@ justify-content: center; } - /deep/ .loading-layer { + ::v-deep .loading-layer { background: #fff !important; } diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue index 592c3bb..e45b9ff 100644 --- a/pages_promotion/point/detail.vue +++ b/pages_promotion/point/detail.vue @@ -220,7 +220,7 @@ - + @@ -523,7 +523,7 @@ export default { } diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue index 3260d45..1d6cf0c 100644 --- a/pages_promotion/point/order_list.vue +++ b/pages_promotion/point/order_list.vue @@ -252,12 +252,12 @@ export default { \ No newline at end of file diff --git a/pages_tool/_components/ns-birthday-gift/ns-birthday-gift.vue b/pages_tool/_components/ns-birthday-gift/ns-birthday-gift.vue index 254126c..34b10e4 100644 --- a/pages_tool/_components/ns-birthday-gift/ns-birthday-gift.vue +++ b/pages_tool/_components/ns-birthday-gift/ns-birthday-gift.vue @@ -161,7 +161,7 @@ }; \ No newline at end of file diff --git a/pages_tool/login/login.vue b/pages_tool/login/login.vue index a064dbe..49b63d1 100644 --- a/pages_tool/login/login.vue +++ b/pages_tool/login/login.vue @@ -481,14 +481,14 @@ export default { \ No newline at end of file diff --git a/pages_tool/login/public/css/common.scss b/pages_tool/login/public/css/common.scss index 3977688..d249c83 100644 --- a/pages_tool/login/public/css/common.scss +++ b/pages_tool/login/public/css/common.scss @@ -1,8 +1,8 @@ -/deep/.uni-scroll-view { +::v-deep .uni-scroll-view { background-color: #fff; } -/deep/.uni-scroll-view::-webkit-scrollbar { +::v-deep .uni-scroll-view::-webkit-scrollbar { /* 隐藏滚动条，但依旧具备可以滚动的功能 */ display: none; } diff --git a/pages_tool/member/account.vue b/pages_tool/member/account.vue index 6b7f43f..bbcb0f1 100644 --- a/pages_tool/member/account.vue +++ b/pages_tool/member/account.vue @@ -430,7 +430,7 @@ export default { } diff --git a/pages_tool/member/address.vue b/pages_tool/member/address.vue index aad8d7a..8003f5c 100644 --- a/pages_tool/member/address.vue +++ b/pages_tool/member/address.vue @@ -367,7 +367,7 @@ export default { \ No newline at end of file diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue index a523c69..83e7718 100644 --- a/pages_tool/member/collection.vue +++ b/pages_tool/member/collection.vue @@ -73,12 +73,12 @@ export default { \ No newline at end of file diff --git a/pages_tool/member/footprint.vue b/pages_tool/member/footprint.vue index 27e7361..dc6f1c5 100644 --- a/pages_tool/member/footprint.vue +++ b/pages_tool/member/footprint.vue @@ -249,7 +249,7 @@ export default { diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue index 4b1ca5c..7087667 100644 --- a/pages_tool/member/point_detail.vue +++ b/pages_tool/member/point_detail.vue @@ -232,7 +232,7 @@ export default { diff --git a/pages_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue index bff69c4..5fe9db6 100644 --- a/pages_tool/order/refund_batch.vue +++ b/pages_tool/order/refund_batch.vue @@ -289,15 +289,15 @@ export default { @import './public/css/refund.scss'; \ No newline at end of file diff --git a/pages_tool/recharge/list.vue b/pages_tool/recharge/list.vue index 385c3db..1edd6c6 100644 --- a/pages_tool/recharge/list.vue +++ b/pages_tool/recharge/list.vue @@ -300,7 +300,7 @@ box-sizing: border-box; } - /deep/ .mescroll-uni-fixed { + ::v-deep .mescroll-uni-fixed { bottom: 280rpx !important; } .recharge-title{ diff --git a/store/index.js b/store/index.js index 4339ebd..f37eed9 100644 --- a/store/index.js +++ b/store/index.js @@ -412,7 +412,7 @@ const store = new Vuex.Store({ }, // 生成主题颜色CSS变量 themeColorSet() { - console.log('样式颜色设置...'); + // console.log('样式颜色设置...'); let theme = this.state.themeStyle; if (!theme?.main_color || !theme?.aux_color) return; try { @@ -436,7 +436,7 @@ const store = new Vuex.Store({ } catch (e) { console.error('设置主题颜色失败', e); } - console.log('themeColor => ', this.state.themeColor); + // console.log('themeColor => ', this.state.themeColor); } } }) diff --git a/uni.scss b/uni.scss index bd9cf10..d0bc610 100644 --- a/uni.scss +++ b/uni.scss @@ -1,32 +1,50 @@ -/** - * 你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能 - * 建议使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App - */ - -//主色调，红色：#FF0036，绿色 #4CAF50，蓝色：#03A9F4，黄色：#FF9800，粉色：#FF547B，棕色：#C3A769，浅绿色：#65C4AA，黑色：#333333，紫色：#B323B4，淡粉色：#FF8B8B - -// 颜色 -$color-title: #303133; // 主标题 -$color-sub: #606266; // 副标题 -$color-tip: #909399; // 辅助提示色 -$color-bg: #f8f8f8; // 背景色 -$color-line: #eeeeee; //分割线 -$color-disabled: #cccccc; // 禁用色 - -// 文字 -$font-size-base: 28rpx; // 14px，正文文字 -$font-size-toolbar: 32rpx; // 16px，用于导航栏、标题 -$font-size-sub: 26rpx; // 13px，副标题 -$font-size-tag: 24rpx; // 12px，辅助性文字/大标签 -$font-size-goods-tag: 22rpx; // 11px，商品列表角标 -$font-size-activity-tag: 20rpx; // 10px，活动角标（拼团等角标）/小标签文字 - -$margin-both: 30rpx; //外边距 左右 -$margin-updown: 20rpx; // 外边距 上下 -$border-radius: 10rpx; //圆角 -$padding: 20rpx; //内边距 - -$base-color: var(--base-color); // 主色调 -$base-help-color: var(--base-help-color); //辅助颜色 - -$goods-price-color: var(--goods-price-color); +/** + * 你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能 + * 建议使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App + */ + +//主色调，红色：#FF0036，绿色 #4CAF50，蓝色：#03A9F4，黄色：#FF9800，粉色：#FF547B，棕色：#C3A769，浅绿色：#65C4AA，黑色：#333333，紫色：#B323B4，淡粉色：#FF8B8B + +// 颜色 +$color-title: #303133; // 主标题 +$color-sub: #606266; // 副标题 +$color-tip: #909399; // 辅助提示色 +$color-bg: #f8f8f8; // 背景色 +$color-line: #eeeeee; //分割线 +$color-disabled: #cccccc; // 禁用色 + +// 文字 +$font-size-base: 28rpx; // 14px，正文文字 +$font-size-toolbar: 32rpx; // 16px，用于导航栏、标题 +$font-size-sub: 26rpx; // 13px，副标题 +$font-size-tag: 24rpx; // 12px，辅助性文字/大标签 +$font-size-goods-tag: 22rpx; // 11px，商品列表角标 +$font-size-activity-tag: 20rpx; // 10px，活动角标（拼团等角标）/小标签文字 + +$margin-both: 30rpx; //外边距 左右 +$margin-updown: 20rpx; // 外边距 上下 +$border-radius: 10rpx; //圆角 +$padding: 20rpx; //内边距 + +$base-color: var(--base-color); // 主色调 +$base-help-color: var(--base-help-color); //辅助颜色 + +$goods-price-color: var(--goods-price-color); + +// uni 兼容变量 +$uni-font-size-sm: $font-size-tag; // 12px，小字体 +$uni-font-size-base: $font-size-base; // 14px，正文文字 +$uni-font-size-lg: $font-size-toolbar; // 16px，大字体 +$uni-bg-color: $color-bg; // 背景色 +$uni-bg-color-mask: rgba(0, 0, 0, 0.4); // 遮罩背景色 +$uni-border-color: $color-line; // 边框色 +$uni-text-color: $color-title; // 主文字色 +$uni-text-color-grey: $color-tip; // 灰色文字 +$uni-text-color-placeholder: $color-disabled; // 占位文字色 +$uni-bg-color-hover: $color-line; // hover 背景色 +$uni-color-primary: $base-color; // 主色调 +$uni-color-error: #ff4d4f; // 错误色 +$uni-color-success: #52c41a; // 成功色 +$uni-color-warning: #faad14; // 警告色 +$uni-spacing-row-base: $margin-updown; // 行间距 +$uni-opacity-disabled: 0.6; // 禁用透明度 \ No newline at end of file