sunlupeng 3 months ago
parent
commit
c49208b516
4 changed files with 17 additions and 44 deletions
  1. 12 39
      public/dailyDrawCarousel.html
  2. 1 1
      src/permission.js
  3. 2 2
      src/utils/request.js
  4. 2 2
      src/views/HomeView/FestiveEvents.vue

+ 12 - 39
public/dailyDrawCarousel.html

@@ -165,7 +165,7 @@
       transform: rotate(-5deg);
     } */
     .recordListBox {
-      max-height: 200px;
+      max-height: 300px;
       overflow: auto;
     }
 
@@ -206,20 +206,9 @@
     </el-dialog>
     <el-dialog v-model="dialogRecordList" title="中奖记录" width="40%" center>
       <div class="recordListBox">
-        <!-- <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> -->
-        <!-- <el-empty description="暂无数据" v-if="recordList.length==0" :image-size="20"></el-empty> -->
-        <div class="recordItem">
-          <div style="width: 100%;text-align: center;">恭喜,你中了10积分</div>
+        <div class="recordItem" v-for="item in recordList">
+          <div style="width: 100%;text-align: center;">{{item}}</div>
         </div>
-        <!-- <div class="recordItem" v-for="(item, index) in recordList">
-          <div style="width: 100%;text-align: center;">{{item.userName}}</div>
-          <div style="width: 30%;text-align: center;">{{item.prizeName}}</div>
-          <div style="width: 40%;text-align: center;">{{item.createTime}}</div>
-        </div> -->
       </div>
     </el-dialog>
   </div>
@@ -372,36 +361,21 @@
 
       };
 
-      //抽奖记录
-      // async function getRecordList() {
-      //   const postData = {
-      //       actId: state.actId,
-      //     };
-      //     let res = await httpAjax('get', '/mall-prize/prize/user/list', postData);
-      //     if (res.errno === 0) {
-      //       console.log('抽奖记录',res.data);
-      //       state.recordList = res.data;
-      //     } else {
-      //       state.isRunning = false;
-      //       ElementPlus.ElMessage({
-      //         showClose: true,
-      //         message: res.errmsg,
-      //         type: 'error',
-      //       });
-      //     }  
-
-      // };
-
-      //获奖名单
+      //中奖记录
       async function getRecordList() {
-        const postData = {
+        let postData = {
           actId: state.actId,
         };
-        let res = await httpAjax('get', '/mall-prize/prize/winners', postData);
+        postData = JSON.stringify(postData)
+        postData = encryptECB(postData)
+        postData = postData.replace(/[\t\r\f\n\s]*/g, '');
+        ElementPlus.ElLoading.service();
+        let res = await httpAjax('post', '/mall-prize/continuousClicks', postData);
+        ElementPlus.ElLoading.service().close();
         if (res.errno === 0) {
           state.recordList = res.data;
+          state.dialogRecordList = true;
         } else {
-          state.isRunning = false;
           ElementPlus.ElMessage({
             showClose: true,
             message: res.errmsg,
@@ -466,7 +440,6 @@
       }
       const showRecordList = () => {
         getRecordList();
-        state.dialogRecordList = true;
       }
       const start = () => {
         // ElementPlus.ElMessage({

+ 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('bb205f6fcd05bcdb30b645cbedf35fab');
+  // setToken('bb205f6fcd05bcdb30b645cbedf35fab');
   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';//测试地址
 

+ 2 - 2
src/views/HomeView/FestiveEvents.vue

@@ -78,8 +78,8 @@ export default {
             console.log(val);
             //节日游戏
             if(val.type=='1'){
-                //司庆日签到 测试 正式44
-                if(val.actId==44){
+                //司庆日签到 测试45 正式44
+                if(val.actId==45){
                     this.$router.push({
                         path: '/home/festiveEvents/siQingRiQianDao',
                         query: {