Merge branch 'master' of http://47.102.110.240:3000/yuxiangpei/tbServantMini_cloud

client/app.acss

@@ -103,5 +103,12 @@ font-size: 28rpx;
  color: #09AFFF;
 text-decoration:underline;
 }
-
-
+.work-day{
+  color: #999;
+  font-size: 22rpx;
+  margin:0 0 16rpx;
+}
+.cell-type{
+   margin:0 0 16rpx;
+   font-size:28rpx;
+}

client/pages/customer/servantdetail/servantdetail.acss

@@ -31,10 +31,7 @@
   color: #999999;
   font-size: 14px;
 }
-.cell-type{
-  color: #666666;
-  font-size: 16px;
-}
+
 .nosettingservaent{
   background: #FFFFFF;
   text-align: center;

client/pages/customer/servantsettings/servantsettings.acss

@@ -1,5 +1,6 @@
 .servant-settings-page{
   background-color: #F3F3F3;
+  padding:0 0 160rpx;
 }
 .servant-setting-header{
   height: 62rpx;
@@ -26,7 +27,7 @@
 .setting-list{
   background: #FFFFFF;
   border-radius: 18px;
-  margin: 25.99rpx 24rpx 20rpx 24rpx;
+  margin: 26rpx 24rpx 30rpx 24rpx;
 }
 .setting-list-title{
   color: #333333;

client/pages/servant/servantdetail/servantdetail.acss

@@ -31,10 +31,7 @@
   color: #999999;
   font-size: 14px;
 }
-.cell-type{
-  color: #666666;
-  font-size: 16px;
-}
+
 .nosettingservaent{
   background: #FFFFFF;
   text-align: center;

client/pages/servant/servantsettings/servantsettings.acss

@@ -1,5 +1,6 @@
 .servant-settings-page{
   background-color: #F3F3F3;
+   padding:0 0 160rpx;
 }
 .servant-setting-header{
   height: 62rpx;
@@ -26,7 +27,7 @@
 .setting-list{
   background: #FFFFFF;
   border-radius: 18px;
-  margin: 25.99rpx 24rpx 20rpx 24rpx;
+  margin: 26rpx 24rpx 30rpx 24rpx;
 }
 .setting-list-title{
   color: #333333;