xiaoe_mp_npm 1.0.21 → 1.0.22-store2

package/miniprogram_dist/Task/taskQuizRemindPopup/index.scss

@@ -0,0 +1,108 @@
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin remind-popup {
+  border-radius: vmin(16);
+  overflow: hidden;
+  .popup-quiz-box {
+    box-sizing: border-box;
+    width: vmin(576);
+    padding: vmin(48);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    background: linear-gradient(180deg, rgba(20, 114, 255, 0.12) 0%, rgba(20, 114, 255, 0) 100%), #fff;
+  
+    font-size: vmin(28);
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+    font-family: "PingFang SC";
+    position: relative;
+    .time-icon {
+      width: vmin(172);
+      height: vmin(172);
+      position: absolute;
+      right: 0;
+      top: -#{vmin(10)};
+    }
+    .header-title {
+      color: #333333;
+      text-align: center;
+      font-size: vmin(32);
+      font-style: normal;
+      font-weight: 500;
+      margin-bottom: vmin(16);
+      line-height: vmin(48);
+    }
+    .content-body {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: #666666;
+      text-align: center;
+      align-self: stretch;
+      line-height: vmin(40);
+      margin-bottom: vmin(48);
+    }
+    .quiz-remind-btn {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      font-weight: 500;
+      view {
+        display: flex;
+        width: vmin(224);
+        height: vmin(80);
+        justify-content: center;
+        align-items: center;
+        border-radius: vmin(40);
+      }
+      .close-btn {
+        box-sizing: border-box;
+        border: vmin(1) solid #cccccc;
+        color: #333333;
+      }
+      .to-quiz-btn {
+        background: #1472ff;
+        color: #ffffff;
+      }
+    }
+  }
+}
+
+.remind-popup {
+  @include remind-popup;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .remind-popup {
+    @include remind-popup;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .remind-popup {
+    @include remind-popup;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .remind-popup {
+    @include remind-popup;
+  }
+}

package/miniprogram_dist/Task/taskQuizRemindPopup/index.wxml

@@ -0,0 +1,27 @@
+<view catchtap>
+  <van-popup
+    show="{{showPopup}}"
+    zIndex="{{500}}"
+    custom-class="remind-popup"
+    bind:close="closePop"
+    bind:click-overlay="closePop"
+    overlay-style="{{ 'background-color: rgba(0, 0, 0, 0.8)' }}"
+  >
+    <!-- 内容 -->
+    <view class="popup-quiz-box">
+      <image
+        class="time-icon"
+        src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lz6lllsd09kp.svg"
+      />
+      <!-- 标题 -->
+      <view class="header-title">答题开始了</view>
+      <!-- 内容 -->
+      <view class="content-body">完成答题任务将会获得奖励</view>
+      <!-- 按钮 -->
+      <view class="quiz-remind-btn">
+        <view class="close-btn" catchtap="closePop">取消</view>
+        <view class="to-quiz-btn" catchtap="quizHandle">去答题</view>
+      </view>
+    </view>
+  </van-popup>
+</view>

package/miniprogram_dist/Task/taskQuizRemindPopup/index.wxss

@@ -0,0 +1,286 @@
+.remind-popup {
+  border-radius: 2.13333vmin;
+  overflow: hidden;
+}
+.remind-popup .popup-quiz-box {
+  box-sizing: border-box;
+  width: 76.8vmin;
+  padding: 6.4vmin;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background: linear-gradient(180deg, rgba(20, 114, 255, 0.12) 0%, rgba(20, 114, 255, 0) 100%), #fff;
+  font-size: 3.73333vmin;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  font-family: "PingFang SC";
+  position: relative;
+}
+.remind-popup .popup-quiz-box .time-icon {
+  width: 22.93333vmin;
+  height: 22.93333vmin;
+  position: absolute;
+  right: 0;
+  top: -1.33333vmin;
+}
+.remind-popup .popup-quiz-box .header-title {
+  color: #333333;
+  text-align: center;
+  font-size: 4.26667vmin;
+  font-style: normal;
+  font-weight: 500;
+  margin-bottom: 2.13333vmin;
+  line-height: 6.4vmin;
+}
+.remind-popup .popup-quiz-box .content-body {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #666666;
+  text-align: center;
+  align-self: stretch;
+  line-height: 5.33333vmin;
+  margin-bottom: 6.4vmin;
+}
+.remind-popup .popup-quiz-box .quiz-remind-btn {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-weight: 500;
+}
+.remind-popup .popup-quiz-box .quiz-remind-btn view {
+  display: flex;
+  width: 29.86667vmin;
+  height: 10.66667vmin;
+  justify-content: center;
+  align-items: center;
+  border-radius: 5.33333vmin;
+}
+.remind-popup .popup-quiz-box .quiz-remind-btn .close-btn {
+  box-sizing: border-box;
+  border: 0.13333vmin solid #ccc;
+  color: #333333;
+}
+.remind-popup .popup-quiz-box .quiz-remind-btn .to-quiz-btn {
+  background: #1472ff;
+  color: #ffffff;
+}
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .remind-popup {
+    border-radius: 1.04167vmin;
+    overflow: hidden;
+  }
+  .remind-popup .popup-quiz-box {
+    box-sizing: border-box;
+    width: 37.5vmin;
+    padding: 3.125vmin;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    background: linear-gradient(180deg, rgba(20, 114, 255, 0.12) 0%, rgba(20, 114, 255, 0) 100%), #fff;
+    font-size: 1.82292vmin;
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+    font-family: "PingFang SC";
+    position: relative;
+  }
+  .remind-popup .popup-quiz-box .time-icon {
+    width: 11.19792vmin;
+    height: 11.19792vmin;
+    position: absolute;
+    right: 0;
+    top: -0.65104vmin;
+  }
+  .remind-popup .popup-quiz-box .header-title {
+    color: #333333;
+    text-align: center;
+    font-size: 2.08333vmin;
+    font-style: normal;
+    font-weight: 500;
+    margin-bottom: 1.04167vmin;
+    line-height: 3.125vmin;
+  }
+  .remind-popup .popup-quiz-box .content-body {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #666666;
+    text-align: center;
+    align-self: stretch;
+    line-height: 2.60417vmin;
+    margin-bottom: 3.125vmin;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-weight: 500;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn view {
+    display: flex;
+    width: 14.58333vmin;
+    height: 5.20833vmin;
+    justify-content: center;
+    align-items: center;
+    border-radius: 2.60417vmin;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn .close-btn {
+    box-sizing: border-box;
+    border: 0.0651vmin solid #ccc;
+    color: #333333;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn .to-quiz-btn {
+    background: #1472ff;
+    color: #ffffff;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .remind-popup {
+    border-radius: 1.26984vmin;
+    overflow: hidden;
+  }
+  .remind-popup .popup-quiz-box {
+    box-sizing: border-box;
+    width: 45.71429vmin;
+    padding: 3.80952vmin;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    background: linear-gradient(180deg, rgba(20, 114, 255, 0.12) 0%, rgba(20, 114, 255, 0) 100%), #fff;
+    font-size: 2.22222vmin;
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+    font-family: "PingFang SC";
+    position: relative;
+  }
+  .remind-popup .popup-quiz-box .time-icon {
+    width: 13.65079vmin;
+    height: 13.65079vmin;
+    position: absolute;
+    right: 0;
+    top: -0.79365vmin;
+  }
+  .remind-popup .popup-quiz-box .header-title {
+    color: #333333;
+    text-align: center;
+    font-size: 2.53968vmin;
+    font-style: normal;
+    font-weight: 500;
+    margin-bottom: 1.26984vmin;
+    line-height: 3.80952vmin;
+  }
+  .remind-popup .popup-quiz-box .content-body {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #666666;
+    text-align: center;
+    align-self: stretch;
+    line-height: 3.1746vmin;
+    margin-bottom: 3.80952vmin;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-weight: 500;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn view {
+    display: flex;
+    width: 17.77778vmin;
+    height: 6.34921vmin;
+    justify-content: center;
+    align-items: center;
+    border-radius: 3.1746vmin;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn .close-btn {
+    box-sizing: border-box;
+    border: 0.07937vmin solid #ccc;
+    color: #333333;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn .to-quiz-btn {
+    background: #1472ff;
+    color: #ffffff;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .remind-popup {
+    border-radius: 1.04167vmin;
+    overflow: hidden;
+  }
+  .remind-popup .popup-quiz-box {
+    box-sizing: border-box;
+    width: 37.5vmin;
+    padding: 3.125vmin;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    background: linear-gradient(180deg, rgba(20, 114, 255, 0.12) 0%, rgba(20, 114, 255, 0) 100%), #fff;
+    font-size: 1.82292vmin;
+    font-style: normal;
+    font-weight: 400;
+    line-height: normal;
+    font-family: "PingFang SC";
+    position: relative;
+  }
+  .remind-popup .popup-quiz-box .time-icon {
+    width: 11.19792vmin;
+    height: 11.19792vmin;
+    position: absolute;
+    right: 0;
+    top: -0.65104vmin;
+  }
+  .remind-popup .popup-quiz-box .header-title {
+    color: #333333;
+    text-align: center;
+    font-size: 2.08333vmin;
+    font-style: normal;
+    font-weight: 500;
+    margin-bottom: 1.04167vmin;
+    line-height: 3.125vmin;
+  }
+  .remind-popup .popup-quiz-box .content-body {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #666666;
+    text-align: center;
+    align-self: stretch;
+    line-height: 2.60417vmin;
+    margin-bottom: 3.125vmin;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-weight: 500;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn view {
+    display: flex;
+    width: 14.58333vmin;
+    height: 5.20833vmin;
+    justify-content: center;
+    align-items: center;
+    border-radius: 2.60417vmin;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn .close-btn {
+    box-sizing: border-box;
+    border: 0.0651vmin solid #ccc;
+    color: #333333;
+  }
+  .remind-popup .popup-quiz-box .quiz-remind-btn .to-quiz-btn {
+    background: #1472ff;
+    color: #ffffff;
+  }
+}

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-store2",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {