Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hls-easy-ui
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
easyUI
hls-easy-ui
Commits
97c1d497
Commit
97c1d497
authored
May 08, 2019
by
Nature
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
content 定位调整
parent
03b94183
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
48 additions
and
295 deletions
+48
-295
package.json
package.json
+1
-1
ionic-public-style.less
packages/common/styles/ionic-public-style.less
+2
-2
ionic.less
packages/common/styles/ionic.less
+8
-279
platform-ios.less
packages/common/styles/platform-ios.less
+8
-1
platform-iosx.less
packages/common/styles/platform-iosx.less
+12
-4
index.vue
packages/components/BottomTab/index.vue
+1
-0
index.vue
packages/components/HContent/index.vue
+8
-3
hlsPopup.vue
src/pages/hlsPopup.vue
+6
-4
home.vue
src/pages/home.vue
+2
-1
No files found.
package.json
View file @
97c1d497
{
{
"name"
:
"hls-easy-ui"
,
"name"
:
"hls-easy-ui"
,
"version"
:
"0.0.
1
"
,
"version"
:
"0.0.
2
"
,
"description"
:
"A Vue components project"
,
"description"
:
"A Vue components project"
,
"author"
:
"JingChao <jingchao.wu@hand-china.com>"
,
"author"
:
"JingChao <jingchao.wu@hand-china.com>"
,
"private"
:
false
,
"private"
:
false
,
...
...
packages/common/styles/ionic-public-style.less
View file @
97c1d497
.has-footer {
.has-footer {
bottom: 0.88
rem;
padding-bottom: 1.76
rem;
.scrollContent{
.scrollContent{
padding-bottom:
0.9
rem;
padding-bottom:
1.76
rem;
}
}
}
}
...
...
packages/common/styles/ionic.less
View file @
97c1d497
...
@@ -4089,242 +4089,21 @@ html {
...
@@ -4089,242 +4089,21 @@ html {
touch-action: pan-y;
touch-action: pan-y;
}
}
body,
body{
.ionic-body {
height: 100%;
-webkit-touch-callout: none;
width: 100%;
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
-webkit-text-size-adjust: none;
-moz-text-size-adjust: none;
text-size-adjust: none;
-webkit-tap-highlight-color: transparent;
-webkit-tap-highlight-color: transparent;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
top: 0;
right: 0;
bottom: 0;
left: 0;
overflow: hidden;
overflow: hidden;
margin: 0;
font-size: .32rem;
padding: 0;
font-family: -apple-system-font,sans-serif;
color: #000;
-webkit-tap-highlight-color: transparent;
word-wrap: break-word;
-webkit-font-smoothing: antialiased;
font-size: 0.28rem;
font-family: -apple-system;
font-family: "-apple-system", "Helvetica Neue", "Roboto", "Segoe UI", sans-serif;
//line-height: 40px;
text-rendering: optimizeLegibility;
-webkit-backface-visibility: hidden;
-webkit-user-drag: none;
-ms-content-zooming: none;
}
}
body.grade-b,
body.grade-c {
text-rendering: auto;
}
.content {
.content {
position: relative;
position: relative;
}
}
.scroll-content {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
/*margin-top: -2px;
padding-top: 2px;
margin-bottom: -2px;*/
width: auto;
height: auto;
overflow: auto;
overflow-x: hidden;
-webkit-overflow-scrolling: touch;
overflow-scrolling: touch;
}
.menu .scroll-content.scroll-content-false {
z-index: 11;
}
.scroll-view {
position: relative;
display: block;
overflow: hidden;
margin-top: -1px;
}
.scroll-view.overflow-scroll {
position: relative;
}
.scroll-view.scroll-x {
overflow-x: scroll;
overflow-y: hidden;
}
.scroll-view.scroll-y {
overflow-x: hidden;
overflow-y: scroll;
}
.scroll-view.scroll-xy {
overflow-x: scroll;
overflow-y: scroll;
}
/**
* Scroll is the scroll view component available for complex and custom
* scroll view functionality.
*/
.scroll {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
-webkit-touch-callout: none;
-webkit-text-size-adjust: none;
-moz-text-size-adjust: none;
text-size-adjust: none;
-webkit-transform-origin: left top;
transform-origin: left top;
}
/**
* Set ms-viewport to prevent MS "page squish" and allow fluid scrolling
* https://msdn.microsoft.com/en-us/library/ie/hh869615(v=vs.85).aspx
*/
@-ms-viewport {
width: device-width;
}
.scroll-bar {
position: absolute;
z-index: 9999;
}
.ng-animate .scroll-bar {
visibility: hidden;
}
.scroll-bar-h {
right: 0.04rem;
bottom: 0.06rem;
left: 0.04rem;
height: 0.06rem;
}
.scroll-bar-h .scroll-bar-indicator {
height: 100%;
}
.scroll-bar-v {
top: 0.04rem;
right: 0.06rem;
bottom: 0.04rem;
width: 0.06rem;
}
.scroll-bar-v .scroll-bar-indicator {
width: 100%;
}
.scroll-bar-indicator {
position: absolute;
border-radius: 0.12rem;
background: rgba(0, 0, 0, 0.3);
opacity: 1;
-webkit-transition: opacity 0.3s linear;
transition: opacity 0.3s linear;
}
.scroll-bar-indicator.scroll-bar-fade-out {
opacity: 0;
}
.platform-android .scroll-bar-indicator {
border-radius: 0;
}
.grade-b .scroll-bar-indicator,
.grade-c .scroll-bar-indicator {
background: #aaa;
}
.grade-b .scroll-bar-indicator.scroll-bar-fade-out,
.grade-c .scroll-bar-indicator.scroll-bar-fade-out {
-webkit-transition: none;
transition: none;
}
ion-infinite-scroll {
height: 1.2rem;
width: 100%;
display: block;
display: -webkit-box;
display: -webkit-flex;
display: -moz-box;
display: -moz-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-direction: normal;
-webkit-box-orient: horizontal;
-webkit-flex-direction: row;
-moz-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-webkit-box-pack: center;
-ms-flex-pack: center;
-webkit-justify-content: center;
-moz-justify-content: center;
justify-content: center;
-webkit-box-align: center;
-ms-flex-align: center;
-webkit-align-items: center;
-moz-align-items: center;
align-items: center;
}
ion-infinite-scroll .icon {
color: #666666;
font-size: 0.6rem;
color: #666666;
}
ion-infinite-scroll:not(.active) .spinner,
ion-infinite-scroll:not(.active) .icon:before {
display: none;
}
.overflow-scroll {
overflow-x: hidden;
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
-ms-overflow-style: -ms-autohiding-scrollbar;
top: 0;
right: 0;
bottom: 0;
left: 0;
position: absolute;
}
.overflow-scroll.pane {
overflow-x: hidden;
overflow-y: scroll;
}
.overflow-scroll .scroll {
position: static;
height: 100%;
-webkit-transform: translate3d(0, 0, 0);
}
/* If you change these, change platform.scss as well */
/* If you change these, change platform.scss as well */
.has-header {
.has-header {
...
@@ -4348,63 +4127,13 @@ ion-infinite-scroll:not(.active) .icon:before {
...
@@ -4348,63 +4127,13 @@ ion-infinite-scroll:not(.active) .icon:before {
}
}
.has-footer {
.has-footer {
bottom: 0.88rem;
padding-
bottom: 0.88rem;
}
}
.has-subfooter {
.has-subfooter {
bottom: 1.56rem;
bottom: 1.56rem;
}
}
.has-tabs,
.bar-footer.has-tabs {
bottom: 1rem;
}
.has-tabs.pane,
.bar-footer.has-tabs.pane {
bottom: 1rem;
height: auto;
}
.bar-subfooter.has-tabs {
bottom: 1.86rem;
}
.has-footer.has-tabs {
bottom: 1.86rem;
}
.pane {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
-webkit-transition-duration: 0;
transition-duration: 0;
z-index: 1;
}
.view {
z-index: 1;
}
.pane,
.view {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: 100%;
height: 100%;
background-color: #fff;
overflow: hidden;
}
.view-container {
position: absolute;
display: block;
width: 100%;
height: 100%;
}
/**
/**
* Typography
* Typography
...
...
packages/common/styles/platform-ios.less
View file @
97c1d497
...
@@ -3,8 +3,15 @@
...
@@ -3,8 +3,15 @@
top: auto;
top: auto;
bottom: 0.24rem;
bottom: 0.24rem;
}
}
.has-footer {
padding-bottom: 2.16rem;
.scrollContent{
padding-bottom: 2.16rem;
}
}
.has-header {
.has-header {
top
: 1.28rem;
padding-bottom
: 1.28rem;
}
}
.header-top {
.header-top {
margin-top: 1.26rem;
margin-top: 1.26rem;
...
...
packages/common/styles/platform-iosx.less
View file @
97c1d497
...
@@ -7,8 +7,12 @@
...
@@ -7,8 +7,12 @@
.has-tabs {
.has-tabs {
bottom: 1.68rem;
bottom: 1.68rem;
}
}
.has-footer{
.has-footer {
margin-bottom: 0.68rem;
padding-bottom: 2.84rem;
.scrollContent{
padding-bottom: 2.84rem;
}
}
}
.public-style {
.public-style {
.bottom-tab{
.bottom-tab{
...
@@ -29,8 +33,12 @@
...
@@ -29,8 +33,12 @@
.has-tabs {
.has-tabs {
bottom: 1.68rem;
bottom: 1.68rem;
}
}
.has-footer{
.has-footer {
margin-bottom: 0.68rem;
padding-bottom: 2.84rem;
.scrollContent{
padding-bottom: 2.84rem;
}
}
}
.public-style {
.public-style {
.bottom-tab{
.bottom-tab{
...
...
packages/components/BottomTab/index.vue
View file @
97c1d497
...
@@ -32,6 +32,7 @@ export default {
...
@@ -32,6 +32,7 @@ export default {
width: 100%;
width: 100%;
background-color: #fff;
background-color: #fff;
position: fixed;
position: fixed;
z-index: 100;
bottom: 0;
bottom: 0;
display: flex;
display: flex;
align-items: center;
align-items: center;
...
...
packages/components/HContent/index.vue
View file @
97c1d497
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
*/
*/
<
template
>
<
template
>
<section
:class=
"cusClass"
class=
"content
scroll-content
"
>
<section
:class=
"cusClass"
class=
"content"
>
<slot/>
<slot/>
</section>
</section>
</
template
>
</
template
>
...
@@ -22,8 +22,13 @@ export default {
...
@@ -22,8 +22,13 @@ export default {
</
script
>
</
script
>
<
style
lang=
"less"
>
<
style
lang=
"less"
>
.scroll-content {
.content {
flex: 1;
overflow: hidden;
background-color: #fafafa;
position: relative;
overflow-y: scroll;
height: 100%;
}
}
// iPhoneX适配
// iPhoneX适配
...
...
src/pages/hlsPopup.vue
View file @
97c1d497
...
@@ -23,8 +23,7 @@
...
@@ -23,8 +23,7 @@
<tab-item>
涉诉公告
</tab-item>
<tab-item>
涉诉公告
</tab-item>
<tab-item>
司法协助
</tab-item>
<tab-item>
司法协助
</tab-item>
</s-tab>
-->
</s-tab>
-->
<h-content
<h-content
class=
"has-footer"
>
class=
"has-header has-footer"
>
<h-button
class=
"button-class"
type=
"primary"
@
click
.
native=
"showLoading"
>
showLoading
</h-button>
<h-button
class=
"button-class"
type=
"primary"
@
click
.
native=
"showLoading"
>
showLoading
</h-button>
<h-button
class=
"button-class"
type=
"primary"
@
click
.
native=
"hideLoading"
>
hideLoading
</h-button>
<h-button
class=
"button-class"
type=
"primary"
@
click
.
native=
"hideLoading"
>
hideLoading
</h-button>
<h-button
class=
"button-class"
type=
"primary"
@
click
.
native=
"showLongTop"
>
showLongTop
</h-button>
<h-button
class=
"button-class"
type=
"primary"
@
click
.
native=
"showLongTop"
>
showLongTop
</h-button>
...
@@ -221,14 +220,17 @@
...
@@ -221,14 +220,17 @@
<h2
class=
"item-title"
>
s-tab
</h2>
<h2
class=
"item-title"
>
s-tab
</h2>
<div
class=
"local-region"
>
<div
class=
"local-region"
>
<s-tab
:show-divider=
"true"
@
tabClick=
"stabClick"
>
<s-tab
:show-divider=
"true"
@
tabClick=
"stabClick"
:overflowX=
"true"
>
<tab-item>
测试
</tab-item>
<tab-item>
测试
</tab-item>
<tab-item>
你好
</tab-item>
<tab-item>
你好
</tab-item>
<tab-item>
再见
</tab-item>
<tab-item>
再见
</tab-item>
<tab-item>
按钮
</tab-item>
<tab-item>
按钮
</tab-item>
<tab-item>
按钮2
</tab-item>
<tab-item>
按钮3
</tab-item>
<tab-item>
按钮4
</tab-item>
</s-tab>
</s-tab>
<s-tab
:default-active=
"2"
position=
"bottom"
cusClass=
"class"
@
tabClick=
"stabClick
"
>
<s-tab
:default-active=
"2"
:show-divider=
"true"
position=
"bottom"
cusClass=
"class"
@
tabClick=
"stabClick"
:overflowX=
"true
"
>
<tab-item><img
src=
"../assets/image/warning@2x.png"
style=
"width: 18px"
></tab-item>
<tab-item><img
src=
"../assets/image/warning@2x.png"
style=
"width: 18px"
></tab-item>
<tab-item><img
src=
"../assets/image/warning@2x.png"
style=
"width: 18px"
></tab-item>
<tab-item><img
src=
"../assets/image/warning@2x.png"
style=
"width: 18px"
></tab-item>
<tab-item><img
src=
"../assets/image/warning@2x.png"
style=
"width: 18px"
></tab-item>
<tab-item><img
src=
"../assets/image/warning@2x.png"
style=
"width: 18px"
></tab-item>
...
...
src/pages/home.vue
View file @
97c1d497
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
</div>
</div>
<div
slot=
"center"
>
小易
</div>
<div
slot=
"center"
>
小易
</div>
</h-header>
</h-header>
<h-content
id=
"home-content"
class=
"has-header has-footer"
>
<h-content
id=
"home-content"
>
<div
v-for=
"item in message"
class=
"message"
>
<div
v-for=
"item in message"
class=
"message"
>
<p
v-show=
"false"
class=
"message-time"
v-text=
"item.time"
/>
<p
v-show=
"false"
class=
"message-time"
v-text=
"item.time"
/>
<div
v-show=
"!item.isFromeMe"
class=
"message-wrap"
>
<div
v-show=
"!item.isFromeMe"
class=
"message-wrap"
>
...
@@ -154,6 +154,7 @@ export default {
...
@@ -154,6 +154,7 @@ export default {
.content {
.content {
background-color: #eeeeee;
background-color: #eeeeee;
//border: 1px solid red;
//border: 1px solid red;
padding-bottom: 120px;
.message {
.message {
position: relative;
position: relative;
}
}
...
...
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