diff --git a/src/assets/cooperation/3.png b/src/assets/cooperation/3.png index c26f3ed..6c40c83 100644 Binary files a/src/assets/cooperation/3.png and b/src/assets/cooperation/3.png differ diff --git a/src/assets/cooperation/9.png b/src/assets/cooperation/9.png index 8dbf1d3..17ec005 100644 Binary files a/src/assets/cooperation/9.png and b/src/assets/cooperation/9.png differ diff --git a/src/assets/image/icon4r.png b/src/assets/image/icon4r.png new file mode 100644 index 0000000..14cac33 Binary files /dev/null and b/src/assets/image/icon4r.png differ diff --git a/src/assets/image/icon6.png b/src/assets/image/icon6.png index 11594e8..50dc434 100644 Binary files a/src/assets/image/icon6.png and b/src/assets/image/icon6.png differ diff --git a/src/views/home/home.vue b/src/views/home/home.vue index 56b36ea..42d82a7 100644 --- a/src/views/home/home.vue +++ b/src/views/home/home.vue @@ -12,24 +12,21 @@
-
-
- - -
- -
- 更多 -
-
+
+ +
- {{ date }} + +
+ 更多 +
+
@@ -63,6 +61,9 @@ + {{ + parseTime(item.listDate, '{m}-{d}') + }}
@@ -107,6 +108,7 @@
+
- 合肥高新区 + 合肥区县
@@ -404,7 +406,7 @@ export default { pageNum: 1, pageSize: 7 }, - date: this.parseTime(new Date(), '{y}-{m}-{d}'), + // date: this.parseTime(new Date(), '{y}-{m}-{d}'), list: [], list2: [], list3: [] @@ -496,33 +498,22 @@ export default { margin-top: 30px; .title { position: relative; - padding-right: 21px; + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 20px; height: 40px; line-height: 40px; text-align: right; - background-color: #f3f3f3; + background-color: #3394ff; border-radius: 6px 6px 0px 0px; - .title_top { - position: absolute; - display: flex; - justify-content: space-between; - align-items: center; - bottom: 0; - padding: 0 20px; - width: 400px; - height: 50px; - background: #3394ff; - border-radius: 6px 6px 0px 0px; - .title_top_l { - img { - vertical-align: middle; - margin-right: 10px; - } - } - .title_top_r { - font-size: 16px; - color: #fff; - } + img { + vertical-align: middle; + margin-right: 10px; + } + .title_top_r { + font-size: 16px; + color: #fff; } span { font-size: 16px; @@ -550,7 +541,7 @@ export default { color: #ffa32c; } span:nth-child(2) { - padding: 0 20px 0 20px; + padding: 0 10px 0 20px; } } } @@ -598,13 +589,17 @@ export default { display: flex; justify-content: space-between; align-items: center; - padding: 0 21px; + padding: 0 20px; height: 40px; - background-color: #f3f3f3; + background-color: #3394ff; border-radius: 6px 6px 0px 0px; + img { + vertical-align: middle; + margin-right: 10px; + } .title_top_r { font-size: 16px; - color: #666; + color: #fff; } } .tab_list { diff --git a/src/views/portrait.vue b/src/views/portrait.vue index b9c6e1d..aa81463 100644 --- a/src/views/portrait.vue +++ b/src/views/portrait.vue @@ -11,6 +11,8 @@ v-model="queryParams.title" placeholder="请输入搜索关键字" @keyup.enter.native="getPortraitList" + clearable + @clear="getPortraitList" > 搜索