保姆明细

client/app.json

@@ -4,7 +4,9 @@
     "pages/servant/myCustomerList/myCustomerList",
     "pages/customer/myServantList/myServantList",
     "pages/servant/servantCenter/servantCenter",
-    "pages/customer/createServant/createServant"
+    "pages/customer/createServant/createServant",
+    "pages/customer/dailytasks/dailytasks",
+    "pages/servant/servantdetail/servantdetail"
   ],
   "window": {
     "defaultTitle": "保姆管家"

client/pages/customer/dailytasks/dailytasks.acss

@@ -0,0 +1,63 @@
+.daily-servant-page{
+  padding-top:24rpx;
+  padding-bottom: 10pt;
+}
+.dailyitem{
+  padding:24rpx;
+  margin-bottom: 10pt;
+}
+.every-week{
+  color: #666;
+  font-weight:normal;
+}
+.name-content{
+  padding-right:30rpx;
+}
+.name-input{
+  text-align: right;
+  width:100%;
+}
+.daily-list{
+  margin-top:24rpx;
+  display: flex;
+  flex-wrap: wrap;
+}
+.daily-item{
+  height: 52rpx;
+  line-height: 52rpx;
+  border:1rpx solid #999;
+  color: #999;
+  margin:0 20rpx 16rpx 0;
+  border-radius:52rpx;
+  text-align: center;
+  padding-left: 10pt;
+  padding-right: 10pt;
+}
+.daily-item-selected{
+  background: #E6F7FF;
+  border-color:#09AFFF;
+  color:#09AFFF;
+}
+.picker-wrapper{
+    padding:0 24rpx;
+  height: 102rpx;
+  margin-bottom:18rpx;
+  line-height: 102rpx;
+}
+
+.row{
+  display: flex;
+  align-items: center;
+}
+.row-title{
+  font-weight:bold;
+}
+.row-extra{
+  flex:1;
+  text-align: right;
+}
+.row-arrow{
+  width:12rpx;
+  height: 22rpx;
+  margin:0 0 0 10rpx;
+}

client/pages/customer/dailytasks/dailytasks.axml

@@ -0,0 +1,44 @@
+<view class="common-page-padding daily-servant-page">
+<!---洗护类--->
+  <view class="common-card dailyitem">
+    <view class="cell-title">洗护类</view>
+    <view class="daily-list">
+      <view a:for="{{washingandnursing}}" class="daily-item {{washingandnursinglist.indexOf(item.id)!=-1 ?'daily-item-selected':''}}" key="{{index}}" data-id="{{item.id}}"  onTap="toggleWashinGandnursing">{{item.text}}</view>
+    </view>
+  </view>
+<!---做饭类--->
+  <view class="common-card dailyitem">
+    <view class="cell-title">做饭类</view>
+    <view class="daily-list">
+      <view a:for="{{cooking}}" class="daily-item {{cookinglist.indexOf(item.id)!=-1 ?'daily-item-selected':''}}" key="{{index}}" data-id="{{item.id}}">{{item.text}}</view>
+    </view>
+  </view>
+<!---打扫类--->
+  <view class="common-card dailyitem">
+    <view class="cell-title">打扫类</view>
+    <view class="daily-list">
+      <view a:for="{{cleaningclass}}" class="daily-item {{cleaningclasslist.indexOf(item.id)!=-1 ?'daily-item-selected':''}}" key="{{index}}" data-id="{{item.id}}">{{item.text}}</view>
+    </view>
+  </view>
+<!---照顾老人--->
+  <view class="common-card dailyitem">
+    <view class="cell-title">照顾老人</view>
+    <view class="daily-list">
+      <view a:for="{{careolder}}" class="daily-item {{careolderlist.indexOf(item.id)!=-1 ?'daily-item-selected':''}}" key="{{index}}" data-id="{{item.id}}">{{item.text}}</view>
+    </view>
+  </view>
+<!---孩子--->
+  <view class="common-card dailyitem">
+    <view class="cell-title">孩子</view>
+    <view class="daily-list">
+      <view a:for="{{children}}" class="daily-item {{childrenlist.indexOf(item.id)!=-1 ?'daily-item-selected':''}}" key="{{index}}" data-id="{{item.id}}">{{item.text}}</view>
+    </view>
+  </view>
+<!--宠物--->
+  <view class="common-card dailyitem">
+    <view class="cell-title">宠物</view>
+    <view class="daily-list">
+      <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>

client/pages/customer/dailytasks/dailytasks.js

@@ -0,0 +1,36 @@
+Page({
+  data: {
+    washingandnursing: [{text:'洗衣服',id:'1',},{text:'熨烫衣服',id:'2',},{text:'晾晒收衣',id:'3',}],
+    cooking: [{text:'做早餐',id:'1'},{text:'做午餐',id:'2'},{text:'做晚餐',id:'3'}],
+    cleaningclass: [{text:'打扫全屋',id:'1'},{text:'打扫客厅',id:'2'},{text:'打扫卧室',id:'3'},{text:'打扫书房',id:'4'},{text:'打扫厨房',id:'5'},{text:'打扫卫生间',id:'6'},{text:'打扫院子',id:'7'}],
+    careolder:[{text:'照顾老人',id:'1'},{text:'为老人做饭',id:'2'},{text:'为老人做擦洗服务',id:'3'}],
+    children:[{text:'打扫全屋',id:'1'},{text:'打扫客厅',id:'2'},{text:'打扫卧室',id:'3'},{text:'打扫书房',id:'4'},{text:'打扫厨房',id:'5'},{text:'打扫卫生间',id:'6'},{text:'打扫院子',id:'7'}],
+    pets:[{text:'打扫全屋',id:'1'},{text:'打扫客厅',id:'2'},{text:'打扫卧室',id:'3'},{text:'打扫书房',id:'4'},{text:'打扫厨房',id:'5'},{text:'打扫卫生间',id:'6'},{text:'打扫院子',id:'7'}],
+    washingandnursinglist:[],
+    cookinglist:[],
+    cleaningclasslist:[],
+    careolderlist:[],
+    childrenlist:[],
+    petslist:[]
+  },
+  onLoad(options) {
+    console.log(options);
+  },
+  toggleWashinGandnursing(e){
+    
+    let id=e.target.dataset.id;
+    if(this.data.washingandnursinglist.indexOf(id)==-1){
+      let newArr=this.data.washingandnursinglist;
+      newArr.push(id);
+      this.setData({
+        washingandnursinglist:newArr
+      })
+    }else{
+      let newArr=this.data.washingandnursinglist;
+      newArr.splice(newArr.indexOf(id),1);
+      this.setData({
+        washingandnursinglist:newArr
+      })
+    }
+  },
+});

client/pages/customer/dailytasks/dailytasks.json

@@ -0,0 +1,3 @@
+{
+   "defaultTitle": "每日任务"
+}

client/pages/customer/myServantList/myServantList.axml

@@ -50,7 +50,7 @@
       <view class="mini-button-wrapper">
 <button type="primary" class="common-button" hover-class="active-button"  size="mini" onTap="addServant">现在添加</button>
       </view>
-      <view class="switch-role">角色选择错啦，去切换 >> </view>
+      <navigator open-type="reLaunch" url="/pages/common/index/index" hover-class="navigator-hover" class="switch-role">角色选择错啦，去切换 >></navigator>
 <!-- 提示暂未设置服务者 -->
 <modal
 		show="{{unSetModal}}"

client/pages/servant/servantdetail/servantdetail.acss

@@ -0,0 +1,19 @@
+.servantdetail-servant-page{
+  padding-top:24rpx;
+  padding-bottom: 10pt;
+}
+.servantdetailitem{
+  padding:24rpx;
+  margin-bottom: 10pt;
+}
+.good-list{
+  margin-top: 5pt;
+  background-color: #FAFAFA;
+  padding: 10pt;
+  border-radius: 6pt;
+}
+.good-item-list{
+  margin-top: 10pt;
+  margin-left: 10pt;
+}
+

client/pages/servant/servantdetail/servantdetail.axml

@@ -0,0 +1,31 @@
+<view class="common-page-padding servantdetail-servant-page">
+  <!---阿姨类型--->
+  <view class="common-card servantdetailitem">
+    <view class="cell-title">王阿姨</view>
+    <view class="servant-list">
+      
+    </view>
+  </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

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

client/pages/servant/servantdetail/servantdetail.json

@@ -0,0 +1,3 @@
+{
+  "defaultTitle":"阿姨偏好"
+}