diff --git a/dist.nu b/dist.nu index 5f298e8..6d9f8fe 100644 --- a/dist.nu +++ b/dist.nu @@ -1,5 +1,5 @@ -cd ./src/images/ -svn add . --no-ignore --force -svn ci -m "版本更新" -cd .. -cd .. +cd ./src/images/; +svn add . --no-ignore --force; +svn ci -m "版本更新"; +cd ..; +cd ..; diff --git a/src/echart/components/homeLevel1/index.ts b/src/echart/components/homeLevel1/index.ts index e141c94..2415761 100644 --- a/src/echart/components/homeLevel1/index.ts +++ b/src/echart/components/homeLevel1/index.ts @@ -1,11 +1,14 @@ -const _app = getApp() +const _app = getApp(); // pages/story/a.ts Component({ /** * 组件的属性列表 */ - properties: {}, + properties: { + userInfo: Object, + DoctorTitleType: Object, + }, /** * 组件的初始数据 @@ -13,28 +16,55 @@ Component({ data: { fold1: false, foldHeight1: 10000, + take: {}, }, - attached() { - this.getHeight() + lifetimes: { + attached() { + this.getHeight(); + this.getTake(); + this.getCase(); + }, }, /** * 组件的方法列表 */ methods: { getHeight() { - const query = wx.createSelectorQuery().in(this) - query.select('#fold1').boundingClientRect() + const query = wx.createSelectorQuery().in(this); + query.select("#fold1").boundingClientRect(); query.exec((res) => { this.setData({ foldHeight1: res[0].height, - }) - }) + }); + }); }, toggleFold1() { this.setData({ fold1: !this.data.fold1, - }) + }); + }, + getTake() { + wx.ajax({ + method: "GET", + url: "?r=takeda/doctor/todo", + data: {}, + }).then((res) => { + this.setData({ + take: res, + }); + }); + }, + getCase() { + wx.ajax({ + method: "GET", + url: "?r=takeda/doctor/case", + data: {}, + }).then((res) => { + this.setData({ + case: res, + }); + }); }, }, -}) +}); diff --git a/src/echart/components/homeLevel1/index.wxml b/src/echart/components/homeLevel1/index.wxml index 3d7085e..e481dd7 100644 --- a/src/echart/components/homeLevel1/index.wxml +++ b/src/echart/components/homeLevel1/index.wxml @@ -1,34 +1,33 @@ - + - 徐萌 - 主治医师 + {{userInfo.Name}} + {{userInfo.OtherTitle}} + {{DoctorTitleType[userInfo.TitleType]}} - 北京天坛医院 - 三甲 - 广州市/番禺区 + {{userInfo.HospitalName}} + {{userInfo.HospitalClassificationName}}{{userInfo.HospitalLevelName}} + + {{userInfo.CityName}}{{userInfo.CountyName?'/':''}}{{userInfo.CountyName}} + - + 我的专属邀约码 @@ -36,8 +38,8 @@ 邀约 - - + + 个人信息