Merge remote-tracking branch 'origin/master'

src/assets/css/xpgj.css

@@ -207,7 +207,16 @@
 	box-shadow: none;
 }
 .vongi-bar .mui-title{
-	color:#ffffff
+	color:#ffffff;
+	text-align: left;
+    left: 15px;
+}
+.vongi-bar a .mui-icon{
+	color:#ffffff;
+	font-size:18px
+}
+.vongi-bar a{
+	color:#ffffff;
 }
 .vongi-all{
 	background:#ffffff

src/projects/business/views/Master/Home.vue

@@ -1,7 +1,11 @@
 <template>
 	<div>
 		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle" headerClass="vongi-bar" :leftShow="false"></top-header>
+		<!-- <top-header :pageTitle="pageTitle" headerClass="vongi-bar" :leftShow="false"></top-header> -->
+		<header class="mui-bar mui-bar-nav vongi-bar">
+			<a class="mui-title">荆鹏软件集团有限公司<!-- <span class="mui-icon mui-icon-arrowdown"></span> --></a>
+			<a class="mui-pull-right" href="">员工<span class="mui-icon iconfont icon-jiaohuan"></span></a>
+		</header>
 
 		<div class="mui-content margin49">
 			<div class="vongi-icons">
@@ -46,20 +50,20 @@
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/cicon10.png" />
-							<div class="mui-media-body">访客审批</div>
+							<img src="~$project/assets/img/icon_kaoqinshenpi.png" />
+							<div class="mui-media-body">考勤审批</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/cicon01.png" />
-							<div class="mui-media-body">携物出厂</div>
+							<img src="~$project/assets/img/icon_qingjiashenpi.png" />
+							<div class="mui-media-body">请假审批</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/cicon27.png" />
-							<div class="mui-media-body">每周菜谱</div>
+							<img src="~$project/assets/img/icon_fangkeshenpi.png" />
+							<div class="mui-media-body">访客审批</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
@@ -70,8 +74,8 @@
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
 						<a href="javascript:void(0)">
-							<img src="~$project/assets/img/cicon22.png" />
-							<div class="mui-media-body">用车申请</div>
+							<img src="~$project/assets/img/cicon01.png" />
+							<div class="mui-media-body">携物出厂</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">