luoye / littleApp_child

Download as
Browse Code »

Commit 5dc253ee0806311ebfb3d48cccc332689fc25586

Authored by wangjialin
2 parents 62808ffe1c 7d47501c15
Exists in dev_wjl and in 1 other branch dev-wrh

解决冲突

Showing 4 changed files

littleApp_child/app.json View file @ 5dc253e
... ... @@ -77,7 +77,7 @@
77 77 },
78 78 "plugins": {
79 79 "myPlugin": {
80   - "version": "1.4.2",
  80 + "version": "1.4.3",
81 81 "provider": "wx8c631f7e9f2465e1"
82 82 }
83 83 }
littleApp_child/pages/home/home.js View file @ 5dc253e
... ... @@ -201,7 +201,6 @@
201 201 })
202 202 },
203 203  
204   -
205 204 /*---------交互--------*/
206 205 // 下拉刷新回调接口
207 206 onPullDownRefresh: function() {
208 207  
... ... @@ -419,12 +418,13 @@
419 418 wx.showModal({
420 419 title: '温馨提示',
421 420 content: '您还没有开通该项服务哦',
422   - confirmText: '立即开通',
  421 + confirmText: '取消',
  422 + showCancel: false, // 显示取消按钮
423 423 success: function(res) {
424 424 if (res.confirm) {
425   - wx.navigateTo({
426   - url: '../vipService/vipService',
427   - })
  425 + // wx.navigateTo({
  426 + // url: '../vipService/vipService',
  427 + // })
428 428 }
429 429 }
430 430 })
431 431  
... ... @@ -440,12 +440,14 @@
440 440 wx.showModal({
441 441 title: '温馨提示',
442 442 content: '尚未开通儿保助理服务，无法享受会员服务',
443   - confirmText: '立即开通',
  443 + confirmText: '取消',
  444 + showCancel: false, // 显示取消按钮
444 445 success: function (res) {
445 446 if (res.confirm) {
446   - wx.navigateTo({
447   - url: '../vipService/vipService',
448   - })
  447 + // wx.navigateTo({
  448 + // url: '../vipService/vipService',
  449 + // })
  450 + // console.log('你好');
449 451 }
450 452 }
451 453 })
... ... @@ -569,7 +571,8 @@
569 571 param.type = 2
570 572 }
571 573 networkUtil._get(api.userInfo + app.globalData.currentId, param, function(res) {
572   - // console.log('获取用户信息1212', res)
  574 + console.log('获取用户信息1212', res)
  575 + wx.setStorageSync('hospitalId', res.data.data.hospitalId)
573 576 if (res.data.data.bzstatus==1){
574 577 self.data.riskBase=true;
575 578 }else{
littleApp_child/pages/vipService/vipService.js View file @ 5dc253e
... ... @@ -12,13 +12,15 @@
12 12 vipList: [],
13 13 isVip: false,
14 14 phone: '',
  15 + hospitalId:null
15 16 },
16 17 onLoad: function (e) {
17 18 var self = this
18 19 networkUtil.showLoading()
19 20 self.setData({
20 21 phone: app.globalData.userInfo.phone,
21   - userId:e.id
  22 + userId:e.id,
  23 + hospitalId:wx.getStorageSync('hospitalId')
22 24 })
23 25  
24 26 self.requestData()
littleApp_child/pages/vipService/vipService.wxml View file @ 5dc253e
... ... @@ -33,7 +33,7 @@
33 33 <view class="vip_intr_titleBar_nameplate">VIP</view>
34 34 <view class="vip_intr_titleBar_nameplate noVip" wx:if="{{item.price==0}}">标准</view>
35 35  
36   - <view class="vip_intr_price_text" wx:if="{{item.price!=0}}">￥{{item.price}}</view>
  36 + <view class="vip_intr_price_text" wx:if="{{item.price!=0 && hospitalId !== 666668 }}">￥{{item.price}}</view>
37 37 <view class="vip_intr_status_text" wx:if="{{item.status==1||item.price==0}}">已开通</view>
38 38 <view class="vip_intr_status_text" wx:if="{{item.status==3}}">已过期</view>
39 39 <view class="vip_intr_status_text" wx:if="{{item.status==4}}">已暂停</view>