From 00128f8670db76e87e95e800f6d18d6c28443c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 20 Sep 2023 13:52:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                            |  17 ++---
 pages/myinformation/myinformation.vue |   9 ++-
 pagesB/coupon/coupon.vue              | 100 ++++++++++++++++++++++++--
 pagesB/managefamily/managefamily.vue  |  19 ++++-
 4 files changed, 125 insertions(+), 20 deletions(-)

diff --git a/pages.json b/pages.json
index f1d8f18..004f860 100644
--- a/pages.json
+++ b/pages.json
@@ -34,16 +34,13 @@
 				"navigationBarTitleText": "管理家庭成员",
 				"enablePullDownRefresh": false
 			}
-		}    ,{
-                    "path" : "coupon/coupon",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "优惠券",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-            ]
+		}, {
+			"path": "coupon/coupon",
+			"style": {
+				"navigationBarTitleText": "优惠券",
+				"enablePullDownRefresh": false
+			}
+		}]
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index c0c3fca..1e38b1c 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -40,7 +40,7 @@
 						健康豆
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" @tap='gocoupon'>
 					<view class="number">
 						0
 					</view>
@@ -158,7 +158,12 @@
 				uni.navigateTo({
 					url: '/pagesB/managefamily/managefamily'
 				})
-			}
+			},
+			gocoupon() {
+				uni.navigateTo({
+					url: '/pagesB/coupon/coupon'
+				})
+			},
 		}
 	}
 </script>
diff --git a/pagesB/coupon/coupon.vue b/pagesB/coupon/coupon.vue
index 8c3b35f..d3020c0 100644
--- a/pagesB/coupon/coupon.vue
+++ b/pagesB/coupon/coupon.vue
@@ -1,19 +1,105 @@
 <template>
-	<view>
-		
+	<view class="app">
+		<!-- <view class="tabs">
+			<view class="tab-item">
+				<view class="title">
+					券
+				</view>
+				<view class="text">
+					{{total}}张
+				</view>
+			</view>
+		</view> -->
+		<view class="content">
+			<view class="statuss">
+				<view class="statusitem" :style="couponstatus==''?'color: #F44B2F;':''">
+					全部
+				</view>
+				<span> |</span>
+				<view class="statusitem" :style="couponstatus=='NOT_USED'?'color: #F44B2F;':''">
+					待领取
+				</view>
+				<span> |</span>
+				<view class="statusitem" :style="couponstatus=='USED'?'color: #F44B2F;':''">
+					已使用
+				</view>
+				<span> |</span>
+				<view class="statusitem" :style="couponstatus=='EXPIRED'?'color: #F44B2F;':''">
+					已过期
+				</view>
+			</view>
+			<view class="rollup">
+				<view class="item">
+					<view class="top" style="background: #EFECEC;color: #4B4B4B;">
+						<view class="title">
+							<span class="text">
+								￥
+							</span>
+							<span class="price">
+								0
+							</span>
+						</view>
+						<view class="what" style="background: #EFECEC;">
+							名字
+						</view>
+						<view class="texts">
+							满10可用
+						</view>
+						<view class="time">
+							有效期至
+						</view>
+						<view class="btngq">
+							已过期
+						</view>
+						<!-- <view class="btn">
+							使用
+						</view> -->
+					</view>
+					<view class="bottom">
+						新人福利
+					</view>
+				</view>
+			</view>
+			<view class="noorder">
+				<u-empty mode="coupon" icon-size='220'></u-empty>
+			</view>
+		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
-
 <script>
 	export default {
 		data() {
 			return {
-				
+				pageNum: 1,
+				pageSize: 10,
+				couponlist: null,
+				total: 0,
+				couponstatus: ''
 			};
-		}
+		},
+		onLoad() {},
+		methods: {},
+		onReachBottom() { //下滑加载
+			if (this.couponlist.length >= this.total) {} else {
+				this.pageNum++;
+				selectCoupon(this.pageNum, this.pageSize, this.patientId, this.couponstatus).then(res => {
+					res.rows.forEach(e => {
+						this.couponlist.push(e)
+					})
+				})
+			}
+		},
+		onPullDownRefresh() { //下拉刷新
+			this.pageNum = 1;
+			this.getlist();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 	}
 </script>
 
 <style lang="scss">
-
-</style>
+	@import './coupon.scss'
+</style>
\ No newline at end of file
diff --git a/pagesB/managefamily/managefamily.vue b/pagesB/managefamily/managefamily.vue
index e653aec..1e2f632 100644
--- a/pagesB/managefamily/managefamily.vue
+++ b/pagesB/managefamily/managefamily.vue
@@ -36,7 +36,24 @@
 			return {
 
 			};
-		}
+		},
+		onReachBottom() { //下滑加载
+			if (this.couponlist.length >= this.total) {} else {
+				this.pageNum++;
+				selectCoupon(this.pageNum, this.pageSize, this.patientId, this.couponstatus).then(res => {
+					res.rows.forEach(e => {
+						this.couponlist.push(e)
+					})
+				})
+			}
+		},
+		onPullDownRefresh() { //下拉刷新
+			this.pageNum = 1;
+			this.getlist();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 	}
 </script>