sunlupeng пре 4 месеци
родитељ
комит
c273da53ff

BIN
src/assets/image/answerGame/WeekKaijiang/cgjl.jpg


BIN
src/assets/image/answerGame/WeekKaijiang/finish.png


BIN
src/assets/image/answerGame/WeekKaijiang/goHome.png


BIN
src/assets/image/zjmd.jpg


+ 5 - 5
src/components/SiderInfo.vue

@@ -15,11 +15,9 @@
                 </button>
             </div>
         </div>
-        <div class="sidebar-block">
+        <div class="sidebar-block" :class="lalalha">
             <div class="awardTitle">中奖名单</div>
-            <div style="padding: 0px 5px 5px 5px;">
-                <list-scroll></list-scroll>
-            </div>
+            <list-scroll></list-scroll>
 
             <!-- <div class="avatar">
                 <el-avatar fit="fill" :size="65" :src="avatar"></el-avatar>
@@ -247,7 +245,9 @@ export default {
     line-height: 40px;
     font-size: 16px;
     text-align: center;
-    border-bottom: 1px solid #dcdfe6;
+    border-bottom: 1px solid #fff;
+    background-color:#ff9170;
+    color: #fff;
 }
 
 .aside {

+ 8 - 1
src/components/list-scroll.vue

@@ -68,18 +68,25 @@
       width: 100%;
       margin: 0 auto;
       overflow: hidden;
+      position:relative;
+      z-index: 10;
+      background: url(@/assets/image/zjmd.jpg) no-repeat;
+      background-size: 100% 100%;
+      width: 260px;
+      height: 200px;  
       ul {
         list-style: none;
         padding: 0;
         margin: 0 auto;
         li{
+          color: #fff;
           display: block;
           height: 50px;
           display: flex;
          align-items: center;
           font-size: 12px;
           font-weight: bold;
-          border-bottom: 1px solid #dcdfe6;
+          border-bottom: 1px solid #fff;
           .name{
             width: 15%;
             text-align: center;

+ 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('d7aee0531a6594ae55368635c8aa2b18');
+  // setToken('07d796e21d6a255b0d34454bc8feeb74');
   const path = to.path;
   const Authorization = to.query.Authorization
   if (path.indexOf('auth') != -1 && Authorization) { 

+ 2 - 2
src/utils/request.js

@@ -2,9 +2,9 @@ import axios from 'axios'
 import { Message, MessageBox } from 'element-ui'
 import { getToken } from '@/utils/auth'
 
-let prodBaseURL = 'https://xiaoyou.dgtis.com/admin';//正式地址
+// let prodBaseURL = 'https://xiaoyou.dgtis.com/admin';//正式地址
 
-// let prodBaseURL = 'https://malltest.dgtis.com/admin';//阿里云地址
+let prodBaseURL = 'https://malltest.dgtis.com/admin';//阿里云地址
 
 let devBaseURL = 'https://malltest.dgtis.com/admin';//测试地址
 

+ 39 - 23
src/views/HomeView/AnswerGame/WeekKaijiang.vue

@@ -10,10 +10,10 @@
                                     @click="clickRuleWrapper">
                                 <img class="record" src="@/assets/image/answerGame/WeekKaijiang/record.png" alt="抽奖记录"
                                     @click="clickRecordWrapper">
-                                <!-- <div class="top" v-if="top">
-                                    <span style="font-size: 18px;color: #fff;font-weight: 600;background-color: rgba(0, 0, 0, .5);border-radius: 6px;padding: 5px;">
-                                        当前拥有抽奖券:{{ top }}张</span>
-                                </div> -->
+                                <div class="top" v-if="top">
+                                    <span style="font-size: 14px;color: #fff;font-weight: 600;border-radius: 6px;padding: 5px;">
+                                        本期未开出奖品,将累计到下期</span>
+                                </div>
                                 <img class="answer" src="@/assets/image/answerGame/WeekKaijiang/join.png" alt="参与活动"
                                     @click="clickAnswer">
                                 <img class="exit" src="@/assets/image/answerGame/WeekKaijiang/exit.png" alt="退出活动"
@@ -31,7 +31,7 @@
                                     <i class="el-icon-close"></i>
                                 </span>
                             </div>
-                            <div v-html="rule"></div>
+                            <div class="ruleBox" v-html="rule"></div>
                         </el-card>
                     </div>
                     <div class="confirmWrapper" v-if="isConfirmWrapper">
@@ -43,7 +43,7 @@
                     <div class="recordWrapper" v-show="isRecordWrapper">
                         <el-card class="box-card">
                             <div slot="header" class="clearfix">
-                                <span>奖记录</span>
+                                <span>奖记录</span>
                                 <span style="float: right; font-size: 20px;cursor: pointer;"
                                     @click="closeRecordWrapper">
                                     <i class="el-icon-close"></i>
@@ -51,15 +51,15 @@
                             </div>
                             <div class="recordListBox" ref="scrollview" @mousewheel="scrollChange" v-loading="loading">
                                 <div class="recordItem title">
-                                    <div style="width: 50%;text-align: center;">日期</div>
-                                    <div style="width: 25%;text-align: center;">奖券</div>
-                                    <div style="width: 25%;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>
                                 <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: 50%;text-align: center;">{{ item.createTime }}</div>
-                                    <div style="width: 25%;text-align: center;">{{ item.couponNumber }}</div>
-                                    <div style="width: 25%;text-align: center;">
+                                    <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>
@@ -123,7 +123,14 @@ export default {
     data() {
         return {
             loading: false,
-            recordList: [],
+            recordList: [
+                {
+                    createTime: '2023-11-01',
+                    couponNumber: '202440410004',
+                    lotteryTicketStatus:0,
+                    
+                }
+            ],
             page: 1,
             pageSize: 10,
             actId: this.$route.query.actId,
@@ -186,7 +193,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);
@@ -317,12 +324,12 @@ export default {
 }
 </script>
 <style scoped>
-.recordListBox::-webkit-scrollbar {
+.ruleBox::-webkit-scrollbar, .recordListBox::-webkit-scrollbar {
     display: none;
     /* Chrome Safari */
 }
 
-.recordListBox {
+.ruleBox, .recordListBox {
     max-height: 500px;
     overflow: auto;
     scrollbar-width: none;
@@ -370,6 +377,14 @@ export default {
     justify-content: center;
     align-content: center;
 }
+/* .recordListBox {
+    position: relative;
+    z-index: 10;
+    background: url(@/assets/image/answerGame/WeekKaijiang/cgjl.jpg) no-repeat;
+    background-size: 100% 100%;
+    width: 350px;
+    height: 500px;
+} */
 
 .gameBox .item {
     position: relative;
@@ -512,7 +527,7 @@ export default {
 .home .rules {
     cursor: pointer;
     position: absolute;
-    width: 42px;
+    width: 50px;
     top: 25%;
     left: 5%;
 }
@@ -520,14 +535,14 @@ export default {
 .home .record {
     cursor: pointer;
     position: absolute;
-    width: 42px;
+    width: 50px;
     top: 25%;
     right: 5%;
 }
 
 .home .top {
     position: absolute;
-    bottom: 25%;
+    top: 20%;
     left: 0;
     right: 0;
     margin: auto;
@@ -629,8 +644,8 @@ export default {
     position: absolute;
     background: url(@/assets/image/answerGame/WeekKaijiang/finish.png) no-repeat;
     background-size: 100% 100%;
-    width: 258px;
-    height: 258px;
+    width: 319px;
+    height: 194px;
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
@@ -641,9 +656,10 @@ export default {
 }
 
 .closeWrapper .goHome {
+    margin-bottom: 10px;
     cursor: pointer;
-    width: 112px;
-    height: 55px;
+    width: 117px;
+    height: 41px;
 }
 
 .payBox-way {