Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cauchy-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ui
cauchy-ui
Commits
5cf103e0
Commit
5cf103e0
authored
Jul 21, 2021
by
郭志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: ui走查
parent
f88d03e5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
56 additions
and
21 deletions
+56
-21
index.less
src/style/index.less
+0
-1
var.less
src/style/var.less
+2
-2
index.less
src/views/home/index.less
+1
-1
SkuList.vue
src/views/vipLife/components/SkuList.vue
+13
-3
SpuList.vue
src/views/vipLife/components/SpuList.vue
+4
-0
index.less
src/views/vipLife/index.less
+21
-1
index.vue
src/views/vipLife/index.vue
+15
-13
No files found.
src/style/index.less
View file @
5cf103e0
...
...
@@ -104,7 +104,6 @@ strong {
}
.Vl__panel-tips {
color: @text-grey;
min-height: 143px;
p {
.text-14();
margin-bottom: @padding-xs;
...
...
src/style/var.less
View file @
5cf103e0
...
...
@@ -62,9 +62,9 @@
@padding-xl: @padding-unit * 8;
// Font
@font-size-list: 10,11, 12, 13, 14, 15, 16, 17, 18, 20, 24, 26, 28, 30, 52;
@font-size-list: 10,11, 12, 13, 14, 15, 16, 17, 18, 20, 2
2, 2
4, 26, 28, 30, 52;
.generate-text(1
4
);
.generate-text(1
5
);
.generate-text(@n, @i: 1) when (@i =< @n) {
@font: extract(@font-size-list, @i);
.text-@{font} {
...
...
src/views/home/index.less
View file @
5cf103e0
...
...
@@ -20,7 +20,7 @@
background-color: @white;
z-index: 9;
.button{
.text-1
8
();
.text-1
6
();
}
}
}
...
...
src/views/vipLife/components/SkuList.vue
View file @
5cf103e0
...
...
@@ -13,8 +13,12 @@
}"
@click="item.hasStock
&&
parent.handleSkuSelected(item, index)"
>
<div
v-font-resize
class=
"Vl__sku-name"
>
{{
props
.
threeCol
?
item
.
salePrice
:
item
.
skuName
}}{{
props
.
showUnit
?
'
元
'
:
''
}}
<div
v-if=
"props.showUnit"
class=
"Vl__sku-name unit"
>
{{
props
.
threeCol
?
item
.
salePrice
:
item
.
skuName
}}
<span>
元
</span>
</div>
<div
v-else
v-font-resize
class=
"Vl__sku-name"
>
{{
props
.
threeCol
?
item
.
salePrice
:
item
.
skuName
}}
</div>
<div
class=
"Vl__sku-price"
>
售价
{{
item
.
price
}}
元
</div>
</div>
...
...
@@ -95,7 +99,7 @@ export default {
content: ' ';
background: @gray-2;
.text-10();
border-radius: 0 @border-radius-sm -
2
0 @border-radius-sm - 2;
border-radius: 0 @border-radius-sm -
4
0 @border-radius-sm - 2;
padding: 0 @padding-unit;
position: absolute;
top: 0;
...
...
@@ -150,6 +154,12 @@ export default {
-webkit-line-clamp: 1;
flex-shrink: 0;
overflow: hidden;
&.unit {
.text-22();
}
span {
.text-14();
}
}
&-price {
color: @gray-5;
...
...
src/views/vipLife/components/SpuList.vue
View file @
5cf103e0
...
...
@@ -170,6 +170,10 @@ export default {
&_active {
box-shadow: 0px 2px 12px 0px rgba(100, 101, 102, 0.12);
transform: scale(1.03);
.Vl__spu-name {
font-weight: @font-weight-bold;
color: @text-color;
}
}
}
&-name {
...
...
src/views/vipLife/index.less
View file @
5cf103e0
@bottom-height: 60px;
@{deep} .Vl {
&__tabs {
.cr-tabs__item--active {
.cr-tabs__text {
font-weight: bold;
}
}
}
&__panel {
background-color: @white;
border-radius: @border-radius-lx @border-radius-lx 0 0;
...
...
@@ -13,7 +20,17 @@
color: @text-color;
.text-16();
font-weight: @font-weight-bold - 100;
margin: @padding-lg + @padding-unit 0 @padding-sm;
padding: @padding-lg + @padding-unit 0 @padding-sm;
}
&-content {
height: 58vh;
overflow-y: scroll;
&::-webkit-scrollbar {
display:none;
}
&.has-input {
height: 47.6vh;
}
}
&-loading {
position: absolute;
...
...
@@ -44,6 +61,9 @@
display: flex;
align-items: center;
justify-content: flex-end;
.cr-button {
.text-16();
}
}
}
\ No newline at end of file
src/views/vipLife/index.vue
View file @
5cf103e0
<
template
>
<div
class=
"page page__nopad"
>
<cr-tabs
v-model=
"currentTab"
@
click=
"handleTabChange"
>
<cr-tabs
v-model=
"currentTab"
class=
"Vl__tabs"
@
click=
"handleTabChange"
>
<cr-tab
v-for=
"(item, index) in spuData"
:key=
"index"
:title=
"item.name"
:name=
"+item.type"
/>
</cr-tabs>
<spu-list
ref=
"spuList"
:list=
"spuList"
:info=
"spuInfo"
@
scroll=
"handleSpuScroll"
/>
...
...
@@ -9,18 +9,20 @@
<account-input
v-if=
"spuInfo.rechargeAccountType !== 2"
v-model=
"account"
:info=
"spuInfo"
/>
<div
v-else
class=
"Vl__panel-placeholder"
/>
</
template
>
<div
class=
"Vl__panel-title"
>
充值类型
</div>
<sku-list
:list=
"skuList"
:info=
"skuInfo"
:show-unit=
"false"
/>
<div
v-show=
"showLoading"
class=
"Vl__panel-loading"
>
<cr-loading
color=
"#ec1500"
/>
</div>
<
template
v-if=
"tips"
>
<div
class=
"Vl__panel-title"
>
{{
tips
.
title
}}
</div>
<div
class=
"Vl__panel-tips"
v-html=
"tips.content"
/>
</
template
>
<div
class=
"Vl__panel-title"
>
温馨提示
</div>
<div
class=
"Vl__panel-tips"
>
<p>
充值类商品售出后无法进行退换,非充值用户请谨慎购买。
</p>
<div
class=
"Vl__panel-content"
:class=
"{ 'has-input': spuInfo.rechargeAccountType !== 2 }"
>
<div
class=
"Vl__panel-title"
>
充值类型
</div>
<sku-list
:list=
"skuList"
:info=
"skuInfo"
:show-unit=
"false"
/>
<div
v-show=
"showLoading"
class=
"Vl__panel-loading"
>
<cr-loading
color=
"#ec1500"
/>
</div>
<
template
v-if=
"tips"
>
<div
class=
"Vl__panel-title"
>
{{
tips
.
title
}}
</div>
<div
class=
"Vl__panel-tips"
v-html=
"tips.content"
/>
</
template
>
<div
class=
"Vl__panel-title"
>
温馨提示
</div>
<div
class=
"Vl__panel-tips"
>
<p>
充值类商品售出后无法进行退换,非充值用户请谨慎购买。
</p>
</div>
</div>
</div>
<div
class=
"Vl__bottom"
>
...
...
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