细节调成任务提醒

client/pages/servant/servantdetail/servantdetail.acss

@@ -34,4 +34,22 @@
 .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,42 +1,52 @@
-<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 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 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.axml

@@ -1,4 +1,5 @@
 <view class="common-page-padding servantlistpage">
+<!---服务列表-->
   <view class="servantlistitem">
      <view class="servantlistitem-left">打扫类</view>
      <view class="servantlistitem-right">

client/pages/servant/servantsettings/servantsettings.acss

@@ -14,6 +14,8 @@
   width: 23rpx;
   height: 22rpx;
   margin-right: 10rpx;
+  float: left;
+  margin-top: 21rpx;
 }
 .close-stle{
   width: 17.87rpx;

client/pages/servant/servantsettings/servantsettings.axml

@@ -1,9 +1,11 @@
 <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>
@@ -45,6 +47,7 @@
       </view>
     </view>
   </view>
+  <!--提交按钮-->
   <view class="common-button-wrapper">
      <button type="primary" class="common-button" hover-class="active-button"  onTap="dailytasksdeit">完成</button>
   </view>

client/pages/servant/taskreminder/taskreminder.acss

@@ -136,4 +136,14 @@
   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

@@ -21,6 +21,7 @@
           保密工种：<label>钟点工</label>
         </view>
       </view>
+      <!---一周任务查看器-->
     <view class="tasks-line">
       <view class="common-page-padding tasks-tik">
         <view class="tik-title">
@@ -39,6 +40,7 @@
           </view>
         </view>
       </view>
+      <!--任务列表-->
       <view class="common-page-padding tasks-list">
         <view class="cell-title">
           <label>任务提醒</label>
@@ -47,22 +49,34 @@
             <label>编辑每日任务</label>
           </view>
         </view>
-        <view class="tasks-list-item">
-          洗衣服
-        </view>
-        <view class="tasks-list-item">
-          做完饭
-        </view>
-        <view class="tasks-list-item">
-          打扫卧室
+        <!--有提醒任务-->
+        <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 class="tasks-list-item">
-          打扫房间
+        <!--没有任务-->
+        <view  a:if="{{!isreminds}}">
+          <view class="notasks">
+            <text>还没有任务</text>
+          </view>
         </view>
       </view>
-      <view class="tasks-list-money">
-        <view class="tasks-list-pay">今日花销合计</view>
-        <view class="tasks-list-pay-right"><text>100</text>元</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>
   <!---弹出日历--->

client/pages/servant/taskreminder/taskreminder.js

@@ -3,7 +3,8 @@ 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}]
+    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() {
     //加载选中的时间