Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xpgj-xsy

src/assets/css/xsy.css

@@ -236,6 +236,14 @@
 .vongi-eat-dat .vongi-wordcard-center li{
 	padding:10px 0
 }
+.vongi-fplist .icon-ze-friends{
+	color:#1677FF;
+	margin-right:5px
+}
+.box-show{
+	-webkit-box-shadow: 0 1px 6px #ccc;
+	box-shadow: 0 1px 6px #ccc;
+}
 @media (max-width: 320px) {
 	
 }

src/assets/fonts/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "21572075",
+      "name": "ze-friends",
+      "font_class": "ze-friends",
+      "unicode": "e6ba",
+      "unicode_decimal": 59066
+    },
     {
       "icon_id": "21236766",
       "name": "查验放行",

src/projects/business/views-xsy/PlanClass/Person.vue

@@ -40,6 +40,9 @@
 			</ul>
 			<!--人员列表-->
 			<div class="vongi-fplist">
+				<div class="mui-content-padded">
+					<h5><i class="iconfont icon-ze-friends blue"></i>人员列表</h5>
+				</div>
 				<form class="mui-input-group">
 					<div class="mui-input-row mui-checkbox">
 						<label>0-休息</label>
@@ -54,7 +57,7 @@
 						<input name="checkbox1" value="Item 3" type="checkbox">
 					</div>
 				</form>
-				<div class="fyy-footer vongi-footer">
+				<div class="fyy-footer vongi-footer box-show">
 					<h5 class="margin10">已选择人员：</h5>
 					<div class="vongi-yjbtn flew">
 						<span>邹杰<a class="iconfont icon-guanbi1"></a></span>