xiaoe_mp_npm 1.0.14-test02 → 1.0.14-test03

package/miniprogram_dist/CouponList/components/CouponItem/index.js

@@ -285,17 +285,9 @@ Component({
   },
   observers: {
     item(val) {
-      if (val) {
-        if (this.data.isFullScreen) {
-          this.setData({
-            is_viewUsingInfo: false,
-            coupon_type: this.data.couponType
-          });
-        }
-        // 只有列表需要处理
-        if (this.data.isNewList) {
-          this.initCouponType();
-        }
+      // 只有列表需要处理
+      if (val && this.data.isNewList) {
+        this.initCouponType();
       }
     }
   },
@@ -394,10 +386,6 @@ Component({
           this.triggerEvent('receivedSuccess');
           // 抛出方法拉起弹窗
           this.triggerEvent('showReceivePopup', { couponInfo: data });
-          // 全屏端领取成功关闭优惠券弹窗
-          if (this.properties.isFullScreen) {
-            this.triggerEvent('closeCounpon');
-          }
         }
       };
       const failCb = data => {

package/miniprogram_dist/CouponReceivePopup/index.wxml

@@ -1,5 +1,5 @@
 <!--subpkg/npm-compoent/miniprogram_npm/xiaoe_mp_npm/CouponReceivePopup/index.wxml-->
-<view class="coupon-receive">
+<view class="coupon-receive" catchtap>
   <van-popup
     show="{{ showPopup }}"
     round

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "1.0.14-test02",
+  "version": "1.0.14-test03",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

package/src/CouponList/components/CouponItem/index.js

@@ -285,17 +285,9 @@ Component({
   },
   observers: {
     item(val) {
-      if (val) {
-        if (this.data.isFullScreen) {
-          this.setData({
-            is_viewUsingInfo: false,
-            coupon_type: this.data.couponType
-          });
-        }
-        // 只有列表需要处理
-        if (this.data.isNewList) {
-          this.initCouponType();
-        }
+      // 只有列表需要处理
+      if (val && this.data.isNewList) {
+        this.initCouponType();
       }
     }
   },
@@ -394,10 +386,6 @@ Component({
           this.triggerEvent('receivedSuccess');
           // 抛出方法拉起弹窗
           this.triggerEvent('showReceivePopup', { couponInfo: data });
-          // 全屏端领取成功关闭优惠券弹窗
-          if (this.properties.isFullScreen) {
-            this.triggerEvent('closeCounpon');
-          }
         }
       };
       const failCb = data => {

package/src/CouponReceivePopup/index.wxml

@@ -1,5 +1,5 @@
 <!--subpkg/npm-compoent/miniprogram_npm/xiaoe_mp_npm/CouponReceivePopup/index.wxml-->
-<view class="coupon-receive">
+<view class="coupon-receive" catchtap>
   <van-popup
     show="{{ showPopup }}"
     round