Parcourir la source

Merge branch 'dev' of http://101.36.160.140:21044/portal-site-vue-qinghai/portal-site-web into dev

chenghanbin il y a 4 mois
Parent
commit
c54ccc1e0c

BIN
src/assets/homeImg/依申请公开.png


BIN
src/assets/homeImg/政府网站工作年报.png


BIN
src/assets/homeImg/政策文件.png


BIN
src/assets/homeImg/政策解读.png


BIN
src/assets/homeImg/行政规范性文件.png


+ 2 - 2
src/router/modules/News.route.js

@@ -73,13 +73,13 @@ const testRouter = [
73 73
       {
74 74
         path: "picture",
75 75
         name: "picture",
76
-        meta: { title: "图片列表", tagRoute: "GIP" },
76
+        meta: { title: "图片新闻", tagRoute: "GIP" },
77 77
         component: () => import("@/views/News/picture/index.vue"),
78 78
       },
79 79
       {
80 80
         path: "pictureDetails",
81 81
         name: "pictureDetails",
82
-        meta: { title: "图片列表详情", tagRoute: "GIP" },
82
+        meta: { title: "图片新闻", tagRoute: "GIP" },
83 83
         component: () => import("@/views/News/pictureDetails/index.vue"),
84 84
       },
85 85
     ],

+ 1 - 1
src/views/Home/components/broadcast.vue

@@ -90,7 +90,7 @@ export default {
90 90
       // console.log(1221);
91 91
       //定义一个路径
92 92
       let href = router.resolve({
93
-        path: "/News/picture",
93
+        path: "/News/imgesDel",
94 94
         // query: { type: "ttxmbt" },
95 95
       }).href;
96 96
       //打开新的页面 到 href 这个页面

+ 5 - 1
src/views/News/pictureDetails/index.vue

@@ -4,7 +4,7 @@
4 4
     <div class="content-lzyj">
5 5
       <article-module :article="pageData.article">
6 6
         <div class="articleInfo">
7
-          <span class="title">[发布时间] <span>{{ pageData.publishTime }}</span></span>
7
+          <span class="title">发布时间: <span>{{ pageData.publishTime }}</span></span>
8 8
         </div>
9 9
       </article-module>
10 10
     </div>
@@ -43,4 +43,8 @@ function getPageData() {
43 43
 
44 44
   .articleInfo {}
45 45
 }
46
+
47
+.title {
48
+  color: #969696;
49
+}
46 50
 </style>

+ 1 - 0
src/views/footer/index.vue

@@ -37,6 +37,7 @@ import {} from "vue";
37 37
   background-color: #7898c0;
38 38
   border-top: 2px solid #37e;
39 39
   background: url("../../assets/bgImage/footer.png") 100% 100% no-repeat;
40
+  margin-top: 30px;
40 41
   .link {
41 42
     ul {
42 43
       width: 380px;