client/app.json

@@ -11,7 +11,10 @@
     "pages/common/selectRole/selectRole",
     "pages/customer/monthReport/monthReport",
     "pages/customer/editServant/editServant",
-    "pages/common/userGuide/userGuide"
+    "pages/servant/taskreminder/taskreminder",
+    "pages/servant/servantlist/servantlist",
+    "pages/common/userGuide/userGuide",
+    "pages/servant/servantsettings/servantsettings"
   ],
   "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,55 @@
 .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;
+}
+.nosettingservaent{
+  background: #FFFFFF;
+  text-align: center;
+  padding-top: 290rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333333;
+  height: 1624rpx;
+}
+.nosettingservaent image{
+  width: 360rpx;
+  height: 309rpx;
+  margin-bottom: 18rpx;
+}
+.nosettingservaent text{
+  display: inline-block;
+  width: 100%;
+}

client/pages/servant/servantdetail/servantdetail.axml

@@ -1,30 +1,52 @@
-<view class="common-page-padding servantdetail-servant-page">
-  <!---阿姨类型--->
-  <view class="common-card servantdetailitem">
-    <view class="cell-title">王阿姨</view>
-    <view class="servant-list">
-      
-    </view>
+<!--未设置保姆偏好-->
+<view a:if="{{!isservantsettinged}}">
+  <view class="nosettingservaent">
+    <image mode="scaleToFill" src="/image/no-content.png"/>
+    <text>保姆还未设置偏好</text>
   </view>
-  <!---阿姨类型--->
-  <view class="common-card servantdetailitem">
-    <view class="cell-title">做饭类</view>
-    <view class="servant-list">
-      <view class="good-list">
-        <view>1. 您擅长做的菜系？</view>
-        <view class="good-item-list">粤菜</view>
+</view>
+ <!--已经设置过保姆偏好-->
+<view a:if="{{isservantsettinged}}">
+  <view class="common-page-padding servantdetail-servant-page">
+    <!---阿姨类型--->
+    <view class="common-card servantdetailitem">
+      <view class="cell-title">
+      <label>王阿姨</label>
+      <image mode="scaleToFill" src="/image/icon-edit.png"/>
       </view>
-    </view>
-    <view class="servant-list">
-      <view class="good-list">
-        <view>1. 您擅长做的菜系？</view>
-        <view class="good-item-list">粤菜</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="servant-list">
-      <view class="good-list">
-        <view>1. 您擅长做的菜系？</view>
-        <view class="good-item-list">粤菜</view>
+    <!---阿姨类型--->
+    <view class="common-card servantdetailitem">
+      <view class="cell-title">做饭类</view>
+      <view class="servant-list">
+        <view class="good-list">
+          <view>1. 您擅长做的菜系？</view>
+          <view class="good-item-list">粤菜</view>
+        </view>
+      </view>
+      <view class="servant-list">
+        <view class="good-list">
+          <view>1. 您擅长做的菜系？</view>
+          <view class="good-item-list">粤菜</view>
+        </view>
+      </view>
+      <view class="servant-list">
+        <view class="good-list">
+          <view>1. 您擅长做的菜系？</view>
+          <view class="good-item-list">粤菜</view>
+        </view>
       </view>
     </view>
   </view>

client/pages/servant/servantdetail/servantdetail.js

@@ -1,4 +1,6 @@
 Page({
-  data: {},
+  data: {
+    isservantsettinged:true
+  },
   onLoad() {},
 });

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,30 @@
+<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/servantsettings/servantsettings.acss

@@ -0,0 +1,85 @@
+.servant-settings-page{
+  background-color: #F3F3F3;
+}
+.servant-setting-header{
+  height: 62rpx;
+  line-height: 62rpx;
+  background-color: #E6F7FF;
+  color: #09AFFF;
+  padding-left: 35rpx;
+  padding-right: 24rpx;
+  font-size: 22rpx;
+}
+.notice-style{
+  width: 23rpx;
+  height: 22rpx;
+  margin-right: 10rpx;
+  float: left;
+  margin-top: 21rpx;
+}
+.close-stle{
+  width: 17.87rpx;
+  height: 17.87rpx;
+  float: right;
+  margin-top: 20rpx;
+}
+.setting-list{
+  background: #FFFFFF;
+  border-radius: 18px;
+  margin: 25.99rpx 24rpx 120rpx 24rpx;
+}
+.setting-list-title{
+  color: #333333;
+  font-size: 32rpx;
+  font-weight: bold;
+  text-align: center;
+  height: 80rpx;
+  line-height: 80rpx;
+  padding-right: 24rpx; 
+}
+.setting-list-title text{
+  font-size: 26rpx;
+  float: right;
+}
+.setting-list-item{
+  padding-left: 44rpx;
+  padding-top: 37rpx;
+  border-top: 1rpx solid #EEEEEE;
+  padding-bottom: 37rpx;
+}
+.item-title{
+  color: #333333;
+  font-size: 28rpx;
+  font-weight: bold;
+  height: 28rpx;
+  line-height: 28rpx;
+  margin-bottom: 31rpx;
+  display: inline-block;
+}
+.item-body{
+  margin-bottom: 24rpx;
+  padding-left: 20rpx;
+}
+.item-body-checkbox{
+  width: 24rpx;
+  height: 24rpx;
+  border-radius: 2rpx;
+  border: 1rpx solid #D7DBE0;
+}
+.item-body-checkbox:before{
+  width: 24rpx;
+  height: 24rpx;
+  border-radius: 2rpx;
+  border: 1rpx solid #09AFFF;
+}
+.item-body textarea{
+  background-color: #EEEEEE;
+  border: none;
+  height: 110rpx;
+  margin-left: 40rpx;
+  margin-right: 86rpx;
+  color: #CCCCCC;
+  font-size: 24rpx;
+  padding: 12rpx;
+  width: 80%;
+}

client/pages/servant/servantsettings/servantsettings.axml

@@ -0,0 +1,54 @@
+<view class="servant-settings-page">
+<!--服务设置-->
+  <view class="servant-setting-header">
+    <image mode="scaleToFill" src="/image/notice-blue.png" class="notice-style"/>
+    <text>您可以查看保姆偏好，双向沟通更清晰</text>
+    <image mode="scaleToFill" src="/image/close-blue.png" class="close-stle"/>
+  </view>
+  <!--服务列表-->
+  <view class="setting-list">
+    <view class="setting-list-title">
+      做饭类<text>1/6</text>
+    </view>
+    <view class="setting-list-item">
+      <text class="item-title">1.您家人喜欢的菜系是那种？</text>
+      <view class="item-body">
+        <checkbox value="0" checked="true" class="item-body-checkbox"/><text>粤菜</text>
+      </view>
+      <view class="item-body">
+        <checkbox value="1" class="item-body-checkbox"/><text>川菜</text>
+      </view>
+      <view class="item-body">
+        <checkbox value="3" class="item-body-checkbox"/><text>本帮菜</text>
+      </view>
+      <view class="item-body">
+        <checkbox value="5" class="item-body-checkbox"/><text>自定义</text>
+      </view>
+      <view class="item-body">
+         <textarea placeholder="请输入文字"></textarea>
+      </view>
+    </view>
+    <view class="setting-list-item">
+      <text class="item-title">1.您家人喜欢的菜系是那种？</text>
+      <view class="item-body">
+        <checkbox value="0" checked="true" class="item-body-checkbox"/><text>粤菜</text>
+      </view>
+      <view class="item-body">
+        <checkbox value="1" class="item-body-checkbox"/><text>川菜</text>
+      </view>
+      <view class="item-body">
+        <checkbox value="3" class="item-body-checkbox"/><text>本帮菜</text>
+      </view>
+      <view class="item-body">
+        <checkbox value="5" class="item-body-checkbox"/><text>自定义</text>
+      </view>
+      <view class="item-body">
+         <textarea placeholder="请输入文字"></textarea>
+      </view>
+    </view>
+  </view>
+  <!--提交按钮-->
+  <view class="common-button-wrapper">
+     <button type="primary" class="common-button" hover-class="active-button"  onTap="dailytasksdeit">完成</button>
+  </view>
+</view>

client/pages/servant/servantsettings/servantsettings.js

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

client/pages/servant/servantsettings/servantsettings.json

@@ -0,0 +1,3 @@
+{
+    "defaultTitle": "保姆偏好"
+}

client/pages/servant/taskreminder/taskreminder.acss

@@ -0,0 +1,149 @@
+.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: bold;
+}
+.tik-right{
+  color: #09AFFF;
+  float: right;
+  font-size: 20rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+}
+.tik-right image{
+  width: 19.31rpx;
+  height: 20rpx;
+  margin-right: 6rpx;
+  margin-top: 30rpx;
+  float: left;
+}
+.tik-week-item{
+  float: left;
+  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;
+}
+.tasks-list-pay{
+  font-weight: bold;
+  color: #333333;
+  font-size: 28rpx;
+  float: left;
+  width: 50%;
+  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;
+}
+.notasks{
+  margin: 21rpx 24rpx 30rpx 24rpx;
+  height: 327rpx;
+  line-height:  327rpx;
+  background: #FAFAFA;
+  border-radius: 12rpx;
+  text-align: center;
+  font-size: 36rpx;
+  color: #999999;
+}

client/pages/servant/taskreminder/taskreminder.axml

@@ -0,0 +1,88 @@
+<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" onTap="showtime">
+            <image mode="scaleToFill" src="/image/icon-calendar.png"/>
+            <label>查看其它日期</label>
+          </view>
+        </view>
+        <view class="tik-week" a:for="{{datelist}}" key="{{index}}">
+          <view class="tik-week-item {{item.cssName}}" onTap="changeWeekTime"  data-id="{{id}}">
+            <view>{{item.title}}</view>
+            <view>{{item.day}}
+            <text a:if={{item.cssName}}>\n▪</text>
+            </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 a:if="{{isreminds}}">
+          <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  a:if="{{!isreminds}}">
+          <view class="notasks">
+            <text>还没有任务</text>
+          </view>
+        </view>
+      </view>
+      
+      <view a:if="{{isreminds}}">
+        <view class="tasks-list-money">
+          <view class="tasks-list-pay">今日花销合计</view>
+          <view class="tasks-list-pay-right"><text>100</text>元</view>
+        </view>
+      </view>
+    </view>
+  <!---弹出日历--->
+  <modal show="{{showchangetime}}">
+    <calendar
+    type="single"
+    onSelect="handleSelect" />
+  </modal>
+</view>

client/pages/servant/taskreminder/taskreminder.js

@@ -0,0 +1,80 @@
+var util = require('../../../util/util.js')
+Page({
+  data: {
+    showchangetime:false,
+    nowselectTime:util.formatDate(new Date()),
+    datelist:[{title:"周一",date:0,cssName:'',id:1,day:0},{title:"周二",date:0,cssName:'',id:2,day:0},{title:"周三",date:0,cssName:'',id:3,day:0},{title:"周四",date:0,cssName:'',id:4,day:0},{title:"周五",date:0,cssName:'',id:5,day:0},{title:"周六",date:0,cssName:'',id:6,day:0},{title:"周天",date:0,cssName:'',id:7,day:0}],
+    isreminds:true
+  },
+  onLoad() {
+    //加载选中的时间
+    console.log(this.data.nowselectTime);
+    let that=this;
+    that.getWeekStartDate(this.data.nowselectTime);
+    let data = this.data.datelist;
+    for(let i=0;i<7;i++){
+      if(this.data.weekdateday[i]==this.data.nowDay){
+        data[i].date=this.data.weekdate[i];
+        data[i].day=this.data.weekdateday[i];
+        data[i].cssName='tik-week-item-select'
+      }
+      else{
+        data[i].date=this.data.weekdate[i];
+        data[i].day=this.data.weekdateday[i];
+      }
+    }
+    this.setData({
+      datelist: data
+    });
+    //处理时间完成
+  },
+  dateAdd:function(startDate,days) {
+  startDate = new Date(startDate);
+  startDate = +startDate + days * 1000 * 60 * 60 * 24;
+  startDate = new Date(startDate);
+  //var nextStartDate = startDate.getFullYear() + "-" + (startDate.getMonth() + 1) + "-" + startDate.getDate();
+  return startDate.getDate();
+},
+  datedayAdd:function(startDate,days) {
+  startDate = new Date(startDate);
+  startDate = +startDate + days * 1000 * 60 * 60 * 24;
+  startDate = new Date(startDate);
+  var nextStartDate = startDate.getFullYear() + "-" + (startDate.getMonth() + 1) + "-" + startDate.getDate();
+  
+  return nextStartDate;
+},
+   //获取本周的开始日期
+  getWeekStartDate(nowday) {
+    let that = this;
+    this.now = new Date(nowday);
+    this.nowYear = this.now.getFullYear(); //当前年 
+    this.nowMonth = this.now.getMonth(); //当前月 
+    this.nowDay = this.now.getDate(); //当前日 
+    this.setData({
+      nowDay:this.nowDay
+    });//保存当前日
+    this.nowDayOfWeek = this.now.getDay(); //今天是本周的第几天 
+    let dateStart = util.formatDate(new Date(this.nowYear, this.nowMonth, this.nowDay - this.nowDayOfWeek + 1));
+    
+    let weekdateday=[this.dateAdd(dateStart,0),this.dateAdd(dateStart,1),this.dateAdd(dateStart,2),this.dateAdd(dateStart,3),this.dateAdd(dateStart,4),this.dateAdd(dateStart,5),this.dateAdd(dateStart,6)];
+    let weekdate=[this.datedayAdd(dateStart,0),this.datedayAdd(dateStart,1),this.datedayAdd(dateStart,2),this.datedayAdd(dateStart,3),this.datedayAdd(dateStart,4),this.datedayAdd(dateStart,5),this.datedayAdd(dateStart,6)];
+    this.setData({
+      weekdate: weekdate,
+      weekdateday:weekdateday
+    })
+
+  },
+  changeWeekTime(e){
+    console.log(e.target.id);
+    let changetime=e.target;
+  },
+  
+  showtime(){
+    this.setData({
+      showchangetime: true,
+    });
+  },
+  handleSelect(e) {
+      console.log(e[0]);
+  },
+});

client/pages/servant/taskreminder/taskreminder.json

@@ -0,0 +1,7 @@
+{
+  "defaultTitle":"任务提醒器",
+  "usingComponents":{
+    "calendar": "mini-antui/es/calendar/index",
+    "modal": "mini-ali-ui/es/modal/index"
+  }
+}