xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/Task/TaskQuizPopup/index.scss

@@ -1,159 +1,159 @@
-$deviceWidth: 750;
-
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin task-quiz-popup {
-  height: 100%;
-  .quiz-popup {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    background-color: #f5f5f5;
-    border-radius: vmin(24) vmin(24) 0 0;
-    z-index: 500;
-    .content-header {
-      width: 100%;
-      height: vmin(96);
-      font-size: vmin(32);
-      font-weight: 500;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      position: relative;
-      .popup-close-icon {
-        width: vmin(32);
-        height: vmin(32);
-        position: absolute;
-        top: vmin(32);
-        right: vmin(32);
-      }
-    }
-  
-    .popup-content{
-      flex: 1;
-      box-sizing: border-box;
-      overflow-y: overlay;
-      padding: 0 vmin(32);
-      width: 100%;
-
-      .reward-show-box {
-        display: flex;
-        padding: vmin(32) vmin(24);
-        flex-direction: column;
-        align-items: flex-start;
-        border-radius: vmin(16);
-        background: #fff;
-        color: #333333;
-        font-family: "PingFang SC";
-        font-size: vmin(28);
-        font-style: normal;
-        font-weight: 400;
-        margin-bottom: vmin(32);
-        line-height: vmin(40);
-        .reward-condition {
-          font-weight: 500;
-          .orange-color {
-            color: #ff5429;
-          }
-        }
-        .reward-result {
-          display: flex;
-          align-items: center;
-          margin-top: vmin(8);
-          .reward-result-show {
-            margin-left: vmin(16);
-            color: #ff5429;
-            font-size: vmin(24);
-            display: inline-flex;
-            align-items: center;
-  
-            .reward-img {
-              width: vmin(24);
-              height: vmin(24);
-              padding: vmin(4) 0;
-              vertical-align: top;
-            }
-          }
-        }
-      }
-      .analysis-tip {
-        font-size: vmin(32);
-        color: #333333;
-        font-family: "PingFang SC";
-        font-style: normal;
-        font-weight: 500;
-        line-height: vmin(48);
-        margin-bottom: vmin(32);
-      }
-    }
-  
-    .content-footer {
-      width: 100%;
-      height: vmin(112);
-      font-size: vmin(32);
-      font-weight: 400;
-      color: #999;
-      line-height: vmin(40);
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      padding: 0 vmin(32);
-      box-sizing: border-box;
-      view {
-        flex: 1;
-        height: vmin(80);
-        font-weight: 500;
-        line-height: vmin(80);
-        font-size: vmin(28);
-        text-align: center;
-        border-radius: vmin(40);
-        box-sizing: border-box;
-      }
-      .last-step {
-        margin-right: vmin(30);
-      }
-      .last-step,
-      .next-step {
-        color: #1472ff;
-        border: vmin(2) solid #1472ff;
-      }
-      .submit-step {
-        color: #fff;
-        background: #1472ff;
-      }
-    }
-  }
-}
-
-.task-quiz-popup {
-  @include task-quiz-popup;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .task-quiz-popup {
-    @include task-quiz-popup;
-  }
-}
-
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .task-quiz-popup {
-    @include task-quiz-popup;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .task-quiz-popup {
-    @include task-quiz-popup;
-  }
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin task-quiz-popup {
+  height: 100%;
+  .quiz-popup {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    background-color: #f5f5f5;
+    border-radius: vmin(24) vmin(24) 0 0;
+    z-index: 500;
+    .content-header {
+      width: 100%;
+      height: vmin(96);
+      font-size: vmin(32);
+      font-weight: 500;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      position: relative;
+      .popup-close-icon {
+        width: vmin(32);
+        height: vmin(32);
+        position: absolute;
+        top: vmin(32);
+        right: vmin(32);
+      }
+    }
+  
+    .popup-content{
+      flex: 1;
+      box-sizing: border-box;
+      overflow-y: overlay;
+      padding: 0 vmin(32);
+      width: 100%;
+
+      .reward-show-box {
+        display: flex;
+        padding: vmin(32) vmin(24);
+        flex-direction: column;
+        align-items: flex-start;
+        border-radius: vmin(16);
+        background: #fff;
+        color: #333333;
+        font-family: "PingFang SC";
+        font-size: vmin(28);
+        font-style: normal;
+        font-weight: 400;
+        margin-bottom: vmin(32);
+        line-height: vmin(40);
+        .reward-condition {
+          font-weight: 500;
+          .orange-color {
+            color: #ff5429;
+          }
+        }
+        .reward-result {
+          display: flex;
+          align-items: center;
+          margin-top: vmin(8);
+          .reward-result-show {
+            margin-left: vmin(16);
+            color: #ff5429;
+            font-size: vmin(24);
+            display: inline-flex;
+            align-items: center;
+  
+            .reward-img {
+              width: vmin(24);
+              height: vmin(24);
+              padding: vmin(4) 0;
+              vertical-align: top;
+            }
+          }
+        }
+      }
+      .analysis-tip {
+        font-size: vmin(32);
+        color: #333333;
+        font-family: "PingFang SC";
+        font-style: normal;
+        font-weight: 500;
+        line-height: vmin(48);
+        margin-bottom: vmin(32);
+      }
+    }
+  
+    .content-footer {
+      width: 100%;
+      height: vmin(112);
+      font-size: vmin(32);
+      font-weight: 400;
+      color: #999;
+      line-height: vmin(40);
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 0 vmin(32);
+      box-sizing: border-box;
+      view {
+        flex: 1;
+        height: vmin(80);
+        font-weight: 500;
+        line-height: vmin(80);
+        font-size: vmin(28);
+        text-align: center;
+        border-radius: vmin(40);
+        box-sizing: border-box;
+      }
+      .last-step {
+        margin-right: vmin(30);
+      }
+      .last-step,
+      .next-step {
+        color: #1472ff;
+        border: vmin(2) solid #1472ff;
+      }
+      .submit-step {
+        color: #fff;
+        background: #1472ff;
+      }
+    }
+  }
+}
+
+.task-quiz-popup {
+  @include task-quiz-popup;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .task-quiz-popup {
+    @include task-quiz-popup;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .task-quiz-popup {
+    @include task-quiz-popup;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .task-quiz-popup {
+    @include task-quiz-popup;
+  }
 }

package/miniprogram_dist/Task/TaskQuizPopup/index.wxml

@@ -1,99 +1,99 @@
-<view class="task-quiz-popup" catchtap>
-  <van-popup
-  show="{{showPopup}}"
-  position="{{ popPosition }}"
-  custom-style="{{ customStyle }}"
-  z-index="{{500}}"
-  custom-class="quiz-popup"
-  safe-area-inset-bottom="{{ !showAnalysis }}"
-  overlay-style="{{ 'background-color: rgba(0, 0, 0, 0.8)' }}"
-  catch:close="closePop"
-  catch:click-overlay="closePop"
-  >
-    <!-- 标题 -->
-    <view class="content-header">
-      {{ showAnalysis ? '直播答题结果' : '直播答题' }}
-      <image
-        wx:if="{{!isFull}}"
-        class="popup-close-icon"
-        src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lz0vxpq80hw7.svg"
-        catchtap="closePop"
-      />
-    </view>
-    <!-- 内容 -->
-    <view class="popup-content">
-      <!-- 结果解析 -->
-      <block wx:if="{{ showAnalysis }}">
-        <!-- 获奖结果区 -->
-        <view class="reward-show-box">
-          <view class="reward-condition">
-            <text>本次直播答题</text>
-            <text class="orange-color">{{join_result.qs_is_pass || quiz_task_item.qs_is_pass ? '达到' : '未达到'}}</text>
-            <text>获奖条件：答对 {{quiz_task_item.reward_frequency}} 道题</text>
-          </view>
-          <view class="reward-result">
-            <block wx:if="{{ ShowRewardTxt }}">
-              {{
-                join_result.qs_is_pass || quiz_task_item.qs_is_pass
-                  ? '获得奖励'
-                  : '未获得奖励'
-              }}
-            </block>
-            <view
-              wx:if="{{ ShowReward }}"
-              class="reward-result-show"
-            >
-              <image class="reward-img" src="{{ rewardIcon }}" />{{ rewardText }}
-            </view>
-          </view>
-        </view>
-        <!-- 解析区 -->
-        <view class="analysis-tip">解析</view>
-        <quizContent
-          wx:for="{{quizList}}"
-          questionContent="{{item}}"
-          quizIndex="{{index + 1}}"
-          showAnalysis="{{true}}"
-          wx:key="{{item.qs_id}}"
-        />
-      </block>
-      <!-- 答题内容 -->
-      <block wx:else>
-        <quizContent
-          wx:if="{{quizList.length > 0}}"
-          questionContent="{{quizList[currentIndex]}}"
-          quizIndex="{{currentIndex + 1}}"
-          catch:clickOption="clickOption"
-        />
-      </block>
-    </view>
-    <!-- 底部按钮 -->
-    <view wx:if="{{ !showAnalysis }}" class="content-footer">
-      <view
-        hidden="{{!(currentIndex !== 0 && total > 1)}}"
-        data-type="prev"
-        class="last-step"
-        catchtap="handleQuizOrder"
-      >
-        上一题
-      </view>
-      <view
-        hidden="{{!(currentIndex !== total - 1 && total > 1)}}"
-        data-type="next"
-        class="next-step"
-        catchtap="handleQuizOrder"
-      >
-        下一题
-      </view>
-      <view
-        hidden="{{!(total === 1 || currentIndex === total - 1)}}"
-        data-type="submit"
-        class="submit-step"
-        catchtap="handleQuizOrder"
-      >
-        提交
-      </view>
-    </view>
-  </van-popup>
-  <van-dialog id="van-dialog" />
-</view>
+<view class="task-quiz-popup" catchtap>
+  <van-popup
+  show="{{showPopup}}"
+  position="{{ popPosition }}"
+  custom-style="{{ customStyle }}"
+  z-index="{{500}}"
+  custom-class="quiz-popup"
+  safe-area-inset-bottom="{{ !showAnalysis }}"
+  overlay-style="{{ 'background-color: rgba(0, 0, 0, 0.8)' }}"
+  catch:close="closePop"
+  catch:click-overlay="closePop"
+  >
+    <!-- 标题 -->
+    <view class="content-header">
+      {{ showAnalysis ? '直播答题结果' : '直播答题' }}
+      <image
+        wx:if="{{!isFull}}"
+        class="popup-close-icon"
+        src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lz0vxpq80hw7.svg"
+        catchtap="closePop"
+      />
+    </view>
+    <!-- 内容 -->
+    <view class="popup-content">
+      <!-- 结果解析 -->
+      <block wx:if="{{ showAnalysis }}">
+        <!-- 获奖结果区 -->
+        <view class="reward-show-box">
+          <view class="reward-condition">
+            <text>本次直播答题</text>
+            <text class="orange-color">{{join_result.qs_is_pass || quiz_task_item.qs_is_pass ? '达到' : '未达到'}}</text>
+            <text>获奖条件：答对 {{quiz_task_item.reward_frequency}} 道题</text>
+          </view>
+          <view class="reward-result">
+            <block wx:if="{{ ShowRewardTxt }}">
+              {{
+                join_result.qs_is_pass || quiz_task_item.qs_is_pass
+                  ? '获得奖励'
+                  : '未获得奖励'
+              }}
+            </block>
+            <view
+              wx:if="{{ ShowReward }}"
+              class="reward-result-show"
+            >
+              <image class="reward-img" src="{{ rewardIcon }}" />{{ rewardText }}
+            </view>
+          </view>
+        </view>
+        <!-- 解析区 -->
+        <view class="analysis-tip">解析</view>
+        <quizContent
+          wx:for="{{quizList}}"
+          questionContent="{{item}}"
+          quizIndex="{{index + 1}}"
+          showAnalysis="{{true}}"
+          wx:key="{{item.qs_id}}"
+        />
+      </block>
+      <!-- 答题内容 -->
+      <block wx:else>
+        <quizContent
+          wx:if="{{quizList.length > 0}}"
+          questionContent="{{quizList[currentIndex]}}"
+          quizIndex="{{currentIndex + 1}}"
+          catch:clickOption="clickOption"
+        />
+      </block>
+    </view>
+    <!-- 底部按钮 -->
+    <view wx:if="{{ !showAnalysis }}" class="content-footer">
+      <view
+        hidden="{{!(currentIndex !== 0 && total > 1)}}"
+        data-type="prev"
+        class="last-step"
+        catchtap="handleQuizOrder"
+      >
+        上一题
+      </view>
+      <view
+        hidden="{{!(currentIndex !== total - 1 && total > 1)}}"
+        data-type="next"
+        class="next-step"
+        catchtap="handleQuizOrder"
+      >
+        下一题
+      </view>
+      <view
+        hidden="{{!(total === 1 || currentIndex === total - 1)}}"
+        data-type="submit"
+        class="submit-step"
+        catchtap="handleQuizOrder"
+      >
+        提交
+      </view>
+    </view>
+  </van-popup>
+  <van-dialog id="van-dialog" />
+</view>

package/miniprogram_dist/Task/common/task.js

@@ -1,55 +1,55 @@
-const computedBehavior = require('miniprogram-computed').behavior
-// 奖励icon配置
-const reward_config = {
-  1: {
-    label: '积分',
-    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5y1064s.png',
-  },
-  2: {
-    label: '优惠券',
-    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5y00wfn.png',
-  },
-  3: {
-    label: '红包',
-    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5xy0i8g.png',
-  },
-  4: {
-    label: '课程',
-    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5xu04is.png',
-  },
-  5: {
-    label: '奖品',
-    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5xz08pf.png',
-  },
-}
-
-export default Behavior({
-  behaviors: [computedBehavior],
-  data: {},
-  computed: {
-    // 奖励图标
-    rewardIcon(data) {
-      const { reward_type } = data.taskItem
-      return reward_config[reward_type]?.icon
-    },
-
-    // 奖励内容
-    rewardText(data) {
-      const { reward_type, reward_value, reward_pay_type, team_pay_config } = data.taskItem
-      const onlyOneType = [2, 4, 5]
-      if (onlyOneType.includes(reward_type)) {
-        return `+1 ${reward_config[reward_type]?.label}`
-      } else if (reward_type === 3) {
-        if (reward_pay_type === 0) {
-          return `+${(reward_value.money / 100).toFixed(2)} ${reward_config[reward_type]?.label}`
-        } else if (reward_pay_type === 10 && team_pay_config) {
-          const storeList = JSON.parse(team_pay_config)
-          const storeItem = storeList.find((item) => item.team_id === data.teamId)
-          if (storeItem) return `+${(storeItem.money / 100).toFixed(2)} ${reward_config[reward_type]?.label}`
-        }
-      } else {
-        return `+${reward_value} ${reward_config[reward_type]?.label}`
-      }
-    },
-  },
-})
+const computedBehavior = require('miniprogram-computed').behavior
+// 奖励icon配置
+const reward_config = {
+  1: {
+    label: '积分',
+    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5y1064s.png',
+  },
+  2: {
+    label: '优惠券',
+    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5y00wfn.png',
+  },
+  3: {
+    label: '红包',
+    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5xy0i8g.png',
+  },
+  4: {
+    label: '课程',
+    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5xu04is.png',
+  },
+  5: {
+    label: '奖品',
+    icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltrgz5xz08pf.png',
+  },
+}
+
+export default Behavior({
+  behaviors: [computedBehavior],
+  data: {},
+  computed: {
+    // 奖励图标
+    rewardIcon(data) {
+      const { reward_type } = data.taskItem
+      return reward_config[reward_type]?.icon
+    },
+
+    // 奖励内容
+    rewardText(data) {
+      const { reward_type, reward_value, reward_pay_type, team_pay_config } = data.taskItem
+      const onlyOneType = [2, 4, 5]
+      if (onlyOneType.includes(reward_type)) {
+        return `+1 ${reward_config[reward_type]?.label}`
+      } else if (reward_type === 3) {
+        if (reward_pay_type === 0) {
+          return `+${(reward_value.money / 100).toFixed(2)} ${reward_config[reward_type]?.label}`
+        } else if (reward_pay_type === 10 && team_pay_config) {
+          const storeList = JSON.parse(team_pay_config)
+          const storeItem = storeList.find((item) => item.team_id === data.teamId)
+          if (storeItem) return `+${(storeItem.money / 100).toFixed(2)} ${reward_config[reward_type]?.label}`
+        }
+      } else {
+        return `+${reward_value} ${reward_config[reward_type]?.label}`
+      }
+    },
+  },
+})