scottpan/huangjingfen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix uniapp v2 login and sass compatibility

Browse Source
This commit is contained in:
danaisuiyuan
2026-05-03 15:56:26 +08:00
parent 8472bb4639
commit 79436c011c
75 changed files with 188 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pro_v3.5.1/app/services/system/LocalCopyrightService.php
View File

@@ -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'] ?? '',

4
pro_v3.5.1/view/uniapp_v2/components/activityModal/index.vue
View File

@@ -91,13 +91,13 @@
<style lang="scss">
/* #ifdef H5 || APP-PLUS */
.activity-popup /deep/uni-swiper .uni-swiper-dot{
.activity-popup ::v-deep uni-swiper .uni-swiper-dot{
width: 14rpx;
height: 14rpx;
}
/* #endif */
/* #ifdef MP-WEIXIN */
.activity-popup /deep/.wx-swiper-dot~.wx-swiper-dot {
.activity-popup ::v-deep .wx-swiper-dot~.wx-swiper-dot {
width: 10rpx;
height: 10rpx;
}

2
pro_v3.5.1/view/uniapp_v2/components/splitOrder/index.vue
View File

@@ -128,7 +128,7 @@
</script>
<style lang="scss">
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid $primary-admin !important;
background-color: $primary-admin !important;
color: #fff !important;

21
pro_v3.5.1/view/uniapp_v2/libs/login.js
View File

@@ -28,6 +28,23 @@ import {
} from './../config/cache';
import Routine from '@/libs/routine';
function normalizeRoutineAuthTypes(config = {}) {
let types = config.routine_auth_type;
if (Array.isArray(types)) return types.map(item => Number(item));
if (typeof types === 'string') return types.split(',').map(item => Number(item));
return [];
}
function isRoutineWechatAuth(config = {}) {
const authTypes = normalizeRoutineAuthTypes(config);
return Number(config.wechat_auth_switch) === 1 || authTypes.includes(1);
}
function isRoutinePhoneAuth(config = {}) {
const authTypes = normalizeRoutineAuthTypes(config);
return Number(config.phone_auth_switch) === 1 || authTypes.includes(2);
}
function prePage() {
let pages = getCurrentPages();
let prePage = pages[pages.length - 1];
@@ -56,7 +73,7 @@ function _toLogin(push, pathLogin) {
if (!pathLogin)
pathLogin = '/page/users/login/index'
Cache.set('login_back_url', path);
const BASIC_CONFIG = uni.getStorageSync('BASIC_CONFIG');
const BASIC_CONFIG = uni.getStorageSync('BASIC_CONFIG') || {};
// #ifdef H5
if (isWeixin() && BASIC_CONFIG.wechat_status) {
uni.navigateTo({
@@ -72,7 +89,7 @@ function _toLogin(push, pathLogin) {
// #ifdef MP
let url
if (!BASIC_CONFIG.wechat_auth_switch) {
if (!isRoutineWechatAuth(BASIC_CONFIG) && isRoutinePhoneAuth(BASIC_CONFIG)) {
url = '/pages/users/binding_phone/index?pageType=0'
} else {
url = '/pages/users/wechat_login/index'

8
pro_v3.5.1/view/uniapp_v2/manifest.json
View File

@@ -1,7 +1,7 @@
{
"name" : "范氏国香",
"appid" : "__UNI__6691FE3",
"description" : "范氏国香商城",
"name" : "芍药居草本",
"appid" : "__UNI__518D050",
"description" : "芍药居草本商城",
"versionName" : "3.5.1",
"versionCode" : 351,
"transformPx" : false,
@@ -201,7 +201,7 @@
"optimization" : {
"subPackages" : true
},
"appid" : "wx269fc281236ef045"
"appid" : "wxaafcb57c19b75f4d"
},
"mp-alipay" : {
"usingComponents" : true

2
pro_v3.5.1/view/uniapp_v2/pages/activity/goods_bargain_details/index.vue
View File

@@ -1192,7 +1192,7 @@
background-size: 100% 100%;
width: 100%;
height: 116rpx;
/deep/.time{
::v-deep .time{
padding-top: 14px;
.styleAll{
background-color: #E93323;

2
pro_v3.5.1/view/uniapp_v2/pages/activity/goods_combination_status/index.vue
View File

@@ -1096,7 +1096,7 @@
color: #fc4141;
}
.group-con .wrapper .title .name /deep/.time .styleAll {
.group-con .wrapper .title .name ::v-deep .time .styleAll {
text-align: center;
border-radius: 8rpx;
font-size: 24rpx;

8
pro_v3.5.1/view/uniapp_v2/pages/activity/goods_details/index.vue
View File

@@ -1560,14 +1560,14 @@
</script>
<style lang="scss">
/deep/uni-video {
::v-deep uni-video {
width: 100% !important;
}
/deep/video {
::v-deep video {
width: 100% !important;
}
/deep/ .styleAll{
::v-deep .styleAll{
display: inline-block;
min-width: 34rpx;
height: 36rpx;
@@ -1578,7 +1578,7 @@
font-family:'Regular';
padding: 0 2rpx;
}
.seckill-card /deep/ .timeTxt{
.seckill-card ::v-deep .timeTxt{
padding: 0 6rpx;
}
.z-99{

2
pro_v3.5.1/view/uniapp_v2/pages/activity/goods_seckill/index.vue
View File

@@ -373,7 +373,7 @@
right: 30rpx;
}
.sel-last {
/deep/.uni-scroll-view{
::v-deep .uni-scroll-view{
margin-right: -10rpx;
}

2
pro_v3.5.1/view/uniapp_v2/pages/activity/new_customer/index.vue
View File

@@ -282,7 +282,7 @@
</script>
<style lang="scss">
/deep/ .navbar{
::v-deep .navbar{
z-index: 90;
}
.bg-top{

2
pro_v3.5.1/view/uniapp_v2/pages/activity/presell/index.vue
View File

@@ -251,7 +251,7 @@
font-size: 18rpx;
color: #e93323;
}
/deep/ .empty-box{
::v-deep .empty-box{
width: 100%;
height: 280px;
}

2
pro_v3.5.1/view/uniapp_v2/pages/admin/distribution/scanning/index.vue
View File

@@ -330,7 +330,7 @@
min-height: 0;
box-sizing: border-box;
/deep/.shoppingCart {
::v-deep .shoppingCart {
position: absolute;
top: 0;
right: 0;

6
pro_v3.5.1/view/uniapp_v2/pages/admin/goods/components/classify/index.vue
View File

@@ -162,15 +162,15 @@
</script>
<style lang="scss" scoped>
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid $primary-admin;
background-color: $primary-admin;
color: #fff;
}
/deep/checkbox{
::v-deep checkbox{
margin-right: 13rpx;
}
/deep/uni-checkbox .uni-checkbox-input{
::v-deep uni-checkbox .uni-checkbox-input{
border-radius: 4rpx;
width: 28rpx;
height: 28rpx;

10
pro_v3.5.1/view/uniapp_v2/pages/admin/goods/index.vue
View File

@@ -413,14 +413,14 @@
</script>
<style lang="scss" scoped>
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid $primary-admin !important;
background-color: $primary-admin !important;
}
/deep/uni-checkbox .uni-checkbox-input{
::v-deep uni-checkbox .uni-checkbox-input{
margin-top: -4rpx;
}
/deep/checkbox:not([disabled]) .uni-checkbox-input:hover {
::v-deep checkbox:not([disabled]) .uni-checkbox-input:hover {
border-color: #d1d1d1 !important;
}
.empty-box{
@@ -522,11 +522,11 @@
.list{
padding-bottom: 20rpx;
padding: 0 20rpx 20rpx 20rpx;
/deep/uni-checkbox .uni-checkbox-input{
::v-deep uni-checkbox .uni-checkbox-input{
background-color: #f5f5f5;
margin: 0 20rpx 20rpx 0;
}
/deep/wx-checkbox .wx-checkbox-input{
::v-deep wx-checkbox .wx-checkbox-input{
background-color: #f5f5f5;
margin: 0 20rpx 20rpx 0;
}

4
pro_v3.5.1/view/uniapp_v2/pages/admin/goods/specs.vue
View File

@@ -221,11 +221,11 @@ export default {
</script>
<style lang="scss" scoped>
/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked {
::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked {
border: 1px solid $primary-admin !important;
background-color: $primary-admin !important;
}
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid $primary-admin !important;
background-color: $primary-admin !important;
}

4
pro_v3.5.1/view/uniapp_v2/pages/admin/orderList/index.vue
View File

@@ -582,7 +582,7 @@
<style lang="scss" scoped>
.pos-order-list {
/deep/.navbar {
::v-deep .navbar {
.content {
background: #F5F5F5 !important;
}
@@ -685,7 +685,7 @@
border-radius: 24rpx;
background-color: #fff;
/deep/.time {
::v-deep .time {
.title {
color: #FF7E00;
}

2
pro_v3.5.1/view/uniapp_v2/pages/admin/user/components/editBalance/index.vue
View File

@@ -175,7 +175,7 @@ export default {
font-family: Regular;
color: #FF7E00;
}
/deep/.uni-input-input{
::v-deep .uni-input-input{
padding-right: 10rpx;
}
.placeholder{

2
pro_v3.5.1/view/uniapp_v2/pages/admin/user/components/member/index.vue
View File

@@ -165,7 +165,7 @@ export default {
font-family: Regular;
color: #FF7E00;
}
/deep/.uni-input-input{
::v-deep .uni-input-input{
padding-right: 10rpx;
}
.placeholder{

12
pro_v3.5.1/view/uniapp_v2/pages/admin/user/list.vue
View File

@@ -431,14 +431,14 @@
</script>
<style lang="scss" scoped>
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid $primary-admin !important;
background-color: $primary-admin !important;
}
/deep/checkbox:not([disabled]) .uni-checkbox-input:hover {
::v-deep checkbox:not([disabled]) .uni-checkbox-input:hover {
border-color: #d1d1d1 !important;
}
/deep/.empty-page{
::v-deep .empty-page{
margin-top: 20rpx;
}
.accountTitle{
@@ -507,10 +507,10 @@
.list{
padding-bottom: 20rpx;
margin-top: 32rpx;
/deep/uni-checkbox .uni-checkbox-input{
::v-deep uni-checkbox .uni-checkbox-input{
margin: 0 20rpx 20rpx 0;
}
/deep/wx-checkbox .wx-checkbox-input{
::v-deep wx-checkbox .wx-checkbox-input{
margin: 0 20rpx 20rpx 0;
}
.item {
@@ -643,7 +643,7 @@
width: 100%;
left: 0;
/deep/uni-checkbox .uni-checkbox-input{
::v-deep uni-checkbox .uni-checkbox-input{
margin-bottom: 6rpx;
}

2
pro_v3.5.1/view/uniapp_v2/pages/annex/offline_pay/index.vue
View File

@@ -350,7 +350,7 @@
</style>
<style lang="scss" scoped>
/deep/uni-radio .uni-radio-input.uni-radio-input-checked {
::v-deep uni-radio .uni-radio-input.uni-radio-input-checked {
border: 1px solid #FDC383 !important;
background-color: #FDC383 !important;
}

12
pro_v3.5.1/view/uniapp_v2/pages/annex/vip_grade_active/index.vue
View File

@@ -382,34 +382,34 @@
line-height: 40rpx;
color: #333333;
/deep/uni-radio {
::v-deep uni-radio {
vertical-align: middle;
margin-right: 14rpx;
}
/deep/uni-radio .uni-radio-input {
::v-deep uni-radio .uni-radio-input {
width: 28rpx;
height: 28rpx;
border: 1px solid #E6993A;
}
/deep/uni-radio .uni-radio-input.uni-radio-input-checked {
::v-deep uni-radio .uni-radio-input.uni-radio-input-checked {
border: 1px solid #E6993A !important;
background-color: #E6993A !important;
}
/deep/.wx-radio-input {
::v-deep .wx-radio-input {
width: 29rpx;
height: 29rpx;
border: 1px solid #CCCCCC;
}
/deep/.wx-radio-input.wx-radio-input-checked {
::v-deep .wx-radio-input.wx-radio-input-checked {
border: 1px solid #E6993A !important;
background-color: #E6993A !important;
}
/deep/uni-radio .uni-radio-input.uni-radio-input-checked:before {
::v-deep uni-radio .uni-radio-input.uni-radio-input-checked:before {
font-size: 15rpx;
}

2
pro_v3.5.1/view/uniapp_v2/pages/annex/vip_paid/index.vue
View File

@@ -974,7 +974,7 @@
}
}
.recommend /deep/ .fw-500 {
.recommend ::v-deep .fw-500 {
font-weight: bold;
}
.text-gold,.icon-a-ic_CompleteSelect{

2
pro_v3.5.1/view/uniapp_v2/pages/behalf/cashier/index.vue
View File

@@ -160,7 +160,7 @@
</script>
<style lang="scss">
/deep/ .styleAll{
::v-deep .styleAll{
padding: 0 6rpx;
border: 1rpx solid #DDDDDD;
border-radius: 8rpx;

2
pro_v3.5.1/view/uniapp_v2/pages/behalf/goods_list/template/template1.vue
View File

@@ -693,7 +693,7 @@
position: absolute;
top: -10rpx;
right: -20rpx;
/deep/ .uni-badge--error {
::v-deep .uni-badge--error {
background-color: $primary-admin !important;
}
}

2
pro_v3.5.1/view/uniapp_v2/pages/behalf/goods_list/template/template2.vue
View File

@@ -640,7 +640,7 @@
position: absolute;
top: -10rpx;
right: -20rpx;
/deep/ .uni-badge--error {
::v-deep .uni-badge--error {
background-color: $primary-admin !important;
}
.uni-badge {

10
pro_v3.5.1/view/uniapp_v2/pages/behalf/order_confirm/index.vue
View File

@@ -1142,17 +1142,17 @@ export default {
</script>
<style lang="scss" scoped>
/deep/.uni-date-x--border {
::v-deep .uni-date-x--border {
border: 0;
}
/deep/.uni-icons {
::v-deep .uni-icons {
font-size: 0 !important;
}
/deep/.uni-date-x {
::v-deep .uni-date-x {
color: #999;
font-size: 15px;
}
/deep/.uni-date__x-input {
::v-deep .uni-date__x-input {
font-size: 15px;
}
.height-add {
@@ -1160,7 +1160,7 @@ export default {
height: calc(176rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
}
/deep/uni-checkbox[disabled] .uni-checkbox-input {
::v-deep uni-checkbox[disabled] .uni-checkbox-input {
background-color: #eee;
}
.alipaysubmit {

4
pro_v3.5.1/view/uniapp_v2/pages/discover/discoverDetails/index.vue
View File

@@ -782,14 +782,14 @@ page{
}
}
// #ifdef APP-PLUS || H5
/deep/uni-swiper .uni-swiper-dots-horizontal .uni-swiper-dot{
::v-deep uni-swiper .uni-swiper-dots-horizontal .uni-swiper-dot{
width: 12rpx;
height: 12rpx;
border-radius: 50%;
}
// #endif
// #ifdef MP
swiper /deep/.wx-swiper-dot{
swiper ::v-deep .wx-swiper-dot{
width: 12rpx;
height: 12rpx;
border-radius: 50%;

4
pro_v3.5.1/view/uniapp_v2/pages/discoverIndex/index.vue
View File

@@ -897,14 +897,14 @@
color: #e93323;
}
// #ifdef APP-PLUS || H5
.pro-card /deep/uni-swiper .uni-swiper-dots-horizontal .uni-swiper-dot{
.pro-card ::v-deep uni-swiper .uni-swiper-dots-horizontal .uni-swiper-dot{
width: 12rpx;
height: 12rpx;
border-radius: 50%;
}
// #endif
// #ifdef MP
.pro-card swiper /deep/.wx-swiper-dot{
.pro-card swiper ::v-deep .wx-swiper-dot{
width: 12rpx;
height: 12rpx;
border-radius: 50%;

2
pro_v3.5.1/view/uniapp_v2/pages/extension/invite_friend/index.vue
View File

@@ -269,7 +269,7 @@
padding: 0 30rpx 30rpx 30rpx;
word-wrap: break-word;
text-align: justify;
/deep/p{
::v-deep p{
margin-bottom: 8rpx;
line-height: 60rpx;
}

12
pro_v3.5.1/view/uniapp_v2/pages/extension/news_list/index.vue
View File

@@ -212,30 +212,30 @@
}
}
// #ifdef APP-PLUS || H5
.newsList /deep/uni-swiper .uni-swiper-dots-horizontal{
.newsList ::v-deep uni-swiper .uni-swiper-dots-horizontal{
bottom: 50rpx;
}
.newsList /deep/uni-swiper .uni-swiper-dots-horizontal .uni-swiper-dot{
.newsList ::v-deep uni-swiper .uni-swiper-dots-horizontal .uni-swiper-dot{
width: 10rpx;
height: 10rpx;
border-radius: 50%;
}
.newsList /deep/uni-swiper .uni-swiper-dots-horizontal .uni-swiper-dot-active{
.newsList ::v-deep uni-swiper .uni-swiper-dots-horizontal .uni-swiper-dot-active{
width: 18rpx;
height: 10rpx;
border-radius: 6rpx;
background-color: #fff;
}
.newsList .swiper /deep/.uni-swiper-dot ~ .uni-swiper-dot {
.newsList .swiper ::v-deep .uni-swiper-dot ~ .uni-swiper-dot {
margin-left: 5rpx;
}
// #endif
// #ifdef MP
.newsList /deep/wx-swiper .wx-swiper-dots-horizontal{
.newsList ::v-deep wx-swiper .wx-swiper-dots-horizontal{
bottom: 50rpx;
}
.newsList .swiper /deep/.wx-swiper-dot~.wx-swiper-dot {
.newsList .swiper ::v-deep .wx-swiper-dot~.wx-swiper-dot {
width: 10rpx;
height: 10rpx;
border-radius: 50%;

2
pro_v3.5.1/view/uniapp_v2/pages/goods/cashier/index.vue
View File

@@ -449,7 +449,7 @@ export default {
</script>
<style lang="scss">
/deep/ .styleAll {
::v-deep .styleAll {
padding: 0 6rpx;
border: 1rpx solid #dddddd;
border-radius: 8rpx;

2
pro_v3.5.1/view/uniapp_v2/pages/goods/components/invoicePicker/index.vue
View File

@@ -111,7 +111,7 @@
</script>
<style lang="scss" scoped>
/deep/uni-radio .uni-radio-input {
::v-deep uni-radio .uni-radio-input {
margin-right: 0;
}

2
pro_v3.5.1/view/uniapp_v2/pages/goods/goods_list/index.vue
View File

@@ -751,7 +751,7 @@
position: absolute;
top: -10rpx;
right: -20rpx;
/deep/ .uni-badge--error {
::v-deep .uni-badge--error {
background-color: var(--view-theme) !important;
}
.uni-badge {

2
pro_v3.5.1/view/uniapp_v2/pages/goods/goods_return/index.vue
View File

@@ -517,7 +517,7 @@
align-self: flex-start;
}
.list /deep/ .uni-input-input {
.list ::v-deep .uni-input-input {
text-align: right;
color: var(--view-theme);
font-weight: 400;

4
pro_v3.5.1/view/uniapp_v2/pages/goods/goods_return_list/index.vue
View File

@@ -122,11 +122,11 @@
</script>
<style scoped lang="scss">
/deep/.splitOrder uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked{
::v-deep .splitOrder uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked{
border: 1px solid var(--view-theme)!important;
background-color: var(--view-theme)!important;
}
/deep/.splitOrder checkbox .wx-checkbox-input.wx-checkbox-input-checked{
::v-deep .splitOrder checkbox .wx-checkbox-input.wx-checkbox-input-checked{
border: 1px solid var(--view-theme)!important;
background-color: var(--view-theme)!important;
}

6
pro_v3.5.1/view/uniapp_v2/pages/goods/lottery/grids/index.vue
View File

@@ -355,7 +355,7 @@
</script>
<style lang="scss" scoped>
/deep/ .lucky-wheel .marquee-item {
::v-deep .lucky-wheel .marquee-item {
text-align: center;
font-size: 20rpx !important;
color: #E93323 !important;
@@ -366,7 +366,7 @@
}
}
/deep/ .lottery .marquee-item {
::v-deep .lottery .marquee-item {
letter-spacing: 2px;
}
@@ -384,7 +384,7 @@
width: 100%;
}
/deep/ .safe-area-inset-bottom {
::v-deep .safe-area-inset-bottom {
height: 0;
height: constant(safe-area-inset-bottom);
height: env(safe-area-inset-bottom);

2
pro_v3.5.1/view/uniapp_v2/pages/goods/lottery/wheel/index.vue
View File

@@ -278,7 +278,7 @@
background: linear-gradient(270deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.85) 49%, rgba(255, 255, 255, 0) 100%);
}
/deep/.marquee-item {
::v-deep .marquee-item {
font-size: 20rpx;
color: #E93323;

14
pro_v3.5.1/view/uniapp_v2/pages/goods/order_confirm/index.vue
View File

@@ -1849,17 +1849,17 @@ export default {
</script>
<style lang="scss" scoped>
/deep/.uni-date-x--border {
::v-deep .uni-date-x--border {
border: 0;
}
/deep/.uni-icons {
::v-deep .uni-icons {
font-size: 0 !important;
}
/deep/.uni-date-x {
::v-deep .uni-date-x {
color: #999;
font-size: 15px;
}
/deep/.uni-date__x-input {
::v-deep .uni-date__x-input {
font-size: 15px;
}
.height-add {
@@ -1867,10 +1867,10 @@ export default {
height: calc(176rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
}
/deep/uni-checkbox[disabled] .uni-checkbox-input {
::v-deep uni-checkbox[disabled] .uni-checkbox-input {
background-color: #eee;
}
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
color: #fff !important;
@@ -1916,7 +1916,7 @@ export default {
height: 100%;
display: block;
}
.order-submission /deep/ .gift-message-card {
.order-submission ::v-deep .gift-message-card {
margin: 20rpx 20rpx 0 20rpx;
}
.address {

2
pro_v3.5.1/view/uniapp_v2/pages/goods/order_list/index.vue
View File

@@ -547,7 +547,7 @@ export default {
position: absolute;
top: -16rpx;
right: -30rpx;
/deep/ .uni-badge--error {
::v-deep .uni-badge--error {
background-color: var(--view-theme) !important;
}
.uni-badge {

2
pro_v3.5.1/view/uniapp_v2/pages/goods/order_refund_goods/index.vue
View File

@@ -476,7 +476,7 @@
align-self: flex-start;
}
.list /deep/ .uni-input-input {
.list ::v-deep .uni-input-input {
text-align: right;
}
</style>

2
pro_v3.5.1/view/uniapp_v2/pages/goods_cate/template/template1.vue
View File

@@ -332,7 +332,7 @@ page {
}
</style>
<style scoped lang="scss">
/deep/uni-scroll-view{
::v-deep uni-scroll-view{
padding-bottom: 0!important;
}
.height-add {

2
pro_v3.5.1/view/uniapp_v2/pages/goods_cate/template/template2.vue
View File

@@ -884,7 +884,7 @@
position: absolute;
top: -10rpx;
right: -20rpx;
/deep/ .uni-badge--error {
::v-deep .uni-badge--error {
background-color: var(--view-theme) !important;
}
.uni-badge {

2
pro_v3.5.1/view/uniapp_v2/pages/goods_cate/template/template3.vue
View File

@@ -821,7 +821,7 @@
position: absolute;
top: -10rpx;
right: -20rpx;
/deep/ .uni-badge--error {
::v-deep .uni-badge--error {
background-color: var(--view-theme) !important;
}
.uni-badge {

8
pro_v3.5.1/view/uniapp_v2/pages/goods_details/index.vue
View File

@@ -2058,21 +2058,21 @@ export default {
</script>
<style lang="scss">
.popup-content /deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked {
.popup-content ::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
color: #fff !important;
}
.popup-content /deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
.popup-content ::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
color: #fff !important;
}
.popup-content /deep/ radio .uni-radio-input.uni-radio-input-checked {
.popup-content ::v-deep radio .uni-radio-input.uni-radio-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
}
.popup-content /deep/ radio .wx-radio-input.wx-radio-input-checked {
.popup-content ::v-deep radio .wx-radio-input.wx-radio-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
}

6
pro_v3.5.1/view/uniapp_v2/pages/index/components/homeComb.vue
View File

@@ -828,15 +828,15 @@
}
}
/deep/.dot0 .uni-swiper-dots-horizontal {
::v-deep .dot0 .uni-swiper-dots-horizontal {
left: 10%;
}
/deep/.dot1 .uni-swiper-dots-horizontal {
::v-deep .dot1 .uni-swiper-dots-horizontal {
left: 50%;
}
/deep/.dot2 .uni-swiper-dots-horizontal {
::v-deep .dot2 .uni-swiper-dots-horizontal {
left: 90%;
}
</style>

4
pro_v3.5.1/view/uniapp_v2/pages/index/components/richText.vue
View File

@@ -92,11 +92,11 @@
}
}
/deep/uni-video {
::v-deep uni-video {
width: 100% !important;
}
/deep/video {
::v-deep video {
width: 100% !important;
}
</style>

8
pro_v3.5.1/view/uniapp_v2/pages/index/components/swiperBg.vue
View File

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

8
pro_v3.5.1/view/uniapp_v2/pages/index/components/swipers.vue
View File

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

2
pro_v3.5.1/view/uniapp_v2/pages/merchant/cart/index.vue
View File

@@ -1242,7 +1242,7 @@
}
</script>
<style scoped lang="scss">
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid #2D8CF0 !important;
background-color: #2D8CF0 !important;
color: #fff !important;

2
pro_v3.5.1/view/uniapp_v2/pages/merchant/goodsDetails/index.vue
View File

@@ -1610,7 +1610,7 @@
display: block;
overflow: auto;
}
/deep/.brand-tag{
::v-deep .brand-tag{
background-color: $primary-merchant;
}
</style>

2
pro_v3.5.1/view/uniapp_v2/pages/merchant/index/index.vue
View File

@@ -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;
}
</style>

2
pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template2.vue
View File

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

4
pro_v3.5.1/view/uniapp_v2/pages/merchant/index/template/template3.vue
View File

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

2
pro_v3.5.1/view/uniapp_v2/pages/merchant/user/index.vue
View File

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

2
pro_v3.5.1/view/uniapp_v2/pages/order_addcart/order_addcart.vue
View File

@@ -1320,7 +1320,7 @@
}
</script>
<style scoped lang="scss">
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
color: #fff !important;

4
pro_v3.5.1/view/uniapp_v2/pages/user/components/member/index.vue
View File

@@ -113,7 +113,7 @@ export default {
</template>
<style lang="scss">
/deep/ .bind-phone {
::v-deep .bind-phone {
margin-top: 12rpx;
background: rgba(255, 255, 255, 0.3);
border-radius: 30px;
@@ -125,7 +125,7 @@ export default {
line-height: 28rpx;
padding: 6rpx 16rpx;
}
/deep/ .tips::before {
::v-deep .tips::before {
content: '';
position: absolute;
bottom: -6rpx;

6
pro_v3.5.1/view/uniapp_v2/pages/user/components/order/index.vue
View File

@@ -53,14 +53,14 @@ export default {
</template>
<style lang="scss" scoped>
// /deep/ .section-content .uni-badge-left-margin {
// ::v-deep .section-content .uni-badge-left-margin {
// position: absolute;
// top: 0rpx;
// right: 44rpx;
// /deep/.uni-badge--error {
// ::v-deep .uni-badge--error {
// background-color: #fff !important;
// }
// /deep/.uni-badge {
// ::v-deep .uni-badge {
// color: var(--view-theme);
// border: 1px solid var(--view-theme);
// z-index: 29;

2
pro_v3.5.1/view/uniapp_v2/pages/user/components/order/template1.vue
View File

@@ -87,7 +87,7 @@ export default {
position: absolute;
top: -20rpx;
right: 26rpx;
/deep/ .uni-badge--error {
::v-deep .uni-badge--error {
background-color: var(--view-theme) !important;
}
.uni-badge {

2
pro_v3.5.1/view/uniapp_v2/pages/user/components/order/template2.vue
View File

@@ -77,7 +77,7 @@ export default {
.uni-badge--error {
background-color: #fff !important;
}
/deep/ .uni-badge--error {
::v-deep .uni-badge--error {
background-color: var(--view-theme) !important;
}
.uni-badge {

4
pro_v3.5.1/view/uniapp_v2/pages/users/agent/staff_list.vue
View File

@@ -505,8 +505,8 @@
margin: 0rpx 20rpx 0rpx 20rpx;
text-align: center;
}
/deep/ .uni-input-placeholder,
/deep/ .uni-input-input{
::v-deep .uni-input-placeholder,
::v-deep .uni-input-input{
color: #bbb;
text-align: center;
}

2
pro_v3.5.1/view/uniapp_v2/pages/users/binding_phone/index.vue
View File

@@ -365,7 +365,7 @@
</script>
<style lang="scss" scoped>
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
width: 28rpx;

2
pro_v3.5.1/view/uniapp_v2/pages/users/login/index.vue
View File

@@ -640,7 +640,7 @@
</script>
<style lang="scss" scoped>
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
width: 28rpx;

2
pro_v3.5.1/view/uniapp_v2/pages/users/user_cancellation/index.vue
View File

@@ -96,7 +96,7 @@ export default {
</script>
<style lang="scss" scoped>
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
width: 28rpx;

4
pro_v3.5.1/view/uniapp_v2/pages/users/user_goods_collection/index.vue
View File

@@ -325,7 +325,7 @@
</script>
<style lang="scss">
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
color: #fff !important;
@@ -380,7 +380,7 @@
margin-right: 20rpx;
}
/deep/checkbox .uni-checkbox-input {
::v-deep checkbox .uni-checkbox-input {
margin-right: 0;
}

4
pro_v3.5.1/view/uniapp_v2/pages/users/user_info/index.vue
View File

@@ -610,7 +610,7 @@
// radio-group{
// display: flex;
// }
/deep/ uni-radio-input{
::v-deep uni-radio-input{
margin-right: 12rpx;
.uni-radio-input.uni-radio-input-checked:before {
font-size: 26rpx;
@@ -646,7 +646,7 @@
input{
text-align: right;
}
/deep/.uni-input-input{
::v-deep .uni-input-input{
font-size: 30rpx;
}
.picker{

2
pro_v3.5.1/view/uniapp_v2/pages/users/user_invoice_form/index.vue
View File

@@ -457,7 +457,7 @@
}
}
/deep/.disabled .uni-radio-input {
::v-deep .disabled .uni-radio-input {
background-color: #F8F8F8;
}

2
pro_v3.5.1/view/uniapp_v2/pages/users/user_money/index.vue
View File

@@ -280,7 +280,7 @@
</script>
<style scoped lang="scss">
/deep/.recommend{
::v-deep .recommend{
padding: 40rpx 20rpx 0 20rpx;
}
.my-account{

2
pro_v3.5.1/view/uniapp_v2/pages/users/user_set/index.vue
View File

@@ -220,7 +220,7 @@ export default {
}
}
/deep/.uni-switch-input {
::v-deep .uni-switch-input {
width: 84rpx;
height: 48rpx;
margin: -8rpx 0;

4
pro_v3.5.1/view/uniapp_v2/pages/users/user_spread_code/index.vue
View File

@@ -497,12 +497,12 @@
border-radius: 15rpx;
}
.distribution-posters /deep/.active {
.distribution-posters ::v-deep .active {
transform: none;
transition: all 0.2s ease-in 0s;
}
.distribution-posters /deep/ .quiet {
.distribution-posters ::v-deep .quiet {
transform: scale(0.89);
transition: all 0.2s ease-in 0s;
}

2
pro_v3.5.1/view/uniapp_v2/pages/users/user_spread_user/components/task.vue
View File

@@ -114,7 +114,7 @@
</script>
<style lang="scss" scoped>
/deep/uni-radio .uni-radio-input {
::v-deep uni-radio .uni-radio-input {
margin-right: 0;
}

2
pro_v3.5.1/view/uniapp_v2/pages/users/visit_list/index.vue
View File

@@ -384,7 +384,7 @@
}
</script>
<style lang="scss">
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
color: #fff !important;

28
pro_v3.5.1/view/uniapp_v2/pages/users/wechat_login/index.vue
View File

@@ -27,7 +27,7 @@
<button hover-class="none" @tap="wechatLogin" class="bg-color btn1">授权登录</button>
<!-- #endif -->
<!-- #ifdef MP -->
<template v-if="configData.wechat_auth_switch">
<template v-if="isWechatAuth">
<button hover-class="none" v-if="bindPhone" open-type="getPhoneNumber" @getphonenumber="getphonenumber"
class="bg-color btn1">授权登录</button>
<button hover-class="none" v-else-if="!bindPhone" @tap="getAuthLogin"
@@ -39,7 +39,7 @@
<button v-else hover-class="none" open-type="getUserInfo" @getuserinfo="setUserInfo"
class="bg-color btn1">授权登录</button>
</template>
<button v-if="configData.phone_auth_switch" hover-class="none" @tap="phoneLogin" class="btn2">手机号登录</button>
<button v-if="isPhoneAuth" hover-class="none" @tap="phoneLogin" class="btn2">手机号登录</button>
<button hover-class="none" @tap="cancelLogin" class="btn3">取消登录</button>
<!-- #endif -->
</view>
@@ -117,7 +117,7 @@
canUseGetUserProfile: false,
canGetPrivacySetting: false,
mp_is_new: this.$Cache.get('MP_VERSION_ISNEW') || false,
configData: this.$Cache.get('BASIC_CONFIG'),
configData: this.$Cache.get('BASIC_CONFIG') || {},
imgHost: HTTP_REQUEST_URL,
loginBg:'',
protocol: false,
@@ -129,6 +129,26 @@
editUserModal,
privacyAgreementPopup
},
computed: {
routineAuthTypes() {
const types = this.configData.routine_auth_type;
if (Array.isArray(types)) return types.map(item => Number(item));
if (typeof types === 'string') return types.split(',').map(item => Number(item));
return [];
},
hasAuthConfig() {
return this.routineAuthTypes.length > 0 ||
this.configData.wechat_auth_switch !== undefined ||
this.configData.phone_auth_switch !== undefined;
},
isWechatAuth() {
if (!this.hasAuthConfig) return true;
return Number(this.configData.wechat_auth_switch) === 1 || this.routineAuthTypes.includes(1);
},
isPhoneAuth() {
return Number(this.configData.phone_auth_switch) === 1 || this.routineAuthTypes.includes(2);
}
},
onLoad(options) {
if (uni.getUserProfile) {
this.canUseGetUserProfile = true
@@ -556,7 +576,7 @@
page {
background: #fff;
}
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid var(--view-theme) !important;
background-color: var(--view-theme) !important;
width: 28rpx;

7
pro_v3.5.1/view/uniapp_v2/uni.scss
View File

@@ -90,3 +90,10 @@ $uni-color-subtitle: #555555; // 二级标题颜色
$uni-font-size-subtitle:36upx;
$uni-color-paragraph: #3F536E; // 文章段落颜色
$uni-font-size-paragraph:30upx;
/* 文字基本颜色 */
$uni-text-color: #333333; // 基本色
$uni-text-color-inverse: #ffffff; // 反色
$uni-text-color-grey: #999999; // 辅助灰色
$uni-text-color-placeholder: #808080;
$uni-text-color-disable: #c0c0c0;