jufubao-mall 2.0.20-beta12 → 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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbMallProductList/cateMixins.js +10 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-mall",
3
- "version": "2.0.20-beta12",
3
+ "version": "2.0.20-beta13",
4
4
  "private": false,
5
5
  "description": "聚福宝商城业务组件插件包",
6
6
  "main": "index.js",
package/src/components/JfbMallProductList/cateMixins.js CHANGED
@@ -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' : (parseInt(this.tabStyle['subTitleIconBorder'].split(' ')[0]) * this.$rpxNum) + 'px',
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 num = this.tabStyle['subTitleIconBorder'].split(' ')[0];
80
- style['border'] = `${num} solid rgba(255,255,255,0.01)`;
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