UI

components/yxp-txt-scroll/yxp-txt-scroll.nvue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container" :style="{minHeight: fontSize + 'rpx'}">
+	<view class="container-gg" :style="{minHeight: fontSize + 'rpx'}">
 		<view class="notice-text-box" ref="yxpTxtBox" id="yxpTxtBox">
 			<view class="notice-text-con" ref="yxpTxt" id="yxpTxt"
 				:style="{animationDuration: (durationB || duration) / 1000 + 's',animationDelay: delay / 1000 + 's', paddingLeft: boxWidth + 'px'}">
@@ -27,7 +27,7 @@
 			},
 			fontColor: {
 				type: String,
-				default: '#333333'
+				default: '#fff'
 			},
 			duration: {
 				type: String,
@@ -151,7 +151,7 @@
 	}
 </script>
 <style>
-	.container {
+	.container-gg {
 		flex: 1;
 		display: flex;
 		flex-direction: column;

pages.json

@@ -1,20 +1,23 @@
 {
-	"pages": [{
-			"path": "pages/login",
+	"pages": [
+		{
+			"path": "pages/work/index",
 			"style": {
-				"navigationBarTitleText": "登录",
+				"navigationBarTitleText": "工作台",
 				"navigationStyle": "custom"
 			}
-		}, {
+		},
+		{
 			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "通知公告",
 				"navigationStyle": "custom"
 			}
-		}, {
-			"path": "pages/work/index",
+		},{
+			"path": "pages/login",
 			"style": {
-				"navigationBarTitleText": "工作台"
+				"navigationBarTitleText": "登录",
+				"navigationStyle": "custom"
 			}
 		},
 

pages/index.vue

@@ -1,33 +1,40 @@
 <template>
-
-
-	<view>
-		<view style="background-color: white;">
-			<view style=" display: flex;">
-				<text style="text-align:center;width: 35px;margin-left: 15px; margin-top: 10px;">
-					公告
-				</text>
-				<yxp-txt-scroll :text="content" fontSize="28" duration="5000" delay="500" txtPadding="10"
-					style=" margin: auto; width: 100%;" @onClick="goDetails"></yxp-txt-scroll>
-
-				<view style=" text-align: right;width: 70px;margin-top: 10px;color: darkgray" @click="more()"> 更多
-					<image src="../static/images/icon_right.png" style="width: 15px;height: 15px;" mode="widthFix">
+	<view class="gg-container">
+		<view class="gg-tit">
+			<view class="gg-title">
+				<image src="../static/images/logo-gg.png" style="width: 100rpx; height: 71rpx;"></image>
+				长春市贞达市政施工管理平台
+			</view>
+			<image src="../static/images/gg-bg.png" style="width: 100%; position:absolute;height: 40vh;" />
+			<view class="gg-body">
+				<view class="gg-body-tt">
+					<image src="../static/images/gg-lb.png" style="width: 60rpx; height: 60rpx;margin-right: 10rpx;">
 					</image>
+					<view>公告</view>
+				</view>
+				<yxp-txt-scroll :text="content" fontSize="30" duration="5000" delay="500" txtPadding="10"
+					style=" margin: auto; width: 80%;" @onClick="goDetails"></yxp-txt-scroll>
+				<view
+					style=" text-align: right;width: 70px;color: #fff; display: flex; justify-content: end;align-items: center;"
+					@click="more()">
+					更多
+					<image src="../static/images/icon_right.png" style="width: 15px;height: 15px;" mode="widthFix" />
 				</view>
 			</view>
-			<view class="notice" v-for="(item,index) in list" :key="index" v-if="index==0">
-				<view class="justify-content">
-					<view class="font-forty">
-						{{item.noticeTitle}}
-					</view>
-					<view class="font-twenty-eight gray">
-						{{item.createTime}}
-					</view>
+		</view>
+
+		<view class="notice" v-for="(item,index) in list" :key="index" v-if="index==0">
+			<view class="justify-content">
+				<view class="font-forty" style="font-size: 42rpx; font-weight: bold;">
+					{{item.noticeTitle}}
 				</view>
-				<view class="font-thirty-two black" style="margin: 30rpx 0;">
-					<rich-text :nodes="item.noticeContent"></rich-text>
+				<view class="font-twenty-eight gray" style="display: flex; align-items: center; margin-top: 20rpx; color:#777;">				
+				 <image src="../static/images/time.png" style="width: 26rpx;height: 26rpx; margin-right: 15rpx;"></image>	{{item.createTime}}
 				</view>
 			</view>
+			<view class="font-thirty-two black" style="margin: 30rpx 0;">
+				<rich-text :nodes="item.noticeContent"></rich-text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -106,7 +113,46 @@
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	.gg-container {
+		background-color: #fff;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.gg-tit {
+		width: 100%;
+		position: relative;
+		top: 0;
+		height: 40vh;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.gg-body {
+		display: flex;
+		position: absolute;
+		bottom: 25rpx;
+		width: 728rpx;
+		height: 80rpx;
+		background: linear-gradient(0deg, #90BDFF, #3F93FD, #20B9D5);
+		border-radius: 40rpx;
+		justify-content: center;
+		align-items: center;
+
+		.gg-body-tt {
+			text-align: left;
+			margin-left: 5px;
+			width: 25%;
+			display: flex;
+			align-items: center;
+			color: #FFFFFF;
+			font-weight: bold;
+			font-size: 30rpx;
+		}
+	}
+
 	.content {
 		display: flex;
 		flex-direction: column;
@@ -131,6 +177,17 @@
 		justify-content: space-between;
 	}
 
+	.gg-title {
+		width: 100%;
+		position: absolute;
+		z-index: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 40rpx;
+		font-weight: bold;
+		color: #FFFFFF;
+	}
 
 
 

pages/work/index.vue

@@ -1,14 +1,18 @@
 <template>
 	<view class="work-container">
-
-
+		<view style="work-banner">
+			<image src="../../static/images/work-banner.png" style="width: 100%;height:44vh"></image>
+		</view>
 		<view class="grid-body">
-
-
 			<view class="Grid">
 				<view class="Grid-Item" v-for="item in List" :key="item.id" @click="navClick(item.id)"
 					hover-class="click-hover" hover-start-time="50" hover-stay-time="50">
-
+					<image src="../../static/images/mygc.png" style="width: 300rpx; height: 300rpx;" v-if="item.title == '民用工程'"></image>
+					<image src="../../static/images/gygc.png" style="width: 300rpx; height: 300rpx;" v-if="item.title == '工业工程'"></image>
+					<image src="../../static/images/szgc.png" style="width: 300rpx; height: 300rpx;" v-if="item.title == '市政工程'"></image>
+					<image src="../../static/images/wxzy.png" style="width: 300rpx; height: 300rpx;" v-if="item.title == '危险作业工程'"></image>
+					<image src="../../static/images/dggc.png" style="width: 300rpx; height: 300rpx;" v-if="item.title == '顶管工程'"></image>
+					<image src="../../static/images/jjgc.png" style="width: 300rpx; height: 300rpx;" v-if="item.title == '基建工程'"></image>
 					<view class="GStitle">{{ item.title }}
 					</view>
 				</view>
@@ -16,6 +20,7 @@
 			<view v-if="showPopup" class="popup">
 				<view class="content">
 					<view class="line1">
+						<image></image>
 						<view>旧改工程</view>
 					</view>
 					<view class="line2" v-for="(item, index) in OldProjectList" :key="index">
@@ -366,6 +371,12 @@
 		font-size: 14px;
 		line-height: inherit;
 	}
+	
+	.work-container{
+		display: flex;
+		flex-direction: column;
+	}
+
 
 	/* #endif */
 
@@ -607,7 +618,7 @@
 
 		.Grid-Item {
 			width: 50%;
-			height: 100px;
+			// height: 100px;
 			text-align: center;
 			border: 1rpx solid #ff0000;
 			box-sizing: border-box;