sunlupeng hai 1 ano
pai
achega
d7fab5dd77

BIN=BIN
src/assets/image/answerGame/WeekKaijiang/gift.png


BIN=BIN
src/assets/image/gift.png


+ 3 - 1
src/components/AppHeader.vue

@@ -35,12 +35,14 @@
                 <el-avatar fit="fill" :size="50" :src="avatar"></el-avatar>
                 <div class="nameAndIntegral">
                     <div>姓名: {{ userInfo.userName }}</div>
-                    <div>
+                    <div style="display: flex;align-items: center;">
                         积分: <span class="blue">{{ userInfo.surplusIntegral }}</span>
                         <router-link to="/ipay">
                             <span class="ipay-btn">充值</span>
                         </router-link>
+                        <img style="height: 24px;margin-left: 10px;" src="@/assets/image/gift.png" alt="返奖">
                     </div>
+                    
                 </div>
             </div>
         </nav>

+ 1 - 1
src/components/SiderInfo.vue

@@ -15,7 +15,7 @@
                 </button>
             </div>
         </div>
-        <div class="sidebar-block" :class="lalalha">
+        <div class="sidebar-block">
             <div class="awardTitle">中奖名单</div>
             <list-scroll></list-scroll>
 

+ 1 - 1
src/permission.js

@@ -4,7 +4,7 @@ import { getToken, setToken } from '@/utils/auth' // getToken from cookie
 import { lockStatus,unlock } from "@/api/allApi";
 //路由跳转之前
 router.beforeEach((to, _from, next) => {
-  // setToken('07d796e21d6a255b0d34454bc8feeb74');
+  setToken('822456ddec16938bdff67f8b0416cdf4');
   const path = to.path;
   const Authorization = to.query.Authorization
   if (path.indexOf('auth') != -1 && Authorization) { 

+ 12 - 16
src/views/HomeView/AnswerGame/WeekKaijiang.vue

@@ -6,6 +6,7 @@
                     <div class="home">
                         <div :class="{ 'dim': isDim }">
                             <div v-if="!isDim">
+                                <img class="gift" src="@/assets/image/answerGame/WeekKaijiang/gift.png" alt="返奖">
                                 <img class="rules" src="@/assets/image/answerGame/WeekKaijiang/rules.png" alt="互动规则"
                                     @click="clickRuleWrapper">
                                 <img class="record" src="@/assets/image/answerGame/WeekKaijiang/record.png" alt="抽奖记录"
@@ -51,18 +52,15 @@
                             </div>
                             <div class="recordListBox" ref="scrollview" @mousewheel="scrollChange" v-loading="loading">
                                 <div class="recordItem title">
-                                    <div style="width: 30%;text-align: center;">日期</div>
+                                    <div style="width: 30%;text-align: center;">购买日期</div>
                                     <div style="width: 40%;text-align: center;">奖券</div>
-                                    <div style="width: 30%;text-align: center;">状态</div>
+                                    <div style="width: 30%;text-align: center;">开奖结果</div>
                                 </div>
                                 <el-empty description="暂无数据" v-if="recordList.length == 0" :image-size="20"></el-empty>
                                 <div class="recordItem" v-for="(item, index) in recordList">
                                     <div style="width: 30%;text-align: center;">{{ item.createTime }}</div>
                                     <div style="width: 40%;text-align: center;">{{ item.couponNumber }}</div>
-                                    <div style="width: 30%;text-align: center;">
-                                        {{ item.lotteryTicketStatus == 0 ? '未开奖' : item.lotteryTicketStatus == 1 ? '未中奖'
-                                            : '已中奖' }}
-                                    </div>
+                                    <div style="width: 30%;text-align: center;">{{ item.prizeName }}</div>
                                 </div>
                             </div>
                         </el-card>
@@ -123,14 +121,7 @@ export default {
     data() {
         return {
             loading: false,
-            recordList: [
-                {
-                    createTime: '2023-11-01',
-                    couponNumber: '202440410004',
-                    lotteryTicketStatus:0,
-                    
-                }
-            ],
+            recordList: [],
             page: 1,
             pageSize: 10,
             actId: this.$route.query.actId,
@@ -193,7 +184,7 @@ export default {
                 console.log(res);
                 let list = res.data.data.items;
                 if (this.page == 1) {
-                    // this.recordList = list;
+                    this.recordList = list;
                 } else {
                     //如果不是则在后面追加数据
                     this.rankList.push(...list);
@@ -523,7 +514,12 @@ export default {
     width: 375px;
     height: 667px;
 }
-
+.home .gift {
+    position: absolute;
+    width: 60px;
+    top: 12%;
+    right: 0;
+}
 .home .rules {
     cursor: pointer;
     position: absolute;