diff --git a/littleApp_child/pages/diet/measuret.js b/littleApp_child/pages/diet/measuret.js index 4819640..94ce7f8 100644 --- a/littleApp_child/pages/diet/measuret.js +++ b/littleApp_child/pages/diet/measuret.js @@ -660,18 +660,18 @@ Page({ saveFoodlist(){ var that = this; let listss=that.data.foodList - if(that.data.hospitalId==666668&&that.data.yl<6){ + if(that.data.hospitalId==4055&&that.data.yl<6){ networkUtil.showErrorToast('孩子目前还未到六月龄') return } - if(that.data.hospitalId==666668&&that.data.yl>12){ + if(that.data.hospitalId==4055&&that.data.yl>12){ networkUtil.showErrorToast('孩子已超过十二月龄') return } this.setData({ show : true }) - if(that.data.hospitalId==666668){ + if(that.data.hospitalId==4055){ listss=[...that.data.foodList1,...that.data.foodList2,...that.data.foodList3,...that.data.foodList4,...that.data.foodList5,...that.data.foodList6,...that.data.foodList7] } networkUtil._post(api.setFootList,{ @@ -766,7 +766,7 @@ Page({ foodList2:list2, foodList3:list3 }) - if(app.globalData.userInfo.hospitalId==666668){ + if(app.globalData.userInfo.hospitalId==4055){ if((app.globalData.userInfo.monthage.includes("岁")&&app.globalData.userInfo.monthage.includes("月"))||(app.globalData.userInfo.monthage.includes("岁")&&(app.globalData.userInfo.monthage.match(/^\d+/)-0)>1)){ this.setData({ yl:13 diff --git a/littleApp_child/pages/diet/measuret.wxml b/littleApp_child/pages/diet/measuret.wxml index 3b80779..24cc547 100644 --- a/littleApp_child/pages/diet/measuret.wxml +++ b/littleApp_child/pages/diet/measuret.wxml @@ -14,7 +14,7 @@ 表示爱吃 - + @@ -25,7 +25,7 @@ - + 六月龄膳食调查 @@ -107,7 +107,7 @@ 查看历史报告 - + 录入时间:{{item.createTime||yyyy/mm/dd}} @@ -178,7 +178,7 @@ - + 录入时间:{{item.createTime||yyyy/mm/dd}} diff --git a/littleApp_child/pages/feedback/feedback.js b/littleApp_child/pages/feedback/feedback.js index 6e7b0d5..2d21902 100644 --- a/littleApp_child/pages/feedback/feedback.js +++ b/littleApp_child/pages/feedback/feedback.js @@ -19,13 +19,15 @@ Page({ chooseThree: 0, content: "", babyname:'', - babyid:'' + babyid:'', + hpid:'' }, onLoad: function (e) { // console.log('撒大大',e); this.setData({ babyname:e.babyname, - babyid:wx.getStorageSync('erid') + babyid:wx.getStorageSync('erid'), + hpid:wx.getStorageSync('hospitalId') }) wx.getSystemInfo({ success: function (res) { @@ -78,6 +80,18 @@ Page({ content: value }) }, + submit2:function(){ + wx.showModal({ + title: '提示', + content: '提交成功', + showCancel: false, + success: function (res) { + wx.navigateBack() + return + } + }) + + }, submit: function () { if (this.data.content.length==0){ networkUtil.showErrorToast('请填写意见或建议') diff --git a/littleApp_child/pages/feedback/feedback.wxml b/littleApp_child/pages/feedback/feedback.wxml index 12e565d..cef8a8d 100644 --- a/littleApp_child/pages/feedback/feedback.wxml +++ b/littleApp_child/pages/feedback/feedback.wxml @@ -25,7 +25,8 @@ --> - 反馈记录 + 反馈记录 - \ No newline at end of file + + \ No newline at end of file diff --git a/littleApp_child/pages/home/home.js b/littleApp_child/pages/home/home.js index 29681f6..1d5aca0 100644 --- a/littleApp_child/pages/home/home.js +++ b/littleApp_child/pages/home/home.js @@ -622,7 +622,9 @@ Page({ networkUtil._post(api.getBabyBuildPidInfo,param,function(res){ wx.setStorageSync('erid',res.data.data.id) // console.log('获取用户信息12122', res) - self.getBabyMsgCountByIdNum(res.data.data.id) + if(wx.getStorageSync('hospitalId')==4055){ + self.getBabyMsgCountByIdNum(res.data.data.id) + } // self.setNotification(res.data.data.id) self.setData({ erid:res.data.data.id diff --git a/littleApp_child/pages/home/home.wxml b/littleApp_child/pages/home/home.wxml index 94fddd7..16162ce 100644 --- a/littleApp_child/pages/home/home.wxml +++ b/littleApp_child/pages/home/home.wxml @@ -13,7 +13,7 @@ - + {{MsgCount || ''}} @@ -75,7 +75,7 @@ 疾病护理咨询 --> - + 历史咨询记录 @@ -108,18 +108,18 @@ 眼保健记录 - + {{unTotleReadCount}} 专家咨询 - + 线上咨询 - + 身高体重曲线 @@ -127,7 +127,7 @@ 补填户籍地址 - + 中医指导文章 diff --git a/littleApp_child/pages/vipService/vipService.js b/littleApp_child/pages/vipService/vipService.js index 7ed8726..ca3e5d8 100644 --- a/littleApp_child/pages/vipService/vipService.js +++ b/littleApp_child/pages/vipService/vipService.js @@ -59,11 +59,23 @@ Page({ var param = { babyId:self.data.userId } + var arr=[] networkUtil._get(api.goods, {}, function (res) { // console.log('vip1',res) - self.setData({ - vipList: res.data.data, - }) + if(self.data.hospitalId==4055){ + arr[0]=res.data.data[0] + arr[1]=res.data.data[1] + arr[0].desc=['1.精准指导服务:'+res.data.data[0].desc,'2.随访提醒:'+res.data.data[2].desc,'3.查看检查记录:'+res.data.data[3].desc] + arr[1].desc=[res.data.data[1].desc] + console.log('arr',arr); + self.setData({ + vipList: arr, + }) + }else{ + self.setData({ + vipList: res.data.data, + }) + } }, function (res) { }) diff --git a/littleApp_child/pages/vipService/vipService.wxml b/littleApp_child/pages/vipService/vipService.wxml index 3ddbebd..047d79a 100644 --- a/littleApp_child/pages/vipService/vipService.wxml +++ b/littleApp_child/pages/vipService/vipService.wxml @@ -24,8 +24,7 @@ VIP服务内容 - - + @@ -33,22 +32,32 @@ VIP 标准 - ¥{{item.price}} - + 开通 + + {{item.desc}} + + + + + + + + {{item.name}} + VIP + 标准 + + ¥{{item.price}} 已开通 未开通 已开通 未开通 - 已开通 - 未开通 - 已开通 - 未开通 - {{item.desc}} + {{items}} diff --git a/littleApp_child/pages/weightReportList/weightReportList.js b/littleApp_child/pages/weightReportList/weightReportList.js index 39bf8bd..c5a096b 100644 --- a/littleApp_child/pages/weightReportList/weightReportList.js +++ b/littleApp_child/pages/weightReportList/weightReportList.js @@ -9,7 +9,8 @@ Page({ */ data: { listData:[], - babyId:'' + babyId:'', + hpid:'' }, // 获取膳食检查列表 getBabyNutritionList:function(){ @@ -37,7 +38,8 @@ Page({ */ onLoad: function (options) { this.setData({ - babyId:wx.getStorageSync('erid') + babyId:wx.getStorageSync('erid'), + hpid:wx.getStorageSync('hospitalId') }) this.getBabyNutritionList() }, diff --git a/littleApp_child/pages/weightReportList/weightReportList.wxml b/littleApp_child/pages/weightReportList/weightReportList.wxml index d5e0122..efb5086 100644 --- a/littleApp_child/pages/weightReportList/weightReportList.wxml +++ b/littleApp_child/pages/weightReportList/weightReportList.wxml @@ -4,7 +4,7 @@ 记录时间{{item.recordTime}} 月龄{{item.monthAge}} - + 贴心提醒: 待医院医生确认即可查看膳食报告 \ No newline at end of file diff --git a/littleApp_child/utils/WebIMConfig.js b/littleApp_child/utils/WebIMConfig.js index 99b198a..d49b564 100644 --- a/littleApp_child/utils/WebIMConfig.js +++ b/littleApp_child/utils/WebIMConfig.js @@ -27,8 +27,8 @@ let config = { /* * Application AppKey */ - appkey: '1123170414115195#mommybaby',//测试版 - // appkey: '1123170414115195#mommybabyfinalversion',//正式版 + // appkey: '1123170414115195#mommybaby',//测试版 + appkey: '1123170414115195#mommybabyfinalversion',//正式版 // appkey: "easemob-demo#chatdemoui", /* * Whether to use HTTPS '1177161227178308#xcx' diff --git a/littleApp_child/utils/network_util.js b/littleApp_child/utils/network_util.js index 3c4c895..38d2e5e 100644 --- a/littleApp_child/utils/network_util.js +++ b/littleApp_child/utils/network_util.js @@ -4,7 +4,7 @@ // 18382670036 多层次 // 18328537371 陈云 666666 // 0测试环境 1正式环境 2演示环境 3衡水 -var Builing_Release_AppStore = 0; +var Builing_Release_AppStore = 1; // 获取服务器地址 function kServerBaseUrl() { switch (Builing_Release_AppStore) {