xiaoe_mp_npm 1.0.14-test01 → 1.0.14-test03

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/miniprogram_dist/CouponList/components/CouponItem/index.js +3 -15
  2. package/miniprogram_dist/CouponReceivePopup/index.wxml +2 -4
  3. package/package.json +1 -1
  4. package/src/CouponList/components/CouponItem/index.js +3 -15
  5. package/src/CouponReceivePopup/index.wxml +2 -4
package/miniprogram_dist/CouponList/components/CouponItem/index.js CHANGED
@@ -285,17 +285,9 @@ Component({
285
285
  },
286
286
  observers: {
287
287
  item(val) {
288
- if (val) {
289
- if (this.data.isFullScreen) {
290
- this.setData({
291
- is_viewUsingInfo: false,
292
- coupon_type: this.data.couponType
293
- });
294
- }
295
- // 只有列表需要处理
296
- if (this.data.isNewList) {
297
- this.initCouponType();
298
- }
288
+ // 只有列表需要处理
289
+ if (val && this.data.isNewList) {
290
+ this.initCouponType();
299
291
  }
300
292
  }
301
293
  },
@@ -394,10 +386,6 @@ Component({
394
386
  this.triggerEvent('receivedSuccess');
395
387
  // 抛出方法拉起弹窗
396
388
  this.triggerEvent('showReceivePopup', { couponInfo: data });
397
- // 全屏端领取成功关闭优惠券弹窗
398
- if (this.properties.isFullScreen) {
399
- this.triggerEvent('closeCounpon');
400
- }
401
389
  }
402
390
  };
403
391
  const failCb = data => {
package/miniprogram_dist/CouponReceivePopup/index.wxml CHANGED
@@ -1,5 +1,5 @@
1
1
  <!--subpkg/npm-compoent/miniprogram_npm/xiaoe_mp_npm/CouponReceivePopup/index.wxml-->
2
- <view class="coupon-receive">
2
+ <view class="coupon-receive" catchtap>
3
3
  <van-popup
4
4
  show="{{ showPopup }}"
5
5
  round
@@ -48,9 +48,7 @@
48
48
  <!-- 领取次日x天内有效 / 自领取起x天内有效-->
49
49
  <text wx:if="{{couponInfo.valid_day}}">{{ getCouponValidInfo }}</text>
50
50
  <!-- 有效期至 -->
51
- <text wx:if="{{!couponInfo.valid_day && couponInfo.valid_at && couponInfo.invalid_at}}">
52
- 有效期至：{{ price.formatDateToMinte(couponInfo.invalid_at) }}
53
- </text>
51
+ <text wx:if="{{!couponInfo.valid_day && couponInfo.valid_at && couponInfo.invalid_at}}">有效期至：{{ price.formatDateToMinte(couponInfo.invalid_at) }}</text>
54
52
  </view>
55
53
  <view class="receive-container-new__btn_box" wx:if="{{!isGiftCoupon}}">
56
54
  <view class="receive-container-new__coupon_btn" catchtap="goMyCoupons">去查看</view>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xiaoe_mp_npm",
3
- "version": "1.0.14-test01",
3
+ "version": "1.0.14-test03",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
package/src/CouponList/components/CouponItem/index.js CHANGED
@@ -285,17 +285,9 @@ Component({
285
285
  },
286
286
  observers: {
287
287
  item(val) {
288
- if (val) {
289
- if (this.data.isFullScreen) {
290
- this.setData({
291
- is_viewUsingInfo: false,
292
- coupon_type: this.data.couponType
293
- });
294
- }
295
- // 只有列表需要处理
296
- if (this.data.isNewList) {
297
- this.initCouponType();
298
- }
288
+ // 只有列表需要处理
289
+ if (val && this.data.isNewList) {
290
+ this.initCouponType();
299
291
  }
300
292
  }
301
293
  },
@@ -394,10 +386,6 @@ Component({
394
386
  this.triggerEvent('receivedSuccess');
395
387
  // 抛出方法拉起弹窗
396
388
  this.triggerEvent('showReceivePopup', { couponInfo: data });
397
- // 全屏端领取成功关闭优惠券弹窗
398
- if (this.properties.isFullScreen) {
399
- this.triggerEvent('closeCounpon');
400
- }
401
389
  }
402
390
  };
403
391
  const failCb = data => {
package/src/CouponReceivePopup/index.wxml CHANGED
@@ -1,5 +1,5 @@
1
1
  <!--subpkg/npm-compoent/miniprogram_npm/xiaoe_mp_npm/CouponReceivePopup/index.wxml-->
2
- <view class="coupon-receive">
2
+ <view class="coupon-receive" catchtap>
3
3
  <van-popup
4
4
  show="{{ showPopup }}"
5
5
  round
@@ -48,9 +48,7 @@
48
48
  <!-- 领取次日x天内有效 / 自领取起x天内有效-->
49
49
  <text wx:if="{{couponInfo.valid_day}}">{{ getCouponValidInfo }}</text>
50
50
  <!-- 有效期至 -->
51
- <text wx:if="{{!couponInfo.valid_day && couponInfo.valid_at && couponInfo.invalid_at}}">
52
- 有效期至：{{ price.formatDateToMinte(couponInfo.invalid_at) }}
53
- </text>
51
+ <text wx:if="{{!couponInfo.valid_day && couponInfo.valid_at && couponInfo.invalid_at}}">有效期至：{{ price.formatDateToMinte(couponInfo.invalid_at) }}</text>
54
52
  </view>
55
53
  <view class="receive-container-new__btn_box" wx:if="{{!isGiftCoupon}}">
56
54
  <view class="receive-container-new__coupon_btn" catchtap="goMyCoupons">去查看</view>