diff --git a/littleApp_child/pages/Setting/Setting.js b/littleApp_child/pages/Setting/Setting.js
index 50d0a0a..e434d93 100644
--- a/littleApp_child/pages/Setting/Setting.js
+++ b/littleApp_child/pages/Setting/Setting.js
@@ -45,6 +45,8 @@ Page({
if (getApp().globalData.tourist == true) {
param.type = 2
}
+ var list=networkUtil.Builing_Release_AppStore
+ console.log('服务器地址',list);
networkUtil._get(api.userInfo + app.globalData.currentId, param, function (res) {
console.log('获取用户信息', res)
self.setData({
diff --git a/littleApp_child/pages/diet/measuret.js b/littleApp_child/pages/diet/measuret.js
index 94ce7f8..b273bd1 100644
--- a/littleApp_child/pages/diet/measuret.js
+++ b/littleApp_child/pages/diet/measuret.js
@@ -454,6 +454,7 @@ Page({
"软米饭", "面食", "粗粮薯类", "蔬菜", "水果", "全蛋", "肉类", "鱼虾类", "豆制品"
],
hospitalId: "",
+ networkutil:'',
toDay:"",
pid:"",
show:false,
@@ -660,18 +661,18 @@ Page({
saveFoodlist(){
var that = this;
let listss=that.data.foodList
- if(that.data.hospitalId==4055&&that.data.yl<6){
+ if((that.data.hospitalId==4055&&that.data.yl<6&&that.data.networkutil==1)||that.data.hospitalId==666668&&that.data.yl<6&&(that.data.networkutil==0||that.data.networkutil==4)){
networkUtil.showErrorToast('孩子目前还未到六月龄')
return
}
- if(that.data.hospitalId==4055&&that.data.yl>12){
+ if((that.data.hospitalId==4055&&that.data.yl>12&&that.data.networkutil==1)||that.data.hospitalId==666668&&that.data.yl>12&&(that.data.networkutil==0||that.data.networkutil==4)){
networkUtil.showErrorToast('孩子已超过十二月龄')
return
}
this.setData({
show : true
})
- if(that.data.hospitalId==4055){
+ if((that.data.hospitalId==4055&&that.data.networkutil==1)||(that.data.hospitalId==666668&&(that.data.networkutil==0||that.data.networkutil==4))){
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,{
@@ -756,6 +757,7 @@ Page({
})
this.setData({
hospitalId: app.globalData.userInfo.hospitalId,
+ networkutil:networkUtil.Builing_Release_AppStore,
pid:app.globalData.userInfo.pid,
})
var list1=this.data.foodList.slice(0,6)
@@ -766,7 +768,7 @@ Page({
foodList2:list2,
foodList3:list3
})
- if(app.globalData.userInfo.hospitalId==4055){
+ if((app.globalData.userInfo.hospitalId==4055&&this.data.networkutil==1)||(app.globalData.userInfo.hospitalId==666668&&(this.data.networkutil==0||this.data.networkutil==4))){
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 24cc547..a7ee4f6 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 2d21902..2ebfe98 100644
--- a/littleApp_child/pages/feedback/feedback.js
+++ b/littleApp_child/pages/feedback/feedback.js
@@ -20,14 +20,16 @@ Page({
content: "",
babyname:'',
babyid:'',
- hpid:''
+ hpid:'',
+ networkutil:''
},
onLoad: function (e) {
// console.log('撒大大',e);
this.setData({
babyname:e.babyname,
babyid:wx.getStorageSync('erid'),
- hpid:wx.getStorageSync('hospitalId')
+ hpid:wx.getStorageSync('hospitalId'),
+ networkutil:networkUtil.Builing_Release_AppStore
})
wx.getSystemInfo({
success: function (res) {
diff --git a/littleApp_child/pages/feedback/feedback.wxml b/littleApp_child/pages/feedback/feedback.wxml
index cef8a8d..47a7f9b 100644
--- a/littleApp_child/pages/feedback/feedback.wxml
+++ b/littleApp_child/pages/feedback/feedback.wxml
@@ -25,8 +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 1d5aca0..39eb118 100644
--- a/littleApp_child/pages/home/home.js
+++ b/littleApp_child/pages/home/home.js
@@ -88,17 +88,19 @@ Page({
yc:0,
hospitalId1:null,
userInfoDate:{},
- erid:null
+ erid:null,
+ networkutil:''
},
/*---------生命周期--------*/
onLoad: function(options) {
// console.log(app.globalData,'options1121');
+ this.setData({
+ hospitalId1:options.hospitalId,
+ networkutil:networkUtil.Builing_Release_AppStore
+ })
this.getUserInfo(app.globalData.token)
hospitalId = options.hospitalId;
this.calculatePageSize()
- this.setData({
- hospitalId1:options.hospitalId
- })
// 网络监听
this.networkStatusChange()
var that = this
@@ -622,7 +624,7 @@ Page({
networkUtil._post(api.getBabyBuildPidInfo,param,function(res){
wx.setStorageSync('erid',res.data.data.id)
// console.log('获取用户信息12122', res)
- if(wx.getStorageSync('hospitalId')==4055){
+ if((wx.getStorageSync('hospitalId')==4055&&self.data.networkutil==1)||(wx.getStorageSync('hospitalId')==666668&&(self.data.networkutil==0||self.data.networkutil==4))){
self.getBabyMsgCountByIdNum(res.data.data.id)
}
// self.setNotification(res.data.data.id)
diff --git a/littleApp_child/pages/home/home.wxml b/littleApp_child/pages/home/home.wxml
index 16162ce..8f11cd5 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 ca3e5d8..8d55f08 100644
--- a/littleApp_child/pages/vipService/vipService.js
+++ b/littleApp_child/pages/vipService/vipService.js
@@ -13,7 +13,8 @@ Page({
isVip: false,
isVip1: false,
phone: '',
- hospitalId:null
+ hospitalId:null,
+ networkutil:''
},
onLoad: function (e) {
var self = this
@@ -21,7 +22,8 @@ Page({
self.setData({
phone: app.globalData.userInfo.phone,
userId:wx.getStorageSync('erid'),
- hospitalId:wx.getStorageSync('hospitalId')
+ hospitalId:wx.getStorageSync('hospitalId'),
+ networkutil:networkUtil.Builing_Release_AppStore
})
self.requestData()
@@ -62,7 +64,7 @@ Page({
var arr=[]
networkUtil._get(api.goods, {}, function (res) {
// console.log('vip1',res)
- if(self.data.hospitalId==4055){
+ if((self.data.hospitalId==4055&&self.data.networkutil==1)||(self.data.hospitalId==666668&&(self.data.networkutil==0||self.data.networkutil==4))){
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]
diff --git a/littleApp_child/pages/vipService/vipService.wxml b/littleApp_child/pages/vipService/vipService.wxml
index 047d79a..2b5e390 100644
--- a/littleApp_child/pages/vipService/vipService.wxml
+++ b/littleApp_child/pages/vipService/vipService.wxml
@@ -24,7 +24,7 @@
VIP服务内容
-
+
@@ -32,7 +32,7 @@
VIP
标准
- ¥{{item.price}}
+ ¥{{item.price}}
已开通
已过期
已暂停
@@ -43,7 +43,7 @@
-
+
@@ -51,7 +51,7 @@
VIP
标准
- ¥{{item.price}}
+ ¥{{item.price}}
已开通
未开通
已开通
diff --git a/littleApp_child/pages/weightReportList/weightReportList.js b/littleApp_child/pages/weightReportList/weightReportList.js
index c5a096b..b726446 100644
--- a/littleApp_child/pages/weightReportList/weightReportList.js
+++ b/littleApp_child/pages/weightReportList/weightReportList.js
@@ -10,7 +10,8 @@ Page({
data: {
listData:[],
babyId:'',
- hpid:''
+ hpid:'',
+ networkutil:''
},
// 获取膳食检查列表
getBabyNutritionList:function(){
@@ -39,7 +40,8 @@ Page({
onLoad: function (options) {
this.setData({
babyId:wx.getStorageSync('erid'),
- hpid:wx.getStorageSync('hospitalId')
+ hpid:wx.getStorageSync('hospitalId'),
+ networkutil:networkUtil.Builing_Release_AppStore
})
this.getBabyNutritionList()
},
diff --git a/littleApp_child/pages/weightReportList/weightReportList.wxml b/littleApp_child/pages/weightReportList/weightReportList.wxml
index efb5086..1845c5c 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