sunshibo 1 месяц назад
Родитель
Сommit
c041d0975a
3 измененных файлов с 10 добавлено и 4 удалено
  1. 4 3
      api/dining.js
  2. 2 1
      pages.json
  3. 4 0
      pages/coupon/index.vue

+ 4 - 3
api/dining.js

@@ -90,14 +90,15 @@ function getUserOwnedCouponListImpl(params) {
 }
 }
 export const GetUserOwnedCouponList = getUserOwnedCouponListImpl;
 export const GetUserOwnedCouponList = getUserOwnedCouponListImpl;
 
 
-// 用户优惠券列表(GET /dining/coupon/life-discount-coupon/getUserCouponList,入参 tabType 0未使用/1即将过期/2已使用/3已过期
+// 用户优惠券列表(GET /dining/coupon/getUserCouponList,入参 tabType、page、size、phoneId 当前登录人手机号前拼接 user_
 export const GetUserCouponList = (params) =>
 export const GetUserCouponList = (params) =>
   api.get({
   api.get({
-    url: '/dining/coupon/life-discount-coupon/getUserCouponList',
+    url: '/dining/coupon/getUserCouponList',
     params: {
     params: {
       tabType: params?.tabType ?? 0,
       tabType: params?.tabType ?? 0,
       page: params?.page ?? 1,
       page: params?.page ?? 1,
-      size: params?.size ?? 20
+      size: params?.size ?? 20,
+      phoneId: params?.phoneId
     }
     }
   });
   });
 
 

+ 2 - 1
pages.json

@@ -93,7 +93,8 @@
 		{
 		{
 			"path": "pages/coupon/index",
 			"path": "pages/coupon/index",
 			"style": {
 			"style": {
-				"navigationBarTitleText": "我的券包"
+				"navigationBarTitleText": "我的券包",
+				"disableScroll": true
 			}
 			}
 		}
 		}
 	],
 	],

+ 4 - 0
pages/coupon/index.vue

@@ -183,10 +183,12 @@ onShow(() => {
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .page {
 .page {
+  height: 100vh;
   min-height: 100vh;
   min-height: 100vh;
   background: #F5F5F5;
   background: #F5F5F5;
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
+  overflow: hidden;
 }
 }
 
 
 .header {
 .header {
@@ -203,6 +205,7 @@ onShow(() => {
 }
 }
 
 
 .tabs {
 .tabs {
+  flex-shrink: 0;
   background: #FFFFFF;
   background: #FFFFFF;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
@@ -238,6 +241,7 @@ onShow(() => {
 
 
 .content {
 .content {
   flex: 1;
   flex: 1;
+  min-height: 0;
   padding: 24rpx 30rpx;
   padding: 24rpx 30rpx;
   padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
   padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
   box-sizing: border-box;
   box-sizing: border-box;