|
@@ -705,14 +705,14 @@
|
|
|
|
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
- <van-toast id="van-toast"/>
|
|
|
|
|
|
+ <van-toast id="van-toast" />
|
|
</scroll-view>
|
|
</scroll-view>
|
|
|
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import store from "../../store/competition";
|
|
import store from "../../store/competition";
|
|
-import {cal_down_time} from "../../utils";
|
|
|
|
|
|
+import { cal_down_time } from "../../utils";
|
|
import {
|
|
import {
|
|
checkJoined,
|
|
checkJoined,
|
|
doEnroll,
|
|
doEnroll,
|
|
@@ -723,9 +723,9 @@ import {
|
|
getJsSDK,
|
|
getJsSDK,
|
|
getPromotionRanking,
|
|
getPromotionRanking,
|
|
} from "../../requests/competition";
|
|
} from "../../requests/competition";
|
|
-import Toast from '../../../static/vant/toast/toast';
|
|
|
|
-import {reload_userinfo} from "../../utils/user";
|
|
|
|
-import {userDetail} from "../../requests/user";
|
|
|
|
|
|
+import Toast from "../../../static/vant/toast/toast";
|
|
|
|
+import { reload_userinfo } from "../../utils/user";
|
|
|
|
+import { userDetail } from "../../requests/user";
|
|
|
|
|
|
var $this;
|
|
var $this;
|
|
var $now = Math.round(new Date() / 1000);
|
|
var $now = Math.round(new Date() / 1000);
|
|
@@ -784,8 +784,7 @@ export default {
|
|
to_report() {
|
|
to_report() {
|
|
// $this.$router.push({name: "Report"})
|
|
// $this.$router.push({name: "Report"})
|
|
},
|
|
},
|
|
- get_init() {
|
|
|
|
- },
|
|
|
|
|
|
+ get_init() {},
|
|
//打开分享窗口
|
|
//打开分享窗口
|
|
show_share_window() {
|
|
show_share_window() {
|
|
$this.share_show = true;
|
|
$this.share_show = true;
|
|
@@ -836,7 +835,7 @@ export default {
|
|
},
|
|
},
|
|
//时间产生变化时
|
|
//时间产生变化时
|
|
onTimeChange($e) {
|
|
onTimeChange($e) {
|
|
- let $datetime = $this.timeData = $e.mp.detail
|
|
|
|
|
|
+ let $datetime = ($this.timeData = $e.mp.detail);
|
|
for (let $key in $datetime) {
|
|
for (let $key in $datetime) {
|
|
if ($datetime[$key].toString().length == 1) {
|
|
if ($datetime[$key].toString().length == 1) {
|
|
$datetime[$key] = "0" + $datetime[$key];
|
|
$datetime[$key] = "0" + $datetime[$key];
|
|
@@ -951,12 +950,16 @@ export default {
|
|
userDetail().then((res) => {
|
|
userDetail().then((res) => {
|
|
let $data = res.data;
|
|
let $data = res.data;
|
|
$this.userinfo = $data.data;
|
|
$this.userinfo = $data.data;
|
|
- $this.userinfo['validity_time'] = formatTime($this.userinfo['validity_time'])
|
|
|
|
- $this.userinfo['level_name'] = utils.get_level_name($this.userinfo['level'])
|
|
|
|
- $this.userinfo['free_time'] = formatSeconds($this.userinfo['free_time'])
|
|
|
|
- store.setters.set_userinfo($this.userinfo)
|
|
|
|
- })
|
|
|
|
- let $userinfo = wx.getStorageSync('userinfo')
|
|
|
|
|
|
+ $this.userinfo["validity_time"] = formatTime(
|
|
|
|
+ $this.userinfo["validity_time"]
|
|
|
|
+ );
|
|
|
|
+ $this.userinfo["level_name"] = utils.get_level_name(
|
|
|
|
+ $this.userinfo["level"]
|
|
|
|
+ );
|
|
|
|
+ $this.userinfo["free_time"] = formatSeconds($this.userinfo["free_time"]);
|
|
|
|
+ store.setters.set_userinfo($this.userinfo);
|
|
|
|
+ });
|
|
|
|
+ let $userinfo = wx.getStorageSync("userinfo");
|
|
//检查用户是否参与比赛了
|
|
//检查用户是否参与比赛了
|
|
checkJoined($this.activity_id, $userinfo.user_id).then((res) => {
|
|
checkJoined($this.activity_id, $userinfo.user_id).then((res) => {
|
|
let $res = res.data;
|
|
let $res = res.data;
|
|
@@ -974,9 +977,9 @@ export default {
|
|
},
|
|
},
|
|
onShareAppMessage() {
|
|
onShareAppMessage() {
|
|
return {
|
|
return {
|
|
- title: "欢迎进入水母星球",
|
|
|
|
- imageUrl: "http://img.shuimuai.com/textwx5_4img.png",
|
|
|
|
- path:"/pages/competition/main?activity_id="+$this.activity_id
|
|
|
|
|
|
+ title: "欢迎参加 “专注勇士PK赛”",
|
|
|
|
+ imageUrl: "http://img.shuimuai.com/sharePkPahe_two.jpg",
|
|
|
|
+ path: "/pages/competition/main?activity_id=" + $this.activity_id,
|
|
};
|
|
};
|
|
},
|
|
},
|
|
};
|
|
};
|
|
@@ -1165,11 +1168,11 @@ page {
|
|
}
|
|
}
|
|
|
|
|
|
.diy_container
|
|
.diy_container
|
|
-.rank_container
|
|
|
|
-.rank_main
|
|
|
|
-.rank_main_list
|
|
|
|
-.my_score
|
|
|
|
-.right_title {
|
|
|
|
|
|
+ .rank_container
|
|
|
|
+ .rank_main
|
|
|
|
+ .rank_main_list
|
|
|
|
+ .my_score
|
|
|
|
+ .right_title {
|
|
width: 55px;
|
|
width: 55px;
|
|
height: 10px;
|
|
height: 10px;
|
|
font-size: 9px;
|
|
font-size: 9px;
|
|
@@ -1188,12 +1191,12 @@ page {
|
|
}
|
|
}
|
|
|
|
|
|
.diy_container
|
|
.diy_container
|
|
-.rank_container
|
|
|
|
-.rank_main
|
|
|
|
-.rank_main_list
|
|
|
|
-.my_score
|
|
|
|
-.rank_item
|
|
|
|
-.rank_num {
|
|
|
|
|
|
+ .rank_container
|
|
|
|
+ .rank_main
|
|
|
|
+ .rank_main_list
|
|
|
|
+ .my_score
|
|
|
|
+ .rank_item
|
|
|
|
+ .rank_num {
|
|
font-size: 10px;
|
|
font-size: 10px;
|
|
font-family: Microsoft YaHei;
|
|
font-family: Microsoft YaHei;
|
|
font-weight: bold;
|
|
font-weight: bold;
|
|
@@ -1202,12 +1205,12 @@ page {
|
|
}
|
|
}
|
|
|
|
|
|
.diy_container
|
|
.diy_container
|
|
-.rank_container
|
|
|
|
-.rank_main
|
|
|
|
-.rank_main_list
|
|
|
|
-.my_score
|
|
|
|
-.rank_item
|
|
|
|
-.rank_username {
|
|
|
|
|
|
+ .rank_container
|
|
|
|
+ .rank_main
|
|
|
|
+ .rank_main_list
|
|
|
|
+ .my_score
|
|
|
|
+ .rank_item
|
|
|
|
+ .rank_username {
|
|
font-size: 10px;
|
|
font-size: 10px;
|
|
font-family: Microsoft YaHei;
|
|
font-family: Microsoft YaHei;
|
|
font-weight: bold;
|
|
font-weight: bold;
|
|
@@ -1220,23 +1223,23 @@ page {
|
|
}
|
|
}
|
|
|
|
|
|
.diy_container
|
|
.diy_container
|
|
-.rank_container
|
|
|
|
-.rank_main
|
|
|
|
-.rank_main_list
|
|
|
|
-.my_score
|
|
|
|
-.rank_item
|
|
|
|
-.avatar {
|
|
|
|
|
|
+ .rank_container
|
|
|
|
+ .rank_main
|
|
|
|
+ .rank_main_list
|
|
|
|
+ .my_score
|
|
|
|
+ .rank_item
|
|
|
|
+ .avatar {
|
|
width: 24px;
|
|
width: 24px;
|
|
height: 25px;
|
|
height: 25px;
|
|
}
|
|
}
|
|
|
|
|
|
.diy_container
|
|
.diy_container
|
|
-.rank_container
|
|
|
|
-.rank_main
|
|
|
|
-.rank_main_list
|
|
|
|
-.my_score
|
|
|
|
-.rank_item
|
|
|
|
-.rank_score {
|
|
|
|
|
|
+ .rank_container
|
|
|
|
+ .rank_main
|
|
|
|
+ .rank_main_list
|
|
|
|
+ .my_score
|
|
|
|
+ .rank_item
|
|
|
|
+ .rank_score {
|
|
font-size: 10px;
|
|
font-size: 10px;
|
|
font-family: Microsoft YaHei;
|
|
font-family: Microsoft YaHei;
|
|
font-weight: bold;
|
|
font-weight: bold;
|