diff --git a/src/app.ts b/src/app.ts index 3f0aac3..58f0cc5 100644 --- a/src/app.ts +++ b/src/app.ts @@ -630,8 +630,7 @@ App({ const checkUserType = () => { const userInfo = this.globalData.userInfo if (userInfo.UserType) { - // resolve(userInfo.UserType >= 4 ? 'DRUG' : 'PATIENT') - resolve('PATIENT') + resolve(userInfo.UserType >= 3 ? 'DRUG' : 'PATIENT') return true } return false diff --git a/src/components/pageNavbar/index.wxml b/src/components/pageNavbar/index.wxml index 8da1693..762e83d 100644 --- a/src/components/pageNavbar/index.wxml +++ b/src/components/pageNavbar/index.wxml @@ -1,7 +1,7 @@ - - + + diff --git a/src/custom-tab-bar/index.wxml b/src/custom-tab-bar/index.wxml index 133410e..de23629 100644 --- a/src/custom-tab-bar/index.wxml +++ b/src/custom-tab-bar/index.wxml @@ -1,13 +1,13 @@ - + 用药提醒 - + 累计邀约 @@ -25,7 +25,7 @@ - + {{detail.yr}}年激活 @@ -60,7 +60,7 @@ model:value="{{year1}}" > {{year1}}年 - + 统计数据截止昨天 diff --git a/src/doctor/pages/d_interactiveDoctor/index.wxml b/src/doctor/pages/d_interactiveDoctor/index.wxml index 5f592e3..3b7459f 100644 --- a/src/doctor/pages/d_interactiveDoctor/index.wxml +++ b/src/doctor/pages/d_interactiveDoctor/index.wxml @@ -65,7 +65,7 @@ - + @@ -83,7 +83,7 @@ 发送消息 - + 出诊时间 diff --git a/src/doctor/pages/d_login/index.wxml b/src/doctor/pages/d_login/index.wxml index 2b37ea5..4d6e52b 100644 --- a/src/doctor/pages/d_login/index.wxml +++ b/src/doctor/pages/d_login/index.wxml @@ -1,6 +1,6 @@ - + 尊敬的医生您好 “愈见昕生”是北京白求恩公益基金会发起的 IgG4-RD 患者健康管理平台。 @@ -17,7 +17,7 @@ 或者 - + 手机号验证码 @@ -43,7 +43,7 @@ 立即加入 - + 我同意依照此 diff --git a/src/doctor/pages/d_my/index.wxml b/src/doctor/pages/d_my/index.wxml index fdba768..22ef0f7 100644 --- a/src/doctor/pages/d_my/index.wxml +++ b/src/doctor/pages/d_my/index.wxml @@ -12,33 +12,33 @@ - + - + 个人信息 - + 隐私协议 - + 关注公众号 - + 问题反馈 diff --git a/src/doctor/pages/d_patient/index.wxml b/src/doctor/pages/d_patient/index.wxml index b1a6018..7f062d7 100644 --- a/src/doctor/pages/d_patient/index.wxml +++ b/src/doctor/pages/d_patient/index.wxml @@ -2,7 +2,7 @@ - + + diff --git a/src/gift/pages/cutaneous/index.wxml b/src/gift/pages/cutaneous/index.wxml index 02c1d1b..fb5df8d 100644 --- a/src/gift/pages/cutaneous/index.wxml +++ b/src/gift/pages/cutaneous/index.wxml @@ -1,4 +1,4 @@ - + + diff --git a/src/gift/pages/dtpDurg/index.wxml b/src/gift/pages/dtpDurg/index.wxml index d7a435a..74a48b6 100644 --- a/src/gift/pages/dtpDurg/index.wxml +++ b/src/gift/pages/dtpDurg/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/src/gift/pages/giftDetail/index.wxml b/src/gift/pages/giftDetail/index.wxml index 2da9a75..65450a7 100644 --- a/src/gift/pages/giftDetail/index.wxml +++ b/src/gift/pages/giftDetail/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/src/gift/pages/giftList/index.wxml b/src/gift/pages/giftList/index.wxml index a25b4cb..77315e4 100644 --- a/src/gift/pages/giftList/index.wxml +++ b/src/gift/pages/giftList/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/src/gift/pages/myGift/index.wxml b/src/gift/pages/myGift/index.wxml index 5d97dba..bcf981f 100644 --- a/src/gift/pages/myGift/index.wxml +++ b/src/gift/pages/myGift/index.wxml @@ -1,4 +1,4 @@ - + 订单号:{{item.orderNo}} diff --git a/src/gift/pages/myHealthRecord/index.ts b/src/gift/pages/myHealthRecord/index.ts index 9c497e8..527c8b6 100644 --- a/src/gift/pages/myHealthRecord/index.ts +++ b/src/gift/pages/myHealthRecord/index.ts @@ -100,17 +100,10 @@ Page({ }, tab: 1, - - theme: '', }, ecDataTrendComponent: null as any, ecDataHormoneComponent: null as any, onLoad() { - app.getTheme().then((res) => { - this.setData({ - theme: res, - }) - }) }, async onShow() { echarts = await require.async('../../../resource/components/echart/echarts.js') diff --git a/src/gift/pages/myHealthRecord/index.wxml b/src/gift/pages/myHealthRecord/index.wxml index d74b27d..a6f21ec 100644 --- a/src/gift/pages/myHealthRecord/index.wxml +++ b/src/gift/pages/myHealthRecord/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/src/gift/pages/myHealthRecordChart/index.ts b/src/gift/pages/myHealthRecordChart/index.ts index 65788b4..fa52f5d 100644 --- a/src/gift/pages/myHealthRecordChart/index.ts +++ b/src/gift/pages/myHealthRecordChart/index.ts @@ -34,17 +34,9 @@ Page({ page: 0, safeAreaLeft: 20, - - theme: '', }, ecDataTrendComponent: null as any, async onLoad() { - app.getTheme().then((res) => { - this.setData({ - theme: res, - }) - }) - const that = this that.getSystemInfo() diff --git a/src/gift/pages/orderDetail/index.wxml b/src/gift/pages/orderDetail/index.wxml index d5d9b57..9dd5e88 100644 --- a/src/gift/pages/orderDetail/index.wxml +++ b/src/gift/pages/orderDetail/index.wxml @@ -1,4 +1,4 @@ - + {{detail.statusName}} diff --git a/src/gift/pages/orderEnd/index.wxml b/src/gift/pages/orderEnd/index.wxml index 2353e31..3974e16 100644 --- a/src/gift/pages/orderEnd/index.wxml +++ b/src/gift/pages/orderEnd/index.wxml @@ -1,4 +1,4 @@ - + 下单成功 订单号:{{detail.orderNo}} diff --git a/src/gift/pages/priceDetail/index.wxml b/src/gift/pages/priceDetail/index.wxml index 2ed83b5..9ebab0f 100644 --- a/src/gift/pages/priceDetail/index.wxml +++ b/src/gift/pages/priceDetail/index.wxml @@ -1,4 +1,4 @@ - +