xiaoe_mp_npm 1.0.21 → 1.0.22-store1

package/miniprogram_dist/Task/taskReceivePopup/integral/index.scss

@@ -1,60 +1,60 @@
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-$deviceWidth: 750;
-
-@mixin integral-receive-popup {
-  .receive-container {
-      width: vmin(400);
-      height: vmin(400);
-      background-size: 100% 100%;
-      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5js008xu.png');
-      overflow: hidden;
-      &__content-number {
-          margin-top: vmin(336);
-          font-weight: 500;
-          text-align: center;
-          color: #FFF5CC;
-          font-size: vmin(48);
-          line-height: vmin(48);
-      }
-      &__btn {
-          width: vmin(296);
-          height: vmin(80);
-          text-align: center;
-          line-height: vmin(80);
-          border-radius: vmin(40);
-          font-size: vmin(32);
-          font-weight: 500;
-          color: #fff;
-          background: linear-gradient(270deg, #FF5820 0%, #FF4067 100%);
-          margin: vmin(48) auto 0;
-      }
-  }
-  &.integral-receive-popup-full .receive-container{
-    transform: scale(0.8)
-  }
-}
-
-.integral-receive-popup {
-  @include integral-receive-popup;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .integral-receive-popup {
-    @include integral-receive-popup;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .integral-receive-popup {
-    @include integral-receive-popup;
-  }
-}
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+$deviceWidth: 750;
+
+@mixin integral-receive-popup {
+  .receive-container {
+      width: vmin(400);
+      height: vmin(400);
+      background-size: 100% 100%;
+      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/loqj5js008xu.png');
+      overflow: hidden;
+      &__content-number {
+          margin-top: vmin(336);
+          font-weight: 500;
+          text-align: center;
+          color: #FFF5CC;
+          font-size: vmin(48);
+          line-height: vmin(48);
+      }
+      &__btn {
+          width: vmin(296);
+          height: vmin(80);
+          text-align: center;
+          line-height: vmin(80);
+          border-radius: vmin(40);
+          font-size: vmin(32);
+          font-weight: 500;
+          color: #fff;
+          background: linear-gradient(270deg, #FF5820 0%, #FF4067 100%);
+          margin: vmin(48) auto 0;
+      }
+  }
+  &.integral-receive-popup-full .receive-container{
+    transform: scale(0.8)
+  }
+}
+
+.integral-receive-popup {
+  @include integral-receive-popup;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .integral-receive-popup {
+    @include integral-receive-popup;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .integral-receive-popup {
+    @include integral-receive-popup;
+  }
+}

package/miniprogram_dist/Task/taskReceivePopup/integral/index.wxml

@@ -1,12 +1,12 @@
-<van-popup
-  show="{{true}}"
-  round
-  class="integral-receive-popup {{isFullScreen? 'integral-receive-popup-full' : ''}}"
-  custom-style="background: unset"
-  bind:close="closePopup"
->
-  <view class="receive-container" style="background-image: url({{awardImg}})">
-    <view class="receive-container__content-number">+{{rewardValue}}</view>
-  </view>
-  <view class="receive-container__btn" catchtap="closePopup">开心收下</view>
-</van-popup>
+<van-popup
+  show="{{true}}"
+  round
+  class="integral-receive-popup {{isFullScreen? 'integral-receive-popup-full' : ''}}"
+  custom-style="background: unset"
+  bind:close="closePopup"
+>
+  <view class="receive-container" style="background-image: url({{awardImg}})">
+    <view class="receive-container__content-number">+{{rewardValue}}</view>
+  </view>
+  <view class="receive-container__btn" catchtap="closePopup">开心收下</view>
+</van-popup>

package/miniprogram_dist/common/utils/tool.js

@@ -1,66 +1,72 @@
 /*函数节流*/
 function throttle(fn, interval) {
-  var enterTime = 0; //触发的时间
-  var gapTime = interval || 300; //间隔时间，如果interval不传，则默认300ms
+  var enterTime = 0 //触发的时间
+  var gapTime = interval || 300 //间隔时间，如果interval不传，则默认300ms
   return function () {
-    var context = this;
-    var backTime = new Date(); //第一次函数return即触发的时间
+    var context = this
+    var backTime = new Date() //第一次函数return即触发的时间
     if (backTime - enterTime > gapTime) {
-      fn.call(context, arguments);
-      enterTime = backTime; //赋值给第一次触发的时间，这样就保存了第二次触发的时间
+      fn.call(context, arguments)
+      enterTime = backTime //赋值给第一次触发的时间，这样就保存了第二次触发的时间
     }
-  };
+  }
 }
 
 /*函数防抖*/
 function debounce(func, wait, immediate) {
-  let timer;
+  let timer
 
   return function () {
-      //this指向debounce
-      let context = this;
-      //即参数，func,wait
-      let args = arguments;
+    //this指向debounce
+    let context = this
+    //即参数，func,wait
+    let args = arguments
 
-      //如果timer不为null, 清除定时器
-      if (timer) clearTimeout(timer);
+    //如果timer不为null, 清除定时器
+    if (timer) clearTimeout(timer)
 
-      //如果是立即执行
-      if (immediate) {
-          //定义callNow = !timer
-          var callNow = !timer;
-          //定义wait时间后把timer变为null
-          //即在wait时间之后事件才会有效
-          timer = setTimeout(() => {
-              timer = null;
-          }, wait)
-          //如果callNow为true,即原本timer为null
-          //那么执行func函数
-          if (callNow) func.apply(context, args)
-      } else {
-          //如果是不立即执行
-          //那就是每次重新定时
-          timer = setTimeout(function () {
-              func.apply(context, args)
-          }, wait);
-      }
+    //如果是立即执行
+    if (immediate) {
+      //定义callNow = !timer
+      var callNow = !timer
+      //定义wait时间后把timer变为null
+      //即在wait时间之后事件才会有效
+      timer = setTimeout(() => {
+        timer = null
+      }, wait)
+      //如果callNow为true,即原本timer为null
+      //那么执行func函数
+      if (callNow) func.apply(context, args)
+    } else {
+      //如果是不立即执行
+      //那就是每次重新定时
+      timer = setTimeout(function () {
+        func.apply(context, args)
+      }, wait)
+    }
   }
 }
-// }
-// function debounce(fn, interval) {
-//   var timer;
-//   var gapTime = interval || 1000; //间隔时间，如果interval不传，则默认1000ms
-//   return function () {
-//     clearTimeout(timer);
-//     var context = this;
-//     var args = arguments; //保存此处的arguments，因为setTimeout是全局的，arguments不是防抖函数需要的。
-//     timer = setTimeout(function () {
-//       fn.call(context, args);
-//     }, gapTime);
-//   };
-// }
+
+/**
+ * 高并发请求打散
+ * @param delayHandler 目标并发量获取器
+ * @param options 配置项 { defaultDelay: 1000, useScatter: false }
+ * @param cb 回调函数
+ * @returns {number} 定时器
+ */
+function scatterRequest(delayHandler, options, cb) {
+  let timer
+  const { defaultDelay = 1000, useScatter = false } = options
+  let delay = useScatter ? delayHandler() : defaultDelay // 默认并发量为1000
+  console.log(useScatter ? `[scatterRequest] High concurrency delay request: ${delay}` : '[scatterRequest] Disabled')
+  timer = setTimeout(() => {
+    cb()
+  }, delay)
+  return timer
+}
 
 module.exports = {
   throttle,
-  debounce
-};
+  debounce,
+  scatterRequest,
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "1.0.21",
+  "version": "1.0.22-store1",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

package/src/CustomPopup/index.wxss

@@ -1,22 +1,22 @@
-.popup-content {
-  height: 100%;
-}
-.popup-content .popup-header {
-  width: 100%;
-  position: sticky;
-  top: 0;
-  left: 0;
-  background: #ffffff;
-  height: 12.8vmin;
-}
-.popup-content .popup-cont {
-  height: calc(100% - 12.8vmin);
-}
-.popup-content .popup-bottom {
-  width: 100%;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  background: #ffffff;
-  height: 12.8vmin;
-}
+.popup-content {
+  height: 100%;
+}
+.popup-content .popup-header {
+  width: 100%;
+  position: sticky;
+  top: 0;
+  left: 0;
+  background: #ffffff;
+  height: 12.8vmin;
+}
+.popup-content .popup-cont {
+  height: calc(100% - 12.8vmin);
+}
+.popup-content .popup-bottom {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  background: #ffffff;
+  height: 12.8vmin;
+}

package/src/Task/TaskBubble/index.js

@@ -9,7 +9,8 @@ const task_title = {
     "6": "完成打赏",
     "7": "完成投票",
     "8": "完成问卷",
-    "9": "完成签到"
+    "9": "完成签到",
+    "10": "完成答题"
   }
 }
 Component({

package/src/Task/TaskBubble/index.json

@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }

package/src/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;
+  }
+}

package/src/Task/TaskBubble/index.wxml

@@ -1,22 +1,22 @@
-<view class="barrage-container" catch:tap="bubbleClick" style="{{zIndex?'z-index:'+zIndex:''}}">
-  <view class="barrage-wrap">
-    <view class="barrage-item" animation="{{animationData}}">
-      <view class="barrage-content">
-        <image
-          class="task-completion-icon"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopitz1y0c73.png"
-          alt
-        />
-        <view wx:if="{{taskMsg.live_task.task_type === 1}}" class="task-type">观看时长</view>
-        <view>{{ rewardValue }}</view>
-        <image class="prize-icon" src="{{taskIconImg}}" alt="奖励" />
-        <view class="prize-num">+{{ prizeNum }}</view>
-        <image
-          class="right-arrow-icon"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopitz1k0dzj.png"
-          alt
-        />
-      </view>
-    </view>
-  </view>
-</view>
+<view class="barrage-container" catch:tap="bubbleClick" style="{{zIndex?'z-index:'+zIndex:''}}">
+  <view class="barrage-wrap">
+    <view class="barrage-item" animation="{{animationData}}">
+      <view class="barrage-content">
+        <image
+          class="task-completion-icon"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopitz1y0c73.png"
+          alt
+        />
+        <view wx:if="{{taskMsg.live_task.task_type === 1}}" class="task-type">观看时长</view>
+        <view>{{ rewardValue }}</view>
+        <image class="prize-icon" src="{{taskIconImg}}" alt="奖励" />
+        <view class="prize-num">+{{ prizeNum }}</view>
+        <image
+          class="right-arrow-icon"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopitz1k0dzj.png"
+          alt
+        />
+      </view>
+    </view>
+  </view>
+</view>