任务管理器，服务列表

client/app.json

@@ -10,7 +10,9 @@
     "pages/customer/customerCenter/customerCenter",
     "pages/common/selectRole/selectRole",
     "pages/customer/monthReport/monthReport",
-    "pages/customer/editServant/editServant"
+    "pages/customer/editServant/editServant",
+    "pages/servant/taskreminder/taskreminder",
+    "pages/servant/servantlist/servantlist"
   ],
   "window": {
     "defaultTitle": "保姆管家"

client/pages/customer/dailytasks/dailytasks.acss

@@ -1,10 +1,10 @@
 .daily-servant-page{
   padding-top:24rpx;
-  padding-bottom: 10pt;
+  padding-bottom: 10rpx;
 }
 .dailyitem{
   padding:24rpx;
-  margin-bottom: 10pt;
+  margin-bottom: 10rpx;
 }
 .every-week{
   color: #666;
@@ -30,8 +30,8 @@
   margin:0 20rpx 16rpx 0;
   border-radius:52rpx;
   text-align: center;
-  padding-left: 10pt;
-  padding-right: 10pt;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
 }
 .daily-item-selected{
   background: #E6F7FF;
@@ -60,4 +60,7 @@
   width:12rpx;
   height: 22rpx;
   margin:0 0 0 10rpx;
+}
+.dailyitem-buttom{
+  height: 120rpx;
 }

client/pages/customer/dailytasks/dailytasks.axml

@@ -41,4 +41,9 @@
       <view a:for="{{pets}}" class="daily-item {{petslist.indexOf(item.id)!=-1 ?'daily-item-selected':''}}" key="{{index}}" data-id="{{item.id}}">{{item.text}}</view>
     </view>
   </view>
+  <view class="dailyitem-buttom"></view>
+
+ <view class="common-button-wrapper">
+     <button type="primary" class="common-button" hover-class="active-button"  onTap="dailytasksdeit">完成编辑</button>
+  </view>
 </view>

client/pages/customer/dailytasks/dailytasks.js

@@ -33,4 +33,7 @@ Page({
       })
     }
   },
+  dailytasksdeit(){
+    
+  },
 });

client/pages/servant/servantdetail/servantdetail.acss

@@ -1,19 +1,37 @@
 .servantdetail-servant-page{
   padding-top:24rpx;
-  padding-bottom: 10pt;
+  padding-bottom: 20rpx;
 }
 .servantdetailitem{
   padding:24rpx;
-  margin-bottom: 10pt;
+  margin-bottom: 24rpx;
 }
 .good-list{
-  margin-top: 5pt;
+  margin-top: 15rpx;
   background-color: #FAFAFA;
-  padding: 10pt;
-  border-radius: 6pt;
+  padding: 24rpx;
+  border-radius: 12rpx;
+  color: #333333;
 }
 .good-item-list{
-  margin-top: 10pt;
-  margin-left: 10pt;
+  margin-top: 24rpx;
+  margin-left: 24rpx;
+  color: #666666;
 }
-
+.cell-title{
+  color: #333333;
+  font-size: 18px;
+}
+.cell-title image{
+  width: 27.5rpx;
+  height: 27.5rpx;
+  margin-left: 9rpx;
+}
+.cell-list{
+  color: #999999;
+  font-size: 14px;
+}
+.cell-type{
+  color: #666666;
+  font-size: 16px;
+}

client/pages/servant/servantdetail/servantdetail.axml

@@ -1,9 +1,21 @@
 <view class="common-page-padding servantdetail-servant-page">
   <!---阿姨类型--->
   <view class="common-card servantdetailitem">
-    <view class="cell-title">王阿姨</view>
-    <view class="servant-list">
-      
+    <view class="cell-title">
+    <label>王阿姨</label>
+    <image mode="scaleToFill" src="/image/icon-edit.png"/>
+    </view>
+    <view class="cell-list">
+      <label>周一▪</label>
+      <label>周二▪</label>
+      <label>周三▪</label>
+      <label>周四▪</label>
+      <label>周五▪</label>
+      <label>周六▪</label>
+      <label>周日</label>
+    </view>
+    <view class="cell-type">
+      保密工种：<label>钟点工</label>
     </view>
   </view>
   <!---阿姨类型--->

client/pages/servant/servantlist/servantlist.acss

@@ -0,0 +1,35 @@
+.servantlistpage{
+  padding-top: 27rpx;
+}
+.servantlistitem{
+  height: 102rpx;
+  line-height: 102rpx;
+  background: #FFFFFF;
+  border-radius: 18px;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-bottom: 17rpx;
+}
+.servantlistitem image{
+  width: 9.75rpx;
+  height: 17.2rpx;
+}
+.servantlistitem-left{
+  float: left;
+  padding-left: 28rpx;
+}
+.servantlistitem-right{
+  float: right;
+  padding-right: 31rpx;
+}
+.noset{
+  width: 78rpx;
+  height: 31rpx;
+  background: #FFEDEA;
+  border-radius: 4px;
+  color: #FF5030;
+  font-size: 20rpx;
+  display: inline-block;
+  margin-left: 16rpx;
+  text-align: center;
+}

client/pages/servant/servantlist/servantlist.axml

@@ -0,0 +1,29 @@
+<view class="common-page-padding servantlistpage">
+  <view class="servantlistitem">
+     <view class="servantlistitem-left">打扫类</view>
+     <view class="servantlistitem-right">
+      <image mode="scaleToFill" src="/image/icon-right.png"/>
+     </view>
+  </view>
+  <view class="servantlistitem">
+     <view class="servantlistitem-left">做饭类</view>
+     <view class="servantlistitem-right">
+      <image mode="scaleToFill" src="/image/icon-right.png"/>
+     </view>
+  </view>
+  <view class="servantlistitem">
+     <view class="servantlistitem-left">
+      打扫类
+      <label class="noset">未设置</label>
+     </view>
+     <view class="servantlistitem-right">
+      <image mode="scaleToFill" src="/image/icon-right.png"/>
+     </view>
+  </view>
+  <view class="servantlistitem">
+     <view class="servantlistitem-left">做饭类</view>
+     <view class="servantlistitem-right">
+      <image mode="scaleToFill" src="/image/icon-right.png"/>
+     </view>
+  </view>
+</view>

client/pages/servant/servantlist/servantlist.js

@@ -0,0 +1,4 @@
+Page({
+  data: {},
+  onLoad() {},
+});

client/pages/servant/servantlist/servantlist.json

@@ -0,0 +1 @@
+{}

client/pages/servant/taskreminder/taskreminder.acss

@@ -0,0 +1,139 @@
+.tasks-page{
+  padding-top: 0rpx;
+  background-color: #FFFFFF;
+}
+.tasks-head{
+  height: 185rpx;
+  background-color: #FFFFFF;
+  padding-left: 48rpx;
+}
+.cell-title{
+  color: #333333;
+  font-size: 32rpx;
+}
+.cell-title image{
+  width: 24rpx;
+  height: 16rpx;
+  margin-left: 9rpx;
+}
+.cell-list{
+  color: #999999;
+  font-size: 22rpx;
+}
+.cell-type{
+  color: #666666;
+  font-size: 28rpx;
+}
+.cell-right{
+  float: right;
+  width: 50%;
+  padding-right: 48rpx;
+  font-size: 24rpx;
+  color: #999999;
+  font-weight: normal;
+  text-align: right;
+}
+.tasks-line{
+  background-color: #F3F3F3;
+  border-top-right-radius: 28rpx;
+  border-top-left-radius: 28rpx;
+  padding-bottom: 25rpx;
+  padding-top: 26rpx;
+}
+.tasks-tik{
+  background-color: #FFFFFF;
+  margin-left: 23rpx;
+  margin-right: 24rpx;
+  border-radius: 12rpx;
+  padding-top: 29rpx;
+  padding-left: 24rpx;
+  height: 258rpx;
+  margin-bottom: 25rpx;
+}
+.tik-title{
+  color: #333333;
+  font-size: 48rpx;
+  font-weight: 500;
+}
+.tik-right{
+  color: #09AFFF;
+  float: right;
+  font-size: 20rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.tik-right image{
+  width: 19.31rpx;
+  height: 20rpx;
+}
+.tik-week-item{
+  float: right;
+  width: 14.2%;
+  color: #999999;
+  text-align: center;
+  height: 121rpx;
+  padding-top: 23rpx;
+}
+.tik-week-item-select{
+  background: rgba(9, 175, 255, 0.05);
+  color: #09AFFF;
+  border-radius: 12px;
+}
+.tik-week-item view{
+  padding-bottom: 20rpx;
+}
+.tasks-list{
+  margin-top: 56rpx;
+  background: #FFFFFF;
+  border-radius: 18px;
+  margin-left: 23rpx;
+  margin-right: 24rpx;
+  padding-top: 35rpx;
+  padding-bottom: 23rpx;
+}
+.tasks-list-item{
+  height: 100rpx;
+  background: #FAFAFA;
+  border-radius: 12px;
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #333333;
+  line-height: 100rpx;
+  padding-left: 28rpx;
+  margin-top: 30rpx;
+}
+.tasks-list-money{
+  height: 102rpx;
+  margin-top: 25rpx;
+  border-radius: 18px;
+  background: #FFFFFF;
+  margin-left: 23rpx;
+  margin-right: 24rpx;
+  padding-top: 35rpx;
+  padding-bottom: 23rpx;
+}
+.tasks-list-pay{
+  font-weight: bold;
+  color: #333333;
+  font-size: 28rpx;
+  float: left;
+  width: 50%;
+  height: 102rpx;
+  line-height: 102rpx;
+  padding-left: 24rpx;
+}
+.tasks-list-pay-right{
+  float: right;
+  width: 40%;
+  text-align: right;
+  padding-right: 5%;
+  height: 102rpx;
+  line-height: 102rpx;
+  font-weight: bold;
+}
+.tasks-list-pay-right text{
+  color: #09AFFF;
+  font-weight: normal;
+  margin-right: 8rpx;
+}

client/pages/servant/taskreminder/taskreminder.axml

@@ -0,0 +1,90 @@
+<view class="tasks-page">
+<!---客户信息-->
+    <view class="tasks-head">
+      <view class="cell-title">
+        <label>王阿姨</label>
+        <view class="cell-right">
+          <image mode="scaleToFill" src="/image/switch-grey.png"/>
+          <label>切换到其他家庭</label>
+        </view>
+      </view>
+      <view class="cell-list">
+        <label>周一▪</label>
+        <label>周二▪</label>
+        <label>周三▪</label>
+        <label>周四▪</label>
+        <label>周五▪</label>
+        <label>周六▪</label>
+        <label>周日</label>
+      </view>
+        <view class="cell-type">
+          保密工种：<label>钟点工</label>
+        </view>
+      </view>
+    <view class="tasks-line">
+      <view class="common-page-padding tasks-tik">
+        <view class="tik-title">
+          <label>今天</label>
+          <view class="tik-right">
+            <image mode="scaleToFill" src="/image/icon-calendar.png"/>
+            <label>查看其它日期</label>
+          </view>
+        </view>
+        <view class="tik-week">
+          <view class="tik-week-item">
+            <view>周一</view>
+            <view>14</view>
+          </view>
+          <view class="tik-week-item tik-week-item-select">
+            <view>周一</view>
+            <view>14<text>\n▪</text></view>
+          </view>
+          <view class="tik-week-item">
+            <view>周一</view>
+            <view>14</view>
+          </view>
+          <view class="tik-week-item">
+            <view>周一</view>
+            <view>14</view>
+          </view>
+          <view class="tik-week-item">
+            <view>周一</view>
+            <view>14</view>
+          </view>
+          <view class="tik-week-item">
+            <view>周一</view>
+            <view>14</view>
+          </view>
+          <view class="tik-week-item">
+            <view>周一</view>
+            <view>14</view>
+          </view>
+        </view>
+      </view>
+      <view class="common-page-padding tasks-list">
+        <view class="cell-title">
+          <label>任务提醒</label>
+          <view class="tik-right">
+            <image mode="scaleToFill" src="/image/icon-edit.png"/>
+            <label>编辑每日任务</label>
+          </view>
+        </view>
+        <view class="tasks-list-item">
+          洗衣服
+        </view>
+        <view class="tasks-list-item">
+          做完饭
+        </view>
+        <view class="tasks-list-item">
+          打扫卧室
+        </view>
+        <view class="tasks-list-item">
+          打扫房间
+        </view>
+      </view>
+      <view class="tasks-list-money">
+        <view class="tasks-list-pay">今日花销合计</view>
+        <view class="tasks-list-pay-right"><text>100</text>元</view>
+      </view>
+    </view>
+</view>

client/pages/servant/taskreminder/taskreminder.js

@@ -0,0 +1,4 @@
+Page({
+  data: {},
+  onLoad() {},
+});

client/pages/servant/taskreminder/taskreminder.json

@@ -0,0 +1,3 @@
+{
+  "defaultTitle":"任务提醒器"
+}