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

src/router/modules/News.route.js

@@ -73,13 +73,13 @@ const testRouter = [
       {
         path: "picture",
         name: "picture",
-        meta: { title: "图片列表", tagRoute: "GIP" },
+        meta: { title: "图片新闻", tagRoute: "GIP" },
         component: () => import("@/views/News/picture/index.vue"),
       },
       {
         path: "pictureDetails",
         name: "pictureDetails",
-        meta: { title: "图片列表详情", tagRoute: "GIP" },
+        meta: { title: "图片新闻", tagRoute: "GIP" },
         component: () => import("@/views/News/pictureDetails/index.vue"),
       },
     ],

src/style/home/index.less

@@ -75,7 +75,6 @@
         text-align: center;
         line-height: 40px;
         border: 1px #cbd9e3 solid;
-        border-radius: 8px;
         margin-right: 14px;
         cursor: pointer;
       }
@@ -211,12 +210,13 @@
 }
 
 .col-box-title {
-  width: 102px;
+  width: 132px;
   line-height: 40px;
   margin-bottom: 12px;
   text-indent: 1ch;
-  color: #0176c9;
+  color: #fff;
   font-weight: bold;
+  background-color: #0176c9;
   border-bottom: 1px #0176c9 solid;
 }
 

src/views/Home/components/broadcast.vue

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

src/views/Home/index.vue

@@ -24,14 +24,20 @@
 				<div class="title">
 					<p class="errorClass" :class="{ actives: isHovered == 1 ? true : false }" @mouseenter="mouseenterIactives(1)"
 						@click="tabsData('1')">
+						<img class="img_trxt" v-if="isHovered == 1" src="../../assets/homeImg/gwyxx.png" alt="" />
+						<img class="img_trxt" v-else src="../../assets/homeImg/gwyxx-h.png" alt="" />
 						国务院信息
 					</p>
 					<p class="errorClass" :class="{ actives: isHovered == 2 ? true : false }" @mouseenter="mouseenterIactives(2)"
 						@click="tabsData('2')">
+						<img class="img_trxt" v-if="isHovered == 2" src="../../assets/homeImg/qhyw.png" alt="" />
+						<img class="img_trxt" v-else src="../../assets/homeImg/qhyw-h.png" alt="" />
 						青海要闻
 					</p>
 					<p class="errorClass" :class="{ actives: isHovered == 3 ? true : false }" @mouseenter="mouseenterIactives(3)"
 						@click="tabsData('3')">
+						<img class="img_trxt" v-if="isHovered == 3" src="../../assets/homeImg/hyxx.png" alt="" />
+						<img class="img_trxt" v-else src="../../assets/homeImg/hyxx-h.png" alt="" />
 						行业信息
 					</p>
 				</div>
@@ -93,7 +99,10 @@
 		<div class="col-box">
 			<div class="col-box-left">
 				<div class="col-box-text">
-					<p class="col-box-title">政务公开</p>
+					<p class="col-box-title">
+						<img class="img_trxt1" src="../../assets/homeImg/zwgk.png" alt="" />
+						政务公开
+					</p>
 				</div>
 				<div class="col-box-content">
 					<div class="col-content-top">
@@ -151,7 +160,10 @@
       </div> -->
 			<div class="col-box-left">
 				<div class="col-box-text">
-					<p class="col-box-title">互动交流</p>
+					<p class="col-box-title">
+						<img class="img_trxt1" src="../../assets/homeImg/hdjl.png" alt="" />
+						互动交流
+					</p>
 				</div>
 				<div class="col-box-content">
 					<div class="col-content-top1">
@@ -567,6 +579,13 @@ function getDIcList() {
 	width: 98%;
 }
 
+.errorClass {
+	background-color: #fafafa;
+	color: #3274c3;
+	font-weight: bold;
+}
+
+
 .actives {
 	background-color: #3274c3;
 	color: #ffffff;
@@ -584,6 +603,21 @@ function getDIcList() {
 	color: #333;
 }
 
+.img_trxt {
+	width: 18px;
+	height: 18px;
+	vertical-align: middle;
+	margin-bottom: 0px;
+}
+
+.img_trxt1 {
+	width: 22px;
+	height: 22px;
+	margin-right: 6px;
+	vertical-align: middle;
+	margin-bottom: 0px;
+}
+
 .bag-time {
 	width: 18%;
 }

src/views/News/pictureDetails/index.vue

@@ -4,7 +4,7 @@
     <div class="content-lzyj">
       <article-module :article="pageData.article">
         <div class="articleInfo">
-          <span class="title">[发布时间] <span>{{ pageData.publishTime }}</span></span>
+          <span class="title">发布时间: <span>{{ pageData.publishTime }}</span></span>
         </div>
       </article-module>
     </div>
@@ -43,4 +43,8 @@ function getPageData() {
 
   .articleInfo {}
 }
+
+.title {
+  color: #969696;
+}
 </style>

src/views/footer/index.vue

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