xiaoe_mp_npm 1.0.45-test01 → 1.0.45-test02

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

@@ -489,28 +489,28 @@ Component({
     // 新版商户提现按钮文案
     withdrawBtnText(taskItem) {
       const { reward_value } = taskItem
+      let unableBtn = true,
+        ButtonText = '超时未提现'
       switch (reward_value.pay_state) {
         case 0:
         case 2:
         case 11:
-          this.setData({
-            unableBtn: false,
-          })
-          return '立即提现'
+          ButtonText = '立即提现'
+          unableBtn = false
+          break
         case 5:
-          this.setData({
-            unableBtn: true,
-          })
-          return '已提现'
+          ButtonText = '已提现'
+          break
         case 10:
-          this.setData({
-            unableBtn: true,
-          })
-          return '超时未提现'
+          ButtonText = '超时未提现'
+          break
         default:
           break
       }
-      return '超时未提现'
+      this.setData({
+        unableBtn,
+      })
+      return ButtonText
     },
     // 打开答题任务答案解析
     handleAnswerAnalysis() {

package/miniprogram_dist/Task/taskReceivePopup/integral/index.js

@@ -22,6 +22,18 @@ Component({
     rewardData: {
       type: Object,
       value: {},
+      observer(val) {
+        const { reward_value = {}, reward_pay_type, team_pay_config } = val.live_task || {}
+        let red_packet_id = reward_value.red_packet_id || 0
+        // 如果是门店红包的话，需要遍历获取team_id获取对应红包id
+        if (+reward_pay_type === 10) {
+          const teamList = JSON.parse(team_pay_config)
+          red_packet_id = teamList.find((item) => item.team_id === this.data.teamId).red_packet_id
+        }
+        this.setData({
+          red_packet_id,
+        })
+      },
     },
     teamId: {
       type: String,
@@ -41,7 +53,9 @@ Component({
   /**
    * 组件的初始数据
    */
-  data: {},
+  data: {
+    red_packet_id: 0,
+  },
   computed: {
     awardImg(data) {
       let { reward_type } = data.rewardData.live_task

package/miniprogram_dist/Task/taskReceivePopup/integral/index.wxml

@@ -15,7 +15,7 @@
     alive_id="{{ roomInfo.alive_id }}"
     user_id="{{roomInfo.user_id}}"
     alive_room_url="{{roomInfo.alive_room_url}}"
-    red_packet_id="{{rewardData.live_task.reward_value.red_packet_id}}"
+    red_packet_id="{{red_packet_id}}"
     bind:success="closePopup"
   ></instant-withdraw>
   <view class="receive-container__btn" catchtap="closePopup" wx:else>开心收下</view>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "1.0.45-test01",
+  "version": "1.0.45-test02",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {
@@ -75,4 +75,4 @@
     "miniprogram-computed": "4.2.1",
     "mp-plugins-info-collection": "1.1.4"
   }
-}
+}

package/src/Task/TaskIcon/index.wxss

@@ -1,130 +1,130 @@
-.taskIcon {
-  z-index: 9;
-  box-sizing: border-box;
-  width: 9.6vmin;
-  height: 9.6vmin;
-  text-align: center;
-  padding: 0;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  font-size: 2.13333vmin;
-  height: 100%;
-  border-radius: 2.13333vmin;
-  margin: 0 4.26667vmin 3.2vmin 0;
-  pointer-events: auto;
-}
-.taskIcon .task-icon {
-  flex-shrink: 0;
-  display: block;
-  width: 8.53333vmin;
-  height: 8.53333vmin;
-  background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopok62p0l77.png");
-  background-size: 100% 100%;
-}
-.taskIcon .task-text {
-  width: 9.33333vmin;
-  height: 3.2vmin;
-  line-height: 3.2vmin;
-  border-radius: 1.6vmin;
-  font-size: 2.13333vmin;
-  background: rgba(0, 0, 0, 0.4);
-  color: #fff;
-}
-.taskIcon.verticalStyle {
-  margin: 0;
-  background: rgba(0, 0, 0, 0.2);
-}
-.taskIcon.verticalStyle .task-text {
-  position: absolute;
-  bottom: -0.26667vmin;
-}
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  .taskIcon {
-    z-index: 9;
-    box-sizing: border-box;
-    width: 4.6875vmin;
-    height: 4.6875vmin;
-    text-align: center;
-    padding: 0;
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    font-size: 1.04167vmin;
-    height: 100%;
-    border-radius: 1.04167vmin;
-    margin: 0 2.08333vmin 1.5625vmin 0;
-    pointer-events: auto;
-  }
-  .taskIcon .task-icon {
-    flex-shrink: 0;
-    display: block;
-    width: 4.16667vmin;
-    height: 4.16667vmin;
-    background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopok62p0l77.png");
-    background-size: 100% 100%;
-  }
-  .taskIcon .task-text {
-    width: 4.55729vmin;
-    height: 1.5625vmin;
-    line-height: 1.5625vmin;
-    border-radius: 0.78125vmin;
-    font-size: 1.04167vmin;
-    background: rgba(0, 0, 0, 0.4);
-    color: #fff;
-  }
-  .taskIcon.verticalStyle {
-    margin: 0;
-    background: rgba(0, 0, 0, 0.2);
-  }
-  .taskIcon.verticalStyle .task-text {
-    position: absolute;
-    bottom: -0.13021vmin;
-  }
-}
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  .taskIcon {
-    z-index: 9;
-    box-sizing: border-box;
-    width: 4.6875vmin;
-    height: 4.6875vmin;
-    text-align: center;
-    padding: 0;
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    font-size: 1.04167vmin;
-    height: 100%;
-    border-radius: 1.04167vmin;
-    margin: 0 2.08333vmin 1.5625vmin 0;
-    pointer-events: auto;
-  }
-  .taskIcon .task-icon {
-    flex-shrink: 0;
-    display: block;
-    width: 4.16667vmin;
-    height: 4.16667vmin;
-    background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopok62p0l77.png");
-    background-size: 100% 100%;
-  }
-  .taskIcon .task-text {
-    width: 4.55729vmin;
-    height: 1.5625vmin;
-    line-height: 1.5625vmin;
-    border-radius: 0.78125vmin;
-    font-size: 1.04167vmin;
-    background: rgba(0, 0, 0, 0.4);
-    color: #fff;
-  }
-  .taskIcon.verticalStyle {
-    margin: 0;
-    background: rgba(0, 0, 0, 0.2);
-  }
-  .taskIcon.verticalStyle .task-text {
-    position: absolute;
-    bottom: -0.13021vmin;
-  }
-}
+.taskIcon {
+  z-index: 9;
+  box-sizing: border-box;
+  width: 9.6vmin;
+  height: 9.6vmin;
+  text-align: center;
+  padding: 0;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  font-size: 2.13333vmin;
+  height: 100%;
+  border-radius: 2.13333vmin;
+  margin: 0 4.26667vmin 3.2vmin 0;
+  pointer-events: auto;
+}
+.taskIcon .task-icon {
+  flex-shrink: 0;
+  display: block;
+  width: 8.53333vmin;
+  height: 8.53333vmin;
+  background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopok62p0l77.png");
+  background-size: 100% 100%;
+}
+.taskIcon .task-text {
+  width: 9.33333vmin;
+  height: 3.2vmin;
+  line-height: 3.2vmin;
+  border-radius: 1.6vmin;
+  font-size: 2.13333vmin;
+  background: rgba(0, 0, 0, 0.4);
+  color: #fff;
+}
+.taskIcon.verticalStyle {
+  margin: 0;
+  background: rgba(0, 0, 0, 0.2);
+}
+.taskIcon.verticalStyle .task-text {
+  position: absolute;
+  bottom: -0.26667vmin;
+}
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .taskIcon {
+    z-index: 9;
+    box-sizing: border-box;
+    width: 4.6875vmin;
+    height: 4.6875vmin;
+    text-align: center;
+    padding: 0;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    font-size: 1.04167vmin;
+    height: 100%;
+    border-radius: 1.04167vmin;
+    margin: 0 2.08333vmin 1.5625vmin 0;
+    pointer-events: auto;
+  }
+  .taskIcon .task-icon {
+    flex-shrink: 0;
+    display: block;
+    width: 4.16667vmin;
+    height: 4.16667vmin;
+    background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopok62p0l77.png");
+    background-size: 100% 100%;
+  }
+  .taskIcon .task-text {
+    width: 4.55729vmin;
+    height: 1.5625vmin;
+    line-height: 1.5625vmin;
+    border-radius: 0.78125vmin;
+    font-size: 1.04167vmin;
+    background: rgba(0, 0, 0, 0.4);
+    color: #fff;
+  }
+  .taskIcon.verticalStyle {
+    margin: 0;
+    background: rgba(0, 0, 0, 0.2);
+  }
+  .taskIcon.verticalStyle .task-text {
+    position: absolute;
+    bottom: -0.13021vmin;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .taskIcon {
+    z-index: 9;
+    box-sizing: border-box;
+    width: 4.6875vmin;
+    height: 4.6875vmin;
+    text-align: center;
+    padding: 0;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    font-size: 1.04167vmin;
+    height: 100%;
+    border-radius: 1.04167vmin;
+    margin: 0 2.08333vmin 1.5625vmin 0;
+    pointer-events: auto;
+  }
+  .taskIcon .task-icon {
+    flex-shrink: 0;
+    display: block;
+    width: 4.16667vmin;
+    height: 4.16667vmin;
+    background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopok62p0l77.png");
+    background-size: 100% 100%;
+  }
+  .taskIcon .task-text {
+    width: 4.55729vmin;
+    height: 1.5625vmin;
+    line-height: 1.5625vmin;
+    border-radius: 0.78125vmin;
+    font-size: 1.04167vmin;
+    background: rgba(0, 0, 0, 0.4);
+    color: #fff;
+  }
+  .taskIcon.verticalStyle {
+    margin: 0;
+    background: rgba(0, 0, 0, 0.2);
+  }
+  .taskIcon.verticalStyle .task-text {
+    position: absolute;
+    bottom: -0.13021vmin;
+  }
+}

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

@@ -489,28 +489,28 @@ Component({
     // 新版商户提现按钮文案
     withdrawBtnText(taskItem) {
       const { reward_value } = taskItem
+      let unableBtn = true,
+        ButtonText = '超时未提现'
       switch (reward_value.pay_state) {
         case 0:
         case 2:
         case 11:
-          this.setData({
-            unableBtn: false,
-          })
-          return '立即提现'
+          ButtonText = '立即提现'
+          unableBtn = false
+          break
         case 5:
-          this.setData({
-            unableBtn: true,
-          })
-          return '已提现'
+          ButtonText = '已提现'
+          break
         case 10:
-          this.setData({
-            unableBtn: true,
-          })
-          return '超时未提现'
+          ButtonText = '超时未提现'
+          break
         default:
           break
       }
-      return '超时未提现'
+      this.setData({
+        unableBtn,
+      })
+      return ButtonText
     },
     // 打开答题任务答案解析
     handleAnswerAnalysis() {