Merge remote-tracking branch 'origin/master'

src/assets/css/xpgj.css

@@ -108,10 +108,7 @@
 .vongi-index-inter .mui-col-xs-12 {
 	position:relative
 }
-.vongi-index-inter .mui-slider{
-	padding:5px;
-		    
-}
+
 .vongi-index-inter .mui-slider .mui-slider-item{
 	height: 84px;
 	border-radius: 7px;

src/assets/css/xpwyfyy.css

@@ -1587,3 +1587,9 @@ h3 {
 	text-align: center;
     padding: 10px 15px;
 }
+.vongi-choose .mui-table-view:before,
+.vongi-choose .mui-table-view:after,
+.vongi-choose .mui-table-view-cell:after
+{
+	background:0
+}

src/projects/business/views/HouseKeeper/Admin/Home.vue

@@ -41,7 +41,7 @@
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
 						<router-link :to="{name:'HouseKeeperAdminAttendanceList'}">
-							<img src="~$project/assets/img/logo_xiaopengguanjia.png" />
+							<img src="~$project/assets/img/icon_kaoqintongji.png" />
 							<div class="mui-media-body">考勤统计</div>
 						</router-link>
 					</li>
@@ -86,25 +86,27 @@
 						</div>
 						<a href="" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></a>
 					</div>
-					<div id="slider" class="mui-slider">
-						<div class="mui-slider-group">
-							<!-- 第一张 -->
-							<div class="mui-slider-item">
-								<a href="javascript:void(0)">
-									<img src="~$project/assets/img/02.jpg">
-								</a>
+					<div class="mui-col-xs-12">
+						<div id="slider" class="mui-slider">
+							<div class="mui-slider-group">
+								<!-- 第一张 -->
+								<div class="mui-slider-item">
+									<a href="javascript:void(0)">
+										<img src="~$project/assets/img/02.jpg">
+									</a>
+								</div>
+								<!-- 第二张 -->
+								<div class="mui-slider-item">
+									<a href="javascript:void(0)">
+										<img src="~$project/assets/img/02.jpg">
+									</a>
+								</div>
 							</div>
-							<!-- 第二张 -->
-							<div class="mui-slider-item">
-								<a href="javascript:void(0)">
-									<img src="~$project/assets/img/02.jpg">
-								</a>
+							<div class="mui-slider-indicator">
+								<div class="mui-indicator mui-active"></div>
+								<div class="mui-indicator"></div>
 							</div>
 						</div>
-						<div class="mui-slider-indicator">
-							<div class="mui-indicator mui-active"></div>
-							<div class="mui-indicator"></div>
-						</div>
 					</div>
 				</div>
 			</div>

src/projects/business/views/Master/Attendance/LeaveForm.vue

@@ -63,6 +63,8 @@
 				</button>
 			</div>
 		</div>
+	<loading :visible="isLoading"></loading>
+
 </div>
 </template>
 

src/projects/business/views/Master/Attendance/LeaveInfo.vue

@@ -70,6 +70,8 @@
 				</form>
 
 			</div>
+	<loading :visible="isLoading"></loading>
+
 </div>
 </template>
 

src/projects/business/views/Master/Attendance/LeaveList.vue

@@ -22,6 +22,8 @@
 				<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="save()">写请假条</button></div>
 			</div>
 		</div>
+	<loading :visible="isLoading"></loading>
+
 </div>
 </template>
 

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

@@ -116,25 +116,27 @@
 						</div>
 						<a href="" class="vongi-link"><span class="mui-icon mui-icon-forward"></span></a>
 					</div>
-					<div id="slider" class="mui-slider">
-						<div class="mui-slider-group">
-							<!-- 第一张 -->
-							<div class="mui-slider-item">
-								<a href="javascript:void(0)">
-									<img src="~$project/assets/img/02.jpg">
-								</a>
+					<div class="mui-col-xs-12">
+						<div id="slider" class="mui-slider">
+							<div class="mui-slider-group">
+								<!-- 第一张 -->
+								<div class="mui-slider-item">
+									<a href="javascript:void(0)">
+										<img src="~$project/assets/img/02.jpg">
+									</a>
+								</div>
+								<!-- 第二张 -->
+								<div class="mui-slider-item">
+									<a href="javascript:void(0)">
+										<img src="~$project/assets/img/02.jpg">
+									</a>
+								</div>
 							</div>
-							<!-- 第二张 -->
-							<div class="mui-slider-item">
-								<a href="javascript:void(0)">
-									<img src="~$project/assets/img/02.jpg">
-								</a>
+							<div class="mui-slider-indicator">
+								<div class="mui-indicator mui-active"></div>
+								<div class="mui-indicator"></div>
 							</div>
 						</div>
-						<div class="mui-slider-indicator">
-							<div class="mui-indicator mui-active"></div>
-							<div class="mui-indicator"></div>
-						</div>
 					</div>
 				</div>
 			</div>