修改

public/drawCarousel.html

@@ -283,6 +283,7 @@
               state.prizeId = res.data.index;
               startRun();
             } else {
+              state.isRunning = false;
               ElementPlus.ElMessage({
                 showClose: true,
                 message: res.errmsg,
@@ -383,12 +384,13 @@
             ${bgColor.value}
             transform: rotate(${totalRunAngle.value - state.baseRunAngle}deg);
           `
-
-          ElementPlus.ElMessage({
-            showClose: true,
-            message: "恭喜抽中" + state.prizeList[state.prizeId].prizeName + "," + "请到个人中心查看。",
-            type: 'success',
-          })
+          if(state.prizeList[state.prizeId].prizeType!='40'){
+            ElementPlus.ElMessage({
+              showClose: true,
+              message: "恭喜抽中了" + state.prizeList[state.prizeId].prizeName + "," + "请到个人中心查看。",
+              type: 'success',
+            })
+          }
         }
 
         return {

src/api/allApi.js

@@ -246,18 +246,28 @@ export function welfareType(data) {
 }
 
 
-//用户福利、兑换券列表
-export function welfareList(query) {
+//兑换券列表
+export function myWelfareList(query) {
   return request({
     url: '/coupon/user/centre/list',
     method: 'get',
     params:query
   })
 }
+
+//用户福利
+export function welfareList(query) {
+  return request({
+    url: '/mall-act/user/welfare/list',
+    method: 'get',
+    params:query
+  })
+}
+
 //用户福利领取
 export function receiveWelfare(query) {
   return request({
-    url: '/mall-welfare/receive',
+    url: '/coupon/user/receive',
     method: 'post',
     params:query
   })

src/views/HomeView/MyCenter.vue

@@ -126,7 +126,7 @@
     </div>
 </template>
 <script scoped>
-import { orderList, welfareList,notice,integralTypes,userlogs, } from "@/api/allApi";
+import { orderList, myWelfareList,notice,integralTypes,userlogs, } from "@/api/allApi";
 import { getTab,setTab } from '@/utils/auth'
 export default {
     data() {
@@ -230,7 +230,7 @@ export default {
             })
         },
         getThirdList(){
-            welfareList().then(response=>{
+            myWelfareList().then(response=>{
                 const dataList = response.data.data;
                 dataList.forEach(element => {
                     element.couponImg = element.couponVo.couponImg;

src/views/HomeView/WelfareList.vue

@@ -12,14 +12,14 @@
                             <img :src="item.imgUrl" alt="图片" class="prize-img">
                         </div>
                         <div class="content">
-                            <h3 :title="item.content" class="title">{{ item.title }}</h3>
-                            <p class="desc"><span>{{ item.startTime }} ~ {{ item.endTime }}</span></p>
+                            <h3 :title="item.title" class="title">{{ item.title }}</h3>
+                            <p class="desc"><span :title="item.startTime+'~'+item.endTime">{{ item.startTime }} ~ {{ item.endTime }}</span></p>
                         </div>
                         <div class="btn-container">
-                            <button v-if="item.status==1" class="ui-btn default medium btn">已领取</button>
+                            <!-- <button v-if="item.status==1" class="ui-btn default medium btn">已领取</button>
                             <button v-if="item.status==9" class="ui-btn default medium btn">已过期</button>
-                            <button v-if="item.status==8" class="ui-btn default medium btn">敬请期待</button>
-                            <button v-if="item.status==0" @click="handleClickReceive(item.id)"
+                            <button v-if="item.status==8" class="ui-btn default medium btn">敬请期待</button> -->
+                            <button @click="handleClickReceive(item.actId)"
                                 class="ui-btn primary medium btn">立即领取</button>
                         </div>
                     </div>
@@ -68,23 +68,24 @@ export default {
             setTab('welfare');
         },
         getList() {
-            welfareList({status:'0,1,8,9'}).then(response => {
-                const dataList = response.data.data;
-                dataList.forEach(element => {
-                    element.imgUrl = element.relationWelfareVo.imgUrl;
-                    element.title = element.relationWelfareVo.title;
-                    element.startTime = element.relationWelfareVo.startTime;
-                    element.endTime = element.relationWelfareVo.endTime;
-                    element.welfareId = element.relationWelfareVo.welfareId;
-                });
-                console.log(dataList);
-                this.goodsList = dataList;
+            welfareList().then(response => {
+                this.goodsList = response.data.data;
+                // const dataList = response.data.data;
+                // dataList.forEach(element => {
+                //     element.imgUrl = element.relationWelfareVo.imgUrl;
+                //     element.title = element.relationWelfareVo.title;
+                //     element.startTime = element.relationWelfareVo.startTime;
+                //     element.endTime = element.relationWelfareVo.endTime;
+                //     element.welfareId = element.relationWelfareVo.welfareId;
+                // });
+                // console.log(dataList);
+                // this.goodsList = dataList;
             }).catch(() => {
                
             })
         },
         handleClickReceive(id){
-            receiveWelfare({voucherId:id,status:1}).then(response => {
+            receiveWelfare({actId:id}).then(response => {
                 if(response.data.errno==0){
                     this.goodsList.forEach(element => {
                         if(element.id==id){