Skip to content

visualcloud / Vmatrix-client-taro

Go to a project
Commit 21be16cc by hank
Options

设备与模板市场ui调整

parent f6dc1935
Showing with 52 additions and 20 deletions
.prettierrc
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
"printWidth": 100, "printWidth": 100,
"tabWidth": 2, "tabWidth": 2,
"singleQuote": true, "singleQuote": true,
"semi": false "semi": false,
"proseWarp": "preserve"
} }
.stylelintrc.js
...@@ -11,6 +11,7 @@ module.exports = { ...@@ -11,6 +11,7 @@ module.exports = {
'no-descending-specificity': null, 'no-descending-specificity': null,
'selector-type-no-unknown': null, 'selector-type-no-unknown': null,
'property-no-unknown': null, 'property-no-unknown': null,
'declaration-colon-newline-after': 'always-multi-line',
'font-family-no-missing-generic-family-keyword': null 'font-family-no-missing-generic-family-keyword': null
} }
} }
src/assets/styles/var.scss
@import './mixins.scss'; @import './mixins.scss';
// @import './' // @import './'
$bgColor: #f7f7f7; $bgColor: #f7f7f7;
$bgColor2: #fff;
$text-color: #323233; $text-color: #323233;
$input-color: #323233; $input-color: #323233;
$primary-color: #1989fa; $primary-color: #1989fa;
...@@ -19,23 +19,24 @@ $primary-text-color: #333; ...@@ -19,23 +19,24 @@ $primary-text-color: #333;
border: 0 $style $color; border: 0 $style $color;
@each $d in $dir { @each $d in $dir {
#{border-#{$d}-width}: $width; #{border-#{$d}-width
}: $width;
} }
} }
@font-face { @font-face {
font-family: DINCondensed-Bold; font-family: DINCondensed-Bold;
src: src: url('../font/DINCondensed-Bold.ttf'), url('https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf');
url('../font/DINCondensed-Bold.ttf'),
url('https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf');
} }
@font-face { @font-face {
font-family: 'DIN-Condensed'; font-family: 'DIN-Condensed';
src: src: url(https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf) format('truetype'), url('DINCondensed-Bold.ttf') format('truetype');
url(https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf)
format('truetype'),
url('DINCondensed-Bold.ttf') format('truetype');
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
.hui {
height: 10px;
background: $bgColor;
}
src/pages/home/device/film_list/index.scss
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.films { .films {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: $bgColor; background-color: $bgColor2;
.scroll-view { .scroll-view {
height: 100%; height: 100%;
......
src/pages/home/device/index.scss
...@@ -9,6 +9,11 @@ ...@@ -9,6 +9,11 @@
border-radius: 3px; border-radius: 3px;
} }
.hui {
height: 10px;
background: #f7f7f7;
}
.at-tabs__item--active { .at-tabs__item--active {
color: #ff9110 !important; color: #ff9110 !important;
font-size: 38px !important; font-size: 38px !important;
......
src/pages/home/device/index.tsx
...@@ -52,16 +52,19 @@ class Device extends Component { ...@@ -52,16 +52,19 @@ class Device extends Component {
<AtTabs current={current} tabList={tabList} onClick={this.changePage} swipeable={false}> <AtTabs current={current} tabList={tabList} onClick={this.changePage} swipeable={false}>
<AtTabsPane current={current} index={0}> <AtTabsPane current={current} index={0}>
<View style={{ height: `${windowHeight}px` }}> <View style={{ height: `${windowHeight}px` }}>
<View className="hui" />
<DeviceList height={windowHeight} /> <DeviceList height={windowHeight} />
</View> </View>
</AtTabsPane> </AtTabsPane>
<AtTabsPane className="at-tabs-page" current={current} index={1}> <AtTabsPane className="at-tabs-page" current={current} index={1}>
<View style={{ height: `${windowHeight}px` }}> <View style={{ height: `${windowHeight}px` }}>
<View className="hui" />
<DeviceGroup height={windowHeight} /> <DeviceGroup height={windowHeight} />
</View> </View>
</AtTabsPane> </AtTabsPane>
<AtTabsPane className="at-tabs-page" current={current} index={2}> <AtTabsPane className="at-tabs-page" current={current} index={2}>
<View style={{ height: `${windowHeight}px` }}> <View style={{ height: `${windowHeight}px` }}>
<View className="hui" />
<ShopList height={windowHeight} /> <ShopList height={windowHeight} />
</View> </View>
</AtTabsPane> </AtTabsPane>
......
src/pages/home/film/film_list/index.scss
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.films { .films {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: $bgColor; background-color: $bgColor2;
.film-search-bar { .film-search-bar {
// height: 120px; // height: 120px;
......
src/pages/home/film/schedule_list/index.scss
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.films { .films {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: $bgColor; background-color: $bgColor2;
position: relative; position: relative;
.scroll-view { .scroll-view {
......
src/pages/home/tempaltes/index.tsx
...@@ -74,14 +74,21 @@ class Tempaltes extends Component { ...@@ -74,14 +74,21 @@ class Tempaltes extends Component {
this.getData() this.getData()
} }
getData(showTempalte2?) { getData(showTempalte2?) {
Taro.showLoading()
const { page, showTempalte } = this.state const { page, showTempalte } = this.state
// this.props.getTempListData(page) // this.props.getTempListData(page)
Api.tempalte.getHomeList(showTempalte2 ? showTempalte2 : showTempalte).then(res => { Api.tempalte
this.setState({ .getHomeList(showTempalte2 ? showTempalte2 : showTempalte)
list: res.list .then(res => {
Taro.hideLoading()
this.setState({
list: res.list
})
console.log(res, 'getHomeList')
})
.catch(() => {
Taro.showLoading()
}) })
console.log(res, 'getHomeList')
})
} }
goTypeList() { goTypeList() {
...@@ -137,6 +144,7 @@ class Tempaltes extends Component { ...@@ -137,6 +144,7 @@ class Tempaltes extends Component {
</Text> </Text>
</View> </View>
</View> </View>
<View className="hui" />
{/* <View className="temp-search-bar"> {/* <View className="temp-search-bar">
<Input className="temp-search-bar-search" placeholder="请输入搜索关键词" /> <Input className="temp-search-bar-search" placeholder="请输入搜索关键词" />
</View> */} </View> */}
......
src/pages/home/tempaltes/scss/index.scss
...@@ -7,9 +7,14 @@ ...@@ -7,9 +7,14 @@
flex-direction: column; flex-direction: column;
background-color: #f7f7f7; background-color: #f7f7f7;
.hui {
height: 10px;
background: #f7f7f7;
}
&-search-bar { &-search-bar {
// height: 120px; // height: 120px;
padding: 20px 24px; padding: 20px 24px 10px;
background-color: white; background-color: white;
position: relative; position: relative;
text-align: center; text-align: center;
...@@ -55,6 +60,7 @@ ...@@ -55,6 +60,7 @@
&-content { &-content {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
background: #fff;
&-scroll { &-scroll {
width: 100%; width: 100%;
......
src/pages/home/tempaltes/scss/temp-type.scss
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
.type-item { .type-item {
padding: 20px; padding: 20px;
// padding-right: 10px;
&-title { &-title {
padding-top: 54px; padding-top: 54px;
......
src/pages/home/tempaltes/scss/type_detail.scss
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
flex-wrap: wrap; flex-wrap: wrap;
padding: 44px; padding: 44px;
padding-left: 44px; padding-left: 44px;
padding-right: 10px;
padding-bottom: 0; padding-bottom: 0;
.radio-list__label { .radio-list__label {
...@@ -72,6 +73,11 @@ ...@@ -72,6 +73,11 @@
font-weight: bold; font-weight: bold;
position: relative; position: relative;
&:first-child {
margin-left: 0;
// padding-left: 0;
}
.border { .border {
transition: width 1s; transition: width 1s;
width: 0; width: 0;
......
src/pages/home/user/index.scss
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.user { .user {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: $bgColor; background-color: $bgColor2;
&-top-info { &-top-info {
display: flex; display: flex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment