xiaoe_mp_npm 1.0.9 → 1.0.10

package/miniprogram_dist/CustomPopup/index.js

@@ -47,7 +47,19 @@ Component({
     overlayStyle: {
       type: String,
       value: ''
-    }
+    },
+    customBoxStyle: {
+      type: String,
+      value: ''
+    },
+    popupHeaderStyle: {
+      type: String,
+      value: ''
+    },
+    contentStyle: {
+      type: String,
+      value: ''
+    },
   },
 
   /**

package/miniprogram_dist/CustomPopup/index.wxml

@@ -1,6 +1,6 @@
 <!--src/CustomPopup/index.wxml-->
 <view class="popup-content">
-  <van-popup 
+  <van-popup
     show="{{ showPopup }}"
     position="{{ popPosition }}"
     round="{{ round }}"
@@ -12,14 +12,20 @@
     z-index="{{zIndex}}"
     catchtap="stopEvent"
   >
-    <view class="popup-header" wx:if="{{ hasHeader }}" style="z-index:4">
+    <view class="popup-header" wx:if="{{ hasHeader }}" style="{{popupHeaderStyle}}">
       <slot name="header"></slot>
     </view>
-    <view class="popup-cont" style="{{popPosition == 'right' ? '-webkit-overflow-scrolling:auto;overflow:auto;' : ''}} {{hasBottom ? 'height: calc(100% - 25.6vmin);' : '' }}">
+    <view
+      class="popup-cont"
+      style="{{popPosition == 'right' ? '-webkit-overflow-scrolling:auto;overflow:auto;' : ''}} {{hasBottom ? 'height: calc(100% - 25.6vmin);' : '' }} {{contentStyle}}"
+    >
       <slot name="content"></slot>
     </view>
     <view class="popup-bottom" wx:if="{{ hasBottom }}">
       <slot name="bottom"></slot>
     </view>
+    <view style="{{customBoxStyle}}">
+      <slot name="custom"></slot>
+    </view>
   </van-popup>
 </view>

package/miniprogram_dist/Task/TaskBubble/index.js

@@ -62,6 +62,7 @@ Component({
           if(task_condition === "4") return `成功消费 ${reward_frequency}笔订单数`
           if(task_condition === "5") return `成功消费 ${(reward_frequency/100).toFixed(2)}元`
         }else {
+          console.log("rewardValue",task_title)
           return task_title[task_type][task_condition]
         }
       }       

package/miniprogram_dist/Task/TaskBubble/index.scss

@@ -1,125 +1,125 @@
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-$deviceWidth: 750;
-
-@mixin barrage-container {
-  color: #fff;
-  font-size: vmin(20);
-  .barrage-wrap {
-    display: flex;
-    .barrage-item {
-      position: relative;
-      background: linear-gradient(270deg, #ff552b00 0%, #ff552bc7 21.42%, #ff8b25eb 46.71%, #FC0 100%);
-      height: vmin(64);
-      font-size: vmin(24);
-      line-height: vmin(64);
-      border-radius: vmin(92);
-      transition: 0.3s;
-      transform: translateX(vmin(-500));
-
-      .barrage-content {
-        display: flex;
-        align-items: center;
-      }
-
-      .task-completion-icon {
-        width: vmin(48);
-        height: vmin(48);
-        border-radius: 50%;
-        margin-left: vmin(10);
-        margin-right: vmin(8);
-        flex-shrink: 0;
-      }
-      .task-type {
-        display: flex;
-        flex-direction: column;
-        margin-right: vmin(8);
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        view {
-          width: 100%;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-      }
-      .prize-icon {
-        width: vmin(56);
-        height: vmin(56);
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin: 0 vmin(8);
-      }
-      .prize-num {
-        color: #FFF5CC;
-        font-weight: 500;
-        margin-right: vmin(8);
-      }
-      .right-arrow-icon{
-        height: vmin(40);
-        width: vmin(40);
-        margin-right: vmin(52);
-      }
-      &.barrage-item-show {
-        animation: taskFadeInLeft 1.5s both;
-      }
-      &.barrage-item-hide {
-        animation: taskFadeOut 1.5s both;
-      }
-    }
-    @keyframes taskFadeInLeft {
-      0% {
-        transform: translateX(vmin(-500));
-        opacity: 1;
-      }
-      100% {
-        transform: translateX(0);
-        opacity: 1;
-      }
-    }
-    @keyframes taskFadeOut {
-      0% {
-        transform: translateX(0);
-        opacity: 1;
-      }
-      100% {
-        transform: translateX(0);
-        opacity: 0;
-      }
-    }
-    @keyframes moveRight {
-      from {
-        transform: translateX(-100%);
-      }
-      to {
-        transform: translateX(0);
-      }
-    }
-  }
-}
-
-.barrage-container {
-  @include barrage-container;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .barrage-container {
-    @include barrage-container;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .barrage-container {
-    @include barrage-container;
-  }
-}
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+$deviceWidth: 750;
+
+@mixin barrage-container {
+  color: #fff;
+  font-size: vmin(20);
+  .barrage-wrap {
+    display: flex;
+    .barrage-item {
+      position: relative;
+      background: linear-gradient(270deg, #ff552b00 0%, #ff552bc7 21.42%, #ff8b25eb 46.71%, #FC0 100%);
+      height: vmin(64);
+      font-size: vmin(24);
+      line-height: vmin(64);
+      border-radius: vmin(92);
+      transition: 0.3s;
+      transform: translateX(vmin(-500));
+
+      .barrage-content {
+        display: flex;
+        align-items: center;
+      }
+
+      .task-completion-icon {
+        width: vmin(48);
+        height: vmin(48);
+        border-radius: 50%;
+        margin-left: vmin(10);
+        margin-right: vmin(8);
+        flex-shrink: 0;
+      }
+      .task-type {
+        display: flex;
+        flex-direction: column;
+        margin-right: vmin(8);
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        view {
+          width: 100%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
+      .prize-icon {
+        width: vmin(56);
+        height: vmin(56);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin: 0 vmin(8);
+      }
+      .prize-num {
+        color: #FFF5CC;
+        font-weight: 500;
+        margin-right: vmin(8);
+      }
+      .right-arrow-icon{
+        height: vmin(40);
+        width: vmin(40);
+        margin-right: vmin(52);
+      }
+      &.barrage-item-show {
+        animation: taskFadeInLeft 1.5s both;
+      }
+      &.barrage-item-hide {
+        animation: taskFadeOut 1.5s both;
+      }
+    }
+    @keyframes taskFadeInLeft {
+      0% {
+        transform: translateX(vmin(-500));
+        opacity: 1;
+      }
+      100% {
+        transform: translateX(0);
+        opacity: 1;
+      }
+    }
+    @keyframes taskFadeOut {
+      0% {
+        transform: translateX(0);
+        opacity: 1;
+      }
+      100% {
+        transform: translateX(0);
+        opacity: 0;
+      }
+    }
+    @keyframes moveRight {
+      from {
+        transform: translateX(-100%);
+      }
+      to {
+        transform: translateX(0);
+      }
+    }
+  }
+}
+
+.barrage-container {
+  @include barrage-container;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .barrage-container {
+    @include barrage-container;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .barrage-container {
+    @include barrage-container;
+  }
+}