From 79436c011c1b67339befa9523cab2cba9f28bdef Mon Sep 17 00:00:00 2001 From: danaisuiyuan Date: Sun, 3 May 2026 15:56:26 +0800 Subject: [PATCH] Fix uniapp v2 login and sass compatibility --- .../services/system/LocalCopyrightService.php | 5 +--- .../components/activityModal/index.vue | 4 +-- .../uniapp_v2/components/splitOrder/index.vue | 2 +- pro_v3.5.1/view/uniapp_v2/libs/login.js | 23 +++++++++++++-- pro_v3.5.1/view/uniapp_v2/manifest.json | 8 +++--- .../activity/goods_bargain_details/index.vue | 2 +- .../goods_combination_status/index.vue | 2 +- .../pages/activity/goods_details/index.vue | 8 +++--- .../pages/activity/goods_seckill/index.vue | 2 +- .../pages/activity/new_customer/index.vue | 2 +- .../pages/activity/presell/index.vue | 2 +- .../admin/distribution/scanning/index.vue | 2 +- .../admin/goods/components/classify/index.vue | 6 ++-- .../uniapp_v2/pages/admin/goods/index.vue | 10 +++---- .../uniapp_v2/pages/admin/goods/specs.vue | 4 +-- .../pages/admin/orderDetail/index.vue | 2 +- .../uniapp_v2/pages/admin/orderList/index.vue | 4 +-- .../user/components/editBalance/index.vue | 2 +- .../admin/user/components/member/index.vue | 2 +- .../view/uniapp_v2/pages/admin/user/list.vue | 12 ++++---- .../pages/annex/offline_pay/index.vue | 2 +- .../pages/annex/vip_grade_active/index.vue | 12 ++++---- .../uniapp_v2/pages/annex/vip_paid/index.vue | 2 +- .../uniapp_v2/pages/behalf/cashier/index.vue | 2 +- .../behalf/goods_list/template/template1.vue | 2 +- .../behalf/goods_list/template/template2.vue | 2 +- .../pages/behalf/order_confirm/index.vue | 10 +++---- .../pages/discover/discoverDetails/index.vue | 4 +-- .../uniapp_v2/pages/discoverIndex/index.vue | 4 +-- .../pages/extension/invite_friend/index.vue | 2 +- .../pages/extension/news_list/index.vue | 12 ++++---- .../uniapp_v2/pages/goods/cashier/index.vue | 2 +- .../goods/components/invoicePicker/index.vue | 2 +- .../pages/goods/goods_list/index.vue | 2 +- .../pages/goods/goods_return/index.vue | 2 +- .../pages/goods/goods_return_list/index.vue | 4 +-- .../pages/goods/lottery/grids/index.vue | 6 ++-- .../pages/goods/lottery/wheel/index.vue | 2 +- .../pages/goods/order_confirm/index.vue | 14 +++++----- .../pages/goods/order_list/index.vue | 2 +- .../pages/goods/order_refund_goods/index.vue | 2 +- .../pages/goods_cate/template/template1.vue | 2 +- .../pages/goods_cate/template/template2.vue | 2 +- .../pages/goods_cate/template/template3.vue | 2 +- .../uniapp_v2/pages/goods_details/index.vue | 8 +++--- .../pages/index/components/homeComb.vue | 6 ++-- .../pages/index/components/richText.vue | 4 +-- .../pages/index/components/swiperBg.vue | 8 +++--- .../pages/index/components/swipers.vue | 8 +++--- .../uniapp_v2/pages/merchant/cart/index.vue | 2 +- .../pages/merchant/goodsDetails/index.vue | 2 +- .../uniapp_v2/pages/merchant/index/index.vue | 2 +- .../merchant/index/template/template2.vue | 2 +- .../merchant/index/template/template3.vue | 4 +-- .../uniapp_v2/pages/merchant/user/index.vue | 2 +- .../pages/order_addcart/order_addcart.vue | 2 +- .../pages/user/components/member/index.vue | 4 +-- .../pages/user/components/order/index.vue | 6 ++-- .../pages/user/components/order/template1.vue | 2 +- .../pages/user/components/order/template2.vue | 2 +- .../view/uniapp_v2/pages/user/index.vue | 2 +- .../pages/users/agent/staff_list.vue | 4 +-- .../pages/users/binding_phone/index.vue | 2 +- .../uniapp_v2/pages/users/login/index.vue | 2 +- .../pages/users/user_cancellation/index.vue | 2 +- .../users/user_goods_collection/index.vue | 4 +-- .../uniapp_v2/pages/users/user_info/index.vue | 4 +-- .../pages/users/user_invoice_form/index.vue | 2 +- .../pages/users/user_money/index.vue | 2 +- .../uniapp_v2/pages/users/user_set/index.vue | 2 +- .../pages/users/user_spread_code/index.vue | 4 +-- .../user_spread_user/components/task.vue | 2 +- .../pages/users/visit_list/index.vue | 2 +- .../pages/users/wechat_login/index.vue | 28 ++++++++++++++++--- pro_v3.5.1/view/uniapp_v2/uni.scss | 7 +++++ 75 files changed, 188 insertions(+), 147 deletions(-) diff --git a/pro_v3.5.1/app/services/system/LocalCopyrightService.php b/pro_v3.5.1/app/services/system/LocalCopyrightService.php index 3127db06..254e5502 100644 --- a/pro_v3.5.1/app/services/system/LocalCopyrightService.php +++ b/pro_v3.5.1/app/services/system/LocalCopyrightService.php @@ -15,10 +15,7 @@ class LocalCopyrightService { public function getCopyright(): array { - $config = SystemConfigService::more([ - ['copyright', ''], - ['copyright_img', ''], - ]); + $config = SystemConfigService::more(['copyright', 'copyright_img']); return [ 'copyrightContext' => $config['copyright'] ?? '', diff --git a/pro_v3.5.1/view/uniapp_v2/components/activityModal/index.vue b/pro_v3.5.1/view/uniapp_v2/components/activityModal/index.vue index 52e203e5..82a877f2 100644 --- a/pro_v3.5.1/view/uniapp_v2/components/activityModal/index.vue +++ b/pro_v3.5.1/view/uniapp_v2/components/activityModal/index.vue @@ -91,13 +91,13 @@ diff --git a/pro_v3.5.1/view/uniapp_v2/pages/goods_cate/template/template1.vue b/pro_v3.5.1/view/uniapp_v2/pages/goods_cate/template/template1.vue index e7bf987a..64b58771 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/goods_cate/template/template1.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/goods_cate/template/template1.vue @@ -332,7 +332,7 @@ page { } \ No newline at end of file diff --git a/pro_v3.5.1/view/uniapp_v2/pages/index/components/richText.vue b/pro_v3.5.1/view/uniapp_v2/pages/index/components/richText.vue index 688e5946..cea4b911 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/index/components/richText.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/index/components/richText.vue @@ -92,11 +92,11 @@ } } - /deep/uni-video { + ::v-deep uni-video { width: 100% !important; } - /deep/video { + ::v-deep video { width: 100% !important; } \ No newline at end of file diff --git a/pro_v3.5.1/view/uniapp_v2/pages/index/components/swiperBg.vue b/pro_v3.5.1/view/uniapp_v2/pages/index/components/swiperBg.vue index 05121233..ff0217f4 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/index/components/swiperBg.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/index/components/swiperBg.vue @@ -277,27 +277,27 @@ // 圆形指示点 &.circular { - /deep/.uni-swiper-dot { + ::v-deep .uni-swiper-dot { width: 10rpx !important; height: 10rpx !important; background: rgba(0, 0, 0, .4) !important } - /deep/.uni-swiper-dot-active { + ::v-deep .uni-swiper-dot-active { background: #fff !important } } // 方形指示点 &.square { - /deep/.uni-swiper-dot { + ::v-deep .uni-swiper-dot { width: 20rpx !important; height: 5rpx !important; border-radius: 3rpx; background: rgba(0, 0, 0, .4) !important } - /deep/.uni-swiper-dot-active { + ::v-deep .uni-swiper-dot-active { background: #fff !important } } diff --git a/pro_v3.5.1/view/uniapp_v2/pages/index/components/swipers.vue b/pro_v3.5.1/view/uniapp_v2/pages/index/components/swipers.vue index 68ac3369..face34d3 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/index/components/swipers.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/index/components/swipers.vue @@ -125,24 +125,24 @@ } // 圆形指示点 &.circular{ - /deep/.uni-swiper-dot{ + ::v-deep .uni-swiper-dot{ width: 10rpx!important; height: 10rpx!important; background: rgba(0,0,0,.4)!important } - /deep/.uni-swiper-dot-active{ + ::v-deep .uni-swiper-dot-active{ background: #fff!important } } // 方形指示点 &.square{ - /deep/.uni-swiper-dot{ + ::v-deep .uni-swiper-dot{ width: 20rpx!important; height: 5rpx!important; border-radius: 3rpx; background: rgba(0,0,0,.4)!important } - /deep/.uni-swiper-dot-active{ + ::v-deep .uni-swiper-dot-active{ background: #fff!important } } diff --git a/pro_v3.5.1/view/uniapp_v2/pages/merchant/cart/index.vue b/pro_v3.5.1/view/uniapp_v2/pages/merchant/cart/index.vue index de72954a..a1d48643 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/merchant/cart/index.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/merchant/cart/index.vue @@ -1242,7 +1242,7 @@ } diff --git a/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/index.vue b/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/index.vue index 272e1eac..ed7ca9c0 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/index.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/index.vue @@ -740,7 +740,7 @@ .pb-box{ padding-bottom: calc(20rpx + env(safe-area-inset-bottom)); } - /deep/.brand-tag{ + ::v-deep .brand-tag{ background-color: $primary-merchant; } diff --git a/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template2.vue b/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template2.vue index 0386b43d..5c8c5bca 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template2.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template2.vue @@ -861,7 +861,7 @@ background: $light-primary-merchant; border-color: $primary-merchant; } - /deep/.brand-tag{ + ::v-deep .brand-tag{ background-color: $primary-merchant; } .pb-box{ diff --git a/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template3.vue b/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template3.vue index c2e0803f..48d4dfab 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template3.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template3.vue @@ -773,7 +773,7 @@ position: absolute; top: -10rpx; right: -20rpx; - /deep/ .uni-badge--error { + ::v-deep .uni-badge--error { background-color: $primary-merchant !important; } .uni-badge { @@ -791,7 +791,7 @@ .disabled-btn{ color: #DEDEDE; } - /deep/.brand-tag{ + ::v-deep .brand-tag{ background-color: $primary-merchant; } .pb-box{ diff --git a/pro_v3.5.1/view/uniapp_v2/pages/merchant/user/index.vue b/pro_v3.5.1/view/uniapp_v2/pages/merchant/user/index.vue index 6e978dd2..2ab72410 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/merchant/user/index.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/merchant/user/index.vue @@ -339,7 +339,7 @@ position: absolute; top: -20rpx; right: 26rpx; - /deep/ .uni-badge--error { + ::v-deep .uni-badge--error { background-color: $primary-merchant !important; } .uni-badge { diff --git a/pro_v3.5.1/view/uniapp_v2/pages/order_addcart/order_addcart.vue b/pro_v3.5.1/view/uniapp_v2/pages/order_addcart/order_addcart.vue index cf732bc0..c1444c7e 100644 --- a/pro_v3.5.1/view/uniapp_v2/pages/order_addcart/order_addcart.vue +++ b/pro_v3.5.1/view/uniapp_v2/pages/order_addcart/order_addcart.vue @@ -1320,7 +1320,7 @@ }