@jx3box/jx3box-vue3-ui 1.1.4 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-vue3-ui",
-    "version": "1.1.4",
+    "version": "1.1.6",
     "description": "JX3BOX Vue3 UI",
     "main": "index.js",
     "scripts": {

package/service/cms.js

@@ -104,6 +104,11 @@ function refreshQQBotImage(data) {
     return $cms().post(`/api/cms/qqbot/picture_task`, data);
 }
 
+// 获取用户permission
+function getUserPermission() {
+    return $cms().get(`/api/cms/account/permission/i`)
+}
+
 export {
     getPostAuthors,
     uploadImage,
@@ -122,4 +127,5 @@ export {
     loadEmotions,
     uploadFile,
     refreshQQBotImage,
+    getUserPermission,
 };

package/service/header.js

@@ -28,4 +28,11 @@ function getGames() {
     return axios.get(JX3BOX.__dataPath + "data/product/games.json");
 }
 
-export { getMsg, getNav, getPanel, getBox, getMenu, getGames };
+// 获取全局配置
+function getGlobalConfig() {
+    return axios.get(`${JX3BOX.__ossRoot}config/global.json`).then((res) => {
+        return res.data;
+    });
+}
+
+export { getMsg, getNav, getPanel, getBox, getMenu, getGames, getGlobalConfig };

package/src/App.vue

@@ -112,7 +112,7 @@ export default {
     },
     data() {
         return {
-            post_id: "54842",
+            post_id: "74662",
             post: "",
             client: location.href.includes("origin") ? "origin" : "std",
             tag: "",

package/src/Header.vue

@@ -38,6 +38,8 @@ import user from "./header/User.vue";
 import Box from "../src/Box.vue";
 import { isMiniProgram, miniprogramHack } from "@jx3box/jx3box-common/js/utils";
 import miniprogram from "@jx3box/jx3box-common/data/miniprogram.json";
+import User from "@jx3box/jx3box-common/js/user";
+import { getGlobalConfig } from "../service/header.js";
 
 export default {
     name: "CommonHeader",
@@ -54,21 +56,29 @@ export default {
         },
     },
     methods: {
+        // webView检测
         // webView检测
         checkIsWebView: function () {
             if (window.navigator.userAgent.includes(KW)) {
                 document.documentElement.classList.add("env-app");
             }
 
+            const urlParams = new URLSearchParams(window.location.search);
+            const from = urlParams.get("from");
+            from && sessionStorage.setItem("from", from);
             if (isMiniProgram()) {
-                const urlParams = new URLSearchParams(window.location.search);
                 const appid = urlParams.get("appid");
                 const item = miniprogram?.find((item) => item.appid === appid);
+                const from = urlParams.get("_from");
 
                 document.documentElement.classList.add("v-miniprogram");
 
+                if (from) {
+                    document.documentElement.classList.add("from-" + from);
+                }
+
                 if (appid && item) {
-                    document.documentElement.classList.add("env-miniprogram" + item.id);
+                    document.documentElement.classList.add("env-miniprogram-" + item.id);
 
                     window.JX3BOX_ENV = item.id?.toUpperCase() + "_MINIPROGRAM";
                 } else {
@@ -80,11 +90,80 @@ export default {
                     miniprogramHack();
                 }
             }
+
+            // 如果来自推栏
+            if (sessionStorage.getItem("from") == 'tl') {
+                document.documentElement.classList.add("v-miniprogram");
+            }
+
         },
 
         // 检查
         init: function () {
             this.checkIsWebView();
+
+            const token = this.getUrlParam("__token");
+
+            token && localStorage.setItem("__token", token);
+
+            if (User.isLogin()) {
+                this.loadAsset();
+            }
+
+            // 获取全局配置
+            getGlobalConfig().then(async (res) => {
+                const global_token_version = res.token_version;
+                const token_version = localStorage.getItem("token_version");
+
+                if (User.isLogin()) {
+                    // 对于没有token_version或者token_version不是最新的用户，都需要登出
+                    if (!token_version || token_version != global_token_version) {
+                        // 先保存最新的token_version
+                        localStorage.setItem("token_version", global_token_version);
+                        // 然后执行登出操作
+                        User.destroy().then(() => {
+                            this.$refs.user?.logout();
+                            // 清除马甲所有马甲信息
+                            let keys = Object.keys(localStorage);
+                            let alternate = keys.filter((key) => key.startsWith("jx3box-alternate-"));
+
+                            alternate.forEach((key) => {
+                                localStorage.removeItem(key);
+                            });
+
+                            if (
+                                location.pathname.startsWith("/dashboard") ||
+                                location.pathname.startsWith("/publish")
+                            ) {
+                                location.href = this.siteRoot;
+                            }
+                        });
+                    }
+                } else {
+                    // 非登录状态也更新token_version，确保用户下次登录时使用新版本
+                    if (global_token_version) {
+                        localStorage.setItem("token_version", global_token_version);
+                    }
+                }
+            });
+        },
+
+        getUrlParam(name) {
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+            var r = window.location.search.substr(1).match(reg);
+            return r ? decodeURIComponent(r[2]) : null;
+        },
+        // 资产
+        loadAsset: function () {
+            User.getAsset().then((data) => {
+                this.asset = data;
+
+                const level = User.getLevel(this.asset?.experience);
+
+                if (level > 2) {
+                    document.documentElement.classList.add("is-comment-show");
+                }
+            });
         },
     },
     created: function () {

package/src/author/AuthorInfo.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="c-author-info">
         <div class="u-author">
-            <Avatar class="u-avatar" :uid="uid" :url="data.user_avatar" size="s" :frame="data.user_avatar_frame" />
+            <Avatar class="u-avatar" :uid="uid" :url="data.user_avatar" size="s" :frame="data.user_avatar_frame" v-if="!anonymous" />
+            <Avatar v-else class="u-avatar" :url="defaultUrl" size="s"></Avatar>
             <div class="u-info">
                 <div class="u-name">
                     <el-tooltip class="item" effect="dark" content="签约作者" placement="top" v-if="isSuperAuthor">
@@ -9,12 +10,13 @@
                             <img :src="super_author_icon" alt="superauthor" />
                         </a>
                     </el-tooltip>
-                    <a class="u-displayname" :href="authorLink(uid)" target="_blank">
+                    <a class="u-displayname" :href="authorLink(uid)" target="_blank" v-if="!anonymous">
                         {{ data.display_name || "未知" }}
                     </a>
+                    <span class="u-displayname u-anonymous" v-else>神秘侠士</span>
                 </div>
                 <div class="u-extend">
-                    <el-tooltip class="item" effect="dark" placement="top">
+                    <el-tooltip class="item" effect="dark" placement="top" v-if="!anonymous">
                         <template #content>
                             <span class="u-tips">经验值：{{ data.experience }}</span>
                         </template>
@@ -27,7 +29,16 @@
                             >Lv.{{ level }}</a
                         >
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" :content="vipTypeTitle" placement="top" v-if="isVip">
+                    <a
+                        v-else
+                        class="u-level"
+                        :class="'lv-' + level"
+                        :style="{ backgroundColor: showLevelColor(level) }"
+                        href="/about/incentives"
+                        target="_blank"
+                        >Lv.{{ level }}</a
+                    >
+                    <el-tooltip class="item" effect="dark" :content="vipTypeTitle" placement="top" v-if="isVip && !anonymous">
                         <a class="u-vip" href="/vip/premium?from=sidebar_author" target="_blank">
                             <i class="i-icon-vip on">{{ vipType }}</i>
                         </a>
@@ -49,10 +60,10 @@ import { getUserInfo } from "../../service/author";
 import Avatar from "./Avatar.vue";
 import Honor from "./AuthorHonor.vue";
 
-const { __imgPath, __userLevelColor } = JX3BOX;
+const { __imgPath, __userLevelColor, __cdn } = JX3BOX;
 export default {
     name: "AuthorInfo",
-    props: ["uid"],
+    props: ["uid", "anonymous"],
     components: {
         Avatar,
         Honor,
@@ -67,7 +78,7 @@ export default {
     computed: {
         // level
         level: function () {
-            return User.getLevel(this.data?.experience);
+            return this.anonymous ? -1 : User.getLevel(this.data?.experience);
         },
 
         // vip
@@ -85,6 +96,9 @@ export default {
         isSuperAuthor: function () {
             return this.data?.sign;
         },
+        defaultUrl: function () {
+            return `${__cdn}/design/avatar/xisai/0-1.png`
+        },
     },
     watch: {
         uid: {
@@ -139,6 +153,12 @@ export default {
             color: #f39;
         }
     }
+    .u-anonymous {
+        color: #888;
+        &:hover {
+            color: #888;
+        }
+    }
     .u-superauthor {
         // margin-left: 4px;
         // display: inline-block;

package/src/interact/BoxcoinRecords.vue

@@ -21,7 +21,13 @@
                             <i title="品鉴"><img class svg-inline src="../../assets/img/widget/admin_gift.svg" /></i>
                         </template>
                     </span>
-                    <a class="u-meta u-user" :href="authorLink(item.operate_user_id)" target="_blank">
+                    <template v-if="item.ext_operate_user_info?.id == 1">
+                        <span class="u-meta u-user u-default">
+                            <img class="u-user-avatar" :src="showAvatar(item.ext_operate_user_info.avatar)" alt />
+                            <span>系统</span>
+                        </span>
+                    </template>
+                    <a v-else class="u-meta u-user" :href="authorLink(item.operate_user_id)" target="_blank">
                         <img class="u-user-avatar" :src="showAvatar(item.ext_operate_user_info.avatar)" alt />
                         <span>{{ item.ext_operate_user_info.display_name }}</span>
                     </a>

package/src/single/Author.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="c-author">
-        <AuthorInfo :uid="uid" @ready="installModules" />
+        <AuthorInfo :uid="uid" :anonymous="anonymous" @ready="installModules" />
         <template v-if="data">
             <div class="u-interact">
                 <!-- <AuthorFollow style="margin-right: 8px;" :uid="uid" /> -->
@@ -34,7 +34,7 @@ import AuthorRss from "../author/AuthorRss.vue";
 const jx3box = require("@jx3box/jx3box-common/data/jx3box.json");
 export default {
     name: "AuthorComp",
-    props: ["uid"],
+    props: ["uid", "anonymous"],
     data: function () {
         return {
             data: "",
@@ -43,6 +43,9 @@ export default {
     },
     methods: {
         installModules: function (data) {
+            if (this.anonymous == 1) {
+                return;
+            }
             this.data = data;
         },
         onMessage: function () {

package/src/single/PostHeader.vue

@@ -28,7 +28,8 @@
                 <i class="u-author-icon">
                     <img svg-inline src="../../assets/img/single/author.svg" />
                 </i>
-                <a class="u-name" :href="author_link">{{ author_name }}</a>
+                <a class="u-name" :href="author_link" v-if="!anonymous">{{ author_name }}</a>
+                <span class="u-name u-anonymous" v-else>神秘侠士</span>
             </div>
 
             <!-- 自定义字段 -->
@@ -75,7 +76,7 @@
             </span>
 
             <!-- 编辑 -->
-            <a class="u-edit u-sub-block" :href="edit_link" v-if="canEdit">
+            <a class="u-edit u-sub-block" :href="edit_link" v-if="canEdit && !anonymous">
                 <el-icon class="u-icon-edit" :size="16"><Edit /></el-icon>
                 <span>编辑</span>
             </a>
@@ -93,7 +94,7 @@ const { __clients } = JX3BOX;
 
 export default {
     name: "PostHeader",
-    props: ["post", "stat", "titleExtra"],
+    props: ["post", "stat", "titleExtra", "anonymous",],
     data: function () {
         return {
             wordCount: 0,

package/src/single/Thx.vue

@@ -4,7 +4,7 @@
             <boxcoin-admin
                 :postId="postId"
                 :postType="postType"
-                v-if="hasRight && adminBoxcoinEnable && boxcoin_enable"
+                v-if="hasRight && adminBoxcoinEnable && boxcoin_enable && hasPermission"
                 :userId="userId"
                 :max="admin_max"
                 :min="admin_min"
@@ -14,6 +14,9 @@
                 :authors="authors"
                 @updateRecord="updateRecord"
                 :client="finalClient"
+                :totalLimit="total_limit"
+                :postTypeUsed="post_type_used"
+                :category="category"
             />
             <Like :postId="postId" :postType="postType"></Like>
             <fav :postId="postId" :postType="postType" :postTitle="postTitle"></fav>
@@ -29,13 +32,14 @@
                 v-if="userBoxcoinEnable && boxcoin_enable && allowGift"
                 @updateRecord="updateRecord"
                 :client="finalClient"
+                :category="category"
             />
             <Share :postId="postId" :postType="postType" :client="client" />
             <watch-later :category="postType" :title="postTitle" :author-id="authorId" :banner="banner" :content-id="contentMetaId"></watch-later>
         </div>
         <div class="w-thx-records">
             <boxcoin-records :postId="postId" :postType="postType" :postClient="finalClient" :cacheRecord="cacheRecord"
-                :mode="mode" @update:boxcoin="updateBoxcoin" />
+                :mode="mode" @update:boxcoin="updateBoxcoin" v-if="showRecord" />
         </div>
         <div class="w-thx-copyright">
             &copy;
@@ -57,6 +61,7 @@ import Rss from "../interact/Rss.vue";
 
 import User from "@jx3box/jx3box-common/js/user";
 import { getBoxcoinStatus, getPostBoxcoinConfig } from "../../service/thx";
+import {getConfig,getUserPermission} from "../../service/cms"
 
 export default {
     name: "ThxComp",
@@ -135,7 +140,7 @@ export default {
     data: function () {
         return {
             boxcoin: 0,
-            hasRight: User.getInfo().group >= 32,
+            hasRight: User.getInfo().group >= 64,
             user: User.getInfo(),
 
             admin_max: 0,
@@ -143,6 +148,8 @@ export default {
             admin_left: 0,
             admin_total: 0,
             admin_points: [100],
+            total_limit: 0,
+            post_type_used: 0,
 
             user_left: 0,
             user_points: [100],
@@ -151,6 +158,9 @@ export default {
             boxcoin_enable: 0,
 
             showDrawer: false,
+
+            admin_boxcoin_visible: 1,
+            hasPermission: false,
         };
     },
     computed: {
@@ -162,6 +172,13 @@ export default {
                 return "std"
             }
             return this.client
+        },
+        showRecord() {
+            // 当admin_boxcoin_visible为0时，作者本人和64及以上权限可见打赏记录
+            if (this.admin_boxcoin_visible === 0) {
+                return this.userId == this.user.uid || this.user.group >= 64;
+            }
+            return true;
         }
     },
     watch: {
@@ -182,6 +199,8 @@ export default {
                     this.admin_points = res.data.data.limit.admin_points || [10, 1000];
                     this.admin_left = res.data.data.asManagerBoxCoinRemain || 0;
                     this.admin_total = res.data.data.asManagerBoxCoinTotal || 0;
+                    this.total_limit = res.data.data.limit.total_limit || 0;
+                    this.post_type_used = res.data.data.asPostTypeBoxcoinHasUsedTotalAtCurrentYear || 0;
 
                     this.user_points = res.data.data.limit.user_points || [10, 1000];
                     // 根据多端展示剩余币
@@ -200,6 +219,17 @@ export default {
             getBoxcoinStatus().then((res) => {
                 this.boxcoin_enable = !!~~res.data?.data?.val;
             });
+
+            getConfig({
+                key: 'admin_boxcoin_visible'
+            }).then((res) => {
+                this.admin_boxcoin_visible = Number(res?.val)
+            });
+
+            User.isLogin() &&  getUserPermission().then(res => {
+                const permissions = res.data.data.permission?.map(item => item.action)
+                this.hasPermission = permissions.includes(`manage_boxcoin_${this.postType}`) || User.isSuperAdmin();
+            })
         },
         // 用户打赏
         updateRecord: function (data) {

package/src/single/cms-single.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="m-single-box">
         <!-- 头部 -->
-        <PostHeader :post="post" :stat="stat">
+        <PostHeader :post="post" :stat="stat" :anonymous="anonymous">
             <slot name="single-header"></slot>
         </PostHeader>
 
@@ -171,6 +171,9 @@ export default {
         community_id: function () {
             return this.post?.community_id || 0;
         },
+        anonymous: function () {
+            return this.post?.anonymous ==1;
+        }
     },
     methods: {
         updateCollection: function (val) {