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
c230cf61
Commit
c230cf61
authored
Jul 21, 2021
by
郭志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: UI问题修复
parent
f18eb236
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
7 deletions
+28
-7
AccountInput.vue
src/views/vipLife/components/AccountInput.vue
+10
-1
index.less
src/views/vipLife/index.less
+13
-5
index.vue
src/views/vipLife/index.vue
+5
-1
No files found.
src/views/vipLife/components/AccountInput.vue
View file @
c230cf61
<
template
>
<
template
>
<div
class=
"Vl__account"
>
<div
class=
"Vl__account"
>
<cr-field
v-model=
"accountMask"
:placeholder=
"`请输入$
{info.name || ''}账号`" clearable>
<cr-field
v-model=
"accountMask"
:placeholder=
"`请输入$
{info.name || ''}账号`"
:max-length="maxLength"
clearable
>
<template
#button
>
<template
#button
>
<cr-image
<cr-image
v-if=
"info.icon"
v-if=
"info.icon"
...
@@ -50,6 +55,9 @@ export default {
...
@@ -50,6 +55,9 @@ export default {
};
};
},
},
computed
:
{
computed
:
{
maxLength
()
{
return
this
.
info
.
type
!==
101
?
13
:
30
;
},
accountMask
:
{
accountMask
:
{
get
()
{
get
()
{
return
this
.
info
.
type
!==
101
?
this
.
phoneFormat
(
this
.
value
)
:
this
.
value
;
return
this
.
info
.
type
!==
101
?
this
.
phoneFormat
(
this
.
value
)
:
this
.
value
;
...
@@ -75,6 +83,7 @@ export default {
...
@@ -75,6 +83,7 @@ export default {
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
scoped
>
.Vl {
.Vl {
&__account {
&__account {
padding: 0 @padding-lg;
position: relative;
position: relative;
@{deep} .cr-field {
@{deep} .cr-field {
padding: @padding-xs + 2 0;
padding: @padding-xs + 2 0;
...
...
src/views/vipLife/index.less
View file @
c230cf61
@import '../../style/mixins.less';
@bottom-height: 60px;
@bottom-height: 60px;
.vip-life {
overflow: hidden;
}
@{deep} .Vl {
@{deep} .Vl {
&__tabs {
&__tabs {
.cr-tabs__item--active {
.cr-tabs__item--active {
...
@@ -8,11 +12,10 @@
...
@@ -8,11 +12,10 @@
}
}
}
}
&__panel {
&__panel {
height: 100%;
background-color: @white;
background-color: @white;
border-radius: @border-radius-lx @border-radius-lx 0 0;
border-radius: @border-radius-lx @border-radius-lx 0 0;
padding: @padding-lg @padding-lg @bottom-height;
padding-top: @padding-lg;
min-height: 340px;
position: relative;
&-placeholder {
&-placeholder {
margin-bottom: -@padding-lg;
margin-bottom: -@padding-lg;
}
}
...
@@ -23,7 +26,8 @@
...
@@ -23,7 +26,8 @@
padding: @padding-lg + @padding-unit 0 @padding-sm;
padding: @padding-lg + @padding-unit 0 @padding-sm;
}
}
&-content {
&-content {
height: 58vh;
height: calc(100vh - @bottom-height - 121px - 44px - 48px);
padding: 0 @padding-lg;
overflow-y: scroll;
overflow-y: scroll;
&::-webkit-scrollbar {
&::-webkit-scrollbar {
display:none;
display:none;
...
@@ -61,8 +65,12 @@
...
@@ -61,8 +65,12 @@
display: flex;
display: flex;
align-items: center;
align-items: center;
justify-content: flex-end;
justify-content: flex-end;
.iphonex-fix-padding();
.cr-button {
.cr-button {
.text-16();
font-size: 16px;
span {
font-weight: @font-weight-bold;
}
}
}
}
}
...
...
src/views/vipLife/index.vue
View file @
c230cf61
<
template
>
<
template
>
<div
class=
"page page__nopad"
>
<div
class=
"page page__nopad
vip-life
"
>
<cr-tabs
v-model=
"currentTab"
class=
"Vl__tabs"
@
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-tab
v-for=
"(item, index) in spuData"
:key=
"index"
:title=
"item.name"
:name=
"+item.type"
/>
</cr-tabs>
</cr-tabs>
...
@@ -42,6 +42,7 @@ import SpuList from './components/SpuList.vue';
...
@@ -42,6 +42,7 @@ import SpuList from './components/SpuList.vue';
import
SkuList
from
'
./components/SkuList.vue
'
;
import
SkuList
from
'
./components/SkuList.vue
'
;
import
AccountInput
from
'
./components/AccountInput.vue
'
;
import
AccountInput
from
'
./components/AccountInput.vue
'
;
import
{
throttle
}
from
'
@/service/utils.service
'
;
import
{
throttle
}
from
'
@/service/utils.service
'
;
import
{
isPhone
}
from
'
@/service/validation.service
'
;
import
{
ITEM_WIDTH
}
from
'
./components/constant
'
;
import
{
ITEM_WIDTH
}
from
'
./components/constant
'
;
export
default
{
export
default
{
name
:
'
VipLife
'
,
name
:
'
VipLife
'
,
...
@@ -163,6 +164,9 @@ export default {
...
@@ -163,6 +164,9 @@ export default {
goOrder
:
throttle
(
async
function
()
{
goOrder
:
throttle
(
async
function
()
{
if
(
!
this
.
account
&&
this
.
spuInfo
.
rechargeAccountType
!==
2
)
if
(
!
this
.
account
&&
this
.
spuInfo
.
rechargeAccountType
!==
2
)
return
this
.
$toast
.
fail
(
'
请填写账号!
'
);
return
this
.
$toast
.
fail
(
'
请填写账号!
'
);
if
(
this
.
spuInfo
.
type
!==
101
&&
!
isPhone
(
this
.
account
))
{
return
this
.
$toast
.
fail
(
'
请填写正确的手机号!
'
);
}
if
(
!
this
.
skuInfo
.
skuNo
)
return
this
.
$toast
.
fail
(
'
请选择类型!
'
);
if
(
!
this
.
skuInfo
.
skuNo
)
return
this
.
$toast
.
fail
(
'
请选择类型!
'
);
this
.
$track
.
registeredEvents
(
'
h5_OtherRechargePageRechargeNowClick
'
,
{
this
.
$track
.
registeredEvents
(
'
h5_OtherRechargePageRechargeNowClick
'
,
{
classify_name
:
this
.
spuData
[
this
.
currentTab
-
1
].
name
,
classify_name
:
this
.
spuData
[
this
.
currentTab
-
1
].
name
,
...
...
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