修改

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
+		}
+	})
+}

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
+		}
+	})
+}

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
+		}
+	})
+}

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 @@
 			}
 		]
 	}
-}
+}

pagesB/contractsigningprotocol/contractsigningprotocol.vue

@@ -1,19 +0,0 @@
-<template>
-	<view>
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pagesB/myfamilydoctorteam/myfamilydoctorteam.vue

@@ -3,37 +3,22 @@
 		<view class="teamname">
 			<image src="../../static/pagesB/myfamilydoctorteam.png" mode=""></image>
 			<view class="name">
-				中心团队
+				{{list?list[0].teamName:''}}
 			</view>
 		</view>
 		<view class="list">
-			<view class="item">
+			<view class="item" v-for='item in list'>
-				<image src="../../static/pagesB/Behave.png" mode=""></image>
+				<image src="../../static/docHead.png" mode=""></image>
 				<view class="name">
-					齐鲁医院张医生
+					{{item.realname?item.realname:''}}
 				</view>
 				<view class="phone">
-					17869882345
+					{{item.mobilePhone?item.mobilePhone:''}}
 				</view>
 				<view class="title">
-					全科医生
+					{{item.teamMemberTypeName?item.teamMemberTypeName:''}}
 				</view>
-				<view class="zixunbtn">
+				<view class="zixunbtn" @tap='goseekadvicefrom'>
-					咨询
-				</view>
-			</view>
-			<view class="item">
-				<image src="../../static/pagesB/Behave.png" mode=""></image>
-				<view class="name">
-					齐鲁医院张医生
-				</view>
-				<view class="phone">
-					17869882345
-				</view>
-				<view class="title">
-					全科医生
-				</view>
-				<view class="zixunbtn">
 					咨询
 				</view>
 			</view>
@@ -42,12 +27,55 @@
 </template>
 
 <script>
+	import {
+		getDoctorList
+	} from '@/api/pagesB/myfamilydoctorteam/index.js'
 	export default {
 		data() {
 			return {
-
+				pageNum: 1,
+				pageSize: 10,
+				teamNo: null,
+				list: null,
+				total: 0,
 			};
-		}
+		},
+		onLoad(options) {
+			this.teamNo = options.teamNo
+			this.info()
+		},
+		methods: {
+			info() {
+				getDoctorList(this.pageNum, this.pageSize, this.teamNo, '1').then(res => {
+					this.list = res.rows
+					this.total = res.total
+				})
+			},
+			//咨询
+			goseekadvicefrom() {
+				uni.navigateTo({
+					url: `/pagesB/imagetextConsultation/imagetextConsultation`
+				})
+			},
+		},
+		onReachBottom() { //上滑加载
+			if (this.list.length >= this.total) {} else {
+				this.pageNum++;
+				getDoctorList(this.pageNum, this.pageSize, this.teamNo, '1').then(res => {
+					res.rows.forEach(e => {
+						this.list.push(e)
+					})
+					this.total = res.total
+				})
+			}
+		},
+		onPullDownRefresh() { //下拉刷新
+			this.pageNum = 1;
+			this.info()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 	}
 </script>
 
@@ -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 @@
 			}
 		}
 	}
-</style>
+</style>

pagesB/mysigning/mysigning.vue

@@ -15,7 +15,7 @@
 			</view>
 		</view>
 		<view class="item">
-			{{list.gender=='2'?'女':''}}{{list.gender=='1'?'男':''}}&nbsp;&nbsp;&nbsp; {{list.age}}岁
+			{{list.gender=='2'?'女':''}}{{list.gender=='1'?'男':''}}&nbsp;&nbsp;&nbsp; {{list.age? list.age +'岁':''}}
 		</view>
 		<view class="item">
 			{{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 @@
 			}
 		}
 	}
-</style>
+</style>

pagesB/performancedetails/performancedetails.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="app">
 		<u-collapse :accordion='false'>
-			<u-collapse-item :title="item.head" v-for="item in itemList" :key="item.id"
+			<u-collapse-item :title="item.packageName" v-for="item in itemlist" :key="item.packageNo"
-				:class="headitemid.find(e=>e==item.id)?'headcollapse':''" @change='tapcollapse(item.id)'>
+				:class="item.check?'headcollapse':''" @change='tapcollapse(item)'>
-				<view class="itemtext" v-for="uitem in item.item">
+				<view class="itemtext" v-for="uitem in item.formList">
 					<view class="left">
-						{{uitem.body}}
+						{{uitem.formName}}
 					</view>
 					<view class="right">
-						{{uitem.text}}
+						{{uitem.performanceCount}}/{{uitem.serviceFreq}}
 					</view>
 				</view>
 			</u-collapse-item>
@@ -17,59 +17,33 @@
 </template>
 
 <script>
+	import {
+		getPerformance
+	} from "@/api/pagesB/performancedetails/index.js"
 	export default {
 		data() {
 			return {
-				headitemid: [],
+				itemlist: [],
-				itemList: [{
-					head: "高血压个性服务包",
-					id: 1,
-					item: [{
-							body: '大生化',
-							text: '1/1'
-						},
-						{
-							body: '心电图',
-							text: '1/1'
-						}
-					]
-				}, {
-					head: "高血压基本公卫服务包",
-					id: 2,
-					item: [{
-							body: '大生化',
-							text: '1/1'
-						},
-						{
-							body: '心电图',
-							text: '1/1'
-						}
-					]
-				}, {
-					head: "老年人个性服务包",
-					id: 3,
-					item: [{
-							body: '大生化',
-							text: '1/1'
-						},
-						{
-							body: '心电图',
-							text: '1/1'
-						}
-					]
-				}],
 			};
 		},
+		watch: {},
 		methods: {
-			tapcollapse(i) {
+			tapcollapse(item) {
-				let findindex = this.headitemid.findIndex(e => e == i)
+				item.check = !item.check
-				if (findindex != -1) {
-					this.headitemid.splice(findindex, 1)
-				} else {
-					this.headitemid.push(i)
-				}
 			},
-		}
+			info() {
+				// getPerformance(uni.getStorageSync('userinfo').cardNo, '1').then(res => {
+				getPerformance('372424194703207523', '1').then(res => {
+					res.data.forEach(e => {
+						e.check = false
+					})
+					this.itemlist = res.data
+				})
+			},
+		},
+		onLoad() {
+			this.info();
+		},
 	}
 </script>
 
@@ -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;
 		}
 	}
-</style>
+</style>

pagesC/contractsigningprotocol/contractsigningprotocol.vue

@@ -0,0 +1,37 @@
+<template>
+	<view class="app">
+		<u-parse :html="content"></u-parse>
+	</view>
+</template>
+
+<script>
+	import {
+		getContent
+	} from '@/api/pagesC/contractsigningprotocol/index.js'
+	export default {
+		data() {
+			return {
+				orgNo: null,
+				content: null,
+			};
+		},
+		methods: {
+			info() {
+				getContent(this.orgNo, '1').then(res => {
+					this.content = res.data.content
+				})
+			},
+		},
+		onLoad(options) {
+			console.log(options)
+			this.orgNo = options.orgNo
+			this.info();
+		},
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		margin-top: 100rpx;
+	}
+</style>