From 993a73c9bc86a3978432d19ef7b8168e1ab7434a Mon Sep 17 00:00:00 2001
From: Ldy20010130 <1833225470@qq.com>
Date: Fri, 3 Jan 2025 23:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tabbar/tabbar.vue | 120 ++---
 pages/index.vue              | 986 ++++++++++++++++++-----------------
 static/back.png              | Bin 0 -> 2554 bytes
 static/index.html            |  20 +-
 4 files changed, 579 insertions(+), 547 deletions(-)
 create mode 100644 static/back.png

diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index c5548a2..4d742dd 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -1,43 +1,17 @@
 <template>
 	<view>
 		<u-tabbar :value="value1" :fixed="true" :placeholder="false" :safeAreaInsetBottom="false">
-			<u-tabbar-item
-				:badge="`${item.menuName === '工作待办' ? $store.state.mine.xiaoxi : 0}`"
-				v-for="(item, index) in isMenu"
-				:key="index"
-				:text="item.menuName"
-				
-				:name="item.menuName"
-				@click="click1(item.path)"
-			>
-			<image
-			v-if="item.menuName === '工作待办'"
-			class="u-page item slot-icon"
-			slot="active-icon"
-			src="../../static/images/login/chat.png"
-			style="height: 25px;width: 25px"
-			></image>
-			<image  
-			v-if="item.menuName === '首页'"
-			class="u-page item slot-icon"
-			slot="active-icon"
-			src="../../static/images/login/user.png"
-			style="height: 25px;width: 25px"
-			></image>
-			<image
-			v-if="item.menuName === '工作待办'"
-			class="u-page item slot-icon"
-			slot="inactive-icon"
-			src="../../static/images/login/chat.png"
-			style="height: 25px;width: 25px"
-			></image>
-			<image  
-			v-if="item.menuName === '首页'"
-			class="u-page item slot-icon"
-			slot="inactive-icon"
-			src="../../static/images/login/user.png"
-			style="height: 25px;width: 25px"
-			></image>
+			<u-tabbar-item :badge="`${item.menuName === '工作待办' ? $store.state.mine.xiaoxi : 0}`"
+				v-for="(item, index) in isMenu" :key="index" :text="item.menuName" :name="item.menuName"
+				@click="click1(item.path)">
+				<image v-if="item.menuName === '工作待办'" class="u-page item slot-icon" slot="active-icon"
+					src="../../static/images/login/chat.png" style="height: 25px;width: 25px"></image>
+				<image v-if="item.menuName === '首页'" class="u-page item slot-icon" slot="active-icon"
+					src="../../static/images/login/user.png" style="height: 25px;width: 25px"></image>
+				<image v-if="item.menuName === '工作待办'" class="u-page item slot-icon" slot="inactive-icon"
+					src="../../static/images/login/chat.png" style="height: 25px;width: 25px"></image>
+				<image v-if="item.menuName === '首页'" class="u-page item slot-icon" slot="inactive-icon"
+					src="../../static/images/login/user.png" style="height: 25px;width: 25px"></image>
 			</u-tabbar-item>
 		</u-tabbar>
 		<view style="height: 50px; width: 100%;"></view>
@@ -45,35 +19,51 @@
 </template>
 
 <script>
-export default {
-	name: 'tabbar',
-	props: {
-		value: {
-			type: [Number, String]
+	export default {
+		name: 'tabbar',
+		props: {
+			value: {
+				type: [Number, String]
+			},
+			xiaoxi: {
+				type: [Number, String]
+			}
 		},
-		xiaoxi: {
-			type: [Number, String]
-		}
-	},
-	onShow() {
-		this.xiaoxi = this.$store.state.mine.xiaoxi;
-	},
-	data() {
-		return {
-			//菜单权限数组
-			isMenu: this.$store.getters.saveMenu,
-			//tabber颜色接收
-			value1: this.$props.value
-		};
-	},
-	methods: {
-		click1(e) {
-			this.$tab.reLaunch(e);
-			//获取消息条数
-			this.$store.dispatch('getNewsListOne');
+		onShow() {
+			this.xiaoxi = this.$store.state.mine.xiaoxi;
+		},
+		data() {
+			return {
+				//菜单权限数组
+				isMenu: this.$store.getters.saveMenu,
+				//tabber颜色接收
+				value1: this.$props.value
+			};
+		},
+		methods: {
+			click1(e) {
+				this.$tab.reLaunch(e);
+				//获取消息条数
+				this.$store.dispatch('getNewsListOne');
+			}
 		}
-	}
-};
+	};
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+	/deep/.u-tabbar--fixed {
+		height: calc(45px + constant(safe-area-inset-bottom));
+		height: 45px;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		/* 直接扩展高度，因为padding-bottom是内边距 */
+		height: calc(45px + env(safe-area-inset-bottom));
+		/* 直接扩展高度 */
+		padding-bottom: constant(safe-area-inset-bottom);
+		/*兼容 iOS<11.2 */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* 兼容iOS>= 11.2*/
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index.vue b/pages/index.vue
index 53a848b..2177497 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -2,13 +2,16 @@
 
 	<view class="zhuye">
 		<meta name="viewport"
-		content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<LoadingPage :loading="loading"></LoadingPage>
 
-	<!-- //导航栏 -->
-	<!-- <u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="首页" :autoBack="true">
-	
-	</u-navbar> -->
+		<!-- //导航栏 -->
+		<u-navbar bgColor="#ffffff" :placeholder="true" titleStyle="font-weight:600" title="首页" :autoBack="true">
+			<template #left>
+				<image src='../static/back.png' style="width: 36rpx;height: 36rpx;" @click="goback">
+				</image>
+			</template>
+		</u-navbar>
 
 		<view v-show="!loading">
 			<view class="swiper">
@@ -23,7 +26,8 @@
 						<u-grid-item v-for="(item, index) in indexQuanXian" :key="index" :name="item.path">
 							<view class="grid-item-box1">
 								<image :src="`${item.pic}`" style="width: 70rpx; height: 70rpx;" />
-								<text style=" font-size: 26rpx;font-family: Noto Sans S Chinese;font-weight: 400;color: #212121;margin-top: 10rpx;">{{ item.menuName }}</text>
+								<text
+									style=" font-size: 26rpx;font-family: Noto Sans S Chinese;font-weight: 400;color: #212121;margin-top: 10rpx;">{{ item.menuName }}</text>
 							</view>
 						</u-grid-item>
 					</u-grid>
@@ -31,7 +35,9 @@
 			</view>
 			<view class="box">
 				<view class="notice-body" style="margin-top: 15rpx;" @click="goToPage(3)">
-					<view class="notice"><image src="../static/images/zhuye/notice.png" alt=""></image></view>
+					<view class="notice">
+						<image src="../static/images/zhuye/notice.png" alt=""></image>
+					</view>
 					<u-notice-bar color="#212121" bgColor="#FFFFFFF" icon=" " :text="gonggao"></u-notice-bar>
 					<u-icon name="arrow-right" color="#2979ff" size="20"></u-icon>
 				</view>
@@ -46,12 +52,14 @@
 					<view style="margin-top: 18rpx;">{{ phoCall }}</view>
 				</view>
 			</view>
-			<swiper v-if="showYj >= 0 && !list1.length == '0'" style="height: 210rpx;" class="new box" :autoplay="true" :interval="3000" :circular="true">
+			<swiper v-if="showYj >= 0 && !list1.length == '0'" style="height: 210rpx;" class="new box" :autoplay="true"
+				:interval="3000" :circular="true">
 				<swiper-item v-for="(item, index) in list1" :key="index" @click="goToPage(4, item)">
 					<view style="background-color: #fff;width: 100%;">
 						<!-- 头部 -->
 						<view class="sortHead">
-							<image src="../static/images/Yjplan/sort.png" style="width: 36rpx;height: 36rpx;margin-right: 22rpx;"></image>
+							<image src="../static/images/Yjplan/sort.png"
+								style="width: 36rpx;height: 36rpx;margin-right: 22rpx;"></image>
 							<span class="sortTitle">{{ index + 1 }}.{{ item.houseName }}</span>
 						</view>
 						<!-- 卡片 -->
@@ -72,7 +80,8 @@
 				<view style="background-color: #fff;width: 100%;">
 					<!-- 头部 -->
 					<view class="sortHead">
-						<image src="../static/images/Yjplan/sort.png" style="width: 36rpx;height: 36rpx;margin-right: 22rpx;"></image>
+						<image src="../static/images/Yjplan/sort.png"
+							style="width: 36rpx;height: 36rpx;margin-right: 22rpx;"></image>
 						<span class="sortTitle">最近一次演练计划</span>
 					</view>
 					<!-- 卡片 -->
@@ -82,13 +91,17 @@
 								<view class="content" style="border-left: 13rpx #FFD777 solid;margin-left: 4rpx; ">
 									<view class="name">{{ backlog.drillName }}</view>
 									<view class="address" style="display: flex;align-items: center;">
-										<image src="../static/images/drill/adress.png" style="width: 24rpx;height: 24rpx;margin-right: 5rpx;" />
+										<image src="../static/images/drill/adress.png"
+											style="width: 24rpx;height: 24rpx;margin-right: 5rpx;" />
 										{{ backlog.drillAddress }}
 									</view>
 								</view>
 								<view class="content">
-									<view class="name" style="color: #df4d63;font-weight: 600;">{{ backlog.text4 }}</view>
-									<view class="address" style="display: flex;align-items: center;">{{ backlog.drillDate }}</view>
+									<view class="name" style="color: #df4d63;font-weight: 600;">{{ backlog.text4 }}
+									</view>
+									<view class="address" style="display: flex;align-items: center;">
+										{{ backlog.drillDate }}
+									</view>
 								</view>
 							</view>
 						</view>
@@ -173,547 +186,564 @@
 	</view>
 </template>
 <script>
-import { backlog } from '@/api/indexpage/YJDrill/index.js';
-//权限控制
-import auth from '@/plugins/auth.js';
-//车辆预警
-import { getUserProfile, listCountByAll, listNotice, getConfigKey, getLessNum } from '@/api/indexpage/user.js';
-import { appMenuShowInfo, sendList } from '@/api/menu.js';
-// import { getFzTask, getNoReadMessage } from '@/api/indexpage/mine.js';
-import Tabbar from '@/components/tabbar/tabbar.vue';
-import update from '@/components/update/update.vue';
-import { dateFormat } from '@/minix/timeCommon.js';
-export default {
-	name: 'index',
-	components: {
-		Tabbar,
-		update
-	},
-	data() {
-		return {
-			backlog: [
-				
-			],
-			showYj: '',
-			text1: '',
-			gonggao: '欢迎使用应急资源管理App',
-			daubanData: 0,
-			tabIndex: 0,
-			news: 0,
-			loading: false,
-			fullHeight: '', //轮播图自适应高
-			// showOverPop: this.$store.state.overlaypop.showOverPop, //暂且先改为flase,等联合后台后再来显示
-			name: this.$store.state.user.name,
-			isTF: this.$store.state.updateApp.isTrue,
-			current: 0,
-			renwuList: null,
-			//取到菜单权限
-			indexQuanXian: [],
-			// list1: ["全部", "个体防护", "应急救援设备", "消防设备设施"],
-			list1: [],
-			cardata: {},
-			phoCall: '',
-			quanxianzhifu: true,
-			activityNum: 0, //非常规作业数量
-			name: this.$store.state.user.name
-		};
-	},
-
-	onLoad() {
-		this.text1 = getApp().globalData.config.appInfo.version;
-		//隐常自带tabber
-		uni.hideTabBar();
-		this.news = this.$store.state.mine.xiaoxi;
-		this.getquanxian();
-		//权限按钮
-		this.quanxianzhifu = auth.hasPermi('specialwork:workActivity:add');
-		//获取消息条数
-		this.$store.dispatch('getNewsListOne');
-		this.getYanLian();
-		this.getYj();
-		this.getCar();
-		this.getGongGao();
-		this.getConfigKeyData();
-	},
-	methods: {
-		getYanLian() {
-			backlog().then(res => {
-				this.backlog = res[0];
-				if(this.backlog==null){
-				
-				}
-			});
-		},
-		getYj() {
-			getLessNum().then(res => {
-				this.list1 = res.data;
-			});
-		},
-		goToPage(bs, item) {
-			if (bs === 1) {
-				//仓库库存
-				this.$tab.navigateTo(`/pages/indexpage/Yjcar/Yjcar`);
-			} else if (bs === 2) {
-				this.$tab.navigateTo(`/pages/makePhoneCall/makePhoneCall`);
-			} else if (bs === 3) {
-				//D:/公司代码/公司代码20230829/华北石油局/
-				this.$tab.navigateTo(`/pages/GongGao/GongGao`);
-			} else if (bs === 4) {
-				this.$tab.navigateTo(`/pages/indexpage/YJgoods/wzYvJing/wzYvJing?ckId=${item.houseId}&ckName=${item.houseName}`);
-			}
-		},
-		getGongGao() {
-			listNotice().then(res => {
-				this.gonggao = res.rows
-					.map(item => {
-						return item.noticeContent;
-					})
-					.join(' ');
-			});
-		},
-		getCar() {
-			listCountByAll().then(res => {
-				this.cardata = res.data;
-			});
-		},
-		getConfigKeyData() {
-			getConfigKey('emergency_phone').then(res => {
-				this.phoCall = res.msg;
-			});
-		},
-		// tabs点击切换
-		clicktabs(e) {
-			this.switchTab(e.index);
-		},
-		// 轮播图切换
-		tabChange(e) {
-			let index = e.target.current || e.detail.current; // 获取到当前移动到第几个
-			this.switchTab(index);
-		},
-		//优化---当index相同时，不执行代码
-		switchTab(index) {
-			if (this.tabIndex == index) {
-				return;
-			} else {
-				this.tabIndex = index;
-			}
+	import {
+		backlog
+	} from '@/api/indexpage/YJDrill/index.js';
+	//权限控制
+	import auth from '@/plugins/auth.js';
+	//车辆预警
+	import {
+		getUserProfile,
+		listCountByAll,
+		listNotice,
+		getConfigKey,
+		getLessNum
+	} from '@/api/indexpage/user.js';
+	import {
+		appMenuShowInfo,
+		sendList
+	} from '@/api/menu.js';
+	// import { getFzTask, getNoReadMessage } from '@/api/indexpage/mine.js';
+	import Tabbar from '@/components/tabbar/tabbar.vue';
+	import update from '@/components/update/update.vue';
+	import {
+		dateFormat
+	} from '@/minix/timeCommon.js';
+	export default {
+		name: 'index',
+		components: {
+			Tabbar,
+			update
 		},
-		ShowON(e) {
-			this.show = e;
-			//通知vuex改变变量
-			this.$store.commit('setisFalse');
+		data() {
+			return {
+				backlog: [
+
+				],
+				showYj: '',
+				text1: '',
+				gonggao: '欢迎使用应急资源管理App',
+				daubanData: 0,
+				tabIndex: 0,
+				news: 0,
+				loading: false,
+				fullHeight: '', //轮播图自适应高
+				// showOverPop: this.$store.state.overlaypop.showOverPop, //暂且先改为flase,等联合后台后再来显示
+				name: this.$store.state.user.name,
+				isTF: this.$store.state.updateApp.isTrue,
+				current: 0,
+				renwuList: null,
+				//取到菜单权限
+				indexQuanXian: [],
+				// list1: ["全部", "个体防护", "应急救援设备", "消防设备设施"],
+				list1: [],
+				cardata: {},
+				phoCall: '',
+				quanxianzhifu: true,
+				activityNum: 0, //非常规作业数量
+				name: this.$store.state.user.name
+			};
 		},
-		showOverPop() {
-			//通知vuex改变变量
-			this.$store.commit('setshowOverPop', false);
+
+		onLoad() {
+			this.text1 = getApp().globalData.config.appInfo.version;
+			//隐常自带tabber
+			uni.hideTabBar();
+			this.news = this.$store.state.mine.xiaoxi;
+			this.getquanxian();
+			//权限按钮
+			this.quanxianzhifu = auth.hasPermi('specialwork:workActivity:add');
+			//获取消息条数
+			this.$store.dispatch('getNewsListOne');
+			this.getYanLian();
+			this.getYj();
+			this.getCar();
+			this.getGongGao();
+			this.getConfigKeyData();
 		},
-		getquanxian() {
-			this.$store.state.user.saveMenu.map(item => {
-				if (item.menuName === '首页') {
-					//过滤不显示的按钮
-					item.children.map(item1 => {
-						if (item1.status === '0') {
-							if (item.path === '/pages/indexpage/YJgoods/YJgoods') {
-								this.showYj = 2;
-							}
-							this.indexQuanXian.push(item1);
-						}
-					});
+		methods: {
+			goback() {
+				window.history.back()
+			},
+			getYanLian() {
+				backlog().then(res => {
+					this.backlog = res[0];
+					if (this.backlog == null) {
+
+					}
+				});
+			},
+			getYj() {
+				getLessNum().then(res => {
+					this.list1 = res.data;
+				});
+			},
+			goToPage(bs, item) {
+				if (bs === 1) {
+					//仓库库存
+					this.$tab.navigateTo(`/pages/indexpage/Yjcar/Yjcar`);
+				} else if (bs === 2) {
+					this.$tab.navigateTo(`/pages/makePhoneCall/makePhoneCall`);
+				} else if (bs === 3) {
+					//D:/公司代码/公司代码20230829/华北石油局/
+					this.$tab.navigateTo(`/pages/GongGao/GongGao`);
+				} else if (bs === 4) {
+					this.$tab.navigateTo(
+						`/pages/indexpage/YJgoods/wzYvJing/wzYvJing?ckId=${item.houseId}&ckName=${item.houseName}`);
 				}
-			});
-		},
-		changeGrid(path) {
-			// console.log(path);
-			// this.$modal.showToast('模块建设中~');
-			this.$tab.navigateTo(path);
+			},
+			getGongGao() {
+				listNotice().then(res => {
+					this.gonggao = res.rows
+						.map(item => {
+							return item.noticeContent;
+						})
+						.join(' ');
+				});
+			},
+			getCar() {
+				listCountByAll().then(res => {
+					this.cardata = res.data;
+				});
+			},
+			getConfigKeyData() {
+				getConfigKey('emergency_phone').then(res => {
+					this.phoCall = res.msg;
+				});
+			},
+			// tabs点击切换
+			clicktabs(e) {
+				this.switchTab(e.index);
+			},
+			// 轮播图切换
+			tabChange(e) {
+				let index = e.target.current || e.detail.current; // 获取到当前移动到第几个
+				this.switchTab(index);
+			},
+			//优化---当index相同时，不执行代码
+			switchTab(index) {
+				if (this.tabIndex == index) {
+					return;
+				} else {
+					this.tabIndex = index;
+				}
+			},
+			ShowON(e) {
+				this.show = e;
+				//通知vuex改变变量
+				this.$store.commit('setisFalse');
+			},
+			showOverPop() {
+				//通知vuex改变变量
+				this.$store.commit('setshowOverPop', false);
+			},
+			getquanxian() {
+				this.$store.state.user.saveMenu.map(item => {
+					if (item.menuName === '首页') {
+						//过滤不显示的按钮
+						item.children.map(item1 => {
+							if (item1.status === '0') {
+								if (item.path === '/pages/indexpage/YJgoods/YJgoods') {
+									this.showYj = 2;
+								}
+								this.indexQuanXian.push(item1);
+							}
+						});
+					}
+				});
+			},
+			changeGrid(path) {
+				// console.log(path);
+				// this.$modal.showToast('模块建设中~');
+				this.$tab.navigateTo(path);
+			}
 		}
-	}
-};
+	};
 </script>
 <style lang="scss" scoped>
-.u-nav-slot {
-	width: 100vw;
-	padding: 0 30rpx;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-
-	.city {
-		display: flex;
-		align-items: center;
-		font-size: 38rpx;
-		font-family: Noto Sans S Chinese;
-		font-weight: 400;
-		color: #333333;
-	}
-
-	.weather {
-		display: flex;
-		font-size: 30rpx;
-		font-family: Noto Sans S Chinese;
-		font-weight: 400;
-		color: #333333;
-	}
-}
-
-page {
-	background-color: #f6f7fb;
-	box-sizing: border-box !important;
-	// background: linear-gradient(0deg, #E1E5FD, #F6F7FB) !important;
-}
-
-.sortHead {
-	background-color: #fff;
-	display: flex;
-	font-weight: 600;
-	align-items: center;
-	padding: 12rpx 20rpx;
-
-	.sortTitle {
-		font-family: Noto Sans S Chinese;
-
-		font-size: 32rpx;
-		color: #333333;
-		line-height: 40rpx;
-	}
-}
-
-.sortCard {
-	padding: 0 10rpx;
-	padding-bottom: 10rpx;
-	display: flex;
-	justify-content: space-between;
-	// flex-wrap: wrap;
-	margin-bottom: 10rpx;
-	width: 100%;
-
-	.unfinishlist {
-		width: 672rpx;
-		height: 120rpx;
-		margin-top: 10rpx;
-		background: #ffffff;
-		box-shadow: 0rpx 6rpx 8rpx 0rpx rgba(190, 207, 228, 0.4);
+	.u-nav-slot {
+		width: 100vw;
+		padding: 0 30rpx;
 		display: flex;
 		justify-content: space-between;
-		padding: 0rpx 4rpx;
-		// align-items: flex-start;
+		align-items: center;
 
-		.content {
+		.city {
 			display: flex;
-			flex-direction: column;
-			justify-content: space-evenly;
-			// margin-left: 20rpx;
-
-			.name {
-				font-weight: 400;
-				font-size: 30rpx;
-				color: #333333;
-				margin-left: 10rpx;
-			}
+			align-items: center;
+			font-size: 38rpx;
+			font-family: Noto Sans S Chinese;
+			font-weight: 400;
+			color: #333333;
+		}
 
-			.address {
-				font-family: Noto Sans S Chinese;
-				font-weight: normal;
-				font-size: 24rpx;
-				color: #999999;
-				margin-left: 10rpx;
-			}
+		.weather {
+			display: flex;
+			font-size: 30rpx;
+			font-family: Noto Sans S Chinese;
+			font-weight: 400;
+			color: #333333;
 		}
 	}
 
-	.zonghe {
-		width: 320rpx;
-		height: 140rpx;
-		background: url('../static/images/Yjplan/zonghe.png') no-repeat;
-		background-size: 100% 100%;
-		// margin-right: 19rpx;
+	page {
+		background-color: #f6f7fb;
+		box-sizing: border-box !important;
+		// background: linear-gradient(0deg, #E1E5FD, #F6F7FB) !important;
 	}
 
-	.zhuanxiang {
-		width: 320rpx;
-		height: 140rpx;
-		background: url('../static/images/Yjplan/qita.png') no-repeat;
-		background-size: 100% 100%;
-	}
+	.sortHead {
+		background-color: #fff;
+		display: flex;
+		font-weight: 600;
+		align-items: center;
+		padding: 12rpx 20rpx;
 
-	.title {
-		font-family: Noto Sans S Chinese;
+		.sortTitle {
+			font-family: Noto Sans S Chinese;
 
-		font-size: 30rpx;
-		color: #4d4d4d;
-		line-height: 40rpx;
-		padding: 18rpx 30rpx;
+			font-size: 32rpx;
+			color: #333333;
+			line-height: 40rpx;
+		}
 	}
 
-	.count {
-		font-family: DINPro;
-		font-weight: 500;
-		font-size: 40rpx;
-		color: #353535;
-		line-height: 40rpx;
-		padding: 0 40rpx;
-	}
-}
+	.sortCard {
+		padding: 0 10rpx;
+		padding-bottom: 10rpx;
+		display: flex;
+		justify-content: space-between;
+		// flex-wrap: wrap;
+		margin-bottom: 10rpx;
+		width: 100%;
 
-.box1 .u-badge--not-dot {
-	padding: 5px 8px;
-}
+		.unfinishlist {
+			width: 672rpx;
+			height: 120rpx;
+			margin-top: 10rpx;
+			background: #ffffff;
+			box-shadow: 0rpx 6rpx 8rpx 0rpx rgba(190, 207, 228, 0.4);
+			display: flex;
+			justify-content: space-between;
+			padding: 0rpx 4rpx;
+			// align-items: flex-start;
 
-.zhuye {
-	width: 100%;
+			.content {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-evenly;
+				// margin-left: 20rpx;
+
+				.name {
+					font-weight: 400;
+					font-size: 30rpx;
+					color: #333333;
+					margin-left: 10rpx;
+				}
 
-	.swiper {
-		height: 427rpx;
-		width: 100vw;
-		position: relative;
+				.address {
+					font-family: Noto Sans S Chinese;
+					font-weight: normal;
+					font-size: 24rpx;
+					color: #999999;
+					margin-left: 10rpx;
+				}
+			}
+		}
 
-		.welcome {
-			position: absolute;
-			bottom: 50rpx;
-			right: 60rpx;
-			font-size: 40rpx;
-			font-family: PangMenZhengDao;
-			font-weight: 400;
-			color: #fff;
-			text-shadow: 2px 0px 6px rgba(62, 62, 62, 0.2);
+		.zonghe {
+			width: 320rpx;
+			height: 140rpx;
+			background: url('../static/images/Yjplan/zonghe.png') no-repeat;
+			background-size: 100% 100%;
+			// margin-right: 19rpx;
 		}
 
-		image {
-			width: 100%;
-			height: 100%;
+		.zhuanxiang {
+			width: 320rpx;
+			height: 140rpx;
+			background: url('../static/images/Yjplan/qita.png') no-repeat;
+			background-size: 100% 100%;
+		}
+
+		.title {
+			font-family: Noto Sans S Chinese;
+
+			font-size: 30rpx;
+			color: #4d4d4d;
+			line-height: 40rpx;
+			padding: 18rpx 30rpx;
+		}
+
+		.count {
+			font-family: DINPro;
+			font-weight: 500;
+			font-size: 40rpx;
+			color: #353535;
+			line-height: 40rpx;
+			padding: 0 40rpx;
 		}
 	}
 
-	.box {
-		padding: 0 34rpx;
-		position: relative;
-		top: -50rpx;
-		// z-index: 999;
+	.box1 .u-badge--not-dot {
+		padding: 5px 8px;
 	}
 
-	.notice-body {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 10rpx;
+	.zhuye {
+		width: 100%;
 
-		.notice {
-			width: 55rpx;
-			height: 53rpx;
+		.swiper {
+			height: 427rpx;
+			width: 100vw;
+			position: relative;
+
+			.welcome {
+				position: absolute;
+				bottom: 50rpx;
+				right: 60rpx;
+				font-size: 40rpx;
+				font-family: PangMenZhengDao;
+				font-weight: 400;
+				color: #fff;
+				text-shadow: 2px 0px 6px rgba(62, 62, 62, 0.2);
+			}
 
 			image {
 				width: 100%;
 				height: 100%;
 			}
 		}
-	}
-
-	// 菜单模块
-	.grid-body,
-	.notice-body {
-		width: 100%;
-		// height: 450rpx;
-		background-color: #fff;
-		border-radius: 20rpx;
-		color: #212121;
-		font-size: 26rpx;
-		font-weight: Regular;
 
-		.text {
-			font-size: 28rpx;
-			font-family: Noto Sans S Chinese;
-			font-weight: 400;
-			color: #666666;
+		.box {
+			padding: 0 34rpx;
+			position: relative;
+			top: -50rpx;
+			// z-index: 999;
 		}
 
-		// 常用服务
-		.serve {
+		.notice-body {
 			display: flex;
-			padding: 20rpx;
-			align-items: center;
-			border-bottom: 1rpx #eeeeee solid;
-		}
-
-		.grid-item-box1 {
-			height: 160rpx !important;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
+			justify-content: space-between;
 			align-items: center;
-		}
-	}
+			padding: 10rpx;
 
-	// 车辆
-	.new {
-		// padding: 0 34rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		// width: 100%;
-		border-radius: 20rpx;
-		margin: 20rpx 0;
-
-		.newleft {
-			width: 334rpx;
-			height: 148rpx;
-			background-image: url('../static/images/zhuye/car.png');
-			background-size: 100%;
-			margin-right: 15rpx;
-			font-size: 28rpx;
-			font-family: Alibaba PuHuiTi;
-			font-weight: 600;
-			color: #3d6aa6;
-			padding: 0 26rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-		}
+			.notice {
+				width: 55rpx;
+				height: 53rpx;
 
-		.newright {
-			width: 334rpx;
-			height: 148rpx;
-			background-image: url('../static/images/zhuye/phone.png');
-			background-size: 100%;
-			font-size: 28rpx;
-			font-family: Alibaba PuHuiTi;
-			font-weight: 600;
-			color: #1e7555;
-			padding: 0 26rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
 		}
-	}
-
-	.boxGood {
-		background-color: #fff;
-		border-radius: 20rpx;
-		// height: 1000rpx;
 
-		.title {
-			display: flex;
-			justify-content: space-between;
+		// 菜单模块
+		.grid-body,
+		.notice-body {
 			width: 100%;
+			// height: 450rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			color: #212121;
+			font-size: 26rpx;
+			font-weight: Regular;
 
-			.titlebg {
-				width: 305rpx;
-				height: 71rpx;
+			.text {
+				font-size: 28rpx;
+				font-family: Noto Sans S Chinese;
+				font-weight: 400;
+				color: #666666;
+			}
 
-				image {
-					width: 100%;
-					height: 100%;
-				}
+			// 常用服务
+			.serve {
+				display: flex;
+				padding: 20rpx;
+				align-items: center;
+				border-bottom: 1rpx #eeeeee solid;
 			}
 
-			.address {
+			.grid-item-box1 {
+				height: 160rpx !important;
 				display: flex;
+				flex-direction: column;
 				justify-content: center;
 				align-items: center;
-				margin-right: 20rpx;
 			}
 		}
-	}
 
-	// 物资
-	.goodsContent {
-		height: 200rpx;
-		width: 100%;
-		padding: 30rpx 20rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-evenly;
-		border-bottom: 1px solid #eeeeee;
+		// 车辆
+		.new {
+			// padding: 0 34rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			// width: 100%;
+			border-radius: 20rpx;
+			margin: 20rpx 0;
+
+			.newleft {
+				width: 334rpx;
+				height: 148rpx;
+				background-image: url('../static/images/zhuye/car.png');
+				background-size: 100%;
+				margin-right: 15rpx;
+				font-size: 28rpx;
+				font-family: Alibaba PuHuiTi;
+				font-weight: 600;
+				color: #3d6aa6;
+				padding: 0 26rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
+
+			.newright {
+				width: 334rpx;
+				height: 148rpx;
+				background-image: url('../static/images/zhuye/phone.png');
+				background-size: 100%;
+				font-size: 28rpx;
+				font-family: Alibaba PuHuiTi;
+				font-weight: 600;
+				color: #1e7555;
+				padding: 0 26rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+			}
+		}
 
-		.goodsPic {
-			width: 180rpx;
-			height: 180rpx;
+		.boxGood {
+			background-color: #fff;
+			border-radius: 20rpx;
+			// height: 1000rpx;
 
-			image {
+			.title {
+				display: flex;
+				justify-content: space-between;
 				width: 100%;
-				height: 100%;
+
+				.titlebg {
+					width: 305rpx;
+					height: 71rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.address {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-right: 20rpx;
+				}
 			}
 		}
 
-		.goodsNew {
+		// 物资
+		.goodsContent {
+			height: 200rpx;
+			width: 100%;
+			padding: 30rpx 20rpx;
 			display: flex;
-			flex-direction: column;
+			align-items: center;
 			justify-content: space-evenly;
-			// align-items: center;
-		}
+			border-bottom: 1px solid #eeeeee;
 
-		.name {
-			// width: 87rpx;
-			height: 29rpx;
-			font-size: 30rpx;
-			font-family: Noto Sans S Chinese;
-			font-weight: 600;
-			color: #333333;
-		}
+			.goodsPic {
+				width: 180rpx;
+				height: 180rpx;
 
-		.type {
-			margin: 15rpx 0 10rpx 0;
-			font-size: 26rpx;
-			font-family: Noto Sans S Chinese;
-			font-weight: normal;
-			color: #999999;
-		}
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
 
-		.count {
-			display: flex;
-			font-size: 26rpx;
-			font-family: Noto Sans S Chinese;
-			font-weight: normal;
-			color: #999999;
-		}
+			.goodsNew {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-evenly;
+				// align-items: center;
+			}
 
-		.basicCount {
-			font-size: 22rpx;
-			font-family: Noto Sans S Chinese;
-			font-weight: normal;
-			color: #0098df;
-			width: 212rpx;
-			// height: 40rpx;
-			background: #e8f8ff;
-			border: 1px solid #0098df;
-			border-radius: 4rpx;
-			margin-right: 10rpx;
-			padding: 10rpx;
-			display: flex;
-			align-items: center;
+			.name {
+				// width: 87rpx;
+				height: 29rpx;
+				font-size: 30rpx;
+				font-family: Noto Sans S Chinese;
+				font-weight: 600;
+				color: #333333;
+			}
 
-			image {
-				height: 22rpx;
-				width: 20rpx;
+			.type {
+				margin: 15rpx 0 10rpx 0;
+				font-size: 26rpx;
+				font-family: Noto Sans S Chinese;
+				font-weight: normal;
+				color: #999999;
 			}
-		}
 
-		.currentCount {
-			font-size: 22rpx;
-			font-family: Noto Sans S Chinese;
-			font-weight: normal;
-			color: #ffa132;
-			width: 210rpx;
-			// height: 40rpx;
-			background: #fff9f1;
-			border: 1px solid #ffa132;
-			border-radius: 4rpx;
-			padding: 10rpx;
-			display: flex;
-			align-items: center;
+			.count {
+				display: flex;
+				font-size: 26rpx;
+				font-family: Noto Sans S Chinese;
+				font-weight: normal;
+				color: #999999;
+			}
 
-			image {
-				height: 22rpx;
-				width: 20rpx;
+			.basicCount {
+				font-size: 22rpx;
+				font-family: Noto Sans S Chinese;
+				font-weight: normal;
+				color: #0098df;
+				width: 212rpx;
+				// height: 40rpx;
+				background: #e8f8ff;
+				border: 1px solid #0098df;
+				border-radius: 4rpx;
+				margin-right: 10rpx;
+				padding: 10rpx;
+				display: flex;
+				align-items: center;
+
+				image {
+					height: 22rpx;
+					width: 20rpx;
+				}
 			}
-		}
 
-		.status {
-			font-size: 28rpx;
-			font-family: Noto Sans S Chinese;
-			font-weight: 500;
-			color: #ffa132;
-			// margin: 10rpx 0;
+			.currentCount {
+				font-size: 22rpx;
+				font-family: Noto Sans S Chinese;
+				font-weight: normal;
+				color: #ffa132;
+				width: 210rpx;
+				// height: 40rpx;
+				background: #fff9f1;
+				border: 1px solid #ffa132;
+				border-radius: 4rpx;
+				padding: 10rpx;
+				display: flex;
+				align-items: center;
+
+				image {
+					height: 22rpx;
+					width: 20rpx;
+				}
+			}
+
+			.status {
+				font-size: 28rpx;
+				font-family: Noto Sans S Chinese;
+				font-weight: 500;
+				color: #ffa132;
+				// margin: 10rpx 0;
+			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/static/back.png b/static/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f2a593a45ba38f684cc713867c00b8d2d659100
GIT binary patch
literal 2554
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
Ye|F-y^iV*7Jj?+n2Uq)wUB{CD24`eg3jhEB

literal 0
HcmV?d00001

diff --git a/static/index.html b/static/index.html
index a7af653..0db74de 100644
--- a/static/index.html
+++ b/static/index.html
@@ -2,13 +2,17 @@
 <html lang="zh-CN">
 	<head>
 		<meta charset="utf-8">
+		<meta name='viewport' content="width=device-width, viewport-fit=cover" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		  <meta name="renderer" content="webkit">
+		<meta name="renderer" content="webkit">
 		<title><%= htmlWebpackPlugin.options.title %></title>
-    <link rel="shortcut icon" type="image/x-icon" href="<%= BASE_URL %>static/favicon.ico">
+		<link rel="shortcut icon" type="image/x-icon" href="<%= BASE_URL %>static/favicon.ico">
 		<script>
-			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-			document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS
+				.supports('top: constant(a)'))
+			document.write(
+				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+				(coverSupport ? ', viewport-fit=cover' : '') + '" />')
 		</script>
 		<link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
 	</head>
@@ -17,4 +21,12 @@
 			<strong>本站点必须要开启JavaScript才能运行.</strong>
 		</noscript>
 		<div id="app"></div>
+		<style>
+			#app {
+				padding-bottom: constant(safe-area-inset-bottom);
+				/* 兼容 iOS<11.2 */
+				padding-bottom: env(safe-area-inset-bottom);
+				/* 兼容iOS>= 11.2 */
+			}
+		</style>
 </html>
\ No newline at end of file