xiaoe_mp_npm 1.0.21 → 1.0.22-store2

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.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.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.wxml

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

package/miniprogram_dist/Task/TaskPopup/index.js

@@ -1,132 +1,138 @@
 const computedBehavior = require('miniprogram-computed').behavior
-import { rpxToVmin } from '../../common/utils/index.js'
+import { rpxToVmin } from '../../npm-compoent/miniprogram_npm/xiaoe_mp_npm/common/utils/index.js'
 Component({
   options: {
     styleIsolation: 'shared',
   },
   behaviors: [computedBehavior],
   properties: {
-    showPopup:{
+    showPopup: {
       type: Boolean,
-      value: false
+      value: false,
     },
-    taskList:{
-      type:Array,
-      value:()=>{
+    taskList: {
+      type: Array,
+      value: () => {
         return []
-      }
+      },
     },
-    errorList:{
-      type:Array,
-      value:()=>{
+    errorList: {
+      type: Array,
+      value: () => {
         return []
-      }
+      },
     },
-    rewardList:{
-      type:Array,
-      value:()=>{
+    rewardList: {
+      type: Array,
+      value: () => {
         return []
-      }
+      },
     },
-    hasRewardRecord:{
-      type:Boolean,
-      value: false
+    hasRewardRecord: {
+      type: Boolean,
+      value: false,
     },
     popPosition: {
       type: String,
-      value: 'bottom'
+      value: 'bottom',
     },
-    isShowClose:{
-      type:Boolean,
-      value: true
+    isShowClose: {
+      type: Boolean,
+      value: true,
     },
-    rewardListRefreshStatus:{
-      type:Boolean,
-      value: false
+    rewardListRefreshStatus: {
+      type: Boolean,
+      value: false,
     },
-    taskListRefreshStatus:{
-      type:Boolean,
-      value: false
+    taskListRefreshStatus: {
+      type: Boolean,
+      value: false,
     },
     orientation: {
       type: String,
-      value: 'hor'
+      value: 'hor',
     },
     isFull: {
-      type:Boolean,
-      value: false
+      type: Boolean,
+      value: false,
     },
-    viewingInProgress:{
-      type:Array,
-      value:()=>{
+    viewingInProgress: {
+      type: Array,
+      value: () => {
         return []
-      }
+      },
+    },
+    teamId:{
+      type: String,
+      value: '',
     }
   },
   data: {
-    isShowTaskList:true
+    isShowTaskList: true,
   },
   lifetimes: {
     // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
-    attached: function () {
-
-    },
-    moved: function () { },
-    detached: function () { },
+    attached: function () {},
+    moved: function () {},
+    detached: function () {},
   },
   computed: {
     customStyle(properties) {
       const { popPosition, orientation } = properties
       const position = `position: ${orientation === 'ver' ? 'fixed' : 'absolute'}; left: 0; bottom: 0`
-      return popPosition === "bottom" ? `${position}; width: ${orientation === 'ver' ? '100%' : ''}; height: calc(100% - ${rpxToVmin(422)});` : "height: 100%;width: 100vmin;"
-    },
-    popupContentBackground(data){
-      if(data.isShowTaskList){
-        return data.isFull ? 'background-image: url(https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltzgkkz00m0m.png)' : 'background-image: url(https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqz384w02n9.png);'
-      }else{
-        return "background: #FFEFD7;"
+      return popPosition === 'bottom'
+        ? `${position}; width: ${orientation === 'ver' ? '100%' : ''}; height: calc(100% - ${rpxToVmin(422)});`
+        : 'height: 100%;width: 100vmin;'
+    },
+    popupContentBackground(data) {
+      if (data.isShowTaskList) {
+        return data.isFull
+          ? 'background-image: url(https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltzgkkz00m0m.png)'
+          : 'background-image: url(https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqz384w02n9.png);'
+      } else {
+        return 'background: #FFEFD7;'
       }
-    }
+    },
   },
   methods: {
-    toReward(){
-      if(!this.properties.hasRewardRecord){
+    toReward() {
+      if (!this.properties.hasRewardRecord) {
         wx.showToast({
-          title: "还未完成任务，加油~",
-          icon:"none"
+          title: '还未完成任务，加油~',
+          icon: 'none',
         })
         return
       }
-      this.triggerEvent("toReward")
+      this.triggerEvent('toReward')
       this.setData({
-        isShowTaskList: false
+        isShowTaskList: false,
       })
     },
-    toBack(){
+    toBack() {
       this.setData({
-        isShowTaskList: true
+        isShowTaskList: true,
       })
     },
-    closePop(){
-      this.triggerEvent("closePop")
+    closePop() {
+      this.triggerEvent('closePop')
     },
-    btnClick(e){
-      this.triggerEvent("btnClick",e.detail)
+    btnClick(e) {
+      this.triggerEvent('btnClick', e.detail)
     },
-    onLoad(e){
-      this.triggerEvent("onLoad",e)
+    onLoad(e) {
+      this.triggerEvent('onLoad', e)
+    },
+    getMoreList(e) {
+      this.triggerEvent('getMoreList', e)
     },
-    getMoreList(e){
-      this.triggerEvent("getMoreList",e)
-    }
   },
   observers: {
-    showPopup(newVal){
-      if(newVal){
+    showPopup(newVal) {
+      if (newVal) {
         this.setData({
-          isShowTaskList: true
+          isShowTaskList: true,
         })
       }
-    }
+    },
   },
 })

package/miniprogram_dist/Task/TaskPopup/index.json

@@ -1,8 +1,8 @@
 {
   "component": true,
   "usingComponents": {
-    "custom-popup": "../../CustomPopup/index",
+    "custom-popup": "../../npm-compoent/miniprogram_npm/xiaoe_mp_npm/CustomPopup/index",
     "task-list": "./component/TaskList",
     "reward-list": "./component/RewardList"
   }
-}
+}

package/miniprogram_dist/Task/TaskPopup/index.wxml

@@ -63,6 +63,7 @@
         bind:btnClick="btnClick"
         bind:onLoad="onLoad"
         refreshStatus="{{taskListRefreshStatus}}"
+        teamId="{{teamId}}"
       />
       <reward-list
         wx:else
@@ -71,6 +72,7 @@
         bind:onLoad="onLoad"
         bind:getMoreList="getMoreList"
         refreshStatus="{{rewardListRefreshStatus}}"
+        teamId="{{teamId}}"
       />
     </view>
   </custom-popup>

package/miniprogram_dist/Task/TaskQuizPopup/components/quizContent/index.js

@@ -0,0 +1,132 @@
+const computedBehavior = require('miniprogram-computed').behavior
+Component({
+  behaviors: [computedBehavior],
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 展示的题目内容对象
+    questionContent: {
+      type: Object,
+      value: {},
+      observer(val){
+        // 获取正确答案和用户作答的选项
+        if (val?.id) {
+          // 获取富文本的内容操作
+          // this.getRichTextContent(val)
+          const correctAnswer = this.getAnswerMap(val, val.correct_answer)
+          const userAnswer = this.getAnswerMap(val, val.user_answer)
+          this.setData({
+            correctAnswer,
+            userAnswer
+          })
+        }
+      }
+    },
+    // 是否是结果解析
+    showAnalysis: {
+      type: Boolean,
+      value: false,
+    },
+    // 题目序号
+    quizIndex: {
+      type: Number,
+      value: 1,
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    // 答案选项映射
+    optionIndexMap: [
+      'A',
+      'B',
+      'C',
+      'D',
+      'E',
+      'F',
+      'G',
+      'H',
+      'I',
+      'J',
+      'K',
+      'L',
+      'M',
+      'N',
+      'O',
+      'P',
+      'Q',
+      'R',
+      'S',
+      'T',
+      'U',
+      'V',
+      'W',
+      'X',
+      'Y',
+      'Z',
+    ],
+    correctAnswer: '', // 正确答案
+    userAnswer: '', // 用户作答选项
+  },
+  computed: {
+    // 单选题/多选题/判断题才会显示答案
+    isShowOptionList({ questionContent }) {
+      return [0, 1, 3].includes(questionContent?.qs_type)
+    },
+    // 用户是否回答正确
+    isSuccess({ questionContent }) {
+      let correctAnswer = questionContent?.correct_answer
+      let userAnswer = questionContent?.user_answer
+      return (
+        correctAnswer &&
+        userAnswer &&
+        userAnswer.length === correctAnswer.length &&
+        userAnswer.every((val) => correctAnswer.includes(val))
+      )
+    },
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 选择答案操作
+    clickOption(e) {
+      // 查看解析情况下，不能选择
+      if (this.data.showAnalysis) return
+      this.triggerEvent('clickOption', e.currentTarget.dataset.index)
+    },  
+    /**
+     * 获取答案对应的结果
+     * @param questionContent 题目内容
+     * @param answerList 需要操作的答案列表
+     * @returns 
+     */
+    getAnswerMap(questionContent, answerList) {
+      if (!this.data.showAnalysis) return ''
+      let letters = []
+      let temp = JSON.parse(JSON.stringify(answerList))
+      if (typeof temp === 'number') {
+        temp = [temp]
+      }
+      questionContent.options.forEach((item, index) => {
+        if (temp.indexOf(String(item.op_id)) >= 0) {
+          // 如果是判断题写入的是正确，错误
+          if (questionContent.qs_type === 3) {
+            letters.push(
+              this.data.optionIndexMap[index] === 'A'
+                ? '正确'
+                : '错误'
+            )
+          } else {
+            letters.push(this.data.optionIndexMap[index])
+          }
+        }
+      })
+      return letters.join(' ')
+    },
+  }
+})

package/miniprogram_dist/Task/TaskQuizPopup/components/quizContent/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "quizRichText": "../quizRichText/index"
+  }
+}