diff --git a/littleApp_child/app.json b/littleApp_child/app.json index a0267c7..211089c 100644 --- a/littleApp_child/app.json +++ b/littleApp_child/app.json @@ -77,7 +77,7 @@ }, "plugins": { "myPlugin": { - "version": "1.4.2", + "version": "1.4.3", "provider": "wx8c631f7e9f2465e1" } } diff --git a/littleApp_child/pages/home/home.js b/littleApp_child/pages/home/home.js index e1332c5..9a26e33 100644 --- a/littleApp_child/pages/home/home.js +++ b/littleApp_child/pages/home/home.js @@ -201,7 +201,6 @@ Page({ }) }, - /*---------交互--------*/ // 下拉刷新回调接口 onPullDownRefresh: function() { @@ -419,12 +418,13 @@ Page({ wx.showModal({ title: '温馨提示', content: '您还没有开通该项服务哦', - confirmText: '立即开通', + confirmText: '取消', + showCancel: false, // 显示取消按钮 success: function(res) { if (res.confirm) { - wx.navigateTo({ - url: '../vipService/vipService', - }) + // wx.navigateTo({ + // url: '../vipService/vipService', + // }) } } }) @@ -440,12 +440,14 @@ Page({ wx.showModal({ title: '温馨提示', content: '尚未开通儿保助理服务,无法享受会员服务', - confirmText: '立即开通', + confirmText: '取消', + showCancel: false, // 显示取消按钮 success: function (res) { if (res.confirm) { - wx.navigateTo({ - url: '../vipService/vipService', - }) + // wx.navigateTo({ + // url: '../vipService/vipService', + // }) + // console.log('你好'); } } }) @@ -569,7 +571,8 @@ Page({ param.type = 2 } networkUtil._get(api.userInfo + app.globalData.currentId, param, function(res) { - // console.log('获取用户信息1212', res) + console.log('获取用户信息1212', res) + wx.setStorageSync('hospitalId', res.data.data.hospitalId) if (res.data.data.bzstatus==1){ self.data.riskBase=true; }else{ diff --git a/littleApp_child/pages/vipService/vipService.js b/littleApp_child/pages/vipService/vipService.js index 57d2eec..6356028 100644 --- a/littleApp_child/pages/vipService/vipService.js +++ b/littleApp_child/pages/vipService/vipService.js @@ -12,13 +12,15 @@ Page({ vipList: [], isVip: false, phone: '', + hospitalId:null }, onLoad: function (e) { var self = this networkUtil.showLoading() - + self.setData({ - phone: app.globalData.userInfo.phone + phone: app.globalData.userInfo.phone, + hospitalId:wx.getStorageSync('hospitalId') }) self.requestData() diff --git a/littleApp_child/pages/vipService/vipService.wxml b/littleApp_child/pages/vipService/vipService.wxml index 47e6126..9e76d70 100644 --- a/littleApp_child/pages/vipService/vipService.wxml +++ b/littleApp_child/pages/vipService/vipService.wxml @@ -33,7 +33,7 @@ VIP 标准 - ¥{{item.price}} + ¥{{item.price}} 已开通 已过期 已暂停