xiaoe_mp_npm 1.0.21 → 1.0.22-store1

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.wxml

@@ -1,8 +1,6 @@
 <wxs src="./index.wxs" module="filter" />
 
-<view
-  class="item-box {{lineClass?'line-class':''}} {{listType === 'error' && itemIndex === 0?'bg-change':''}} {{isRadius?'radius':''}} {{isMb?'mb':''}}"
->
+<view class="item-box {{lineClass?'line-class':''}} {{listType === 'error' && itemIndex === 0?'bg-change':''}} {{isRadius?'radius':''}} {{isMb?'mb':''}}">
   <!-- 左侧任务详情 -->
   <view class="left">
     <!-- 任务标题 && 奖励 -->
@@ -12,17 +10,16 @@
       <view class="title" wx:if="{{listType === 'reward'}}">{{ rewardText }}</view>
 
       <!-- 奖励内容 -->
-      <view class="reward" wx:if="{{listType === 'task' || listType === 'error'}}">
+      <view class="reward" wx:if="{{isShowReward}}">
         <image class="reward-img" src="{{rewardIcon}}" />
         <view class="reward-text">{{ rewardText }}</view>
       </view>
     </view>
 
     <!-- 任务时间 -->
-    <view
-      class="time"
-      wx:if="{{listType === 'task' || listType === 'error'}}"
-    >任务时间：{{taskItem.show_start_at}} 至 {{taskItem.show_end_at}}</view>
+    <view class="time" wx:if="{{listType === 'task' || listType === 'error'}}">
+      任务时间：{{taskItem.show_start_at}} 至 {{taskItem.show_end_at}}
+    </view>
 
     <view class="time" wx:if="{{listType === 'reward'}}">获得方式：{{ taskTitle }}</view>
 
@@ -36,12 +33,34 @@
 
     <!-- 奖励发放异常提示 -->
     <view class="task-tip" wx:if="{{taskItem.is_show_reward_info}}">奖励发放中，请稍后查看</view>
-    <view class="task-tip" wx:if="{{listType === 'task' && taskItem.reward_state === 3}}">奖品异常，无法领取，请联系商家处理</view>
+    <view class="task-tip" wx:if="{{listType === 'task' && taskItem.reward_state === 3 && taskItem.task_condition !== '10'}}">
+      奖品异常，无法领取，请联系商家处理
+    </view>
+
+    <!-- 答题任务没完成的提示情况处理  -->
+    <view class="task-tip" wx:if="{{showAnswerTaskIntroduce}}">
+      <!-- 完成但不满足条件 -->
+      <text class="warning-text" wx:if="{{!taskItem.qs_is_pass}}">未达到获奖条件：答对 {{taskItem.reward_frequency}} 题</text>
+      <!-- 完成 -->
+      <text wx:else class="finish-text">已达到获奖条件：答对 {{taskItem.reward_frequency}} 题</text>
+      <!-- 查看解析按钮, 只有开启了解析查看才会显示  -->
+      <view
+        wx:if="{{taskItem.is_show_answer === 1}}"
+        class="show-answer"
+        catch:tap="handleAnswerAnalysis"
+      >
+        查看解析
+        <image class="analysis-icon" src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lyqwwwi10xtb.svg" />
+      </view>
+    </view>
+
+    <!-- 超时没完成 -->
+    <view class="task-tip" wx:if="{{taskItem.join_state === 0 && taskItem.state === 2}}">已超时，未获得奖励</view>
   </view>
 
   <!-- 右侧按钮 -->
-  <view
-    class="btn {{listType === 'reward'?'reward-btn':''}} {{listType==='task' && (taskItem.join_state === 2 || taskItem.join_state === 3 || taskItem.join_state === 0 || taskItem.state === 2)?'gray-btn':''}}"
-    catch:tap="btnClick"
-  >{{btnText}}</view>
+  <view class="btn {{listType === 'reward' && 'reward-btn'}} {{(listType==='task' && (taskItem.join_state === 2 || taskItem.join_state === 3 || taskItem.join_state === 0 || taskItem.state === 2))&&'gray-btn'}} {{getFailStatus && 'orange-btn'}}" catch:tap="btnClick">
+    {{btnText}}
+  </view>
 </view>
+

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.wxs

@@ -1,8 +1,8 @@
-var secondsToMinutes = function(seconds){
-  minutes = Math.floor(seconds / 60);
-  return Math.floor(seconds / 60)
-}
-
-module.exports = {
-  secondsToMinutes: secondsToMinutes,
+var secondsToMinutes = function(seconds){
+  minutes = Math.floor(seconds / 60);
+  return Math.floor(seconds / 60)
+}
+
+module.exports = {
+  secondsToMinutes: secondsToMinutes,
 }

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.wxss

@@ -71,8 +71,27 @@
   margin-top: 1.06667vmin;
   font-size: 3.2vmin;
   color: #FF5429;
+  font-family: "PingFang SC";
+  line-height: 4.26667vmin;
+  align-items: center;
+}
+.item-box .left .task-tip .finish-text {
+  display: inline-block;
+  color: #999999;
+}
+.item-box .left .task-tip .show-answer {
+  display: inline-flex;
+  align-items: center;
+  margin-left: 2.66667vmin;
+  font-style: normal;
+  font-weight: 400;
   line-height: 4.26667vmin;
 }
+.item-box .left .task-tip .show-answer .analysis-icon {
+  width: 3.2vmin;
+  height: 3.2vmin;
+  margin-left: -vmin(4);
+}
 .item-box .btn {
   width: 19.2vmin;
   height: 7.46667vmin;
@@ -95,6 +114,11 @@
   background: #F5F5F5;
   color: #B2B2B2;
 }
+.item-box .btn.orange-btn {
+  color: #ffffff;
+  opacity: 0.4;
+  background: #ff5429;
+}
 @media screen and (min-width: 768px) and (orientation: portrait) {
   .item-box {
     display: flex;
@@ -169,8 +193,27 @@
     margin-top: 0.52083vmin;
     font-size: 1.5625vmin;
     color: #FF5429;
+    font-family: "PingFang SC";
+    line-height: 2.08333vmin;
+    align-items: center;
+  }
+  .item-box .left .task-tip .finish-text {
+    display: inline-block;
+    color: #999999;
+  }
+  .item-box .left .task-tip .show-answer {
+    display: inline-flex;
+    align-items: center;
+    margin-left: 1.30208vmin;
+    font-style: normal;
+    font-weight: 400;
     line-height: 2.08333vmin;
   }
+  .item-box .left .task-tip .show-answer .analysis-icon {
+    width: 1.5625vmin;
+    height: 1.5625vmin;
+    margin-left: -vmin(4);
+  }
   .item-box .btn {
     width: 9.375vmin;
     height: 3.64583vmin;
@@ -193,6 +236,11 @@
     background: #F5F5F5;
     color: #B2B2B2;
   }
+  .item-box .btn.orange-btn {
+    color: #ffffff;
+    opacity: 0.4;
+    background: #ff5429;
+  }
 }
 @media screen and (min-height: 630px) and (orientation: landscape) {
   .item-box {
@@ -268,8 +316,27 @@
     margin-top: 0.63492vmin;
     font-size: 1.90476vmin;
     color: #FF5429;
+    font-family: "PingFang SC";
+    line-height: 2.53968vmin;
+    align-items: center;
+  }
+  .item-box .left .task-tip .finish-text {
+    display: inline-block;
+    color: #999999;
+  }
+  .item-box .left .task-tip .show-answer {
+    display: inline-flex;
+    align-items: center;
+    margin-left: 1.5873vmin;
+    font-style: normal;
+    font-weight: 400;
     line-height: 2.53968vmin;
   }
+  .item-box .left .task-tip .show-answer .analysis-icon {
+    width: 1.90476vmin;
+    height: 1.90476vmin;
+    margin-left: -vmin(4);
+  }
   .item-box .btn {
     width: 11.42857vmin;
     height: 4.44444vmin;
@@ -292,6 +359,11 @@
     background: #F5F5F5;
     color: #B2B2B2;
   }
+  .item-box .btn.orange-btn {
+    color: #ffffff;
+    opacity: 0.4;
+    background: #ff5429;
+  }
 }
 @media screen and (min-height: 768px) and (orientation: landscape) {
   .item-box {
@@ -367,8 +439,27 @@
     margin-top: 0.52083vmin;
     font-size: 1.5625vmin;
     color: #FF5429;
+    font-family: "PingFang SC";
+    line-height: 2.08333vmin;
+    align-items: center;
+  }
+  .item-box .left .task-tip .finish-text {
+    display: inline-block;
+    color: #999999;
+  }
+  .item-box .left .task-tip .show-answer {
+    display: inline-flex;
+    align-items: center;
+    margin-left: 1.30208vmin;
+    font-style: normal;
+    font-weight: 400;
     line-height: 2.08333vmin;
   }
+  .item-box .left .task-tip .show-answer .analysis-icon {
+    width: 1.5625vmin;
+    height: 1.5625vmin;
+    margin-left: -vmin(4);
+  }
   .item-box .btn {
     width: 9.375vmin;
     height: 3.64583vmin;
@@ -391,4 +482,9 @@
     background: #F5F5F5;
     color: #B2B2B2;
   }
+  .item-box .btn.orange-btn {
+    color: #ffffff;
+    opacity: 0.4;
+    background: #ff5429;
+  }
 }

package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.js

@@ -47,6 +47,10 @@ const taskTypeConfig = {
     9:{
       title: "签到",
       icon: "https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfaylp019h.png"
+    },
+    10:{
+      title: "答题",
+      icon: "https://commonresource-1252524126.cdn.xiaoeknow.com/image/lzl1plgd0mex.png"
     }
   }
 }
@@ -74,6 +78,10 @@ Component({
       value:()=>{
         return []
       }
+    },
+    teamId:{
+      type: String,
+      value: '',
     }
   },
   data: {

package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.json

@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "task-type": "../TaskType",
-    "task-item": "../TaskItem"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "task-type": "../TaskType",
+    "task-item": "../TaskItem"
+  }
+}

package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.scss

@@ -1,67 +1,67 @@
-$deviceWidth: 750;
-
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin task-list{
-  height: 100%;
-  min-height: 40vmin;
-  // padding-bottom: vmin(32);
-  box-sizing: border-box;
-  .error-box{
-    background: #fff;
-    padding: vmin(2) vmin(2) 0 vmin(2);
-    position: relative;
-    margin-bottom: vmin(24);
-    border-radius: vmin(16);
-    overflow: hidden;
-  }
-
-  .nothing{
-    display: flex;
-    align-items: center;
-    margin-top: vmin(160);
-    flex-direction: column;
-    image{
-      width: vmin(176);
-      height: vmin(176);
-    }
-    .text{
-      font-size: vmin(28);
-      color: #999999;
-      margin-top: vmin(32);
-    }
-  }
-}
-
-.task-list {
-  @include task-list;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .task-list {
-    @include task-list;
-  }
-}
-
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .task-list {
-    @include task-list;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .task-list {
-    @include task-list;
-  }
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin task-list{
+  height: 100%;
+  min-height: 40vmin;
+  // padding-bottom: vmin(32);
+  box-sizing: border-box;
+  .error-box{
+    background: #fff;
+    padding: vmin(2) vmin(2) 0 vmin(2);
+    position: relative;
+    margin-bottom: vmin(24);
+    border-radius: vmin(16);
+    overflow: hidden;
+  }
+
+  .nothing{
+    display: flex;
+    align-items: center;
+    margin-top: vmin(160);
+    flex-direction: column;
+    image{
+      width: vmin(176);
+      height: vmin(176);
+    }
+    .text{
+      font-size: vmin(28);
+      color: #999999;
+      margin-top: vmin(32);
+    }
+  }
+}
+
+.task-list {
+  @include task-list;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .task-list {
+    @include task-list;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .task-list {
+    @include task-list;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .task-list {
+    @include task-list;
+  }
 }

package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.wxml

@@ -30,6 +30,7 @@
     wx:key="id"
     bind:btnClick="btnClick"
     viewingInProgress="{{viewingInProgress}}"
+    teamId="{{teamId}}"
   ></task-type>
 
   <!-- 空状态 -->

package/miniprogram_dist/Task/TaskPopup/component/TaskType/index.js

@@ -20,6 +20,10 @@ Component({
       value:()=>{
         return []
       }
+    },
+    teamId:{
+      type: String,
+      value: '',
     }
   },
   data: {

package/miniprogram_dist/Task/TaskPopup/component/TaskType/index.json

@@ -1,9 +1,9 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-collapse": "@vant/weapp/collapse/index",
-    "van-collapse-item": "@vant/weapp/collapse-item/index",
-    "van-icon": "@vant/weapp/icon/index",
-    "task-item": "../TaskItem"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-collapse": "@vant/weapp/collapse/index",
+    "van-collapse-item": "@vant/weapp/collapse-item/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "task-item": "../TaskItem"
+  }
+}

package/miniprogram_dist/Task/TaskPopup/component/TaskType/index.scss

@@ -1,63 +1,63 @@
-$deviceWidth: 750;
-
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin collapse{
-  margin-bottom: vmin(24);
-  border-radius: vmin(16);
-  overflow: hidden;
-  .content{
-    padding: 0;
-  }
-  .task-item {
-    display: flex;
-    align-items: center;
-    .type-img {
-      width: vmin(80);
-      height: vmin(80);
-    }
-    .type-title {
-      font-size: vmin(28);
-      font-weight: 500;
-      margin-left: vmin(16);
-      color: #333333;
-    }
-  }
-  .icon{
-    display: flex;
-    align-items: center;
-  }
-}
-
-.collapse {
-  @include collapse;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .collapse {
-    @include collapse;
-  }
-}
-
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .collapse {
-    @include collapse;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .collapse {
-    @include collapse;
-  }
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin collapse{
+  margin-bottom: vmin(24);
+  border-radius: vmin(16);
+  overflow: hidden;
+  .content{
+    padding: 0;
+  }
+  .task-item {
+    display: flex;
+    align-items: center;
+    .type-img {
+      width: vmin(80);
+      height: vmin(80);
+    }
+    .type-title {
+      font-size: vmin(28);
+      font-weight: 500;
+      margin-left: vmin(16);
+      color: #333333;
+    }
+  }
+  .icon{
+    display: flex;
+    align-items: center;
+  }
+}
+
+.collapse {
+  @include collapse;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .collapse {
+    @include collapse;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .collapse {
+    @include collapse;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .collapse {
+    @include collapse;
+  }
 }

package/miniprogram_dist/Task/TaskPopup/component/TaskType/index.wxml

@@ -37,6 +37,7 @@
         taskItem="{{item}}"
         bind:btnClick="btnClick"
         viewingInProgress="{{viewingInProgress}}"
+        teamId="{{teamId}}"
       />
     </van-collapse-item>
   </van-collapse>