diff --git a/api/pagesB/myfamilydoctorteam/index.js b/api/pagesB/myfamilydoctorteam/index.js new file mode 100644 index 0000000..ff93fa4 --- /dev/null +++ b/api/pagesB/myfamilydoctorteam/index.js @@ -0,0 +1,12 @@ +import request from "@/api/request.js" + + +export function getDoctorList(pageNum, pageSize, teamNo, region) { + return request({ + url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&pageSize=${pageSize}&teamNo=${teamNo}`, + method: 'get', + header: { + region: region + } + }) +} \ No newline at end of file diff --git a/api/pagesB/performancedetails/index.js b/api/pagesB/performancedetails/index.js new file mode 100644 index 0000000..e171393 --- /dev/null +++ b/api/pagesB/performancedetails/index.js @@ -0,0 +1,12 @@ +import request from "@/api/request.js" + + +export function getPerformance(identity, region) { + return request({ + url: `/applet/signinfo/getPerformance/${identity}`, + method: 'get', + header: { + region: region + } + }) +} \ No newline at end of file diff --git a/api/pagesC/contractsigningprotocol/index.js b/api/pagesC/contractsigningprotocol/index.js new file mode 100644 index 0000000..829c6cd --- /dev/null +++ b/api/pagesC/contractsigningprotocol/index.js @@ -0,0 +1,12 @@ +import request from "@/api/request.js" + + +export function getContent(orgNo, region) { + return request({ + url: `/applet/signinfo/getContent/${orgNo}`, + method: 'get', + header: { + region: region + } + }) +} \ No newline at end of file diff --git a/pages.json b/pages.json index 891e73b..84a6551 100644 --- a/pages.json +++ b/pages.json @@ -397,12 +397,6 @@ "navigationBarTitleText": "履约详情", "enablePullDownRefresh": false } - }, { - "path": "contractsigningprotocol/contractsigningprotocol", - "style": { - "navigationBarTitleText": "签约协议", - "enablePullDownRefresh": false - } } ] }, { @@ -508,6 +502,12 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } + },{ + "path": "contractsigningprotocol/contractsigningprotocol", + "style": { + "navigationBarTitleText": "签约协议", + "enablePullDownRefresh": false + } } ] }], @@ -550,4 +550,4 @@ } ] } -} \ No newline at end of file +} diff --git a/pagesB/contractsigningprotocol/contractsigningprotocol.vue b/pagesB/contractsigningprotocol/contractsigningprotocol.vue deleted file mode 100644 index b512454..0000000 --- a/pagesB/contractsigningprotocol/contractsigningprotocol.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue b/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue index b572e4c..ea53e42 100644 --- a/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue +++ b/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue @@ -3,37 +3,22 @@ - 中心团队 + {{list?list[0].teamName:''}} - - + + - 齐鲁医院张医生 + {{item.realname?item.realname:''}} - 17869882345 + {{item.mobilePhone?item.mobilePhone:''}} - 全科医生 + {{item.teamMemberTypeName?item.teamMemberTypeName:''}} - - 咨询 - - - - - - 齐鲁医院张医生 - - - 17869882345 - - - 全科医生 - - + 咨询 @@ -42,12 +27,55 @@ @@ -66,7 +94,7 @@ .item { width: 96%; - margin: 0 auto ; + margin: 0 auto; padding-bottom: 60rpx; border-bottom: 2rpx solid #E6E6E6; position: relative; @@ -150,4 +178,4 @@ } } } - \ No newline at end of file + diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue index d520ea2..5f64989 100644 --- a/pagesB/mysigning/mysigning.vue +++ b/pagesB/mysigning/mysigning.vue @@ -15,7 +15,7 @@ - {{list.gender=='2'?'女':''}}{{list.gender=='1'?'男':''}}    {{list.age}}岁 + {{list.gender=='2'?'女':''}}{{list.gender=='1'?'男':''}}    {{list.age? list.age +'岁':''}} {{list.phone?list.phone:''}} @@ -108,7 +108,7 @@ //我的家庭医生团队 gomyfamilydoctorteam() { uni.navigateTo({ - url: '/pagesB/myfamilydoctorteam/myfamilydoctorteam' + url: `/pagesB/myfamilydoctorteam/myfamilydoctorteam?teamNo=${this.list.teamNo}` }) }, // 履约详情 @@ -120,13 +120,13 @@ //签约协议 gocontractsigningprotocol() { uni.navigateTo({ - url: "/pagesB/contractsigningprotocol/contractsigningprotocol" + url: `/pagesC/contractsigningprotocol/contractsigningprotocol?orgNo=${this.list.orgNo}` }) }, //咨询 goseekadvicefrom() { uni.navigateTo({ - url: `pagesB/imagetextConsultation/imagetextConsultation` + url: `/pagesB/imagetextConsultation/imagetextConsultation` }) // uni.navigateTo({ // url: `/pagesC/seekadvicefrom/seekadvicefrom?item=${JSON.stringify(this.list)}` @@ -271,4 +271,4 @@ } } } - \ No newline at end of file + diff --git a/pagesB/performancedetails/performancedetails.vue b/pagesB/performancedetails/performancedetails.vue index 5b13b22..8685b37 100644 --- a/pagesB/performancedetails/performancedetails.vue +++ b/pagesB/performancedetails/performancedetails.vue @@ -1,14 +1,14 @@ @@ -109,6 +83,7 @@ border-bottom: 2rpx solid #E6E6E6; margin: 0 auto; display: flex; + justify-content: space-between; } .headcollapse { @@ -134,4 +109,4 @@ margin-bottom: 20rpx; } } - \ No newline at end of file + diff --git a/pagesC/contractsigningprotocol/contractsigningprotocol.vue b/pagesC/contractsigningprotocol/contractsigningprotocol.vue new file mode 100644 index 0000000..3534a61 --- /dev/null +++ b/pagesC/contractsigningprotocol/contractsigningprotocol.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file