xiaoe_mp_npm 1.0.21 → 1.0.22-store2

package/src/Task/TaskPopup/component/TaskList/index.wxss

@@ -1,118 +1,118 @@
-.task-list {
-  height: 100%;
-  min-height: 40vmin;
-  box-sizing: border-box;
-}
-.task-list .error-box {
-  background: #fff;
-  padding: 0.26667vmin 0.26667vmin 0 0.26667vmin;
-  position: relative;
-  margin-bottom: 3.2vmin;
-  border-radius: 2.13333vmin;
-  overflow: hidden;
-}
-.task-list .nothing {
-  display: flex;
-  align-items: center;
-  margin-top: 21.33333vmin;
-  flex-direction: column;
-}
-.task-list .nothing image {
-  width: 23.46667vmin;
-  height: 23.46667vmin;
-}
-.task-list .nothing .text {
-  font-size: 3.73333vmin;
-  color: #999999;
-  margin-top: 4.26667vmin;
-}
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  .task-list {
-    height: 100%;
-    min-height: 40vmin;
-    box-sizing: border-box;
-  }
-  .task-list .error-box {
-    background: #fff;
-    padding: 0.13021vmin 0.13021vmin 0 0.13021vmin;
-    position: relative;
-    margin-bottom: 1.5625vmin;
-    border-radius: 1.04167vmin;
-    overflow: hidden;
-  }
-  .task-list .nothing {
-    display: flex;
-    align-items: center;
-    margin-top: 10.41667vmin;
-    flex-direction: column;
-  }
-  .task-list .nothing image {
-    width: 11.45833vmin;
-    height: 11.45833vmin;
-  }
-  .task-list .nothing .text {
-    font-size: 1.82292vmin;
-    color: #999999;
-    margin-top: 2.08333vmin;
-  }
-}
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  .task-list {
-    height: 100%;
-    min-height: 40vmin;
-    box-sizing: border-box;
-  }
-  .task-list .error-box {
-    background: #fff;
-    padding: 0.15873vmin 0.15873vmin 0 0.15873vmin;
-    position: relative;
-    margin-bottom: 1.90476vmin;
-    border-radius: 1.26984vmin;
-    overflow: hidden;
-  }
-  .task-list .nothing {
-    display: flex;
-    align-items: center;
-    margin-top: 12.69841vmin;
-    flex-direction: column;
-  }
-  .task-list .nothing image {
-    width: 13.96825vmin;
-    height: 13.96825vmin;
-  }
-  .task-list .nothing .text {
-    font-size: 2.22222vmin;
-    color: #999999;
-    margin-top: 2.53968vmin;
-  }
-}
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  .task-list {
-    height: 100%;
-    min-height: 40vmin;
-    box-sizing: border-box;
-  }
-  .task-list .error-box {
-    background: #fff;
-    padding: 0.13021vmin 0.13021vmin 0 0.13021vmin;
-    position: relative;
-    margin-bottom: 1.5625vmin;
-    border-radius: 1.04167vmin;
-    overflow: hidden;
-  }
-  .task-list .nothing {
-    display: flex;
-    align-items: center;
-    margin-top: 10.41667vmin;
-    flex-direction: column;
-  }
-  .task-list .nothing image {
-    width: 11.45833vmin;
-    height: 11.45833vmin;
-  }
-  .task-list .nothing .text {
-    font-size: 1.82292vmin;
-    color: #999999;
-    margin-top: 2.08333vmin;
-  }
-}
+.task-list {
+  height: 100%;
+  min-height: 40vmin;
+  box-sizing: border-box;
+}
+.task-list .error-box {
+  background: #fff;
+  padding: 0.26667vmin 0.26667vmin 0 0.26667vmin;
+  position: relative;
+  margin-bottom: 3.2vmin;
+  border-radius: 2.13333vmin;
+  overflow: hidden;
+}
+.task-list .nothing {
+  display: flex;
+  align-items: center;
+  margin-top: 21.33333vmin;
+  flex-direction: column;
+}
+.task-list .nothing image {
+  width: 23.46667vmin;
+  height: 23.46667vmin;
+}
+.task-list .nothing .text {
+  font-size: 3.73333vmin;
+  color: #999999;
+  margin-top: 4.26667vmin;
+}
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .task-list {
+    height: 100%;
+    min-height: 40vmin;
+    box-sizing: border-box;
+  }
+  .task-list .error-box {
+    background: #fff;
+    padding: 0.13021vmin 0.13021vmin 0 0.13021vmin;
+    position: relative;
+    margin-bottom: 1.5625vmin;
+    border-radius: 1.04167vmin;
+    overflow: hidden;
+  }
+  .task-list .nothing {
+    display: flex;
+    align-items: center;
+    margin-top: 10.41667vmin;
+    flex-direction: column;
+  }
+  .task-list .nothing image {
+    width: 11.45833vmin;
+    height: 11.45833vmin;
+  }
+  .task-list .nothing .text {
+    font-size: 1.82292vmin;
+    color: #999999;
+    margin-top: 2.08333vmin;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .task-list {
+    height: 100%;
+    min-height: 40vmin;
+    box-sizing: border-box;
+  }
+  .task-list .error-box {
+    background: #fff;
+    padding: 0.15873vmin 0.15873vmin 0 0.15873vmin;
+    position: relative;
+    margin-bottom: 1.90476vmin;
+    border-radius: 1.26984vmin;
+    overflow: hidden;
+  }
+  .task-list .nothing {
+    display: flex;
+    align-items: center;
+    margin-top: 12.69841vmin;
+    flex-direction: column;
+  }
+  .task-list .nothing image {
+    width: 13.96825vmin;
+    height: 13.96825vmin;
+  }
+  .task-list .nothing .text {
+    font-size: 2.22222vmin;
+    color: #999999;
+    margin-top: 2.53968vmin;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .task-list {
+    height: 100%;
+    min-height: 40vmin;
+    box-sizing: border-box;
+  }
+  .task-list .error-box {
+    background: #fff;
+    padding: 0.13021vmin 0.13021vmin 0 0.13021vmin;
+    position: relative;
+    margin-bottom: 1.5625vmin;
+    border-radius: 1.04167vmin;
+    overflow: hidden;
+  }
+  .task-list .nothing {
+    display: flex;
+    align-items: center;
+    margin-top: 10.41667vmin;
+    flex-direction: column;
+  }
+  .task-list .nothing image {
+    width: 11.45833vmin;
+    height: 11.45833vmin;
+  }
+  .task-list .nothing .text {
+    font-size: 1.82292vmin;
+    color: #999999;
+    margin-top: 2.08333vmin;
+  }
+}

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

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

package/src/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/src/Task/TaskPopup/component/TaskType/index.wxss

@@ -1,110 +1,110 @@
-.collapse {
-  margin-bottom: 3.2vmin;
-  border-radius: 2.13333vmin;
-  overflow: hidden;
-}
-.collapse .content {
-  padding: 0;
-}
-.collapse .task-item {
-  display: flex;
-  align-items: center;
-}
-.collapse .task-item .type-img {
-  width: 10.66667vmin;
-  height: 10.66667vmin;
-}
-.collapse .task-item .type-title {
-  font-size: 3.73333vmin;
-  font-weight: 500;
-  margin-left: 2.13333vmin;
-  color: #333333;
-}
-.collapse .icon {
-  display: flex;
-  align-items: center;
-}
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  .collapse {
-    margin-bottom: 1.5625vmin;
-    border-radius: 1.04167vmin;
-    overflow: hidden;
-  }
-  .collapse .content {
-    padding: 0;
-  }
-  .collapse .task-item {
-    display: flex;
-    align-items: center;
-  }
-  .collapse .task-item .type-img {
-    width: 5.20833vmin;
-    height: 5.20833vmin;
-  }
-  .collapse .task-item .type-title {
-    font-size: 1.82292vmin;
-    font-weight: 500;
-    margin-left: 1.04167vmin;
-    color: #333333;
-  }
-  .collapse .icon {
-    display: flex;
-    align-items: center;
-  }
-}
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  .collapse {
-    margin-bottom: 1.90476vmin;
-    border-radius: 1.26984vmin;
-    overflow: hidden;
-  }
-  .collapse .content {
-    padding: 0;
-  }
-  .collapse .task-item {
-    display: flex;
-    align-items: center;
-  }
-  .collapse .task-item .type-img {
-    width: 6.34921vmin;
-    height: 6.34921vmin;
-  }
-  .collapse .task-item .type-title {
-    font-size: 2.22222vmin;
-    font-weight: 500;
-    margin-left: 1.26984vmin;
-    color: #333333;
-  }
-  .collapse .icon {
-    display: flex;
-    align-items: center;
-  }
-}
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  .collapse {
-    margin-bottom: 1.5625vmin;
-    border-radius: 1.04167vmin;
-    overflow: hidden;
-  }
-  .collapse .content {
-    padding: 0;
-  }
-  .collapse .task-item {
-    display: flex;
-    align-items: center;
-  }
-  .collapse .task-item .type-img {
-    width: 5.20833vmin;
-    height: 5.20833vmin;
-  }
-  .collapse .task-item .type-title {
-    font-size: 1.82292vmin;
-    font-weight: 500;
-    margin-left: 1.04167vmin;
-    color: #333333;
-  }
-  .collapse .icon {
-    display: flex;
-    align-items: center;
-  }
-}
+.collapse {
+  margin-bottom: 3.2vmin;
+  border-radius: 2.13333vmin;
+  overflow: hidden;
+}
+.collapse .content {
+  padding: 0;
+}
+.collapse .task-item {
+  display: flex;
+  align-items: center;
+}
+.collapse .task-item .type-img {
+  width: 10.66667vmin;
+  height: 10.66667vmin;
+}
+.collapse .task-item .type-title {
+  font-size: 3.73333vmin;
+  font-weight: 500;
+  margin-left: 2.13333vmin;
+  color: #333333;
+}
+.collapse .icon {
+  display: flex;
+  align-items: center;
+}
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .collapse {
+    margin-bottom: 1.5625vmin;
+    border-radius: 1.04167vmin;
+    overflow: hidden;
+  }
+  .collapse .content {
+    padding: 0;
+  }
+  .collapse .task-item {
+    display: flex;
+    align-items: center;
+  }
+  .collapse .task-item .type-img {
+    width: 5.20833vmin;
+    height: 5.20833vmin;
+  }
+  .collapse .task-item .type-title {
+    font-size: 1.82292vmin;
+    font-weight: 500;
+    margin-left: 1.04167vmin;
+    color: #333333;
+  }
+  .collapse .icon {
+    display: flex;
+    align-items: center;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .collapse {
+    margin-bottom: 1.90476vmin;
+    border-radius: 1.26984vmin;
+    overflow: hidden;
+  }
+  .collapse .content {
+    padding: 0;
+  }
+  .collapse .task-item {
+    display: flex;
+    align-items: center;
+  }
+  .collapse .task-item .type-img {
+    width: 6.34921vmin;
+    height: 6.34921vmin;
+  }
+  .collapse .task-item .type-title {
+    font-size: 2.22222vmin;
+    font-weight: 500;
+    margin-left: 1.26984vmin;
+    color: #333333;
+  }
+  .collapse .icon {
+    display: flex;
+    align-items: center;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .collapse {
+    margin-bottom: 1.5625vmin;
+    border-radius: 1.04167vmin;
+    overflow: hidden;
+  }
+  .collapse .content {
+    padding: 0;
+  }
+  .collapse .task-item {
+    display: flex;
+    align-items: center;
+  }
+  .collapse .task-item .type-img {
+    width: 5.20833vmin;
+    height: 5.20833vmin;
+  }
+  .collapse .task-item .type-title {
+    font-size: 1.82292vmin;
+    font-weight: 500;
+    margin-left: 1.04167vmin;
+    color: #333333;
+  }
+  .collapse .icon {
+    display: flex;
+    align-items: center;
+  }
+}

package/src/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,
         })
       }
-    }
+    },
   },
 })