@jx3box/jx3box-common-ui 5.5.24 → 5.5.27

package/src/Author.vue

@@ -1,56 +1,38 @@
 <template>
     <div class="c-author" v-if="data">
         <div class="u-author">
-            <Avatar
-                class="u-avatar"
-                :uid="uid"
-                :url="data.user_avatar"
-                :size="68"
-                :frame="data.user_avatar_frame"
-            />
-            <a class="u-name" :href="authorLink(uid)">
-                <span>{{ data.display_name }}</span>
+            <Avatar class="u-avatar" :uid="uid" :url="data.user_avatar" :size="68" :frame="data.user_avatar_frame" />
+            <div class="u-info">
+                <a class="u-name" :href="authorLink(uid)">
+                <span>{{ data.display_name.slice(0, 12) }}</span>
+                <el-tooltip class="item" effect="dark" content="签约作者" placement="top" v-if="isSuperAuthor">
+                    <a class="u-superauthor" href="/dashboard/#/cooperation" target="_blank">
+                        <img :src="super_author_icon" alt="superauthor" />
+                    </a>
+                </el-tooltip>
             </a>
-            <el-tooltip
-                class="item"
-                effect="dark"
-                content="签约作者"
-                placement="top"
-                v-if="isSuperAuthor"
-            >
-                <a class="u-superauthor" href="/dashboard/#/cooperation" target="_blank">
-                    <img :src="super_author_icon" alt="superauthor" />
-                </a>
-            </el-tooltip>
-            <el-tooltip
-                class="item"
-                effect="dark"
-                :content="vipTypeTitle"
-                placement="top"
-                v-if="isPRO || isVIP"
-            >
-                <a class="u-vip" href="/vip/premium?from=sidebar_author" target="_blank">
-                    <i class="i-icon-vip on">{{ vipType }}</i>
-                </a>
-            </el-tooltip>
+            <div class="u-extend">
+                <el-tooltip class="item u-level" effect="dark" placement="top">
+                    <div slot="content">
+                        <span class="u-tips">经验值：{{ data.experience }}</span>
+                    </div>
+                    <span>Lv.{{ level }}</span>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" :content="vipTypeTitle" placement="top" v-if="isVip">
+                    <a class="u-vip" href="/vip/premium?from=sidebar_author" target="_blank">
+                        <i class="i-icon-vip on">{{ vipType }}</i>
+                    </a>
+                </el-tooltip>
+            </div>
+            </div>
         </div>
         <div class="u-bio">{{ data.user_bio }}</div>
         <div class="u-link" v-if="hasLink">
-            <a
-                v-if="data.weibo_name"
-                class="u-weibo"
-                :href="weiboLink(data.weibo_id)"
-                target="_blank"
-            >
+            <a v-if="data.weibo_name" class="u-weibo" :href="weiboLink(data.weibo_id)" target="_blank">
                 <img svg-inline src="../assets/img/author/weibo.svg" />
                 {{ data.weibo_name }}
             </a>
-            <a
-                v-if="data.github_name"
-                class="u-github"
-                :href="githubLink(data.github_name)"
-                target="_blank"
-            >
+            <a v-if="data.github_name" class="u-github" :href="githubLink(data.github_name)" target="_blank">
                 <img svg-inline src="../assets/img/author/github.svg" />
                 {{ data.github_name }}
             </a>
@@ -87,9 +69,9 @@
                 <i class="el-icon-school"></i>
                 <span>所属团队</span>
             </div>
-            <a class="u-team" v-for="(item,i) in teams" :key="i" :href="teamLink(item.team_id)" target="_blank">
+            <a class="u-team" v-for="(item, i) in teams" :key="i" :href="teamLink(item.team_id)" target="_blank">
                 <img class="u-team-logo" :src="showTeamLogo(item.team_logo)" />
-                <span class="u-team-name">{{item.team_name}}@{{item.team_server}}</span>
+                <span class="u-team-name">{{ item.team_name }}@{{ item.team_server }}</span>
             </a>
         </div>
         <Authorposts :uid="uid" />
@@ -100,27 +82,16 @@
 const liveStatusMap = ["等待开播", "直播中", "直播结束"];
 import Avatar from "./author/Avatar.vue";
 import Authorposts from "./author/Authorposts.vue";
-import {
-    authorLink,
-    tvLink,
-    getLink,
-    getThumbnail,
-} from "@jx3box/jx3box-common/js/utils";
+import { authorLink, tvLink, getLink, getThumbnail } from "@jx3box/jx3box-common/js/utils";
 import { __server, __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
-import {
-    getUserInfo,
-    getDouyu,
-    getUserMedals,
-    getUserPublicTeams,
-    getSuperAuthor,
-    getIdentity,
-} from "../service/author";
+import { getUserInfo, getDouyu, getUserMedals, getUserPublicTeams } from "../service/author";
 import { user as medal_map } from "@jx3box/jx3box-common/data/medals.json";
 import User from "@jx3box/jx3box-common/js/user";
+import { __userLevel } from "@jx3box/jx3box-common/data/jx3box.json";
 export default {
     name: "Author",
     props: ["uid"],
-    data: function () {
+    data: function() {
         return {
             data: "",
             tv: "",
@@ -133,50 +104,52 @@ export default {
                 //     team_server : "蝶恋花"
                 // }
             ],
-            isSuperAuthor: false,
-            isPRO: false,
             isVIP: false,
         };
     },
     computed: {
-        tv_type: function () {
+        tv_type: function() {
             return this.data && this.data.tv_type;
         },
-        tv_id: function () {
+        tv_id: function() {
             return (this.data && this.data.tv_id) || 0;
         },
-        tv_img: function () {
+        tv_img: function() {
             return __imgPath + "image/tv/" + this.tv_type + ".png";
         },
-        tv_link: function () {
+        tv_link: function() {
             return tvLink(this.tv_type, this.tv_id) || "";
         },
-        tv_status: function () {
+        tv_status: function() {
             return (this.tv && this.tv.show_status == 1) || false;
         },
-        super_author_icon: function () {
+        super_author_icon: function() {
             return __imgPath + "image/user/" + "superauthor.svg";
         },
-        hasLink: function () {
-            return (
-                this.data.weibo_name ||
-                this.data.github_name ||
-                this.data.tuilan_id ||
-                this.data.tv_id
-            );
+        hasLink: function() {
+            return this.data.weibo_name || this.data.github_name || this.data.tuilan_id || this.data.tv_id;
         },
-        hasTrophy: function () {
+        hasTrophy: function() {
             return this.medals.length;
         },
-        vipType: function () {
-            return this.isPRO ? "PRO" : "PRE";
+        vipType: function() {
+            return this.data?.is_pro ? "PRO" : "PRE";
+        },
+        vipTypeTitle: function() {
+            return this.data?.is_pro ? "专业版会员" : "高级版会员";
+        },
+        isVip: function() {
+            return this.data?.is_pro || this.data?.is_pre;
+        },
+        isSuperAuthor: function() {
+            return this.data?.sign;
         },
-        vipTypeTitle: function () {
-            return this.isPRO ? "专业版会员" : "高级版会员";
+        level: function() {
+            return User.getLevel(this.data?.experience);
         },
     },
     methods: {
-        loadData: function () {
+        loadData: function() {
             return getUserInfo(this.uid)
                 .then((data) => {
                     this.data = data;
@@ -184,11 +157,9 @@ export default {
                 .then(() => {
                     this.loadMedals();
                     this.loadTeams();
-                    this.checkSuperAuthor();
-                    this.loadIdentity();
                 });
         },
-        loadTV: function () {
+        loadTV: function() {
             if (this.tv_type == "douyu") {
                 if (!this.tv_id || isNaN(this.tv_id)) return;
                 getDouyu(this.tv_id).then((data) => {
@@ -196,59 +167,44 @@ export default {
                 });
             }
         },
-        loadMedals: function () {
+        loadMedals: function() {
             getUserMedals(this.uid).then((data) => {
                 this.medals = data;
             });
         },
-        loadTeams: function () {
+        loadTeams: function() {
             getUserPublicTeams(this.uid).then((data) => {
                 this.teams = data && data.slice(0, 5);
             });
         },
-        async checkVIP() {
-            this.isPRO = await User.isPRO();
-            this.isVIP = await User.isVIP();
-        },
-        checkSuperAuthor: function () {
-            getSuperAuthor(this.uid).then((res) => {
-                this.isSuperAuthor = res.data.data;
-            });
-        },
-        loadIdentity: function () {
-            getIdentity(this.uid).then((res) => {
-                this.isPRO = res.data.data.isPRO;
-                this.isVIP = res.data.data.isPRE;
-            });
-        },
 
         // filters
-        showMedalIcon: function (val) {
+        showMedalIcon: function(val) {
             return __imgPath + "image/medals/user/" + val + ".gif";
         },
-        showMedalDesc : function (item){
-            return item.medal_desc || medal_map[item.medal]
+        showMedalDesc: function(item) {
+            return item.medal_desc || medal_map[item.medal];
         },
         authorLink,
-        weiboLink: function (val) {
+        weiboLink: function(val) {
             return "https://weibo.com/" + val;
         },
-        githubLink: function (val) {
+        githubLink: function(val) {
             return "https://github.com/" + val;
         },
-        teamLink: function (team_id) {
+        teamLink: function(team_id) {
             return getLink("org", team_id);
         },
-        showTeamLogo: function (val) {
+        showTeamLogo: function(val) {
             return getThumbnail(val, 32);
         },
     },
     watch: {
-        uid: function () {
+        uid: function() {
             this.loadData();
         },
     },
-    mounted: function () {
+    mounted: function() {
         this.uid && this.loadData();
     },
     components: {

package/src/author/Authorposts.vue

@@ -1,19 +1,18 @@
 <template>
-    <div class="c-authorposts">
+    <div class="c-authorposts" v-if="uid">
         <div class="u-label">
             <i class="el-icon-notebook-2"></i>
             <span>作者最新作品</span>
-            <a :href="id | authorLink" class="u-more" target="_blank">全部 &raquo;</a>
+            <a :href="uid | authorLink" class="u-more" target="_blank">全部 &raquo;</a>
         </div>
-        
+
         <ul v-if="data && data.length">
             <li v-for="(item, i) in data" :key="i">
-                <a
-                    class="u-item"
-                    :href="url(item.ID, item.post_type)"
-                    target="_blank"
-                >
-                    <span><i class="u-icon el-icon-reading"></i> {{ item.post_title || item.post_type + '/无标题' }}</span>
+                <a class="u-item" :href="url(item.ID, item.post_type)" target="_blank">
+                    <span
+                        ><i class="u-icon el-icon-reading"></i>
+                        {{ item.post_title || item.post_type + "/无标题" }}</span
+                    >
                 </a>
             </li>
         </ul>
@@ -22,42 +21,40 @@
 
 <script>
 import { getUserPosts } from "../../service/author";
-import {authorLink,getLink} from '@jx3box/jx3box-common/js/utils'
+import { authorLink, getLink } from "@jx3box/jx3box-common/js/utils";
 export default {
     name: "Authorposts",
     props: ["uid"],
     data: function() {
         return {
             data: [],
-            id : this.uid || 0,
         };
     },
-    computed : {
-    },
-    watch : {
-        uid : function (newid){
-            this.id = newid
-            this.init()
-        }
+    computed: {},
+    watch: {
+        uid: {
+            immediate: true,
+            handler: function(user_id) {
+                if (user_id) this.init();
+            },
+        },
     },
     methods: {
         url: function(pid, type) {
-            return getLink(type,pid)
+            return getLink(type, pid);
+        },
+        init: function() {
+            getUserPosts(this.uid)
+                .then((data) => {
+                    this.data = data.slice(0, 5);
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
         },
-        init : function (){
-            if (!this.id) return;
-            getUserPosts(this.id).then((data) => {
-                this.data = data.slice(0, 5);
-            }).catch((err) => {
-                console.log(err)
-            })
-        }
-    },
-    filters : {
-        authorLink
     },
-    mounted: function() {
-        this.init()
+    filters: {
+        authorLink,
     },
 };
 </script>

package/src/header/user.vue

@@ -119,7 +119,10 @@ import {
 } from "@jx3box/jx3box-common/data/jx3box.json";
 import panel from "../../assets/data/panel.json";
 import { getMsg, getMenu } from "../../service/header";
-import { getSuperAuthor } from "../../service/author";
+import { getMyInfo, userSignIn } from "../../service/author";
+import dayjs from 'dayjs';
+import isToday from 'dayjs/plugin/isToday';
+dayjs.extend(isToday);
 export default {
     props: [],
     data: function () {
@@ -201,6 +204,12 @@ export default {
             return __imgPath + "image/user/" + "superauthor.svg";
         },
     },
+    watch: {
+        fold(val) {
+            if (!val) {
+            }
+        }
+    },
     methods: {
         // 消息
         checkMSG: function () {
@@ -242,6 +251,31 @@ export default {
                     });
                 });
         },
+        // 签到
+        signIn: function (){
+            try {
+                let user_last_login = localStorage.getItem('user_last_login');
+                user_last_login = user_last_login && JSON.parse(user_last_login) || ''
+
+                if (user_last_login && dayjs(user_last_login).isToday()) {
+                    console.log('已签到')
+                } else {
+                    userSignIn().then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: '签到成功',
+                            customClass: 'c-header-signin'
+                        })
+                        localStorage.setItem('user_last_login', JSON.stringify(dayjs()))
+                    }).catch(err => {
+                        localStorage.setItem('user_last_login', JSON.stringify(dayjs()))
+                        console.log(dayjs.tz.guess())
+                    }).finally(() => {})
+                }
+            } catch(e) {
+                console.log(e)
+            }
+        },
 
         // 资产
         loadAsset: function () {
@@ -249,10 +283,10 @@ export default {
                 this.asset = data;
             });
         },
-        checkSuperAuthor: function () {
-            getSuperAuthor(this.user?.uid).then((res) => {
-                this.isSuperAuthor = res.data.data;
-            });
+        loadMyInfo: function () {
+            getMyInfo().then(res => {
+                this.isSuperAuthor = !!res.sign
+            })
         },
 
         // 初始化
@@ -262,7 +296,8 @@ export default {
                 this.checkMSG();
                 this.loadPanel();
                 this.loadAsset();
-                this.checkSuperAuthor();
+                this.loadMyInfo()
+                this.signIn()
             }
         },
 
@@ -284,4 +319,4 @@ export default {
     },
     components: {},
 };
-</script>
+</script>

package/src/interact/Fav.vue

@@ -1,9 +1,7 @@
 <template>
     <el-button class="w-fav" size="mini" type="primary" @click="doFav">
-        <i v-if="!favorited" class="el-icon-star-off"></i>
-        <i v-else class="el-icon-star-on"></i>
-        <span v-if="!favorited">收藏</span>
-        <span v-else>取消收藏</span>
+        <i :class="favorite ? 'el-icon-star-on' : 'el-icon-star-off'"></i>
+        <span>{{ favorite ? "取消收藏" : "收藏" }}</span>
     </el-button>
 </template>
 
@@ -12,63 +10,41 @@ import User from "@jx3box/jx3box-common/js/user";
 import { hasFav, addFav, delFav } from "../../service/fav";
 export default {
     name: "Fav",
-    props: ["postType", "postId"],
-    data: function() {
+    props: ["postType", "postId", "postTitle"],
+    data: function () {
         return {
             login: User.isLogin(),
-            favorited: false,
+            favorite: false,
         };
     },
     methods: {
-        doFav: function() {
+        doFav: function () {
             if (this.login) {
-                this.favorited ? this.delFav() : this.addFav();
+                this.favorite ? this.delFav() : this.addFav();
             } else {
                 User.toLogin();
             }
         },
-        hasFav: function() {
-            hasFav(this.postType, this.postId).then(
-                (data) => {
-                    data = data.data;
-                    this.favorited = data.code === 200 && data.data.favorited > 0;
-                },
-                (err) => {
-                    this.fail(err);
-                }
-            );
+        hasFav: function () {
+            hasFav(this.postType, this.postId).then((res) => {
+                this.favorite = res.id || false;
+            });
         },
-        addFav: function() {
-            addFav(this.postType, this.postId).then(
-                (data) => {
-                    if (data.data.code === 200) {
-                        this.favorited = true;
-                    } else this.fail(data.data.message);
-                },
-                (err) => {
-                    this.fail(err);
-                }
-            );
+        addFav: function () {
+            addFav(this.postType, this.postId, this.postTitle).then((res) => {
+                this.favorite = res.id;
+            });
         },
-        delFav: function() {
-            delFav(this.postType, this.postId).then(
-                (data) => {
-                    if (data.data.code === 200) {
-                        this.favorited = false;
-                    } else this.fail(data.data.message);
-                },
-                (err) => {
-                    this.fail(err);
-                }
-            );
+        delFav: function () {
+            delFav(this.favorite).then(() => {
+                this.favorite = false;
+            });
         },
-        fail: function(err) {
+        fail: function (err) {
             if (err.response && err.response.data && err.response.data.code) {
-                this.$message.error(
-                    `[${err.response.data.code}] ${err.response.data.msg}`
-                );
+                this.$message.error(`[${err.response.data.code}] ${err.response.data.msg}`);
             } else {
-                this.$message.error(typeof err === 'string' ? err : "网络请求异常");
+                this.$message.error(typeof err === "string" ? err : "网络请求异常");
             }
             console.log(err);
         },
@@ -78,8 +54,8 @@ export default {
             immediate: true,
             handler() {
                 if (this.login && this.postType && this.postId) this.hasFav();
-            }
-        }
+            },
+        },
     },
 };
 </script>