diff --git a/api/pagesB/myfamilydoctorteam/index.js b/api/pagesB/myfamilydoctorteam/index.js index ff93fa4..ed43382 100644 --- a/api/pagesB/myfamilydoctorteam/index.js +++ b/api/pagesB/myfamilydoctorteam/index.js @@ -1,7 +1,7 @@ import request from "@/api/request.js" -export function getDoctorList(pageNum, pageSize, teamNo, region) { +export function getDoctorListtwo(pageNum, pageSize, teamNo, region) { return request({ url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&pageSize=${pageSize}&teamNo=${teamNo}`, method: 'get', @@ -9,4 +9,4 @@ export function getDoctorList(pageNum, pageSize, teamNo, region) { region: region } }) -} \ No newline at end of file +} diff --git a/api/pagesC/contractsigningprotocol/index.js b/api/pagesC/contractsigningprotocol/index.js index 829c6cd..a7f3cfa 100644 --- a/api/pagesC/contractsigningprotocol/index.js +++ b/api/pagesC/contractsigningprotocol/index.js @@ -9,4 +9,16 @@ export function getContent(orgNo, region) { region: region } }) -} \ No newline at end of file +} + + + +export function getSignProtocol(cardNo, region) { + return request({ + url: `/applet/signinfo/getSignProtocol/${cardNo}`, + method: 'get', + header: { + region: region + } + }) +} diff --git a/components/protocol/index.vue b/components/protocol/index.vue new file mode 100644 index 0000000..6ede464 --- /dev/null +++ b/components/protocol/index.vue @@ -0,0 +1,263 @@ + + + + + diff --git a/pages.json b/pages.json index 84a6551..d077fb6 100644 --- a/pages.json +++ b/pages.json @@ -4,17 +4,17 @@ }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { - "path": "pages/homepage/homepage", - "style": { - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - }, { "path": "pages/startup/startup", "style": { "navigationStyle": "custom", "enablePullDownRefresh": false } + }, { + "path": "pages/homepage/homepage", + "style": { + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } }, { "path": "pages/medicalservice/medicalservice", @@ -502,7 +502,8 @@ "navigationBarTitleText": "", "enablePullDownRefresh": false } - },{ + }, + { "path": "contractsigningprotocol/contractsigningprotocol", "style": { "navigationBarTitleText": "签约协议", diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 894f245..6de6826 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -114,7 +114,7 @@ // 家医签约 goonline() { uni.navigateTo({ - url: "/pagesB/mysigning/mysigning" + url: "/pagesC/Onlinesigning/Onlinesigning" }) // if (!this.userinfo) { // this.gologin(); @@ -246,4 +246,4 @@ \ No newline at end of file + diff --git a/pagesB/createnewconsultation/createnewconsultation.scss b/pagesB/createnewconsultation/createnewconsultation.scss new file mode 100644 index 0000000..f2409c2 --- /dev/null +++ b/pagesB/createnewconsultation/createnewconsultation.scss @@ -0,0 +1,178 @@ +.app { + padding-top: 10rpx; + width: 100%; + + .btns { + width: 100%; + display: flex; + font-size: 31rpx; + justify-content: space-around; + text-align: center; + font-weight: 500; + margin-top: 80rpx; + padding-bottom: 50rpx; + + .btnleft { + width: 290rpx; + height: 62rpx; + background: #FFFFFF; + border: 1px solid #26A888; + border-radius: 5rpx; + color: #26A888; + line-height: 62rpx + } + + .btnright { + width: 289rpx; + height: 62rpx; + background: #26A888; + border-radius: 5rpx; + color: #FFFFFF; + line-height: 62rpx; + } + } + + .item { + width: 96%; + margin: 20rpx auto; + background-color: #fff; + box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 5rpx; + padding-bottom: 50rpx; + + .select { + width: 90%; + height: 80rpx; + background: #F6F6F6; + margin: 12rpx auto; + border-radius: 5rpx; + display: flex; + position: relative; + + text { + padding: 0 60rpx 0 20rpx; + line-height: 80rpx; + font-size: 22rpx; + font-weight: 400; + height: 80rpx; + color: #8E8E8E; + // text-overflow: -o-ellipsis-lastline; + // overflow: hidden; + // text-overflow: ellipsis; + // display: -webkit-box; + // -webkit-line-clamp: 1; + // line-clamp: 1; + // -webkit-box-orient: vertical; + // white-space:normal; + // word-break:break-all; + } + + image { + width: 9rpx; + height: 17rpx; + position: absolute; + right: 40rpx; + top: 50%; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); + } + } + + .textarea { + font-size: 18rpx; + font-weight: 400; + color: #8E8E8E; + line-height: 42rpx; + padding: 30rpx 0 0 40rpx; + } + + .text { + font-size: 30rpx; + font-weight: 400; + color: #333333; + padding: 30rpx 0 0 40rpx; + } + + ::v-deep .u-upload { + padding: 30rpx 30rpx 0 30rpx; + } + + .input { + width: 90%; + height: 80rpx; + border-radius: 5rpx; + background: #f6f6f6; + margin: 20rpx 0 0 40rpx; + position: relative; + padding-left: 10rpx; + + image { + width: 10rpx; + height: 20rpx; + position: absolute; + top: 50%; + right: 5%; + transform: translateY(-50%); + } + + .uni-textarea-placeholder { + padding-left: 12rpx; + font-size: 22rpx; + font-weight: 400; + color: #8E8E8E !important; + } + + .phsy { + padding-left: 12rpx; + font-size: 22rpx; + font-weight: 400; + color: #8E8E8E !important; + } + + .inputtext { + padding-left: 12rpx; + color: black; + font-size: 26rpx; + width: 90%; + height: 80rpx; + line-height: 80rpx; + } + + .uinput { + color: black; + font-size: 26rpx; + width: 90%; + height: 80rpx; + line-height: 80rpx; + } + + .noimageuinput { + width: 98% !important; + } + } + } + + .title { + width: 100%; + padding: 10rpx 0 10rpx 35rpx; + + .left { + vertical-align: middle; + display: inline-block; + width: 10rpx; + height: 30rpx; + background: #26A888; + border-radius: 1rpx; + } + + .right { + vertical-align: middle; + display: inline-block; + font-size: 30rpx; + font-weight: 500; + color: #26A888; + line-height: 30rpx; + margin-left: 20rpx; + } + } + } diff --git a/pagesB/createnewconsultation/createnewconsultation.vue b/pagesB/createnewconsultation/createnewconsultation.vue index 3498f69..c3145a5 100644 --- a/pagesB/createnewconsultation/createnewconsultation.vue +++ b/pagesB/createnewconsultation/createnewconsultation.vue @@ -42,8 +42,9 @@ 选择医生 - - 请选择医生 + + {{formdata.doctorName}} + 请选择医生 @@ -170,6 +171,13 @@ }, onShow() { this.areaInfo(); + let that = this + uni.$on('doctordata', function(data) { + let item = JSON.parse(data.data) + that.formdata.doctorName = item.realname + that.formdata.doctorId = item.userNo + uni.$off('doctordata') + }) }, methods: { updata() { @@ -229,187 +237,15 @@ this.address = '请选择所属地区' } }, + gochoosedoctor() { + uni.navigateTo({ + url: '/pagesC/choosedoctor/choosedoctor' + }) + }, } } \ No newline at end of file + @import './createnewconsultation.scss'; + diff --git a/pagesB/myfamilydoctorteam/myfamilydoctorteam.scss b/pagesB/myfamilydoctorteam/myfamilydoctorteam.scss new file mode 100644 index 0000000..cd38e85 --- /dev/null +++ b/pagesB/myfamilydoctorteam/myfamilydoctorteam.scss @@ -0,0 +1,94 @@ +.app { + width: 96%; + margin: 20rpx auto; + background-color: #fff; + + .list { + width: 100%; + + .item { + width: 96%; + margin: 0 auto; + padding-bottom: 60rpx; + border-bottom: 2rpx solid #E6E6E6; + position: relative; + height: 300rpx; + + .zixunbtn { + width: 169rpx; + height: 61rpx; + background: #26A888; + border-radius: 5rpx; + font-size: 28rpx; + font-weight: 400; + color: #FFFFFF; + line-height: 61rpx; + text-align: center; + position: absolute; + top: 65%; + right: 10rpx; + } + + .title { + position: absolute; + top: 70%; + left: 210rpx; + font-size: 18rpx; + font-weight: 500; + color: #FFA733; + line-height: 30rpx; + height: 30rpx; + background: #FFFFFF; + border: 1px solid #FFA115; + border-radius: 5rpx; + text-align: center; + padding: 0 15rpx; + } + + .phone { + position: absolute; + top: 38%; + left: 210rpx; + font-size: 28rpx; + font-weight: 400; + color: #959595; + } + + .name { + position: absolute; + font-size: 28rpx; + font-weight: 500; + color: #333333; + top: 20%; + left: 210rpx; + } + + image { + position: absolute; + top: 50%; + transform: translateY(-50%); + left: 5rpx; + width: 180rpx; + height: 180rpx; + } + } + } + + .teamname { + padding: 20rpx 0 0 30rpx; + display: flex; + align-items: flex-end; + + image { + width: 40rpx; + height: 36rpx; + } + + .name { + padding-left: 15rpx; + font-size: 28rpx; + font-weight: 500; + color: #000000; + } + } + } diff --git a/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue b/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue index 4a76f56..56a2830 100644 --- a/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue +++ b/pagesB/myfamilydoctorteam/myfamilydoctorteam.vue @@ -28,7 +28,7 @@ \ No newline at end of file + @import './myfamilydoctorteam.scss'; + diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue index f790f7c..a44c9eb 100644 --- a/pagesB/mysigning/mysigning.vue +++ b/pagesB/mysigning/mysigning.vue @@ -190,7 +190,7 @@ //签约协议 gocontractsigningprotocol() { uni.navigateTo({ - url: `/pagesC/contractsigningprotocol/contractsigningprotocol?orgNo=${this.list.orgNo}` + url: `/pagesC/contractsigningprotocol/contractsigningprotocol?orgNo=${this.list.orgNo}&cardNo=${this.list.identity}` }) }, //咨询 @@ -215,4 +215,4 @@ \ No newline at end of file + diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index 1f7bd9f..7a35b39 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -105,7 +105,7 @@ 签约周期(年) - + @@ -148,6 +148,7 @@ + @@ -163,7 +164,11 @@ getSex, getBirthday } from '@/api/conversion.js' + import protocol from '@/components/protocol/index.vue' export default { + components: { + protocol + }, data() { return { showGroup: 1, @@ -461,4 +466,4 @@ \ No newline at end of file + diff --git a/pagesC/choosedoctor/choosedoctor.vue b/pagesC/choosedoctor/choosedoctor.vue index cc58b5d..5c7fcf6 100644 --- a/pagesC/choosedoctor/choosedoctor.vue +++ b/pagesC/choosedoctor/choosedoctor.vue @@ -28,10 +28,14 @@ import { getDoctorList } from '@/api/pagesC/choosedoctor/index.js' + import { + getDoctorListtwo + } from '@/api/pagesB/myfamilydoctorteam/index.js' export default { data() { return { orgNo: null, + teamNo: null, doctorlist: [], doctortotal: 0, pageNum: 1, @@ -39,10 +43,17 @@ }, methods: { getDoctorListinfo() { - getDoctorList(this.pageNum, this.orgNo, '1').then(res => { - this.doctorlist = res.rows - this.doctortotal = res.total - }) + if (this.orgNo) { + getDoctorList(this.pageNum, this.orgNo, '1').then(res => { + this.doctorlist = res.rows + this.doctortotal = res.total + }) + } else { + getDoctorListtwo(this.pageNum, 10, this.teamNo, '1').then(res => { + this.doctorlist = res.rows + this.doctortotal = res.total + }) + } }, emitdata(item) { uni.$emit('doctordata', { @@ -54,18 +65,32 @@ }, }, onLoad(options) { - this.orgNo = options.orgNo + if (options.orgNo) { + this.orgNo = options.orgNo + } else { + // this.teamNo = uni.getStorageSync('userinfo').teamNo + this.teamNo = "00bf7f5a02f3460aa975721ff9f5e533" + } this.getDoctorListinfo(); }, onReachBottom() { //上滑加载 if (this.doctorlist.length >= this.doctortotal) {} else { this.pageNum++; - getDoctorList(this.pageNum, this.orgNo, '1').then(res => { - res.rows.forEach(e => { - this.doctorlist.push(e) + if (this.orgNo) { + getDoctorList(this.pageNum, this.orgNo, '1').then(res => { + res.rows.forEach(e => { + this.doctorlist.push(e) + }) + this.doctortotal = res.total }) - this.doctortotal = res.total - }) + } else { + getDoctorListtwo(this.pageNum, 10, this.teamNo, '1').then(res => { + res.rows.forEach(e => { + this.doctorlist.push(e) + }) + this.doctortotal = res.total + }) + } } }, onPullDownRefresh() { //下拉刷新 diff --git a/pagesC/contractsigningprotocol/contractsigningprotocol.vue b/pagesC/contractsigningprotocol/contractsigningprotocol.vue index cc9a399..c430642 100644 --- a/pagesC/contractsigningprotocol/contractsigningprotocol.vue +++ b/pagesC/contractsigningprotocol/contractsigningprotocol.vue @@ -1,22 +1,128 @@