Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
程默
mayi-mp-shop
Commits
dfe6e753
Commit
dfe6e753
authored
May 23, 2023
by
李嘉林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
横向标签
parent
ac05b28c
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
84 additions
and
16 deletions
+84
-16
build/webpack.dev.conf.js
+10
-10
src/App.vue
+2
-2
src/components/basicTool/transverse-label/index.vue
+63
-1
static/nativeComponents/TimeLimitedDiscount/index.wxss
+1
-1
static/vant/tabs/index.js
+1
-0
static/vant/tabs/index.wxml
+7
-2
No files found.
build/webpack.dev.conf.js
View file @
dfe6e753
...
@@ -82,15 +82,15 @@ module.exports = merge(baseWebpackConfig, {
...
@@ -82,15 +82,15 @@ module.exports = merge(baseWebpackConfig, {
// inject: true
// inject: true
// }),
// }),
new
FriendlyErrorsPlugin
(),
new
FriendlyErrorsPlugin
(),
//
new UglifyJsPlugin({
new
UglifyJsPlugin
({
//
sourceMap: true,
sourceMap
:
true
,
//
uglifyOptions: {
uglifyOptions
:
{
//
compress: {
compress
:
{
//
warnings: false,
warnings
:
false
,
//
drop_console: true,
drop_console
:
true
,
//
pure_funcs: ['console.log']
pure_funcs
:
[
'console.log'
]
//
}
}
//
}
}
//
})
})
]
]
})
})
src/App.vue
View file @
dfe6e753
...
@@ -15,8 +15,8 @@ export default {
...
@@ -15,8 +15,8 @@ export default {
console
.
log
(
extConfig
,
"-----------extConfig"
);
console
.
log
(
extConfig
,
"-----------extConfig"
);
if
(
JSON
.
stringify
(
extConfig
)
==
"{}"
)
{
if
(
JSON
.
stringify
(
extConfig
)
==
"{}"
)
{
let
shopItem
=
{
let
shopItem
=
{
development
:
{
mixid
:
"ssa"
,
"shopid"
:
2342
},
//五粮液uat
//
development: { mixid: "ssa", "shopid": 2342}, //五粮液uat
//
development: { mixid: "antgood", "shopid": 67},
development
:
{
mixid
:
"antgood"
,
"shopid"
:
67
},
// production: { "mixid":"qiyeCT", "shopid": 1045 }, // 道可
// production: { "mixid":"qiyeCT", "shopid": 1045 }, // 道可
// production: { "mixid":"metasense_doctors", "shopid": 1238 }, // 册为医护端
// production: { "mixid":"metasense_doctors", "shopid": 1238 }, // 册为医护端
production
:
{
"mixid"
:
"3QqsFT"
,
"shopid"
:
1337
},
production
:
{
"mixid"
:
"3QqsFT"
,
"shopid"
:
1337
},
...
...
src/components/basicTool/transverse-label/index.vue
View file @
dfe6e753
...
@@ -9,7 +9,13 @@
...
@@ -9,7 +9,13 @@
'--select-tab-text-size':selectTabTextSize+'px',
'--select-tab-text-size':selectTabTextSize+'px',
'--select-tab-background-color':selectTabBackgroundColor,
'--select-tab-background-color':selectTabBackgroundColor,
'--select-tab-underline-color':selectTabUnderlineColor,
'--select-tab-underline-color':selectTabUnderlineColor,
'--tab-background-color':tabBackgroundColor
'--tab-background-color':tabBackgroundColor,
'--main-label-default-font-size':mainLabelDefaultFontSize+'px',
'--main-label-default-color':mainLabelDefaultColor,
'--default-title-is-bold':defaultTitleIsBold?'500':'',
'--main-label-select-font-size':mainLabelSelectFontSize+'px',
'--main-label-select-color':mainLabelSelectColor,
'--select-title-is-bold':selectTitleIsBold?'500':''
}"
}"
>
>
<!-- v-if="tabSlideArrow==1&&isScroll" -->
<!-- v-if="tabSlideArrow==1&&isScroll" -->
...
@@ -19,6 +25,7 @@
...
@@ -19,6 +25,7 @@
:class=
"[
:class=
"[
'floatArrow' + componentIndex,
'floatArrow' + componentIndex,
tabSlideArrow == 1 && tabList.length>5 ? '' : 'hideArrow',
tabSlideArrow == 1 && tabList.length>5 ? '' : 'hideArrow',
'floatArrowTabStyle' + tabStyle2
]"
]"
>
>
<div
class=
"left"
@
click=
"moveTab(-1)"
>
<div
class=
"left"
@
click=
"moveTab(-1)"
>
...
@@ -44,9 +51,11 @@
...
@@ -44,9 +51,11 @@
:title-inactive-color=
"defaultTabTextColor"
:title-inactive-color=
"defaultTabTextColor"
:line-position=
"tabLayout"
:line-position=
"tabLayout"
:line-length-type=
"tabStyle==2?tabUnderline:1"
:line-length-type=
"tabStyle==2?tabUnderline:1"
:datas=
"datas"
:class=
"[
:class=
"[
'defaultTabsStyle',
'defaultTabsStyle',
'defaultTabsStyle' + componentIndex,
'defaultTabsStyle' + componentIndex,
'newTabStyle' + tabStyle2,
'tabStyle' + tabStyle,
'tabStyle' + tabStyle,
stickyTop ? 'stickyTop' : '',
stickyTop ? 'stickyTop' : '',
'tabLayout' + tabLayout,
'tabLayout' + tabLayout,
...
@@ -257,6 +266,10 @@ export default {
...
@@ -257,6 +266,10 @@ export default {
},
},
},
},
tabStyle
()
{
tabStyle
()
{
let
tabStyle
=
this
.
datas
.
componentData
.
tabStyle
;
return
tabStyle
==
3
?
1
:
tabStyle
;
},
tabStyle2
()
{
return
this
.
datas
.
componentData
.
tabStyle
;
return
this
.
datas
.
componentData
.
tabStyle
;
},
},
stickyTop
()
{
stickyTop
()
{
...
@@ -376,6 +389,24 @@ export default {
...
@@ -376,6 +389,24 @@ export default {
return
"var(--main-color)"
;
return
"var(--main-color)"
;
}
}
},
},
mainLabelDefaultFontSize
()
{
return
this
.
datas
.
componentData
.
mainLabelDefaultFontSize
||
12
;
},
mainLabelDefaultColor
()
{
return
this
.
datas
.
componentData
.
mainLabelDefaultColor
;
},
defaultTitleIsBold
()
{
return
this
.
datas
.
componentData
.
defaultTitleIsBold
;
},
mainLabelSelectFontSize
()
{
return
this
.
datas
.
componentData
.
mainLabelSelectFontSize
||
12
;
},
mainLabelSelectColor
()
{
return
this
.
datas
.
componentData
.
mainLabelSelectColor
;
},
selectTitleIsBold
()
{
return
this
.
datas
.
componentData
.
selectTitleIsBold
;
},
},
},
watch
:
{
watch
:
{
active
()
{
active
()
{
...
@@ -559,6 +590,7 @@ export default {
...
@@ -559,6 +590,7 @@ export default {
}
}
</
style
>
</
style
>
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
$
wrapWidth
:
50px
;
.transverse-label
{
.transverse-label
{
.van-tab
{
.van-tab
{
//
padding
:
0
;
//
padding
:
0
;
...
@@ -593,6 +625,9 @@ export default {
...
@@ -593,6 +625,9 @@ export default {
}
}
}
}
}
}
.floatArrowTabStyle3
{
height
:
$
wrapWidth
;
}
.hideArrow
{
.hideArrow
{
opacity
:
0
;
opacity
:
0
;
z-index
:
-9999
;
z-index
:
-9999
;
...
@@ -621,6 +656,33 @@ export default {
...
@@ -621,6 +656,33 @@ export default {
bottom
:
4px
;
bottom
:
4px
;
}
}
}
}
//
样式三
.newTabStyle3
{
.van-tabs__wrap{
//
height
:
$
wrapWidth
;
}
.mainLabel
{
height
:
22px
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
color
:
var
(
--main-label-default-color
)
!important
;
font-size
:
var
(
--main-label-default-font-size
)
!important
;
font-weight
:
var
(
--default-title-is-bold
)
!important
;
}
.mainLabel2
{
line-height
:
20px
;
}
.selectMainLabel
{
color
:
var
(
--main-label-select-color
)
!important
;
font-size
:
var
(
--main-label-select-font-size
)
!important
;
font-weight
:
var
(
--select-title-is-bold
)
!important
;
}
.van-tabs__line
{
height
:
20px
;
bottom
:
0
;
}
}
.stickyTop
{
.stickyTop
{
.van-tabs__wrap
{
.van-tabs__wrap
{
position
:
sticky
;
position
:
sticky
;
...
...
static/nativeComponents/TimeLimitedDiscount/index.wxss
View file @
dfe6e753
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
-o-border-radius: 6rpx;
-o-border-radius: 6rpx;
}
}
.endTimedot {
.endTimedot {
padding
: 0
10rpx;
padding
-right:
10rpx;
}
}
.style2 {
.style2 {
padding: 14px;
padding: 14px;
...
...
static/vant/tabs/index.js
View file @
dfe6e753
...
@@ -34,6 +34,7 @@ VantComponent({
...
@@ -34,6 +34,7 @@ VantComponent({
titleActiveColor
:
String
,
titleActiveColor
:
String
,
titleInactiveColor
:
String
,
titleInactiveColor
:
String
,
color
:
String
,
color
:
String
,
datas
:
Object
,
animated
:
{
animated
:
{
type
:
Boolean
,
type
:
Boolean
,
observer
()
{
observer
()
{
...
...
static/vant/tabs/index.wxml
View file @
dfe6e753
...
@@ -29,9 +29,14 @@
...
@@ -29,9 +29,14 @@
style="{{ computed.tabStyle({ active: index === currentIndex, ellipsis, color, type, disabled: item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable }) }}"
style="{{ computed.tabStyle({ active: index === currentIndex, ellipsis, color, type, disabled: item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable }) }}"
bind:tap="onTap"
bind:tap="onTap"
>
>
<view class="{{ ellipsis ? 'van-ellipsis' : '' }}" style="{{ item.titleStyle }}">
<view class="mainLabel {{index === currentIndex? 'selectMainLabel' : ''}}" wx:if="{{datas.componentData.tabStyle ==3}}">{{item.title}}</view>
<view>主标签</view>
<view class="{{ ellipsis ? 'van-ellipsis' : '' }} mainLabel2" style="{{ item.titleStyle }}">
<view wx:if="{{datas.componentData.tabStyle ==3}}">
{{ datas.componentData.tabList[index].subTitle }}
</view>
<view wx:else>
{{ item.title }}
{{ item.title }}
</view>
<van-info
<van-info
wx:if="{{ item.info !== null || item.dot }}"
wx:if="{{ item.info !== null || item.dot }}"
info="{{ item.info }}"
info="{{ item.info }}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment