浏览代码

静态页面

1002884655 4 年前
父节点
当前提交
f8f6634261
共有 4 个文件被更改,包括 17 次插入10 次删除
  1. 2
    2
      src/components/BookItem/page.scss
  2. 5
    0
      src/pages/Index/BookDetail/page.scss
  3. 1
    1
      src/pages/Index/index.vue
  4. 9
    7
      src/pages/Index/page.scss

+ 2
- 2
src/components/BookItem/page.scss 查看文件

28
     }
28
     }
29
     > .Desc {
29
     > .Desc {
30
       > text {
30
       > text {
31
-        font-size: 28px;
32
-        line-height: 40px;
31
+        font-size: 26px;
32
+        line-height: 1.8em;
33
         overflow: hidden;
33
         overflow: hidden;
34
         text-overflow: ellipsis;
34
         text-overflow: ellipsis;
35
         display: -webkit-box;
35
         display: -webkit-box;

+ 5
- 0
src/pages/Index/BookDetail/page.scss 查看文件

17
       > .FrontInfo {
17
       > .FrontInfo {
18
         position: relative;
18
         position: relative;
19
         overflow: hidden;
19
         overflow: hidden;
20
+<<<<<<< HEAD
20
         > .Like {
21
         > .Like {
21
           display: inline-block;
22
           display: inline-block;
22
           position: absolute;
23
           position: absolute;
39
             }
40
             }
40
           }
41
           }
41
         }
42
         }
43
+=======
44
+        line-height: 1.6em;
45
+
46
+>>>>>>> 377b8f62dcfd8e1a4ba23e4105e500cc7abc9412
42
         > .Img {
47
         > .Img {
43
           padding: 30px 120px;
48
           padding: 30px 120px;
44
           position: relative;
49
           position: relative;

+ 1
- 1
src/pages/Index/index.vue 查看文件

57
                     <text>最新文章</text>
57
                     <text>最新文章</text>
58
                   </view>
58
                   </view>
59
                   <view class="ListContainer">
59
                   <view class="ListContainer">
60
-                    <view class="ArticleItem flex-h" v-for="(item, index) in NewestArticleList">
60
+                    <view class="ArticleItem flex-h" v-for="(item, index) in NewestArticleList" :key="index">
61
                       <BookItem :Data="item"></BookItem>
61
                       <BookItem :Data="item"></BookItem>
62
                     </view>
62
                     </view>
63
                   </view>
63
                   </view>

+ 9
- 7
src/pages/Index/page.scss 查看文件

14
     > view {
14
     > view {
15
       position: relative;
15
       position: relative;
16
       overflow: hidden;
16
       overflow: hidden;
17
-      background: #fff;
17
+      background: #fafafa;
18
       border-radius: 20px;
18
       border-radius: 20px;
19
       align-items: center;
19
       align-items: center;
20
       box-sizing: border-box;
20
       box-sizing: border-box;
21
-      border: 2px solid #333;
21
+      border: 1px solid rgba(0, 0, 0, 0.05);
22
       > text {
22
       > text {
23
         font-size: 32px;
23
         font-size: 32px;
24
         color: #333;
24
         color: #333;
86
               display: block;
86
               display: block;
87
               font-size: 32px;
87
               font-size: 32px;
88
               font-weight: bold;
88
               font-weight: bold;
89
-              line-height: 60px;
89
+              line-height: 1.8em;
90
+              padding: 0.5em 0;
90
             }
91
             }
91
           }
92
           }
92
           > .ListContainer {
93
           > .ListContainer {
120
                     margin-top: 6px;
121
                     margin-top: 6px;
121
                     display: block;
122
                     display: block;
122
                     font-size: 28px;
123
                     font-size: 28px;
123
-                    line-height: 40px;
124
+                    line-height: 1.8em;
124
                     white-space: nowrap;
125
                     white-space: nowrap;
125
                     overflow: hidden;
126
                     overflow: hidden;
126
                     text-overflow: ellipsis;
127
                     text-overflow: ellipsis;
142
               display: block;
143
               display: block;
143
               font-size: 32px;
144
               font-size: 32px;
144
               font-weight: bold;
145
               font-weight: bold;
145
-              line-height: 60px;
146
+              line-height: 1.8em;
147
+              padding: 0.5em 0;
146
             }
148
             }
147
           }
149
           }
148
           > .ListContainer {
150
           > .ListContainer {
184
                 }
186
                 }
185
                 > .Desc {
187
                 > .Desc {
186
                   > text {
188
                   > text {
187
-                    font-size: 28px;
188
-                    line-height: 40px;
189
+                    font-size: 24px;
190
+                    line-height: 28px;
189
                     overflow: hidden;
191
                     overflow: hidden;
190
                     text-overflow: ellipsis;
192
                     text-overflow: ellipsis;
191
                     display: -webkit-box;
193
                     display: -webkit-box;