luoye / littleApp_child

Download as
Browse Code »

Commit 3073f1bdbdc176a6aa9254b0fe6171c081e774c4

Authored by wangjialin
1 parent 680cca87de
Exists in dev_wjl and in 1 other branch dev-wrh

修改医院id

Showing 11 changed files with 46 additions and 34 deletions

littleApp_child/pages/Setting/Setting.js View file @ 3073f1b
... ... @@ -45,6 +45,8 @@
45 45 if (getApp().globalData.tourist == true) {
46 46 param.type = 2
47 47 }
  48 + var list=networkUtil.Builing_Release_AppStore
  49 + console.log('服务器地址',list);
48 50 networkUtil._get(api.userInfo + app.globalData.currentId, param, function (res) {
49 51 console.log('获取用户信息', res)
50 52 self.setData({
littleApp_child/pages/diet/measuret.js View file @ 3073f1b
... ... @@ -454,6 +454,7 @@
454 454 "软米饭", "面食", "粗粮薯类", "蔬菜", "水果", "全蛋", "肉类", "鱼虾类", "豆制品"
455 455 ],
456 456 hospitalId: "",
  457 + networkutil:'',
457 458 toDay:"",
458 459 pid:"",
459 460 show:false,
460 461  
461 462  
... ... @@ -660,18 +661,18 @@
660 661 saveFoodlist(){
661 662 var that = this;
662 663 let listss=that.data.foodList
663   - if(that.data.hospitalId==4055&&that.data.yl<6){
  664 + 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)){
664 665 networkUtil.showErrorToast('孩子目前还未到六月龄')
665 666 return
666 667 }
667   - if(that.data.hospitalId==4055&&that.data.yl>12){
  668 + 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)){
668 669 networkUtil.showErrorToast('孩子已超过十二月龄')
669 670 return
670 671 }
671 672 this.setData({
672 673 show : true
673 674 })
674   - if(that.data.hospitalId==4055){
  675 + if((that.data.hospitalId==4055&&that.data.networkutil==1)||(that.data.hospitalId==666668&&(that.data.networkutil==0||that.data.networkutil==4))){
675 676 listss=[...that.data.foodList1,...that.data.foodList2,...that.data.foodList3,...that.data.foodList4,...that.data.foodList5,...that.data.foodList6,...that.data.foodList7]
676 677 }
677 678 networkUtil._post(api.setFootList,{
... ... @@ -756,6 +757,7 @@
756 757 })
757 758 this.setData({
758 759 hospitalId: app.globalData.userInfo.hospitalId,
  760 + networkutil:networkUtil.Builing_Release_AppStore,
759 761 pid:app.globalData.userInfo.pid,
760 762 })
761 763 var list1=this.data.foodList.slice(0,6)
... ... @@ -766,7 +768,7 @@
766 768 foodList2:list2,
767 769 foodList3:list3
768 770 })
769   - if(app.globalData.userInfo.hospitalId==4055){
  771 + if((app.globalData.userInfo.hospitalId==4055&&this.data.networkutil==1)||(app.globalData.userInfo.hospitalId==666668&&(this.data.networkutil==0||this.data.networkutil==4))){
770 772 if((app.globalData.userInfo.monthage.includes("岁")&&app.globalData.userInfo.monthage.includes("月"))||(app.globalData.userInfo.monthage.includes("岁")&&(app.globalData.userInfo.monthage.match(/^\d+/)-0)>1)){
771 773 this.setData({
772 774 yl:13
littleApp_child/pages/diet/measuret.wxml View file @ 3073f1b
... ... @@ -14,7 +14,7 @@
14 14 <checkbox value="cb" checked="true" color="#ed7d31" />表示爱吃
15 15 </label>
16 16 </view>
17   - <view class="measuret_body" wx:if="{{hospitalId!=4055}}">
  17 + <view class="measuret_body" wx:if="{{(hospitalId!=4055&&networkutil==1)||(hospitalId!=666668&&(networkutil==0||networkutil==4))}}">
18 18 <checkbox-group bindchange="foodClick">
19 19 <view class="section section_gap" wx:for="{{foodList}}" wx:for-index="$index" wx:for-item="item">
20 20 <view class="body-view">
... ... @@ -25,7 +25,7 @@
25 25 </view>
26 26 </checkbox-group>
27 27 </view>
28   - <view class="measuret_body" wx:if="{{hospitalId==4055}}">
  28 + <view class="measuret_body" wx:if="{{(hospitalId==4055&&networkutil==1)||(hospitalId==666668&&(networkutil==0||networkutil==4))}}">
29 29 <view style="font-size: 26rpx;">六月龄膳食调查</view>
30 30 <checkbox-group bindchange="foodClick1">
31 31 <view class="section section_gap" wx:for="{{foodList1}}" wx:for-index="$index" wx:for-item="item">
... ... @@ -107,7 +107,7 @@
107 107 <view class="my_apport" bindtap="getBabyNutritionList" style="margin: 5px auto;position: relative;width: 120px;">
108 108 查看历史报告
109 109 </view>
110   -<scroll-view scroll-y="true" style="pointer-events:none" wx:if="{{hospitalId==4055}}">
  110 +<scroll-view scroll-y="true" style="pointer-events:none" wx:if="{{(hospitalId==4055&&networkutil==1)||(hospitalId==666668&&(networkutil==0||networkutil==4))}}">
111 111 <view class="card" wx:for="{{array}}" wx:for-item="item">
112 112 <view class="title">
113 113 <text class="time">录入时间：{{item.createTime||yyyy/mm/dd}}</text>
... ... @@ -178,7 +178,7 @@
178 178 <view style="clear:both"></view>
179 179 </view>
180 180 </scroll-view>
181   -<scroll-view scroll-y="true" style="pointer-events:none" wx:if="{{hospitalId!=4055}}">
  181 +<scroll-view scroll-y="true" style="pointer-events:none" wx:if="{{(hospitalId!=4055&&networkutil==1)||(hospitalId!=666668&&(networkutil==0||networkutil==4))}}">
182 182 <view class="card" wx:for="{{array}}" wx:for-item="item">
183 183 <view class="title">
184 184 <text class="time">录入时间：{{item.createTime||yyyy/mm/dd}}</text>
littleApp_child/pages/feedback/feedback.js View file @ 3073f1b
... ... @@ -20,14 +20,16 @@
20 20 content: "",
21 21 babyname:'',
22 22 babyid:'',
23   - hpid:''
  23 + hpid:'',
  24 + networkutil:''
24 25 },
25 26 onLoad: function (e) {
26 27 // console.log('撒大大',e);
27 28 this.setData({
28 29 babyname:e.babyname,
29 30 babyid:wx.getStorageSync('erid'),
30   - hpid:wx.getStorageSync('hospitalId')
  31 + hpid:wx.getStorageSync('hospitalId'),
  32 + networkutil:networkUtil.Builing_Release_AppStore
31 33 })
32 34 wx.getSystemInfo({
33 35 success: function (res) {
littleApp_child/pages/feedback/feedback.wxml View file @ 3073f1b
... ... @@ -25,9 +25,9 @@
25 25 </view> -->
26 26 <!-- <button class="delete_bt3" bindtap="submit1">反馈记录</button> -->
27 27 </view>
28   - <view class="dw" bindtap="submit1" wx:if="{{hpid==4055}}">反馈记录</view>
  28 + <view class="dw" bindtap="submit1" wx:if="{{(hpid==4055&&networkutil==1)||(hpid==666668&&(networkutil==0||networkutil==4))}}">反馈记录</view>
29 29 </view>
30 30  
31   -<button class="delete_bt2" bindtap="submit" wx:if="{{hpid==4055}}">提交</button>
32   -<button class="delete_bt2" bindtap="submit2" wx:if="{{hpid!=4055}}">提交</button>
  31 +<button class="delete_bt2" bindtap="submit" wx:if="{{(hpid==4055&&networkutil==1)||(hpid==666668&&(networkutil==0||networkutil==4))}}">提交</button>
  32 +<button class="delete_bt2" bindtap="submit2" wx:if="{{(hpid!=4055&&networkutil==1)||(hpid!=666668&&(networkutil==0||networkutil==4))}}">提交</button>
littleApp_child/pages/home/home.js View file @ 3073f1b
... ... @@ -88,17 +88,19 @@
88 88 yc:0,
89 89 hospitalId1:null,
90 90 userInfoDate:{},
91   - erid:null
  91 + erid:null,
  92 + networkutil:''
92 93 },
93 94 /*---------生命周期--------*/
94 95 onLoad: function(options) {
95 96 // console.log(app.globalData,'options1121');
  97 + this.setData({
  98 + hospitalId1:options.hospitalId,
  99 + networkutil:networkUtil.Builing_Release_AppStore
  100 + })
96 101 this.getUserInfo(app.globalData.token)
97 102 hospitalId = options.hospitalId;
98 103 this.calculatePageSize()
99   - this.setData({
100   - hospitalId1:options.hospitalId
101   - })
102 104 // 网络监听
103 105 this.networkStatusChange()
104 106 var that = this
... ... @@ -622,7 +624,7 @@
622 624 networkUtil._post(api.getBabyBuildPidInfo,param,function(res){
623 625 wx.setStorageSync('erid',res.data.data.id)
624 626 // console.log('获取用户信息12122', res)
625   - if(wx.getStorageSync('hospitalId')==4055){
  627 + if((wx.getStorageSync('hospitalId')==4055&&self.data.networkutil==1)||(wx.getStorageSync('hospitalId')==666668&&(self.data.networkutil==0||self.data.networkutil==4))){
626 628 self.getBabyMsgCountByIdNum(res.data.data.id)
627 629 }
628 630 // self.setNotification(res.data.data.id)
littleApp_child/pages/home/home.wxml View file @ 3073f1b
... ... @@ -13,7 +13,7 @@
13 13  
14 14 <view class="TopBar" style='height:{{tourist == false ? 212 : 152}}px'>
15 15 <!--头像-->
16   - <view class="Notification" bind:tap="setNotification" wx:if="{{userData.hospitalId == 4055}}">
  16 + <view class="Notification" bind:tap="setNotification" wx:if="{{(userData.hospitalId==4055&&networkutil==1)||(userData.hospitalId==666668&&(networkutil==0||networkutil==4))}}">
17 17 <image src="../../source/xiaox.png" mode=""/>
18 18 <text style="color: #fff;" wx:if="{{MsgCount !== 0 || MsgCount == null }}">{{MsgCount || ''}}</text>
19 19 </view>
... ... @@ -75,7 +75,7 @@
75 75 <image src="../../source/yuyueyiyuan.png" style="{{item_small}}" class="foundation_item_small_image"></image>
76 76 <view class="foundation_item_small_text">疾病护理咨询</view>
77 77 </navigator> -->
78   - <navigator wx:if="{{userData.hospitalId != 4055}}" class="foundation_item_small" url="../consultationRecord/consultationRecord">
  78 + <navigator wx:if="{{(userData.hospitalId!=4055&&networkutil==1)||(userData.hospitalId!=666668&&(networkutil==0||networkutil==4))}}" class="foundation_item_small" url="../consultationRecord/consultationRecord">
79 79 <image src="../../source/except.png" style="{{item_small}}" class="foundation_item_small_image"></image>
80 80 <view class="foundation_item_small_text">历史咨询记录</view>
81 81 </navigator>
82 82  
83 83  
... ... @@ -108,18 +108,18 @@
108 108 <image src="../../source/jianchajilu.png" style="{{item_small}}" class="foundation_item_small_image"></image>
109 109 <view class="foundation_item_small_text">眼保健记录</view>
110 110 </navigator>
111   - <navigator wx:if="{{userData.hospitalId != 4055}}" class="foundation_item_small" bindtap="consultation">
  111 + <navigator wx:if="{{(userData.hospitalId!=4055&&networkutil==1)||(userData.hospitalId!=666668&&(networkutil==0||networkutil==4))}}" class="foundation_item_small" bindtap="consultation">
112 112 <view class="unreadCount" wx:if="{{unTotleReadCount>0}}">{{unTotleReadCount}}</view>
113 113 <image src="../../source/icon_consult@2x.png" style="{{item_small}}" class="foundation_item_small_image"></image>
114 114 <view class="foundation_item_small_text">专家咨询</view>
115 115 </navigator>
116 116  
117   - <navigator wx:if="{{userData.hospitalId == 4055}}" class="foundation_item_small" bindtap="consultation1">
  117 + <navigator wx:if="{{(userData.hospitalId==4055&&networkutil==1)||(userData.hospitalId==666668&&(networkutil==0||networkutil==4))}}" class="foundation_item_small" bindtap="consultation1">
118 118 <image src="../../source/icon_consult@2x.png" style="{{item_small}}" class="foundation_item_small_image"></image>
119 119 <view class="foundation_item_small_text">线上咨询</view>
120 120 </navigator>
121 121  
122   - <navigator wx:if="{{userData.hospitalId !== 4055}}" class="foundation_item_small" bind:tap="goGraph">
  122 + <navigator wx:if="{{(userData.hospitalId!=4055&&networkutil==1)||(userData.hospitalId!=666668&&(networkutil==0||networkutil==4))}}" class="foundation_item_small" bind:tap="goGraph">
123 123 <image src="../../source/graph.jpg" style="{{item_small}}" class="foundation_item_small_image"></image>
124 124 <view class="foundation_item_small_text">身高体重曲线</view>
125 125 </navigator>
... ... @@ -127,7 +127,7 @@
127 127 <image src="../../source/jianchajilu.png" style="{{item_small}}" class="foundation_item_small_image"></image>
128 128 <view class="foundation_item_small_text">补填户籍地址</view>
129 129 </navigator>
130   - <navigator class="foundation_item_small" bind:tap="goArticle" wx:if="{{userData.hospitalId !== 4055}}">
  130 + <navigator class="foundation_item_small" bind:tap="goArticle" wx:if="{{(userData.hospitalId!=4055&&networkutil==1)||(userData.hospitalId!=666668&&(networkutil==0||networkutil==4))}}">
131 131 <image src="../../source/jianchajilu.png" style="{{item_small}}" class="foundation_item_small_image"></image>
132 132 <view class="foundation_item_small_text">中医指导文章</view>
133 133 </navigator>
littleApp_child/pages/vipService/vipService.js View file @ 3073f1b
... ... @@ -13,7 +13,8 @@
13 13 isVip: false,
14 14 isVip1: false,
15 15 phone: '',
16   - hospitalId:null
  16 + hospitalId:null,
  17 + networkutil:''
17 18 },
18 19 onLoad: function (e) {
19 20 var self = this
... ... @@ -21,7 +22,8 @@
21 22 self.setData({
22 23 phone: app.globalData.userInfo.phone,
23 24 userId:wx.getStorageSync('erid'),
24   - hospitalId:wx.getStorageSync('hospitalId')
  25 + hospitalId:wx.getStorageSync('hospitalId'),
  26 + networkutil:networkUtil.Builing_Release_AppStore
25 27 })
26 28  
27 29 self.requestData()
... ... @@ -62,7 +64,7 @@
62 64 var arr=[]
63 65 networkUtil._get(api.goods, {}, function (res) {
64 66 // console.log('vip1',res)
65   - if(self.data.hospitalId==4055){
  67 + if((self.data.hospitalId==4055&&self.data.networkutil==1)||(self.data.hospitalId==666668&&(self.data.networkutil==0||self.data.networkutil==4))){
66 68 arr[0]=res.data.data[0]
67 69 arr[1]=res.data.data[1]
68 70 arr[0].desc=['1.精准指导服务:'+res.data.data[0].desc,'2.随访提醒:'+res.data.data[2].desc,'3.查看检查记录:'+res.data.data[3].desc]
littleApp_child/pages/vipService/vipService.wxml View file @ 3073f1b
... ... @@ -24,7 +24,7 @@
24 24 </view>
25 25 <view class='vip_content_text'>VIP服务内容</view>
26 26 <view class='list_item'>
27   - <block wx:for="{{vipList}}" wx:if='{{hospitalId!=4055}}'>
  27 + <block wx:for="{{vipList}}" wx:if='{{(hospitalId!=4055&&networkutil==1)||(hospitalId!=666668&&(networkutil==0||networkutil==4))}}'>
28 28 <view class="vip_intr_bg" bindtap='itemClick' data-id="{{item.id}}" data-status="{{item.status}}" data-price="{{item.price}}">
29 29 <view class="vip_intr_titleBar">
30 30 <image class="vip_intr_titleBar_icon" src='{{item.icon}}'></image>
... ... @@ -32,7 +32,7 @@
32 32 <view class="vip_intr_titleBar_nameplate">VIP</view>
33 33 <view class="vip_intr_titleBar_nameplate noVip" wx:if="{{item.price==0}}">标准</view>
34 34  
35   - <view class="vip_intr_price_text" wx:if="{{item.price!=0 && hospitalId !== 4055 }}">￥{{item.price}}</view>
  35 + <view class="vip_intr_price_text" wx:if="{{item.price!=0 && ((hospitalId!=4055&&networkutil==1)||(hospitalId!=666668&&(networkutil==0||networkutil==4))) }}">￥{{item.price}}</view>
36 36 <view class="vip_intr_status_text" wx:if="{{item.status==1||item.price==0}}">已开通</view>
37 37 <view class="vip_intr_status_text" wx:if="{{item.status==3}}">已过期</view>
38 38 <view class="vip_intr_status_text" wx:if="{{item.status==4}}">已暂停</view>
... ... @@ -43,7 +43,7 @@
43 43 <view style='height:19px;'></view>
44 44 </view>
45 45 </block>
46   - <block wx:for="{{vipList}}" wx:if='{{hospitalId==4055}}'>
  46 + <block wx:for="{{vipList}}" wx:if='{{(hospitalId==4055&&networkutil==1)||(hospitalId==666668&&(networkutil==0||networkutil==4))}}'>
47 47 <view class="vip_intr_bg" bindtap='itemClick' data-id="{{item.id}}" data-status="{{item.status}}" data-price="{{item.price}}">
48 48 <view class="vip_intr_titleBar">
49 49 <image class="vip_intr_titleBar_icon" src='{{item.icon}}'></image>
... ... @@ -51,7 +51,7 @@
51 51 <view class="vip_intr_titleBar_nameplate">VIP</view>
52 52 <view class="vip_intr_titleBar_nameplate noVip" wx:if="{{item.price==0}}">标准</view>
53 53  
54   - <view class="vip_intr_price_text" wx:if="{{item.price!=0 && hospitalId !== 4055 }}">￥{{item.price}}</view>
  54 + <view class="vip_intr_price_text" wx:if="{{item.price!=0 && ((hospitalId!=4055&&networkutil==1)||(hospitalId!=666668&&(networkutil==0||networkutil==4))) }}">￥{{item.price}}</view>
55 55 <view class="vip_intr_status_text" wx:if="{{isVip&&item.id==7}}">已开通</view>
56 56 <view class="vip_intr_status_text" wx:if="{{!isVip&&item.id==7}}">未开通</view>
57 57 <view class="vip_intr_status_text" wx:if="{{isVip1&&item.id==8}}">已开通</view>
littleApp_child/pages/weightReportList/weightReportList.js View file @ 3073f1b
... ... @@ -10,7 +10,8 @@
10 10 data: {
11 11 listData:[],
12 12 babyId:'',
13   - hpid:''
  13 + hpid:'',
  14 + networkutil:''
14 15 },
15 16 // 获取膳食检查列表
16 17 getBabyNutritionList:function(){
... ... @@ -39,7 +40,8 @@
39 40 onLoad: function (options) {
40 41 this.setData({
41 42 babyId:wx.getStorageSync('erid'),
42   - hpid:wx.getStorageSync('hospitalId')
  43 + hpid:wx.getStorageSync('hospitalId'),
  44 + networkutil:networkUtil.Builing_Release_AppStore
43 45 })
44 46 this.getBabyNutritionList()
45 47 },
littleApp_child/pages/weightReportList/weightReportList.wxml View file @ 3073f1b
... ... @@ -4,7 +4,7 @@
4 4 <text>记录时间</text><text>{{item.recordTime}}</text> <text>月龄</text><text>{{item.monthAge}}</text>
5 5 </navigator>
6 6 </view>
7   -<view style="font-size: 24rpx;padding:10rpx;" wx:if="{{hpid==4055}}">
  7 +<view style="font-size: 24rpx;padding:10rpx;" wx:if="{{(hpid==4055&&networkutil==1)||hpid==666668&&(networkutil==0||networkutil==4)}}">
8 8 <view>贴心提醒：</view>
9 9 <view>待医院医生确认即可查看膳食报告</view>
10 10 </view>