luoye / littleApp_child

Download as
Browse Code »

Commit 680cca87de8404946665cfb614d2d4c5c39f860d

Authored by wangjialin
1 parent 15951ad603
Exists in dev_wjl and in 1 other branch dev-wrh

区分大同

Showing 12 changed files with 78 additions and 38 deletions

littleApp_child/pages/diet/measuret.js View file @ 680cca8
... ... @@ -660,18 +660,18 @@
660 660 saveFoodlist(){
661 661 var that = this;
662 662 let listss=that.data.foodList
663   - if(that.data.hospitalId==666668&&that.data.yl<6){
  663 + if(that.data.hospitalId==4055&&that.data.yl<6){
664 664 networkUtil.showErrorToast('孩子目前还未到六月龄')
665 665 return
666 666 }
667   - if(that.data.hospitalId==666668&&that.data.yl>12){
  667 + if(that.data.hospitalId==4055&&that.data.yl>12){
668 668 networkUtil.showErrorToast('孩子已超过十二月龄')
669 669 return
670 670 }
671 671 this.setData({
672 672 show : true
673 673 })
674   - if(that.data.hospitalId==666668){
  674 + if(that.data.hospitalId==4055){
675 675 listss=[...that.data.foodList1,...that.data.foodList2,...that.data.foodList3,...that.data.foodList4,...that.data.foodList5,...that.data.foodList6,...that.data.foodList7]
676 676 }
677 677 networkUtil._post(api.setFootList,{
... ... @@ -766,7 +766,7 @@
766 766 foodList2:list2,
767 767 foodList3:list3
768 768 })
769   - if(app.globalData.userInfo.hospitalId==666668){
  769 + if(app.globalData.userInfo.hospitalId==4055){
770 770 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 771 this.setData({
772 772 yl:13
littleApp_child/pages/diet/measuret.wxml View file @ 680cca8
... ... @@ -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!=666668}}">
  17 + <view class="measuret_body" wx:if="{{hospitalId!=4055}}">
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==666668}}">
  28 + <view class="measuret_body" wx:if="{{hospitalId==4055}}">
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==666668}}">
  110 +<scroll-view scroll-y="true" style="pointer-events:none" wx:if="{{hospitalId==4055}}">
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!=666668}}">
  181 +<scroll-view scroll-y="true" style="pointer-events:none" wx:if="{{hospitalId!=4055}}">
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 @ 680cca8
... ... @@ -19,13 +19,15 @@
19 19 chooseThree: 0,
20 20 content: "",
21 21 babyname:'',
22   - babyid:''
  22 + babyid:'',
  23 + hpid:''
23 24 },
24 25 onLoad: function (e) {
25 26 // console.log('撒大大',e);
26 27 this.setData({
27 28 babyname:e.babyname,
28   - babyid:wx.getStorageSync('erid')
  29 + babyid:wx.getStorageSync('erid'),
  30 + hpid:wx.getStorageSync('hospitalId')
29 31 })
30 32 wx.getSystemInfo({
31 33 success: function (res) {
... ... @@ -77,6 +79,18 @@
77 79 this.setData({
78 80 content: value
79 81 })
  82 + },
  83 + submit2:function(){
  84 + wx.showModal({
  85 + title: '提示',
  86 + content: '提交成功',
  87 + showCancel: false,
  88 + success: function (res) {
  89 + wx.navigateBack()
  90 + return
  91 + }
  92 + })
  93 +
80 94 },
81 95 submit: function () {
82 96 if (this.data.content.length==0){
littleApp_child/pages/feedback/feedback.wxml View file @ 680cca8
... ... @@ -25,8 +25,9 @@
25 25 </view> -->
26 26 <!-- <button class="delete_bt3" bindtap="submit1">反馈记录</button> -->
27 27 </view>
28   - <view class="dw" bindtap="submit1">反馈记录</view>
  28 + <view class="dw" bindtap="submit1" wx:if="{{hpid==4055}}">反馈记录</view>
29 29 </view>
30 30  
31   -<button class="delete_bt2" bindtap="submit">提交</button>
  31 +<button class="delete_bt2" bindtap="submit" wx:if="{{hpid==4055}}">提交</button>
  32 +<button class="delete_bt2" bindtap="submit2" wx:if="{{hpid!=4055}}">提交</button>
littleApp_child/pages/home/home.js View file @ 680cca8
... ... @@ -622,7 +622,9 @@
622 622 networkUtil._post(api.getBabyBuildPidInfo,param,function(res){
623 623 wx.setStorageSync('erid',res.data.data.id)
624 624 // console.log('获取用户信息12122', res)
625   - self.getBabyMsgCountByIdNum(res.data.data.id)
  625 + if(wx.getStorageSync('hospitalId')==4055){
  626 + self.getBabyMsgCountByIdNum(res.data.data.id)
  627 + }
626 628 // self.setNotification(res.data.data.id)
627 629 self.setData({
628 630 erid:res.data.data.id
littleApp_child/pages/home/home.wxml View file @ 680cca8
... ... @@ -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 == 666668}}">
  16 + <view class="Notification" bind:tap="setNotification" wx:if="{{userData.hospitalId == 4055}}">
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 != 666668}}" class="foundation_item_small" url="../consultationRecord/consultationRecord">
  78 + <navigator wx:if="{{userData.hospitalId != 4055}}" 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 != 666668}}" class="foundation_item_small" bindtap="consultation">
  111 + <navigator wx:if="{{userData.hospitalId != 4055}}" 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 == 666668}}" class="foundation_item_small" bindtap="consultation1">
  117 + <navigator wx:if="{{userData.hospitalId == 4055}}" 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 !== 666668}}" class="foundation_item_small" bind:tap="goGraph">
  122 + <navigator wx:if="{{userData.hospitalId !== 4055}}" 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 !== 666668}}">
  130 + <navigator class="foundation_item_small" bind:tap="goArticle" wx:if="{{userData.hospitalId !== 4055}}">
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 @ 680cca8
... ... @@ -59,11 +59,23 @@
59 59 var param = {
60 60 babyId:self.data.userId
61 61 }
  62 + var arr=[]
62 63 networkUtil._get(api.goods, {}, function (res) {
63 64 // console.log('vip1',res)
64   - self.setData({
65   - vipList: res.data.data,
66   - })
  65 + if(self.data.hospitalId==4055){
  66 + arr[0]=res.data.data[0]
  67 + arr[1]=res.data.data[1]
  68 + arr[0].desc=['1.精准指导服务:'+res.data.data[0].desc,'2.随访提醒:'+res.data.data[2].desc,'3.查看检查记录:'+res.data.data[3].desc]
  69 + arr[1].desc=[res.data.data[1].desc]
  70 + console.log('arr',arr);
  71 + self.setData({
  72 + vipList: arr,
  73 + })
  74 + }else{
  75 + self.setData({
  76 + vipList: res.data.data,
  77 + })
  78 + }
67 79 }, function (res) {
68 80  
69 81 })
littleApp_child/pages/vipService/vipService.wxml View file @ 680cca8
... ... @@ -24,8 +24,7 @@
24 24 </view>
25 25 <view class='vip_content_text'>VIP服务内容</view>
26 26 <view class='list_item'>
27   -
28   - <block wx:for="{{vipList}}">
  27 + <block wx:for="{{vipList}}" wx:if='{{hospitalId!=4055}}'>
29 28 <view class="vip_intr_bg" bindtap='itemClick' data-id="{{item.id}}" data-status="{{item.status}}" data-price="{{item.price}}">
30 29 <view class="vip_intr_titleBar">
31 30 <image class="vip_intr_titleBar_icon" src='{{item.icon}}'></image>
32 31  
33 32  
34 33  
... ... @@ -33,22 +32,32 @@
33 32 <view class="vip_intr_titleBar_nameplate">VIP</view>
34 33 <view class="vip_intr_titleBar_nameplate noVip" wx:if="{{item.price==0}}">标准</view>
35 34  
36   - <view class="vip_intr_price_text" wx:if="{{item.price!=0 && hospitalId !== 666668 }}">￥{{item.price}}</view>
37   - <!-- <view class="vip_intr_status_text" wx:if="{{item.status==1||item.price==0}}">已开通</view>
  35 + <view class="vip_intr_price_text" wx:if="{{item.price!=0 && hospitalId !== 4055 }}">￥{{item.price}}</view>
  36 + <view class="vip_intr_status_text" wx:if="{{item.status==1||item.price==0}}">已开通</view>
38 37 <view class="vip_intr_status_text" wx:if="{{item.status==3}}">已过期</view>
39 38 <view class="vip_intr_status_text" wx:if="{{item.status==4}}">已暂停</view>
40 39 <view class="openbt" wx:if="{{item.status==0&&item.price!=0 }}">开通</view>
41   - <view class="openbt" wx:if="{{item.status==2&&item.price!=0 }}">开通</view> -->
  40 + <view class="openbt" wx:if="{{item.status==2&&item.price!=0 }}">开通</view>
  41 + </view>
  42 + <view class="vip_intr_content">{{item.desc}}</view>
  43 + <view style='height:19px;'></view>
  44 + </view>
  45 + </block>
  46 + <block wx:for="{{vipList}}" wx:if='{{hospitalId==4055}}'>
  47 + <view class="vip_intr_bg" bindtap='itemClick' data-id="{{item.id}}" data-status="{{item.status}}" data-price="{{item.price}}">
  48 + <view class="vip_intr_titleBar">
  49 + <image class="vip_intr_titleBar_icon" src='{{item.icon}}'></image>
  50 + <view class="vip_intr_titleBar_text">{{item.name}}</view>
  51 + <view class="vip_intr_titleBar_nameplate">VIP</view>
  52 + <view class="vip_intr_titleBar_nameplate noVip" wx:if="{{item.price==0}}">标准</view>
  53 +
  54 + <view class="vip_intr_price_text" wx:if="{{item.price!=0 && hospitalId !== 4055 }}">￥{{item.price}}</view>
42 55 <view class="vip_intr_status_text" wx:if="{{isVip&&item.id==7}}">已开通</view>
43 56 <view class="vip_intr_status_text" wx:if="{{!isVip&&item.id==7}}">未开通</view>
44 57 <view class="vip_intr_status_text" wx:if="{{isVip1&&item.id==8}}">已开通</view>
45 58 <view class="vip_intr_status_text" wx:if="{{!isVip1&&item.id==8}}">未开通</view>
46   - <view class="vip_intr_status_text" wx:if="{{isVip&&item.id==9}}">已开通</view>
47   - <view class="vip_intr_status_text" wx:if="{{!isVip&&item.id==9}}">未开通</view>
48   - <view class="vip_intr_status_text" wx:if="{{isVip&&item.id==10}}">已开通</view>
49   - <view class="vip_intr_status_text" wx:if="{{!isVip&&item.id==10}}">未开通</view>
50 59 </view>
51   - <view class="vip_intr_content">{{item.desc}}</view>
  60 + <view class="vip_intr_content" wx:for="{{item.desc}}" wx:for-item="items">{{items}}</view>
52 61 <view style='height:19px;'></view>
53 62 </view>
54 63 </block>
littleApp_child/pages/weightReportList/weightReportList.js View file @ 680cca8
... ... @@ -9,7 +9,8 @@
9 9 */
10 10 data: {
11 11 listData:[],
12   - babyId:''
  12 + babyId:'',
  13 + hpid:''
13 14 },
14 15 // 获取膳食检查列表
15 16 getBabyNutritionList:function(){
... ... @@ -37,7 +38,8 @@
37 38 */
38 39 onLoad: function (options) {
39 40 this.setData({
40   - babyId:wx.getStorageSync('erid')
  41 + babyId:wx.getStorageSync('erid'),
  42 + hpid:wx.getStorageSync('hospitalId')
41 43 })
42 44 this.getBabyNutritionList()
43 45 },
littleApp_child/pages/weightReportList/weightReportList.wxml View file @ 680cca8
... ... @@ -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;">
  7 +<view style="font-size: 24rpx;padding:10rpx;" wx:if="{{hpid==4055}}">
8 8 <view>贴心提醒：</view>
9 9 <view>待医院医生确认即可查看膳食报告</view>
10 10 </view>
littleApp_child/utils/WebIMConfig.js View file @ 680cca8
... ... @@ -27,8 +27,8 @@
27 27 /*
28 28 * Application AppKey
29 29 */
30   - appkey: '1123170414115195#mommybaby',//测试版
31   - // appkey: '1123170414115195#mommybabyfinalversion',//正式版
  30 + // appkey: '1123170414115195#mommybaby',//测试版
  31 + appkey: '1123170414115195#mommybabyfinalversion',//正式版
32 32 // appkey: "easemob-demo#chatdemoui",
33 33 /*
34 34 * Whether to use HTTPS '1177161227178308#xcx'
littleApp_child/utils/network_util.js View file @ 680cca8
... ... @@ -4,7 +4,7 @@
4 4 // 18382670036 多层次
5 5 // 18328537371 陈云 666666
6 6 // 0测试环境 1正式环境 2演示环境 3衡水
7   -var Builing_Release_AppStore = 0;
  7 +var Builing_Release_AppStore = 1;
8 8 // 获取服务器地址
9 9 function kServerBaseUrl() {
10 10 switch (Builing_Release_AppStore) {