雇主通知

client/app.acss

@@ -98,6 +98,10 @@ font-size: 28rpx;
 font-size: 28rpx;
   color:#666;
 }
-
+/* 点击查看样式 */
+.link-view-text{
+ color: #09AFFF;
+text-decoration:underline;
+}
 
 

client/pages/customer/customerCenter/customerCenter.acss

@@ -75,7 +75,8 @@ page{
 }
 .notice-bar{
   background: #FFF2E6;
-  padding:0 24rpx;
+  /* padding:0 24rpx; */
+  padding:0 8rpx;
   height: 76rpx;
   color:#111;
   display: flex;
@@ -84,8 +85,8 @@ page{
   margin:0 0 16rpx 0;
 }
 .notice-main{
-  padding-left:68rpx;
-  background: url('/image/icon-notice.png') no-repeat 24rpx top;
+  padding-left:48rpx;
+  background: url('/image/icon-notice.png') no-repeat 4rpx top;
   background-size: 32rpx 32rpx;
 }
 .close-wrapper{

client/pages/customer/customerCenter/customerCenter.axml

@@ -26,14 +26,36 @@
           <view class="about-right" onTap="switchSerHobby">阿姨偏好</view>
        </view>
  </view>
- <!-- 通知 -->
- <view class="notice-bar" a:if="{{noticeShow}}">
-     <view class="notice-main">强提醒内容</view>
+ <!-- 通知  月报更新 bmybgx-->
+ <view class="notice-bar" a:if="{{bmybgxShow}}">
+     <view class="notice-main">月报新鲜出炉，<text class="link-view-text">点击查看</text>保姆本月表现</view>
      <view class="close-wrapper">
-      <image mode="aspectFill" src="/image/icon-close.png" class="notice-close" onTap="closeNotice"/>
+      <image mode="aspectFill" src="/image/icon-close.png" class="notice-close" onTap="closeNotice"  data-noticeType="bmybgx"/>
+     </view>
+ </view>
+  <!-- 通知  任务无法完成rwwfwc-->
+ <view class="notice-bar" a:if="{{rwwfwcShow}}">
+     <view class="notice-main">[王阿姨]表示有任务无法完成,<text class="link-view-text">点击查看原因>></text></view>
+     <view class="close-wrapper">
+      <image mode="aspectFill" src="/image/icon-close.png" class="notice-close" onTap="closeNotice" data-noticeType="rwwfwc"/>
+     </view>
+ </view>
+  <!-- 通知  偏好设置phsz-->
+ <view class="notice-bar" a:if="{{phszShow}}">
+     <view class="notice-main">[王阿姨]设置了她的偏好，<text class="link-view-text">点击查看>></text> </view>
+     <view class="close-wrapper">
+      <image mode="aspectFill" src="/image/icon-close.png" class="notice-close" onTap="closeNotice" data-noticeType="phsz"/>
+     </view>
+ </view>
+
+ <!-- 通知  偏好更新phgx-->
+ <view class="notice-bar" a:if="{{phgxShow}}">
+     <view class="notice-main">[王阿姨]更新了她的偏好，<text class="link-view-text">点击查看>></text></view>
+     <view class="close-wrapper">
+      <image mode="aspectFill" src="/image/icon-close.png" class="notice-close" onTap="closeNotice" data-noticeType="phgx"/>
      </view>
-     
  </view>
+
  <!-- 任务提醒 -->
   <view class="common-card task-module"  onTap="switchTaskRemind">
      <view class="task-top">

client/pages/customer/customerCenter/customerCenter.js

@@ -12,7 +12,10 @@ Page({
     taskListShow:false,//任务列表
     bindCode:'',//关联码
     taskList:[],
-    noticeShow:true,//通知栏展示
+    bmybgxShow:true,//通知栏展示
+    rwwfwcShow:true,
+    phszShow:true,
+    phgxShow:true,
     unSetServiceModal:false,//未设置服务标准
     unSetTaskModal:false,//未设置任务提醒
     finishSetModal:false,//完成设置指引
@@ -58,6 +61,7 @@ Page({
  onShow(query){
     console.log(query);
       this.initCustomerInfo();
+      this.getEmployerNotice();
   },
     // 获取雇佣关系详情
   initCustomerInfo(){
@@ -341,7 +345,7 @@ Page({
     });
     // 首次设置完成提交后台完成引导设置
 
-  this.finishAllSet();
+  // this.finishAllSet();
 
     }else{
      
@@ -362,10 +366,37 @@ Page({
            console.log(e);
            
         })
+  },
+//  获取通知
+  getEmployerNotice(){
+     let params={
+      employRelationNo:app.globalData.employRelationNo,
+      userId:app.globalData.userInfo.id
+    }
+      request.httpServicePost(apiUrl.getEmployerNoticePath,params).then(data=>{
+        console.log(data);
+ 
+       let    bmybgx=(data.bmybgx.size>=1);
+       let    rwwfwc=(data.rwwfwc.size>=1);
+       let    phsz=(data.phsz.size>=1);
+       let    phgx=(data.phgx.size>=1);
+       this.setData({
+    bmybgxShow:bmybgx,
+    rwwfwcShow:rwwfwc,
+    phszShow:phsz,
+    phgxShow:phgx,
+       });
+    
+          }).catch(e=>{
+           console.log(e);
+           
+        })
   }
 
 
 
 
 
+
+
 });

client/pages/servant/servantCenter/servantCenter.acss

@@ -75,7 +75,8 @@ page{
 }
 .notice-bar{
   background: #FFF2E6;
-  padding:0 24rpx;
+  /* padding:0 24rpx; */
+  padding:0 8rpx;
   height: 76rpx;
   color:#111;
   display: flex;
@@ -84,8 +85,8 @@ page{
   margin:0 0 16rpx 0;
 }
 .notice-main{
-  padding-left:68rpx;
-  background: url('/image/icon-notice.png') no-repeat 24rpx top;
+  padding-left:48rpx;
+  background: url('/image/icon-notice.png') no-repeat 4rpx top;
   background-size: 32rpx 32rpx;
 }
 .close-wrapper{