xiaoe_mp_npm 1.0.21 → 1.0.22-store1

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

@@ -1,141 +1,141 @@
-$deviceWidth: 750;
-
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin task-popup {
-  z-index: 500;
-  .decorate{
-    display: flex;
-    justify-content: space-between;
-    position: relative;
-    .close{
-      position: absolute;
-      right: vmin(26);
-      top: vmin(96);
-      width: vmin(64);
-      height: vmin(64);
-      &.hidden{
-        opacity: 0;
-      }
-    }
-    .gift-box{
-      left: vmin(0);
-      top: vmin(-60);
-      width: 100vmin;
-      height: vmin(192);
-      &.hidden{
-        opacity: 0;
-      }
-    }
-  }
-  
-  
-  .task-popup-header{
-    padding: vmin(24) vmin(32);
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    height: vmin(96);
-    box-sizing: border-box;
-    background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqz384r04hx.png') no-repeat;
-    background-size: contain;
-    
-    .to-reward{
-      padding: vmin(8) 0 vmin(8) vmin(16);
-      margin-left: vmin(24);
-      font-size: vmin(24);
-      display: flex;
-      color: #701616;
-      align-items: center;
-      image{
-        width: vmin(32);
-        height: vmin(32);
-      }        
-    }
-    .not-reward{
-      opacity: 0.4;
-    }
-    &.full-header{
-      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltzgkkyr0wfj.png');
-      height: vmin(152);
-      display: block;
-      background-size: contain;
-      .to-reward{
-        margin-top: vmin(64);
-        margin-left: 0;
-        padding-left: 0;
-      }
-    }
-  }
-  .reward-popup-header{
-    background: #FFEFD7;
-    display: flex;
-    padding: vmin(24) vmin(32);
-    align-items: center;
-    justify-content: space-between;
-    height: vmin(96);
-    box-sizing: border-box;
-    border-top-left-radius: vmin(24);
-    border-top-right-radius: vmin(24);
-    color: #701616;
-    &.full-header{
-      border-top-right-radius: 0;
-    }
-    .back{
-      width: vmin(32);
-      height: vmin(32);
-    }
-    .title{
-      font-size: vmin(32);
-    }
-    .reward-close{
-      width: vmin(32);
-      height: vmin(32);
-      &.hidden{
-        opacity: 0;
-      }
-    }
-  }
-
-  .popup-content{
-    box-sizing: border-box;
-    margin-bottom: vmin(32);
-    padding: 0 vmin(32) vmin(32) vmin(32);
-    min-height: 40vmin;
-    height: 100%;
-    background-size: 100% 100%;
-}
-}
-
-.task-popup {
-  @include task-popup;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .task-popup {
-    @include task-popup;
-  }
-}
-
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .task-popup {
-    @include task-popup;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .task-popup {
-    @include task-popup;
-  }
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin task-popup {
+  z-index: 500;
+  .decorate{
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+    .close{
+      position: absolute;
+      right: vmin(26);
+      top: vmin(96);
+      width: vmin(64);
+      height: vmin(64);
+      &.hidden{
+        opacity: 0;
+      }
+    }
+    .gift-box{
+      left: vmin(0);
+      top: vmin(-60);
+      width: 100vmin;
+      height: vmin(192);
+      &.hidden{
+        opacity: 0;
+      }
+    }
+  }
+  
+  
+  .task-popup-header{
+    padding: vmin(24) vmin(32);
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    height: vmin(96);
+    box-sizing: border-box;
+    background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqz384r04hx.png') no-repeat;
+    background-size: contain;
+    
+    .to-reward{
+      padding: vmin(8) 0 vmin(8) vmin(16);
+      margin-left: vmin(24);
+      font-size: vmin(24);
+      display: flex;
+      color: #701616;
+      align-items: center;
+      image{
+        width: vmin(32);
+        height: vmin(32);
+      }        
+    }
+    .not-reward{
+      opacity: 0.4;
+    }
+    &.full-header{
+      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltzgkkyr0wfj.png');
+      height: vmin(152);
+      display: block;
+      background-size: contain;
+      .to-reward{
+        margin-top: vmin(64);
+        margin-left: 0;
+        padding-left: 0;
+      }
+    }
+  }
+  .reward-popup-header{
+    background: #FFEFD7;
+    display: flex;
+    padding: vmin(24) vmin(32);
+    align-items: center;
+    justify-content: space-between;
+    height: vmin(96);
+    box-sizing: border-box;
+    border-top-left-radius: vmin(24);
+    border-top-right-radius: vmin(24);
+    color: #701616;
+    &.full-header{
+      border-top-right-radius: 0;
+    }
+    .back{
+      width: vmin(32);
+      height: vmin(32);
+    }
+    .title{
+      font-size: vmin(32);
+    }
+    .reward-close{
+      width: vmin(32);
+      height: vmin(32);
+      &.hidden{
+        opacity: 0;
+      }
+    }
+  }
+
+  .popup-content{
+    box-sizing: border-box;
+    margin-bottom: vmin(32);
+    padding: 0 vmin(32) vmin(32) vmin(32);
+    min-height: 40vmin;
+    height: 100%;
+    background-size: 100% 100%;
+}
+}
+
+.task-popup {
+  @include task-popup;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .task-popup {
+    @include task-popup;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .task-popup {
+    @include task-popup;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .task-popup {
+    @include task-popup;
+  }
 }

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

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"
+  }
+}