jufubao-mall 2.0.20-beta11 → 2.0.20-beta13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
<view
|
|
53
53
|
:style="[sub.category_id === (['child','parentNew'].includes(showType)? uiPid:uiCateId )?subActTitleIcon:subTitleIcon,subTitleInIcon]"
|
|
54
54
|
class="sub_icon"
|
|
55
|
+
:class="{parentNew: showType === 'parentNew'}"
|
|
55
56
|
>
|
|
56
57
|
<view>
|
|
57
58
|
<image :src="sub.category_icon" style="width:100%;height:100%"/>
|
|
@@ -541,11 +542,13 @@ export default {
|
|
|
541
542
|
& > view {
|
|
542
543
|
width: 100%;
|
|
543
544
|
height: 100%;
|
|
544
|
-
border: 2rpx solid #fff;
|
|
545
545
|
border-radius: var(--sub-icon-w-radius);
|
|
546
546
|
overflow: hidden;
|
|
547
547
|
box-sizing: border-box;
|
|
548
548
|
}
|
|
549
|
+
&.parentNew > view {
|
|
550
|
+
border: 2rpx solid #fff;
|
|
551
|
+
}
|
|
549
552
|
}
|
|
550
553
|
|
|
551
554
|
.sub_name {
|
|
@@ -65,8 +65,12 @@ export default {
|
|
|
65
65
|
},
|
|
66
66
|
|
|
67
67
|
borderComp(){
|
|
68
|
+
let border = 0;
|
|
69
|
+
if(typeof this.tabStyle['subTitleIconBorder'] === 'string' && this.tabStyle['subTitleIconBorder']) {
|
|
70
|
+
border = (parseInt(this.tabStyle['subTitleIconBorder'].split(' ')[0]) * this.$rpxNum) + 'px'
|
|
71
|
+
}
|
|
68
72
|
return {
|
|
69
|
-
'--sub-icon-border' :
|
|
73
|
+
'--sub-icon-border' : border,
|
|
70
74
|
'--sub-icon-w-radius': parseInt(this.tabStyle['subTitleRadius']) * this.$rpxNum + 'px',
|
|
71
75
|
'--sub-icon-right-sp': (this.tabStyle['iconImageSp'] || 16) * this.$rpxNum + 'px',
|
|
72
76
|
backgroundColor: this.titleBgcColor,
|
|
@@ -76,15 +80,17 @@ export default {
|
|
|
76
80
|
subTitleIcon(){
|
|
77
81
|
let style = { borderRadius: this.tabStyle['subTitleRadius']}
|
|
78
82
|
if(this.showType === 'parentNew') {
|
|
79
|
-
let
|
|
80
|
-
|
|
83
|
+
let border = 0;
|
|
84
|
+
if(typeof this.tabStyle['subTitleIconBorder'] === 'string' && this.tabStyle['subTitleIconBorder']) {
|
|
85
|
+
border = this.tabStyle['subTitleIconBorder'].split(' ')[0];
|
|
86
|
+
}
|
|
87
|
+
style['border'] = `${border} solid rgba(255,255,255,0.01)`;
|
|
81
88
|
}
|
|
82
89
|
return style
|
|
83
90
|
},
|
|
84
91
|
subActTitleIcon(){
|
|
85
92
|
let style = { borderRadius: this.tabStyle['subTitleRadius']}
|
|
86
93
|
if(this.showType === 'parentNew') {
|
|
87
|
-
let num = this.tabStyle['subTitleIconBorder'].split(' ')[0];
|
|
88
94
|
style['border'] = this.tabStyle['subTitleIconBorder'];
|
|
89
95
|
}
|
|
90
96
|
return style
|