Commit 8193c2d2 authored by leiqingsong's avatar leiqingsong

修改

parent 19d53344
...@@ -6,7 +6,7 @@ Vue.use(VueRouter); ...@@ -6,7 +6,7 @@ Vue.use(VueRouter);
const routes = [ const routes = [
{ {
path: "/my-status", path: "/my-status",
name: "myStatus", name: "MyStatus",
component: () => import("../views/my/myStatus.vue"), component: () => import("../views/my/myStatus.vue"),
meta: { title: "我的直推", noNav: false} meta: { title: "我的直推", noNav: false}
}, },
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div class="level-progress"> <div class="level-progress">
<div class="level-num">Lv.{{ userLevel }}</div> <div class="level-num">Lv.{{ userLevel }}</div>
<van-progress :percentage="perenct * 100" /> <van-progress :percentage="perenct * 100" />
<div class="level-num">Lv.{{ nextLevel }}</div> <div class="level-num">Lv.{{ nextLevel + 1 }}</div>
</div> </div>
<!-- <div class="relegation">保级还需增加¥{{ relegationNum }} 业绩</div> --> <!-- <div class="relegation">保级还需增加¥{{ relegationNum }} 业绩</div> -->
</div> </div>
......
...@@ -24,9 +24,19 @@ ...@@ -24,9 +24,19 @@
:autoplay="3000" :autoplay="3000"
:show-indicators="false" :show-indicators="false"
> >
<van-swipe-item> {{ awardInfo.awardTime }}</van-swipe-item> <!-- TODO 后端列表循环 -->
<van-swipe-item>内容 2</van-swipe-item> <van-swipe-item class="swipe-item">
<van-swipe-item>内容 3</van-swipe-item> <span>{{ awardInfo.growthAward }}</span>
<span>{{ awardInfo.awardTime }}</span>
</van-swipe-item>
<van-swipe-item class="swipe-item">
<span>{{ awardInfo.growthAward }}</span>
<span>{{ awardInfo.awardTime }}</span>
</van-swipe-item>
<van-swipe-item class="swipe-item">
<span>{{ awardInfo.growthAward }}</span>
<span>{{ awardInfo.awardTime }}</span>
</van-swipe-item>
</van-swipe> </van-swipe>
</van-notice-bar> </van-notice-bar>
</div> </div>
...@@ -39,7 +49,7 @@ ...@@ -39,7 +49,7 @@
style="font-weight: bold" style="font-weight: bold"
></countTo> ></countTo>
<p v-if="awardInfo" style="font-size: 14px;color:#333333"> <p v-if="awardInfo" style="font-size: 14px;color:#333333">
历史累计奖金:¥{{ awardInfo.awardTotal.toFixed(2) || 0 }} 历史累计奖金:¥{{ awardInfo.awardTotal || 0 }}
</p> </p>
</div> </div>
<div class="newAdd-my"> <div class="newAdd-my">
...@@ -117,6 +127,7 @@ export default { ...@@ -117,6 +127,7 @@ export default {
this.awardInfo = res.data; this.awardInfo = res.data;
this.awardInfo.lastToatal = this.awardInfo.lastToatal =
res.data.monthAwardTotal - res.data.growthAward; res.data.monthAwardTotal - res.data.growthAward;
this.awardInfo.awardTotal = res.data.awardTotal.toFixed(2);
} }
}); });
} }
...@@ -172,9 +183,18 @@ export default { ...@@ -172,9 +183,18 @@ export default {
width: 16px; width: 16px;
height: 14px; height: 14px;
} }
::v-deep .van-notice-bar__content {
width: 100%;
}
.notice-swipe { .notice-swipe {
height: 44px; height: 44px;
line-height: 44px; line-height: 44px;
.swipe-item {
display: flex;
justify-content: space-between;
width: 100%;
}
} }
} }
.content { .content {
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
<script> <script>
import { getUserInfo2 } from "@/api/user"; import { getUserInfo2 } from "@/api/user";
import { logoutToApp } from "@/utils/bridgeToAppFun";
import { logout } from "@/api/user"; import { logout } from "@/api/user";
import { fillInviteCode } from "@/api/user"; import { fillInviteCode } from "@/api/user";
import BaseDialog from "../components/BaseDialog.vue"; import BaseDialog from "../components/BaseDialog.vue";
...@@ -86,7 +85,7 @@ export default { ...@@ -86,7 +85,7 @@ export default {
logout() { logout() {
localStorage.removeItem("token"); localStorage.removeItem("token");
logout().then(); logout().then();
logoutToApp(); this.bridgeToAppFun.logoutToApp();
}, },
jumpToInstructions() { jumpToInstructions() {
this.$router.push("/instructions"); this.$router.push("/instructions");
......
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