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 @@
}