xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/src/Task/taskReceivePopup/coupon/index.js

@@ -1,68 +1,68 @@
-const computedBehavior = require('miniprogram-computed').behavior
-Component({
-  behaviors: [computedBehavior],
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    // 全屏互动
-    isFullScreen: {
-      type: Boolean,
-      value: false,
-    },
-    showCouponReceivePopup: {
-      type: Boolean,
-      value: false,
-    },
-    rewardData: {
-      type: Object,
-      value: {},
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {},
-  computed: {
-    receiveCouponNowMsg(data){
-      return data.rewardData.coupon_list[0]
-    },
-    isShowPoint(data) {
-      let tempPrice = data.receiveCouponNowMsg.price;
-      if (tempPrice % 100 == 0) {
-        return false;
-      } else {
-        return true;
-      }
-    },
-    // 是否为礼品券
-    isGiftCoupon(data) {
-      const item = data.receiveCouponNowMsg;
-      return item && item.coupon_type && +item.coupon_type === 6; // 优惠券类型 1=通用优惠券,2=专属优惠券,3=员工优惠券 6=礼品劵 7=兑换券
-    },
-    // 是否为红包礼品券
-    isRedPacketGiftCoupon(data) {
-      const { coupon_type, gift_coupon_type } = data?.receiveCouponNowMsg || {};
-
-      return +coupon_type === 6 && +gift_coupon_type === 1;
-    },
-    // 是否为兑换券
-    isExchangeCoupon(data) {
-      const item = data.receiveCouponNowMsg;
-      return item && item.coupon_type && +item.coupon_type === 7; // 优惠券类型 1=通用优惠券,2=专属优惠券,3=员工优惠券 6=礼品劵 7=兑换券
-    },
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    closePopup() {
-      this.setData({
-        showCouponReceivePopup: false
-      })
-      this.triggerEvent('close')
-    },
-  },
-})
+const computedBehavior = require('miniprogram-computed').behavior
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 全屏互动
+    isFullScreen: {
+      type: Boolean,
+      value: false,
+    },
+    showCouponReceivePopup: {
+      type: Boolean,
+      value: false,
+    },
+    rewardData: {
+      type: Object,
+      value: {},
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {},
+  computed: {
+    receiveCouponNowMsg(data){
+      return data.rewardData.coupon_list[0]
+    },
+    isShowPoint(data) {
+      let tempPrice = data.receiveCouponNowMsg.price;
+      if (tempPrice % 100 == 0) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    // 是否为礼品券
+    isGiftCoupon(data) {
+      const item = data.receiveCouponNowMsg;
+      return item && item.coupon_type && +item.coupon_type === 6; // 优惠券类型 1=通用优惠券,2=专属优惠券,3=员工优惠券 6=礼品劵 7=兑换券
+    },
+    // 是否为红包礼品券
+    isRedPacketGiftCoupon(data) {
+      const { coupon_type, gift_coupon_type } = data?.receiveCouponNowMsg || {};
+
+      return +coupon_type === 6 && +gift_coupon_type === 1;
+    },
+    // 是否为兑换券
+    isExchangeCoupon(data) {
+      const item = data.receiveCouponNowMsg;
+      return item && item.coupon_type && +item.coupon_type === 7; // 优惠券类型 1=通用优惠券,2=专属优惠券,3=员工优惠券 6=礼品劵 7=兑换券
+    },
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    closePopup() {
+      this.setData({
+        showCouponReceivePopup: false
+      })
+      this.triggerEvent('close')
+    },
+  },
+})

package/src/Task/taskReceivePopup/coupon/index.json

@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-popup": "@vant/weapp/popup/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index"
+  }
+}

package/src/Task/taskReceivePopup/coupon/index.scss

@@ -1,123 +1,123 @@
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-$deviceWidth: 750;
-
-@mixin coupon-receive-popup {
-  .receive-container {
-      width: vmin(512);
-      height: vmin(698);
-      background-size: 100% 100%;
-      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5jrx0grc.png');
-      overflow: hidden;
-      .receive-container-gift {
-          margin-top: vmin(300);
-      }
-      &__content {
-          display: flex;
-          flex-direction: column;
-          margin: vmin(272) vmin(32) vmin(32);
-          padding: 0 vmin(24);
-      }
-      &__content-price {
-          font-weight: 500;
-          font-family: "PingFang SC";
-          text-align: left;
-          display: flex;
-          align-items: baseline;
-          margin-top: vmin(48);
-          .smallIcon {
-              color: #fd2b54;
-              font-size: vmin(40);
-              line-height: vmin(40);
-              margin-right: vmin(4);
-          }
-          .boldIcon {
-              color: #fd2b54;
-              font-size: vmin(80);
-              line-height: vmin(80);
-          }
-          .discountFont{
-            color: #fd2b54;
-            font-size: vmin(32);
-            line-height: vmin(32);
-            margin-left: vmin(4);
-            font-weight: 600;
-          }
-      }
-      &__content-gift {
-         .label {
-            color: #fd2b54;
-            font-size: vmin(36);
-            height: vmin(48);
-            line-height: vmin(48);
-            margin-right: vmin(4);
-         }
-         .title {
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            height: vmin(64);
-            margin-top: vmin(4);
-            .title-txt {
-               width: vmin(400);
-               line-height: vmin(64);
-               color: #fd2b54;
-               font-size: vmin(48);
-               font-weight: 600;
-               display: -webkit-box;
-               -webkit-box-orient: vertical;
-               -webkit-line-clamp: 1;
-               font-family: "PingFang SC";
-               font-weight: 600;
-               overflow: hidden;
-            }
-         }
-      }
-      &__content-describe {
-          color: #333333;
-          font-size: vmin(28);
-          font-weight: 400;
-          font-family: "PingFang SC";
-          text-align: left;
-          line-height: vmin(40);
-          margin-top: vmin(76);
-          view {
-              display: block;
-              margin-bottom: vmin(8);
-          }
-      }
-      &__close {
-        display: block;
-        width: vmin(64);
-        height: vmin(64);
-        margin: vmin(32) auto 0;
-      }
-  }
-  &.coupon-receive-popup-full .receive-container-wrapper{
-    transform: scale(0.8)
-  }
-}
-
-.coupon-receive-popup {
-  @include coupon-receive-popup;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .coupon-receive-popup {
-    @include coupon-receive-popup;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .coupon-receive-popup {
-    @include coupon-receive-popup;
-  }
-}
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+$deviceWidth: 750;
+
+@mixin coupon-receive-popup {
+  .receive-container {
+      width: vmin(512);
+      height: vmin(698);
+      background-size: 100% 100%;
+      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5jrx0grc.png');
+      overflow: hidden;
+      .receive-container-gift {
+          margin-top: vmin(300);
+      }
+      &__content {
+          display: flex;
+          flex-direction: column;
+          margin: vmin(272) vmin(32) vmin(32);
+          padding: 0 vmin(24);
+      }
+      &__content-price {
+          font-weight: 500;
+          font-family: "PingFang SC";
+          text-align: left;
+          display: flex;
+          align-items: baseline;
+          margin-top: vmin(48);
+          .smallIcon {
+              color: #fd2b54;
+              font-size: vmin(40);
+              line-height: vmin(40);
+              margin-right: vmin(4);
+          }
+          .boldIcon {
+              color: #fd2b54;
+              font-size: vmin(80);
+              line-height: vmin(80);
+          }
+          .discountFont{
+            color: #fd2b54;
+            font-size: vmin(32);
+            line-height: vmin(32);
+            margin-left: vmin(4);
+            font-weight: 600;
+          }
+      }
+      &__content-gift {
+         .label {
+            color: #fd2b54;
+            font-size: vmin(36);
+            height: vmin(48);
+            line-height: vmin(48);
+            margin-right: vmin(4);
+         }
+         .title {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: vmin(64);
+            margin-top: vmin(4);
+            .title-txt {
+               width: vmin(400);
+               line-height: vmin(64);
+               color: #fd2b54;
+               font-size: vmin(48);
+               font-weight: 600;
+               display: -webkit-box;
+               -webkit-box-orient: vertical;
+               -webkit-line-clamp: 1;
+               font-family: "PingFang SC";
+               font-weight: 600;
+               overflow: hidden;
+            }
+         }
+      }
+      &__content-describe {
+          color: #333333;
+          font-size: vmin(28);
+          font-weight: 400;
+          font-family: "PingFang SC";
+          text-align: left;
+          line-height: vmin(40);
+          margin-top: vmin(76);
+          view {
+              display: block;
+              margin-bottom: vmin(8);
+          }
+      }
+      &__close {
+        display: block;
+        width: vmin(64);
+        height: vmin(64);
+        margin: vmin(32) auto 0;
+      }
+  }
+  &.coupon-receive-popup-full .receive-container-wrapper{
+    transform: scale(0.8)
+  }
+}
+
+.coupon-receive-popup {
+  @include coupon-receive-popup;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .coupon-receive-popup {
+    @include coupon-receive-popup;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .coupon-receive-popup {
+    @include coupon-receive-popup;
+  }
+}

package/src/Task/taskReceivePopup/coupon/index.wxml

@@ -1,81 +1,81 @@
-<wxs src="./index.wxs" module="couponReceivePopup" />
-<van-popup
-  show="{{true}}"
-  round
-  class="coupon-receive-popup {{isFullScreen? 'coupon-receive-popup-full' : ''}}"
-  custom-style="background: unset"
-  bind:close="closePopup"
->
-  <view class="receive-container-wrapper">
-    <view class="receive-container">
-      <view class="receive-container__content {{ isGiftCoupon || isExchangeCoupon ? 'receive-container-gift' : '' }}">
-        {{ data.receiveCouponNowMsg.coupon_type }}
-        <block wx:if="{{isGiftCoupon}}">
-          <view class="receive-container__content-gift">
-            <view class="label">礼品券</view>
-            <view class="title">
-              <view class="title-txt">{{ receiveCouponNowMsg.title }}</view>
-            </view>
-          </view>
-        </block>
-        <block wx:elif="{{isExchangeCoupon}}">
-          <view class="receive-container__content-gift">
-            <view class="label">兑换券</view>
-            <view class="title">
-              <view class="title-txt">{{ receiveCouponNowMsg.title }}</view>
-            </view>
-          </view>
-        </block>
-        <block wx:else>
-          <view class="receive-container__content-price">
-            <view wx:if="{{receiveCouponNowMsg.discount_way === 1}}">
-              <text class="smallIcon">¥</text>
-              <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.price) }}</text>
-              <text
-                class="smallIcon"
-                wx:if="{{isShowPoint}}"
-              >.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.price) }}</text>
-            </view>
-            <text wx:if="{{receiveCouponNowMsg.discount_way === 2}}">
-              <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.discount_percent, false) }}</text>
-              <text
-                class="boldIcon"
-                wx:if="{{receiveCouponNowMsg.discount_percent % 10 !== 0}}"
-              >.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.discount_percent, false) }}</text>
-              <text class="discountFont">折</text>
-            </text>
-          </view>
-        </block>
-        <view class="receive-container__content-describe">
-          <block wx:if="{{!isGiftCoupon && !isExchangeCoupon}}">
-            <!-- 无门槛 -->
-            <view wx:if="{{receiveCouponNowMsg.require_price == 0}}">无门槛</view>
-            <!-- 满xx元可用 -->
-            <view wx:else>满{{ receiveCouponNowMsg.require_price / 100 }}元可用</view>
-          </block>
-          <view wx:if="{{ !isRedPacketGiftCoupon }}">
-            <!-- 全部商品可用 -->
-            <view wx:if="{{receiveCouponNowMsg.type == 1}}">全部商品可用</view>
-            <!-- 部分商品可用 -->
-            <view wx:else>部分商品可用</view>
-          </view>
-          <!-- 领取次日x天内有效 / 自领取起x天内有效-->
-          <view wx:if="{{receiveCouponNowMsg.valid_day}}">
-            <view wx:if="{{receiveCouponNowMsg.valid_after == 1}}">领取次日{{receiveCouponNowMsg.valid_day}}天内有效</view>
-            <view wx:else>自领取起{{receiveCouponNowMsg.valid_day}}天内有效</view>
-          </view>
-          <!-- 有效期至 -->
-          <view
-            wx:if="{{!receiveCouponNowMsg.valid_day && receiveCouponNowMsg.valid_at && receiveCouponNowMsg.invalid_at}}"
-          >有效期至：{{ couponReceivePopup.formatDateToMinte(receiveCouponNowMsg.invalid_at) }}</view>
-        </view>
-      </view>
-    </view>
-    <image
-      src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lmimm9mb0q88.png"
-      alt
-      class="receive-container__close"
-      catchtap="closePopup"
-    />
-  </view>
-</van-popup>
+<wxs src="./index.wxs" module="couponReceivePopup" />
+<van-popup
+  show="{{true}}"
+  round
+  class="coupon-receive-popup {{isFullScreen? 'coupon-receive-popup-full' : ''}}"
+  custom-style="background: unset"
+  bind:close="closePopup"
+>
+  <view class="receive-container-wrapper">
+    <view class="receive-container">
+      <view class="receive-container__content {{ isGiftCoupon || isExchangeCoupon ? 'receive-container-gift' : '' }}">
+        {{ data.receiveCouponNowMsg.coupon_type }}
+        <block wx:if="{{isGiftCoupon}}">
+          <view class="receive-container__content-gift">
+            <view class="label">礼品券</view>
+            <view class="title">
+              <view class="title-txt">{{ receiveCouponNowMsg.title }}</view>
+            </view>
+          </view>
+        </block>
+        <block wx:elif="{{isExchangeCoupon}}">
+          <view class="receive-container__content-gift">
+            <view class="label">兑换券</view>
+            <view class="title">
+              <view class="title-txt">{{ receiveCouponNowMsg.title }}</view>
+            </view>
+          </view>
+        </block>
+        <block wx:else>
+          <view class="receive-container__content-price">
+            <view wx:if="{{receiveCouponNowMsg.discount_way === 1}}">
+              <text class="smallIcon">¥</text>
+              <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.price) }}</text>
+              <text
+                class="smallIcon"
+                wx:if="{{isShowPoint}}"
+              >.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.price) }}</text>
+            </view>
+            <text wx:if="{{receiveCouponNowMsg.discount_way === 2}}">
+              <text class="boldIcon">{{ couponReceivePopup.filterPrice(receiveCouponNowMsg.discount_percent, false) }}</text>
+              <text
+                class="boldIcon"
+                wx:if="{{receiveCouponNowMsg.discount_percent % 10 !== 0}}"
+              >.{{ couponReceivePopup.fixedFont(receiveCouponNowMsg.discount_percent, false) }}</text>
+              <text class="discountFont">折</text>
+            </text>
+          </view>
+        </block>
+        <view class="receive-container__content-describe">
+          <block wx:if="{{!isGiftCoupon && !isExchangeCoupon}}">
+            <!-- 无门槛 -->
+            <view wx:if="{{receiveCouponNowMsg.require_price == 0}}">无门槛</view>
+            <!-- 满xx元可用 -->
+            <view wx:else>满{{ receiveCouponNowMsg.require_price / 100 }}元可用</view>
+          </block>
+          <view wx:if="{{ !isRedPacketGiftCoupon }}">
+            <!-- 全部商品可用 -->
+            <view wx:if="{{receiveCouponNowMsg.type == 1}}">全部商品可用</view>
+            <!-- 部分商品可用 -->
+            <view wx:else>部分商品可用</view>
+          </view>
+          <!-- 领取次日x天内有效 / 自领取起x天内有效-->
+          <view wx:if="{{receiveCouponNowMsg.valid_day}}">
+            <view wx:if="{{receiveCouponNowMsg.valid_after == 1}}">领取次日{{receiveCouponNowMsg.valid_day}}天内有效</view>
+            <view wx:else>自领取起{{receiveCouponNowMsg.valid_day}}天内有效</view>
+          </view>
+          <!-- 有效期至 -->
+          <view
+            wx:if="{{!receiveCouponNowMsg.valid_day && receiveCouponNowMsg.valid_at && receiveCouponNowMsg.invalid_at}}"
+          >有效期至：{{ couponReceivePopup.formatDateToMinte(receiveCouponNowMsg.invalid_at) }}</view>
+        </view>
+      </view>
+    </view>
+    <image
+      src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lmimm9mb0q88.png"
+      alt
+      class="receive-container__close"
+      catchtap="closePopup"
+    />
+  </view>
+</van-popup>

package/src/Task/taskReceivePopup/coupon/index.wxs

@@ -1,48 +1,48 @@
-/*
-  使用目的：
-    这里定义的函数，用在页面中, 类似于 Vue 里的 computed
-
-  注意点：
-    1. wxs中不支持 let , const
-    2. 导出的时候，即使 key 和 value 相同， 也不能简写。
-*/
-
-// 做数值过滤，value-要处理的数字 ToFix2-默认保留两位，默认转分转元，除以100。其他除以10(如折扣)
-var filterPrice = function (value, ToFix2 = true) {
-  var result = (value / 100).toString();
-  if (!ToFix2) {
-      result = (value / 10).toString();
-  }
-  if (result.indexOf(".") > 0) {
-    return result.split(".")[0];
-  } else {
-    return result;
-  }
-}
-
-// 小数点后的样式补充 ToFix2-默认保留2位,其他保留1位
-var fixedFont = function (value, ToFix2 = true) {
-  if (value) {
-    var result = (value / 100).toString();
-    if (!ToFix2) {
-      result = (value / 10).toString();
-    }
-    if (result.toString().indexOf(".") > -1) {
-      return result.split(".")[1];
-    } else {
-      return "";
-    }
-  }
-}
-
-// 时间精确到分
-var formatDateToMinte = function (date) {
-  var lastIndex = date.lastIndexOf(":");
-  return date.substring(0, lastIndex).replace(getRegExp('-', 'g'), ".");
-}
-
-module.exports = {
-  filterPrice: filterPrice,
-  fixedFont: fixedFont,
-  formatDateToMinte: formatDateToMinte
-}
+/*
+  使用目的：
+    这里定义的函数，用在页面中, 类似于 Vue 里的 computed
+
+  注意点：
+    1. wxs中不支持 let , const
+    2. 导出的时候，即使 key 和 value 相同， 也不能简写。
+*/
+
+// 做数值过滤，value-要处理的数字 ToFix2-默认保留两位，默认转分转元，除以100。其他除以10(如折扣)
+var filterPrice = function (value, ToFix2 = true) {
+  var result = (value / 100).toString();
+  if (!ToFix2) {
+      result = (value / 10).toString();
+  }
+  if (result.indexOf(".") > 0) {
+    return result.split(".")[0];
+  } else {
+    return result;
+  }
+}
+
+// 小数点后的样式补充 ToFix2-默认保留2位,其他保留1位
+var fixedFont = function (value, ToFix2 = true) {
+  if (value) {
+    var result = (value / 100).toString();
+    if (!ToFix2) {
+      result = (value / 10).toString();
+    }
+    if (result.toString().indexOf(".") > -1) {
+      return result.split(".")[1];
+    } else {
+      return "";
+    }
+  }
+}
+
+// 时间精确到分
+var formatDateToMinte = function (date) {
+  var lastIndex = date.lastIndexOf(":");
+  return date.substring(0, lastIndex).replace(getRegExp('-', 'g'), ".");
+}
+
+module.exports = {
+  filterPrice: filterPrice,
+  fixedFont: fixedFont,
+  formatDateToMinte: formatDateToMinte
+}