gaoyognxing 4 vuotta sitten
vanhempi
commit
9e6b89c296

+ 2 - 2
client/pages/customer/servantsettings/servantsettings.js

@@ -10,11 +10,11 @@ Page({
     servantlist:[],
   },
   onLoad() {
-    this.getservantlist("SN000002");
+    this.getservantlist("SN000001");
   },
   ///加载绑定数据
   getservantlist(subjectType){
-     request.httpServiceGet(apiUrl1.servantappletservicePath,{subjectType:subjectType}).then(data=>{
+     request.httpServiceGet(apiUr.getEmployerSubList,{subjectType:subjectType}).then(data=>{
         //console.log(data);
         let servantlist = data;
         var that = this;

+ 10 - 1
client/pages/customer/taskreminder/taskreminder.js

@@ -6,7 +6,11 @@ Page({
     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,
     showcancelbox:false,
-    cancellist:[{value:'1', label:'任务太多', checked:true},{value:'2', label:'我不会', checked:false},{value:'3', label:'任务不详细', checked:false}]
+    cancellist:[{value:'1', label:'任务太多', checked:true},{value:'2', label:'我不会', checked:false},{value:'3', label:'任务不详细', checked:false}],
+
+    servantName: '',//保姆姓名
+    weekday: '',//日前
+    servantTypeValue: '',//保姆工种,
   },
   onLoad() {
     //加载选中的时间
@@ -28,6 +32,11 @@ Page({
     this.setData({
       datelist: data
     });
+    this.setData({
+      servantName: app.globalData.relationInfo.servantName,
+      weekday: app.globalData.relationInfo.servantTaskPeriod.workDay,
+      servantTypeValue: app.globalData.relationInfo.servantType
+    })
     //处理时间完成
   },
   showcancel(){

+ 4 - 1
client/util/apiUrl.js

@@ -61,6 +61,8 @@ const selectMonthlyReportPath = baseService + "/monthly/selectMonthlyReport";
 const selectMonthLyReportInfoPath = baseService + "/monthly/selectMonthLyReportInfo";
 //雇主的服务标准
 const employerServiceStandard = baseService + "/servicestandard/insertNewServiceStandards";
+//雇主端题目获取
+const getEmployerSubList = baseService + "/servicestandard/getSubjectWhenFirst";
 
 export default{
 registerUserPath,
@@ -86,5 +88,6 @@ customerDescribleInfo,
 servantDescribleInfo,
 selectMonthlyReportPath,
 selectMonthLyReportInfoPath,
-employerServiceStandard
+employerServiceStandard,
+getEmployerSubList
 }