Commit 593ea800 authored by xieyishang's avatar xieyishang

addxx

parent cbf127bb
......@@ -10,6 +10,10 @@ Vue.use(ElementUI);
import { Message } from 'element-ui'
Vue.prototype.$message = Message
Vue.component(Message.name, Message)//解决默认弹出Message 提示框
Vue.config.productionTip = false
......
......@@ -6,7 +6,7 @@
import store from '../store/index'
import {message} from "element-ui";
import { Message } from 'element-ui'
// 环境的切换
/* if (process.env.NODE_ENV == 'development') {
......@@ -17,7 +17,9 @@
axios.defaults.baseURL = 'https://tj.jxlld.com/Wxapp/';
} */
axios.defaults.baseURL = 'https://zxluma.jxdsy.cn/api/';
// axios.defaults.baseURL = 'https://zxluma.jxdsy.cn/api/';
axios.defaults.baseURL = 'https://luma.jxdsy.cn/api/';
// 请求超时时间
axios.defaults.timeout = 10000;
......@@ -69,7 +71,7 @@
// 清除本地token和清空vuex中token对象
// 跳转登录页面
case 403:
message({
Message({
message: '登录过期,请重新登录',
type: 'warning'
});
......@@ -88,14 +90,14 @@
break;
// 404请求不存在
case 404:
message({
Message({
message: '网络请求不存在',
type: 'warning',
});
break;
// 其他错误,直接抛出错误提示
default:
message({
Message({
message: error.response.data.message,
type: 'warning',
});
......@@ -146,7 +148,7 @@
console.log(res,"res11");
if(res.data.code!=0){
console.info("提示");
message({
Message({
message: res.data.msg,
type: 'warning',
});
......
......@@ -35,6 +35,8 @@
<img class="qiaodaotx" :src="item.avatar">
<p class="qiaodaoxm">{{item.nickname}}</p>
</li>
</ul>
</div>
</div>
......@@ -63,10 +65,7 @@
//显示的数据
Checkuserlist:[
{
username:"春暖花开",
usertx:"https://p.qqan.com/up/2021-7/2021761012352324.png",
},
]
}
},
......@@ -92,8 +91,14 @@
// },1500)
//加载更多数据
let user_idends = "";
if(this.Checkuserlist.length!=0){
user_idends = this.Checkuserlist[this.Checkuserlist.length-1].user_id
}
getSignNewList({
user_id:this.Checkuserlist[this.Checkuserlist.length-1].user_id,
user_id:user_idends,
}).then((res)=>{
if(res.code==0){
......
......@@ -85,7 +85,7 @@
position: relative;
}
.qiaodaotx {
position: relative;
/* position: relative;
z-index: 9;
-webkit-animation: f1 1.2s 0.5s ease forwards;
-moz-animation: 2s 0.5s ease forwards;
......@@ -95,24 +95,40 @@
height: 108px;
margin: 0 auto;
border-radius: 100%;
overflow: hidden;
overflow: hidden; */
width: 108px;
height: 108px;
margin: 0 auto;
border-radius: 100%;
overflow: hidden;
opacity: 0;
display: none;
}
.qiaodaosf .qiaodaotx{
-webkit-animation: f1 1.2s 0.5s ease forwards;
-moz-animation: 2s 0.5s ease forwards;
animation: f1 1.2s 0.5s ease forwards;
display: block;
}
.qiaodaoxm {
font-size: 16px;
color: #FFF;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin: 0 auto;
padding: 5px 0;
text-align: center;
width: 100%;
color: #FFF;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin: 0 auto;
padding: 5px 0;
opacity: 0;
display: none;
text-align: center;
width: 100%;
}
.qiaodaosf .qiaodaoxm {
-webkit-animation: mc 1.2s 0.5s ease forwards;
-moz-animation: 2s 0.5s ease forwards;
animation: mc 1.2s 0.5s ease forwards;
-webkit-animation: mc 1.2s 2s ease forwards;
-moz-animation: 2s 2s ease forwards;
animation: mc 1.2s 2s ease forwards;
display: block;
}
......
......@@ -194,7 +194,9 @@
}
.lottery-win-list .lottery-winner .ulul {
width: 100%;
height: 300px;
/* height: 300px; */
display: inline-block;
margin-bottom: 20px;
}
.ulul .lunci{
color: #fff;
......
......@@ -21,7 +21,9 @@
<div class="bgvideo" style="width: 100%;height: 100%;position: absolute;left:0;top: 0;z-index: -1;">
<!-- bgvideo.mp4 -->
<!-- beijvie.mp4 -->
<video src="@/assets/news/28.mp4" style="object-fit:fill;" autoplay autoplay="autoplay" autobuffer=""
<!-- beijvie.mp4 -->
<!-- 28.mp4 -->
<video src="@/assets/news/beijvie.mp4" style="object-fit:fill;" autoplay autoplay="autoplay" autobuffer=""
autoloop="" loop="" width="100%" height="100%"></video>
</div>
......@@ -200,6 +202,10 @@
if(this.Wintheprizenum>=10){
this.Wintheprizenum = 10;
}
if(this.Wintheprizenum>=this.usersigcount && this.usersigcount!=0){
this.Wintheprizenum = this.usersigcount;
}
},
//开始抽奖
startchoujiang() {
......@@ -209,7 +215,7 @@
cls = setInterval(() => {
let suijiarr = [];
for (let i = 0; i < this.Wintheprizenum; i++) {
let suijindex = this.randomNum(0, this.Checkuserlist.length);
let suijindex = this.randomNum(0, this.Checkuserlist.length-1);
// console.info("suijindex",suijindex);
suijiarr.push(this.Checkuserlist[suijindex]);
}
......@@ -232,7 +238,11 @@
this.isshowstop = false;//隐藏停止按钮
this.dtuserzj = res.data;//赋值中奖名单
}else{
this.centerDialogVisible = false;
clearInterval(cls);//清除定时器
this.isshowstop = false;//隐藏停止按钮
this.dtuserzj = [];
this.$message.error(res.msg);
}
}).catch((err)=>{
this.dtuserzj = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment