设备与模板市场ui调整

.prettierrc

@@ -2,5 +2,6 @@
   "printWidth": 100,
   "tabWidth": 2,
   "singleQuote": true,
-  "semi": false
+  "semi": false,
+  "proseWarp": "preserve"
 }

.stylelintrc.js

@@ -11,6 +11,7 @@ module.exports = {
     'no-descending-specificity': null,
     'selector-type-no-unknown': null,
     'property-no-unknown': null,
+    'declaration-colon-newline-after': 'always-multi-line',
     'font-family-no-missing-generic-family-keyword': null
   }
 }

src/assets/styles/var.scss

 @import './mixins.scss';
 // @import './'
-
 $bgColor: #f7f7f7;
+$bgColor2: #fff;
 $text-color: #323233;
 $input-color: #323233;
 $primary-color: #1989fa;
@@ -19,23 +19,24 @@ $primary-text-color: #333;
   border: 0 $style $color;
 
   @each $d in $dir {
-    #{border-#{$d}-width}: $width;
+    #{border-#{$d}-width
+    }: $width;
   }
 }
 
 @font-face {
   font-family: DINCondensed-Bold;
-  src:
-    url('../font/DINCondensed-Bold.ttf'),
-    url('https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf');
+  src: url('../font/DINCondensed-Bold.ttf'), url('https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf');
 }
 
 @font-face {
   font-family: 'DIN-Condensed';
-  src:
-    url(https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf)
-      format('truetype'),
-    url('DINCondensed-Bold.ttf') format('truetype');
+  src: url(https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf) format('truetype'), url('DINCondensed-Bold.ttf') format('truetype');
   font-weight: bold;
   font-style: normal;
 }
+
+.hui {
+  height: 10px;
+  background: $bgColor;
+}

src/pages/home/device/film_list/index.scss

@@ -3,7 +3,7 @@
 .films {
   width: 100%;
   height: 100%;
-  background-color: $bgColor;
+  background-color: $bgColor2;
 
   .scroll-view {
     height: 100%;

src/pages/home/device/index.scss

@@ -9,6 +9,11 @@
   border-radius: 3px;
 }
 
+.hui {
+  height: 10px;
+  background: #f7f7f7;
+}
+
 .at-tabs__item--active {
   color: #ff9110 !important;
   font-size: 38px !important;

src/pages/home/device/index.tsx

@@ -52,16 +52,19 @@ class Device extends Component {
       <AtTabs current={current} tabList={tabList} onClick={this.changePage} swipeable={false}>
         <AtTabsPane current={current} index={0}>
           <View style={{ height: `${windowHeight}px` }}>
+            <View className="hui" />
             <DeviceList height={windowHeight} />
           </View>
         </AtTabsPane>
         <AtTabsPane className="at-tabs-page" current={current} index={1}>
           <View style={{ height: `${windowHeight}px` }}>
+            <View className="hui" />
             <DeviceGroup height={windowHeight} />
           </View>
         </AtTabsPane>
         <AtTabsPane className="at-tabs-page" current={current} index={2}>
           <View style={{ height: `${windowHeight}px` }}>
+            <View className="hui" />
             <ShopList height={windowHeight} />
           </View>
         </AtTabsPane>

src/pages/home/film/film_list/index.scss

@@ -3,7 +3,7 @@
 .films {
   width: 100%;
   height: 100%;
-  background-color: $bgColor;
+  background-color: $bgColor2;
 
   .film-search-bar {
     // height: 120px;

src/pages/home/film/schedule_list/index.scss

@@ -5,7 +5,7 @@
 .films {
   width: 100%;
   height: 100%;
-  background-color: $bgColor;
+  background-color: $bgColor2;
   position: relative;
 
   .scroll-view {

src/pages/home/tempaltes/index.tsx

@@ -74,14 +74,21 @@ class Tempaltes extends Component {
     this.getData()
   }
   getData(showTempalte2?) {
+    Taro.showLoading()
     const { page, showTempalte } = this.state
     // this.props.getTempListData(page)
-    Api.tempalte.getHomeList(showTempalte2 ? showTempalte2 : showTempalte).then(res => {
-      this.setState({
-        list: res.list
+    Api.tempalte
+      .getHomeList(showTempalte2 ? showTempalte2 : showTempalte)
+      .then(res => {
+        Taro.hideLoading()
+        this.setState({
+          list: res.list
+        })
+        console.log(res, 'getHomeList')
+      })
+      .catch(() => {
+        Taro.showLoading()
       })
-      console.log(res, 'getHomeList')
-    })
   }
 
   goTypeList() {
@@ -137,6 +144,7 @@ class Tempaltes extends Component {
             </Text>
           </View>
         </View>
+        <View className="hui" />
         {/* <View className="temp-search-bar">
           <Input className="temp-search-bar-search" placeholder="请输入搜索关键词" />
         </View> */}

src/pages/home/tempaltes/scss/index.scss

@@ -7,9 +7,14 @@
   flex-direction: column;
   background-color: #f7f7f7;
 
+  .hui {
+    height: 10px;
+    background: #f7f7f7;
+  }
+
   &-search-bar {
     // height: 120px;
-    padding: 20px 24px;
+    padding: 20px 24px 10px;
     background-color: white;
     position: relative;
     text-align: center;
@@ -55,6 +60,7 @@
   &-content {
     flex: 1;
     overflow: hidden;
+    background: #fff;
 
     &-scroll {
       width: 100%;

src/pages/home/tempaltes/scss/temp-type.scss

@@ -19,6 +19,7 @@
 
   .type-item {
     padding: 20px;
+    // padding-right: 10px;
 
     &-title {
       padding-top: 54px;

src/pages/home/tempaltes/scss/type_detail.scss

@@ -16,6 +16,7 @@
     flex-wrap: wrap;
     padding: 44px;
     padding-left: 44px;
+    padding-right: 10px;
     padding-bottom: 0;
 
     .radio-list__label {
@@ -72,6 +73,11 @@
       font-weight: bold;
       position: relative;
 
+      &:first-child {
+        margin-left: 0;
+        // padding-left: 0;
+      }
+
       .border {
         transition: width 1s;
         width: 0;

src/pages/home/user/index.scss

@@ -3,7 +3,7 @@
 .user {
   width: 100%;
   height: 100%;
-  background-color: $bgColor;
+  background-color: $bgColor2;
 
   &-top-info {
     display: flex;