From 882296007b177dda01feb10663ca20189b054db0 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Sat, 2 Mar 2024 12:52:11 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E6=8A=BD=E5=A5=96):[#972]=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E6=8A=BD=E4=B8=AD=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=9B=B4=E6=8E=A5=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=B9=B6=E4=BF=9D=E5=AD=98=E5=9C=A8=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E5=8D=A1=E5=8C=85=EF=BC=8C=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=86=8D=E9=80=9A=E8=BF=87=E6=8A=BD=E5=A5=96=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=BF=9B=E8=A1=8C=E9=A2=86=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg-video/views/lottery-log.vue | 76 ++++++++++++++++++++++-----------
 pkg-video/views/lottery.vue     | 14 +++++-
 2 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/pkg-video/views/lottery-log.vue b/pkg-video/views/lottery-log.vue
index 0d1ea47..57363ef 100644
--- a/pkg-video/views/lottery-log.vue
+++ b/pkg-video/views/lottery-log.vue
@@ -1,35 +1,48 @@
 <template>
-  <view class="pkg-lottery-log" v-if="ready">
-    <image style="width: 734rpx;height: 1418rpx" :src="webUrl+'/20240125215943273915.png'" mode="scaleToFill"/>
-
+  <view class="pkg-lottery-log">
+    <image
+      :src="webUrl+'/20240125215943273915.png'"
+      mode="scaleToFill"
+      style="width: 734rpx;height: 1418rpx"
+    />
     <view class="th flex">
       <view>日期</view>
       <view style="margin-left: 168rpx;">抽奖结果</view>
     </view>
-
-    <scroll-view class="list-box" scroll-y @scrolltolower="onBottom">
-      <view class="item flex jc-between ai-center" v-for="(item,index) in list" :key="index">
+    <scroll-view
+      scroll-y
+      class="list-box"
+      @scrolltolower="onBottom"
+    >
+      <view
+        v-for="(item, index) in list"
+        :key="index"
+        class="item flex jc-between ai-center"
+      >
         <view class="flex ai-center">
           <view style="width: 288rpx;color:#BD2323;font-size: 28rpx">{{ item['drawTime'] }}</view>
           <view class="more-t">{{ item['prizeName'] }}</view>
         </view>
-
-        <image class="flex-0" style="width: 111rpx;height: 64rpx" :src="webUrl+'/20240124232010456109.png'"
-               mode="scaleToFill" v-if="item['isHit']===1 && item['status']===1" @click="takeItem(item)"/>
+        <image
+          v-if="item['isHit'] === 1 && item['status'] === 1"
+          :src="webUrl+'/20240124232010456109.png'"
+          class="flex-0"
+          style="width: 111rpx;height: 64rpx"
+          mode="scaleToFill"
+          @click="takeItem(item, index)"
+        />
       </view>
     </scroll-view>
-
   </view>
 </template>
 
 <script>
 import {getLogs, takePrize} from "@/api/lottery";
-
 export default {
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
-      ready: false,
+      loading: false,
       page: 1,
       list: []
     }
@@ -40,30 +53,44 @@ export default {
     this.fetchList()
   },
   methods: {
-    async fetchList() {
-      const res = await getLogs(this.page, 20)
-      if (res.success) {
-        res.data['records']?.forEach(item => this.list.push(item))
-        this.ready = true
-      }
+    fetchList() {
+      this.loading = true
+      getLogs(this.page, 20).then(res => {
+        const { success, data } = res
+        if (success) {
+          if (data) {
+            if (data.records) {
+              data.records.map(item => {
+                this.list.push(item)
+              })
+            }
+          }
+        }
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      }).finally(() => {
+        this.loading = false
+      })
     },
-
     onBottom() {
+      if (this.loading) {
+        return
+      }
       this.page++
       this.fetchList()
     },
-
-    async takeItem  (item)  {
+    async takeItem(item)  {
+      // 领取商品
       if (item['prizeType'] === 1 && item['status'] === 1) {
         uni.navigateTo({
           url: '/pages/order/OrderSubmission/index?lotteryRecordId=' + item['id']
         })
         return
       }
-
       const res = await takePrize(item.id)
       if (res.success) {
-        item['status'] = 2
+        this.$set(this.list[index], 'status', 2)
         uni.showModal({
           title: '领取成功',
           content: '您的奖品已经领取成功，请前往我的订单查看奖品发货信息',
@@ -84,9 +111,6 @@ export default {
     }
   }
 }
-
-
-
 </script>
 
 <style scoped lang="less">
diff --git a/pkg-video/views/lottery.vue b/pkg-video/views/lottery.vue
index 0fdb3ef..20a104c 100644
--- a/pkg-video/views/lottery.vue
+++ b/pkg-video/views/lottery.vue
@@ -25,8 +25,15 @@
             获得{{ diceResult['prizeName'] }}一份
           </view>
         </view>
-        <image class="btn-result" style="width: 240rpx;height: 68rpx" :src="webUrl+'/20240125205521152611.png'"
-               mode="scaleToFill" @click="closeResultModel" v-if="diceResult['isHit']!==0"/>
+        <!-- fix bug#972: 抽奖抽中优惠券，优惠券直接自动领取并保存在优惠券卡包，不需要再通过抽奖记录进行领取 -->
+        <image
+          v-if="diceResult['isHit'] === 1 && diceResult.prizeType !== 3"
+          :src="webUrl+'/20240125205521152611.png'"
+          class="btn-result"
+          style="width: 240rpx;height: 68rpx"
+          mode="scaleToFill"
+          @click="closeResultModel"
+        />
       </view>
 
       <view class="dialog-take flex jc-center" :style="{'backgroundImage':`url(${webUrl}/20240124210904824337.png)`}"
@@ -90,6 +97,7 @@ export default {
       },
       diceImg: '',
       diceResult: {
+        prizeType: '', // 1-商城商品,2-积分,3-优惠券,4-谢谢参与
         prizeName: '',
         prizeImage: '',
         diceImage: '',
@@ -174,11 +182,13 @@ export default {
     },
 
     closeResultModel() {
+      // 谢谢参与
       if (this.diceResult['prizeType'] === 4) {
         this.showResult = false
         this.showDialog = false
         return
       }
+      // 领取商品
       if (this.diceResult['prizeType'] === 1) {
         this.showResult = false
         this.showDialog = false