Commit daf016b7 authored by ganjingcun's avatar ganjingcun

x

parent a66acb08
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="caption"> <div class="caption">
<h3> <i class="glyphicon glyphicon-user"></i> <strong>{{user.username}}</strong></h3> <h3> <i class="glyphicon glyphicon-user"></i> <strong>{{user.username}}</strong></h3>
<p class="text-muted" style="font-size:20px;">今日首胜: {{activity.today}}/1 </p> <p class="text-muted" style="font-size:20px;">今日首胜: {{activity.today}}/1 </p>
<p class="text-muted" style="font-size:20px;">{{activity.name}}首胜: {{activity.total}}/{{activity.max}} </p> <p class="text-muted" v-if="showActivity" style="font-size:20px;">{{activity.name}}首胜: {{activity.total}}/{{activity.max}} </p>
</div> </div>
</div> </div>
</div> </div>
...@@ -151,10 +151,12 @@ ...@@ -151,10 +151,12 @@
data() { data() {
return { return {
isMobile: false, isMobile: false,
activity:{ activity: {
name:'新年充电活动', today: 0,
max:'15' name: '新年充电活动',
max: '15'
}, },
showActivity: false,
user_info: { user_info: {
exp: 0, exp: 0,
pt: 500, pt: 500,
...@@ -259,7 +261,10 @@ ...@@ -259,7 +261,10 @@
var _this = this; var _this = this;
API.getFirstWin({ username: username }).then((res) => { API.getFirstWin({ username: username }).then((res) => {
_this.activity = res.data _this.activity = res.data
if (_this.activity.name && _this.activity.name.trim().length > 0) {
_this.showActivity = true;
}
}, (res) => { }, (res) => {
console.log(res) console.log(res)
}); });
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<h3> <i class="glyphicon glyphicon-user"></i> <strong>{{username}}</strong></h3> <h3> <i class="glyphicon glyphicon-user"></i> <strong>{{username}}</strong></h3>
<!--<p class="text-nowrap text-muted" style="font-size:20px;">有妞不泡,大逆不道;遇妞则泡,替天行道。 </p>--> <!--<p class="text-nowrap text-muted" style="font-size:20px;">有妞不泡,大逆不道;遇妞则泡,替天行道。 </p>-->
<p class="text-muted" style="font-size:20px;">今日首胜: {{activity.today}}/1 </p> <p class="text-muted" style="font-size:20px;">今日首胜: {{activity.today}}/1 </p>
<p class="text-muted" style="font-size:20px;">{{activity.name}}首胜: {{activity.total}}/{{activity.max}} </p> <p class="text-muted" v-if="showActivity" style="font-size:20px;">{{activity.name}}首胜: {{activity.total}}/{{activity.max}} </p>
</div> </div>
</div> </div>
</div> </div>
...@@ -174,9 +174,11 @@ ...@@ -174,9 +174,11 @@
data() { data() {
return { return {
activity: { activity: {
today: 0,
name: '新年充电活动', name: '新年充电活动',
max: '15' max: '15'
}, },
showActivity: false,
searchText: "", searchText: "",
hasError: false, hasError: false,
username: "", username: "",
...@@ -288,6 +290,9 @@ ...@@ -288,6 +290,9 @@
var _this = this; var _this = this;
API.getFirstWin({ username: username }).then((res) => { API.getFirstWin({ username: username }).then((res) => {
_this.activity = res.data _this.activity = res.data
if (_this.activity.name && _this.activity.name.trim().length > 0) {
_this.showActivity = true;
}
}, (res) => { }, (res) => {
console.log(res) console.log(res)
}); });
......
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
<div class="t m0 x4 ha y17 ff3 fs2 fc0 sc0 ls1 ws0">{{deck.spells[6].num}}</div> <div class="t m0 x4 ha y17 ff3 fs2 fc0 sc0 ls1 ws0">{{deck.spells[6].num}}</div>
</div> </div>
<div class="c x19 y1b wf he"> <div class="c x19 y1b wf he">
<div class="t m0 x4 ha y17 ff5 fs2 fc0 sc0 ls1 ws0">{{deck.spells[5].name}}</div> <div class="t m0 x4 ha y17 ff5 fs2 fc0 sc0 ls1 ws0">{{deck.spells[6].name}}</div>
</div> </div>
<div class="c x17 y1b w10 he"> <div class="c x17 y1b w10 he">
<div class="t m0 x4 ha y17 ff3 fs2 fc0 sc0 ls1 ws0">{{deck.traps[6].num}}</div> <div class="t m0 x4 ha y17 ff3 fs2 fc0 sc0 ls1 ws0">{{deck.traps[6].num}}</div>
...@@ -641,7 +641,7 @@ ...@@ -641,7 +641,7 @@
</div> </div>
<div class="c x1c y36 w1b he"> <div class="c x1c y36 w1b he">
<div class="t m0 x4 h13 y37 ff2 fs4 fc0 sc0 lsa ws0">Infraction(s):<span class="ls1">!</span></div> <div class="t m0 x4 h13 y37 ff2 fs4 fc0 sc0 lsa ws0">Infraction(s):<span class="ls1">!</span></div>
</div> </div>
<div class="c x3 y38 wd hd"> <div class="c x3 y38 wd hd">
<div class="t m0 x4 ha y14 ff3 fs2 fc0 sc0 ls1 ws0">{{deck.extra[6].num}}</div> <div class="t m0 x4 ha y14 ff3 fs2 fc0 sc0 ls1 ws0">{{deck.extra[6].num}}</div>
</div> </div>
...@@ -983,7 +983,7 @@ ...@@ -983,7 +983,7 @@
} }
} }
this.calTotal() this.calTotal();
}, (res) => { }, (res) => {
}) })
} else { } else {
......
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