From fd2134a444711bfaf0cdf451fb2399f0dd1e1284 Mon Sep 17 00:00:00 2001 From: yangsanTT <812952667@qq.com> Date: Sun, 25 Apr 2021 22:49:33 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Utils/Api.js | 2 +- pages.json | 2 +- pages/goods/coupon-details/coupon-details.vue | 8 +- .../coupons-info-details.vue | 17 +- pages/goods/externalCoupon/externalCoupon.vue | 7 +- pages/goods/goods.vue | 4 +- pages/pay/success/success.vue | 7 +- pages/tabBar/user/user.vue | 2 +- pages/user/agentCoupons/agentCoupons.vue | 153 ++++++++++++++---- .../mineCouponsDestails.vue | 8 +- 10 files changed, 140 insertions(+), 70 deletions(-) diff --git a/Utils/Api.js b/Utils/Api.js index 44eab16..c3b27ab 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -147,7 +147,7 @@ export const getCodeListByAgentCoupon = params => { } // 生成二维码 export const generateCode = params => { - return POSTBREST('GET', `${brestBase}/highCouponAgent/generateCode`, params).then(res => res.data); + return POSTBREST('POST', `${brestBase}/highCouponAgent/generateCode`, params).then(res => res.data); } // 查看二维码 export const getCodeById = params => { diff --git a/pages.json b/pages.json index ea6d900..6e91877 100644 --- a/pages.json +++ b/pages.json @@ -293,7 +293,7 @@ }, { "path": "pages/goods/coupons-info-details/coupons-info-details", "style": { - "navigationBarTitleText": "优惠券详情", + "navigationBarTitleText": "卡券详情", "enablePullDownRefresh": false } diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue index b6b4059..b776ff8 100644 --- a/pages/goods/coupon-details/coupon-details.vue +++ b/pages/goods/coupon-details/coupon-details.vue @@ -7,7 +7,7 @@ 已过期 - + @@ -210,11 +210,6 @@ line-height: 35px; } - .coupon-cont { - height: 100px; - margin-bottom: 10px; - } - .coupon-mes { margin-right: 90px; } @@ -222,7 +217,6 @@ .coupon-img { width: 80px; height: 80px; - margin-top: 10px; } .coupon-qr { diff --git a/pages/goods/coupons-info-details/coupons-info-details.vue b/pages/goods/coupons-info-details/coupons-info-details.vue index 54f2a2f..da5c5f3 100644 --- a/pages/goods/coupons-info-details/coupons-info-details.vue +++ b/pages/goods/coupons-info-details/coupons-info-details.vue @@ -7,20 +7,23 @@ 已使用 - + {{couponDesInfo.couponInfo.couponName}} - 领取时间:{{oneTime | formatDate('-')}} + 出售时间:{{oneTime | formatDate('-')}} 使用有效期:{{twoTime | formatDate('-')}} 消费时间:{{threeTime | formatDate('-')}} + 加油站点:{{couponDesInfo.couponCode.storeName}} + 备注:{{couponDesInfo.couponAgentCode.remark}} + 核销码(商户扫客户) @@ -93,9 +96,7 @@ return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; } }, - onReachBottom() { - this.getCodeById(); - }, + methods: { //我的卡券详情 getCodeById() { @@ -170,11 +171,6 @@ line-height: 35px; } - .coupon-cont { - height: 100px; - margin-bottom: 10px; - } - .coupon-mes { margin-right: 90px; } @@ -182,7 +178,6 @@ .coupon-img { width: 80px; height: 80px; - margin-top: 10px; } .coupon-qr { diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue index 3a2664c..68ae4a9 100644 --- a/pages/goods/externalCoupon/externalCoupon.vue +++ b/pages/goods/externalCoupon/externalCoupon.vue @@ -1,6 +1,6 @@