Merge remote-tracking branch 'origin/dev' into dev

api/pages/homepage/homepage.js

@@ -27,7 +27,7 @@ export function detail(identity, region) {
 		url: `/applet/signinfo/detail/${identity}`,
 		method: 'GET',
 		header: {
-			region: region,
+			region: uni.getStorageSync('region'),
 			// Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
 		},
 	})
@@ -39,7 +39,7 @@ export function checkSignApply(identity, region) {
 		url: `/applet/sign/apply/checkSignApply/${identity}`,
 		method: 'GET',
 		header: {
-			region: region,
+			region: uni.getStorageSync('region'),
 		},
 	})
 }

api/pagesB/Behaviorpoints/index.js

@@ -0,0 +1,12 @@
+import request from "../../request.js"
+
+export function prizeExchangelist(data, region) {
+	return request({
+		url: `/applet/score/prizeExchange/list`,
+		method: 'get',
+		data: data,
+		header: {
+			region: uni.getStorageSync('region'),
+		}
+	})
+}

api/pagesB/PointsMall/index.js

@@ -0,0 +1,12 @@
+import request from "../../request.js"
+
+export function prizelist(data, region) {
+	return request({
+		url: `/applet/score/prize/list`,
+		method: 'get',
+		data: data,
+		header: {
+			region: uni.getStorageSync('region'),
+		}
+	})
+}

api/pagesB/myfamilydoctorteam/index.js

@@ -6,7 +6,7 @@ export function getDoctorListtwo(pageNum, pageSize, teamNo, region,realname) {
 		url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&pageSize=${pageSize}&teamNo=${teamNo}&realname=${realname}`,
 		method: 'get',
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }

api/pagesB/mysigning/index.js

@@ -6,7 +6,7 @@ export function rescindapplysave(data, region) {
 		method: 'post',
 		data: data,
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }

api/pagesB/performancedetails/index.js

@@ -6,7 +6,7 @@ export function getPerformance(identity, region) {
 		url: `/applet/signinfo/getPerformance/${identity}`,
 		method: 'get',
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }

api/pagesC/Onlinesigning/index.js

@@ -6,7 +6,7 @@ export function arealist(pid, region) {
 		url: `/applet/signinfo/area/list/${pid}`,
 		method: 'get',
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }
@@ -18,7 +18,7 @@ export function applysave(data, region) {
 		method: 'post',
 		data: data,
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }
@@ -29,7 +29,7 @@ export function getCrowd(identity, region) {
 		url: `/applet/signinfo/getCrowd/${identity}`,
 		method: 'get',
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }
@@ -41,7 +41,7 @@ export function getPackageByCrowdNo(data, region) {
 		method: 'post',
 		data: data,
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }

api/pagesC/ServiceAppointment/ServiceAppointment.js

@@ -6,7 +6,7 @@ export function getForm(identity,region,projectName) {
 		url: `/applet/service/apply/getForm/${identity}?projectName=${projectName}`,
 		method: 'GET',
 		header: {
-				region: region,
+				region: uni.getStorageSync('region'),
 			// Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
 		},
 	})
@@ -17,7 +17,7 @@ export function detail(data) {
 		method: 'post',
 		data:data
 		// header: {
-		// 		region: region,
+		// 		region: uni.getStorageSync('region'),
 		// 	// Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
 		// },
 	})
@@ -28,7 +28,7 @@ export function save(data) {
 		method: 'post',
 		data:data
 		// header: {
-		// 		region: region,
+		// 		region: uni.getStorageSync('region'),,
 		// 	// Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
 		// },
 	})

api/pagesC/choosedoctor/index.js

@@ -6,7 +6,7 @@ export function getDoctorList(pageNum, orgNo, region,realname) {
 		url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&orgNo=${orgNo}&realname=${realname}`,
 		method: 'get',
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }

api/pagesC/contractsigningprotocol/index.js

@@ -6,7 +6,7 @@ export function getContent(userNo, region) {
 		url: `/applet/signinfo/getContent/${userNo}`,
 		method: 'get',
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }
@@ -18,7 +18,7 @@ export function getSignProtocol(cardNo, region) {
 		url: `/applet/signinfo/getSignProtocol/${cardNo}`,
 		method: 'get',
 		header: {
-			region: region
+			region: uni.getStorageSync('region'),
 		}
 	})
 }

pages.json

@@ -61,7 +61,8 @@
 				"path": "Behaviorpoints/Behaviorpoints",
 				"style": {
 					"navigationBarTitleText": "行为积分",
-					"enablePullDownRefresh": false
+					"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
+					"enablePullDownRefresh": true //设置参数为true
 				}
 			},
 			{
@@ -69,7 +70,6 @@
 				"style": {
 					"navigationBarTitleText": "预约详情",
 					"enablePullDownRefresh": false,
-					// "navigationStyle": "default",
 					"navigationBarBackgroundColor": "#4ac4ab"
 				}
 			},
@@ -359,7 +359,8 @@
 				"path": "PointsMall/PointsMall",
 				"style": {
 					"navigationBarTitleText": "积分商城",
-					"enablePullDownRefresh": false
+					"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
+					"enablePullDownRefresh": true //设置参数为true
 				}
 			}, {
 				"path": "screeningResult/screeningResult",
@@ -502,7 +503,7 @@
 					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false
 				}
-			},{
+			}, {
 				"path": "contractsigningprotocol/contractsigningprotocol",
 				"style": {
 					"navigationBarTitleText": "签约协议",

pages/homepage/homepage.vue

@@ -84,6 +84,7 @@
 			// this.login()
 		},
 		onShow() {
+			uni.setStorageSync("region", 1)
 			this.userinfo = uni.getStorageSync('userinfo');
 			this.patientName = this.userinfo.patientName
 			if (this.userinfo) {
@@ -133,7 +134,7 @@
 			// 积分兑换
 			count() {
 				uni.navigateTo({
-					url: "/pagesB/PointsMall/PointsMall"
+					url: '/pagesB/Behaviorpoints/Behaviorpoints'
 				})
 				// if (!this.userinfo) {
 				// 	this.gologin();

pagesB/Behaviorpoints/Behaviorpoints.vue

@@ -43,22 +43,40 @@
 </template>
 <script>
 	import {
-		mapActions
+		prizeExchangelist
-	} from "vuex";
+	} from '@/api/pagesB/Behaviorpoints/index.js'
+	// import {
+	// 	mapActions
+	// } from "vuex";
 	export default {
 		data() {
 			return {
-
+				query: {
+					identity: '372325195905293621',
+					pageNum: 1,
+					pageSize: 10,
+				},
+				list: [],
+				total: 0,
 			};
 		},
+		onLoad() {
+			this.info();
+		},
 		methods: {
+			info() {
+				prizeExchangelist(this.query, '2').then(res => {
+					this.list = res.rows
+					this.total = res.total
+				})
+			},
 			goexchange() {
 				uni.navigateTo({
 					url: '/pagesB/exchangerecords/exchangerecords'
 				})
 			},
 			//积分页面
-			...mapActions(["integralopenPopup"]),
+			// ...mapActions(["integralopenPopup"]),
 			gointegral() {
 				// const value = uni.getStorageSync('openid');
 				// const value2 = uni.getStorageSync('patientId');
@@ -76,6 +94,26 @@
 				// }
 			},
 		},
+
+		onReachBottom() { //下滑加载
+			if (this.list.length >= this.total) {} else {
+				this.query.pageNum++
+				prizeExchangelist(this.query, '1').then(res => {
+					if (res.rows) {
+						res.rows.forEach(e => {
+							this.list.push(e)
+						})
+					}
+				})
+			}
+		},
+		onPullDownRefresh() { //下拉刷新
+			this.query.pageNum = 1;
+			this.info();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 	}
 </script>
 <style lang="scss">

pagesB/PointsMall/PointsMall.vue

@@ -1,28 +1,12 @@
 <template>
 	<view class="app">
-		<view class="content">
+		<view class="content" v-for="item in list">
-			<view class="imageitem">
+			<image :src="item.attachment" mode=""></image>
-				<image src="/static/pagesB/Behave.png" mode=""></image>
-			</view>
 			<view class="servename">
-				服务名称
+				{{item.prizeName}}
 			</view>
 			<view class="PointsRecord">
-				200000
+				{{item.score}}
-			</view>
-			<view class="button" @tap="goexchange">
-				兑换
-			</view>
-		</view>
-		<view class="content">
-			<view class="imageitem">
-				<image src="/static/pagesB/Behave.png" mode=""></image>
-			</view>
-			<view class="servename">
-				服务名称
-			</view>
-			<view class="PointsRecord">
-				200000
 			</view>
 			<view class="button" @tap="goexchange">
 				兑换
@@ -32,9 +16,20 @@
 </template>
 
 <script>
+	import {
+		prizelist
+	} from '@/api/pagesB/PointsMall/index.js'
 	export default {
 		data() {
-			return {};
+			return {
+				query: {
+					identity: '372325195905293621',
+					pageNum: 1,
+					pageSize: 10,
+				},
+				list: [],
+				total: 0,
+			};
 		},
 
 		methods: {
@@ -43,6 +38,34 @@
 					url: '/pagesB/exchangerecords/exchangerecords'
 				});
 			},
+			info() {
+				prizelist(this.query, '2').then(res => {
+					this.list = res.rows
+					this.total = res.total
+				})
+			},
+		},
+		onLoad() {
+			this.info();
+		},
+		onReachBottom() { //下滑加载
+			if (this.list.length >= this.total) {} else {
+				this.query.pageNum++
+				prizelist(this.query, '1').then(res => {
+					if (res.rows) {
+						res.rows.forEach(e => {
+							this.list.push(e)
+						})
+					}
+				})
+			}
+		},
+		onPullDownRefresh() { //下拉刷新
+			this.query.pageNum = 1;
+			this.info();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
 	}
 </script>
@@ -50,22 +73,20 @@
 <style lang="scss">
 	.app {
 		background-color: #F7F5F5;
-		padding-top: 30rpx;
+		padding-top: 10rpx;
 		height: 100vh;
 		display: flex;
 		width: 100%;
 		flex-wrap: wrap;
-		justify-content: flex-start;
+		justify-content: space-evenly;
 
 		.content {
-			width: 352rpx;
 			height: 514rpx;
 			background: #fff;
-			width: 45%;
+			width: 48%;
 			position: relative;
 			border-radius: 5rpx;
-			left: 18rpx;
+			margin: 0 0 20rpx 0;
-			margin: 0 0 20rpx 15rpx;
 
 			.button {
 				width: 100rpx;
@@ -74,7 +95,6 @@
 				position: absolute;
 				text-align: center;
 				font-size: 22rpx;
-				font-family: Source Han Sans CN;
 				font-weight: 400;
 				color: #fff;
 				right: 3%;
@@ -84,40 +104,28 @@
 			}
 
 			.PointsRecord {
-				// width: 83px;
+				padding-top: 20rpx;
-				// height: 19px;
+				font-size: 22rpx;
-				font-size: 20rpx;
-				font-family: Source Han Sans CN;
 				font-weight: 400;
 				color: #26A888;
-				line-height: 33rpx;
 				padding-left: 3%;
 			}
 
 			.servename {
-				// width: 102px;
-				// height: 24px;
 				overflow: hidden;
 				text-overflow: ellipsis;
 				white-space: nowrap;
-				font-size: 26rpx;
+				font-size: 28rpx;
-				font-family: Source Han Sans CN;
 				font-weight: 400;
 				color: #000000;
-				line-height: 33rpx;
 				padding-left: 3%;
 			}
 
-			.imageitem {
+			image {
-				image {
+				width: 100%;
-					width: 100%;
+				height: 355rpx;
-					height: 355rpx;
+				border-radius: 5rpx;
-					background: red;
-					border-radius: 5rpx;
-				}
 			}
 		}
-
-
 	}
 </style>