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

client/pages/customer/customerCenter/customerCenter.acss

@@ -108,6 +108,10 @@ padding:16rpx;
   background-color: #fff;
   margin:0 0 20rpx 0;
 }
+.no-task-top{
+   background-color: #fff;
+  margin:0 0 20rpx 0;
+}
 .no-add{
   background: #FAFAFA;
   height: 240rpx;

client/pages/customer/customerCenter/customerCenter.axml

@@ -58,7 +58,7 @@
 
  <!-- 任务提醒 -->
   <view class="common-card task-module"  >
-     <view class="task-top" onTap="switchTaskRemind">
+     <view class="{{noAddTaskShow?'no-task-top':'task-top'}}" onTap="switchTaskRemind">
       <view class="module-title">任务提醒
        <text class="task-schedule"  a:if="{{taskListShow}}">完成进度{{completeTaskCount}}/{{totalTaskCount}}</text>
       </view>

client/pages/customer/customerCenter/customerCenter.js

@@ -247,10 +247,17 @@ Page({
     });
   },
     switchTaskRemind(){
-      // 跳转到任务提醒器页面
+       
+      if(this.data.noAddTaskShow==false){
+  // 跳转到任务提醒器页面
    my.navigateTo({
       url: '../taskreminder/taskreminder'
     });
+    
+      }
+     
+         
+    
   },
   switchList(){
     my.navigateTo({

client/pages/servant/servantCenter/servantCenter.acss

@@ -108,6 +108,10 @@ padding:16rpx;
   background-color: #fff;
   margin:0 0 20rpx 0;
 }
+.no-task-top{
+   background-color: #fff;
+  margin:0 0 20rpx 0;
+}
 .no-add{
   background: #FAFAFA;
   height: 240rpx;

client/pages/servant/servantCenter/servantCenter.axml

@@ -61,7 +61,7 @@
  </view>
  <!-- 任务提醒 -->
   <view class="common-card task-module" >
-     <view class="task-top" onTap="switchTaskRemind">
+     <view class="{{noAddTaskShow?'no-task-top':'task-top'}}" onTap="switchTaskRemind">
       <view class="module-title">任务提醒
        <text class="task-schedule"  a:if="{{taskListShow}}">完成进度{{completeTaskCount}}/{{totalTaskCount}}</text>
       </view>

client/pages/servant/servantCenter/servantCenter.js

@@ -260,10 +260,12 @@ Page({
  
   },
   switchTaskRemind(){
+     if(this.data.noAddTaskShow==false){
       // 跳转到任务提醒器页面
    my.navigateTo({
       url: '../taskreminder/taskreminder'
     });
+  }
   },
     // 点击设置按钮
   onSetButtonClick(e){