@jx3box/jx3box-common-ui 8.2.15 → 8.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "8.2.15",
+  "version": "8.2.17",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {

package/src/filters/clientBy.vue

@@ -40,8 +40,7 @@ export default {
                 clients = Object.assign({}, clients, {
                     all: "全端",
                 });
-            }
-            console.log(clients)
+            } 
             return clients;
         },
     },

package/src/header/manage.vue

@@ -6,15 +6,15 @@
         <ul class="u-menu u-pop-content">
             <li v-for="item in userPanel" :key="item.label">
                 <a :href="item.link" :target="item.target || '_self'" class="u-menu-item">
-                    <img :src="resolveImg(item.icon)" svg-inline class="u-menu-icon" :alt="item.icon">
+                    <img :src="resolveImg(item.icon)" svg-inline class="u-menu-icon" :alt="item.icon" />
                     {{ item.label }}
                 </a>
             </li>
             <hr v-if="userPanel.length" />
-            <template v-if="isEditor">
+            <template v-if="isTeammate">
                 <li v-for="item in adminPanel" :key="item.label">
                     <a :href="item.link" :target="item.target || '_self'" class="u-menu-item">
-                        <img :src="resolveImg(item.icon)" svg-inline class="u-menu-icon" :alt="item.icon">
+                        <img :src="resolveImg(item.icon)" svg-inline class="u-menu-icon" :alt="item.icon" />
                         {{ item.label }}
                     </a>
                 </li>
@@ -24,7 +24,6 @@
 </template>
 
 <script>
-import User from "@jx3box/jx3box-common/js/user";
 import panel from "../../assets/data/panel.json";
 import { getMenu } from "../../service/header";
 import { __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
@@ -35,6 +34,12 @@ export default {
             panel,
         };
     },
+    props: {
+        isTeammate: {
+            type: Boolean,
+            default: false,
+        },
+    },
     computed: {
         userPanel: function () {
             return this.panel.filter((item) => {
@@ -46,9 +51,6 @@ export default {
                 return item.onlyAdmin;
             });
         },
-        isEditor() {
-            return User.isEditor();
-        },
     },
     mounted() {
         this.loadPanel();
@@ -72,7 +74,7 @@ export default {
         },
         resolveImg: function (img) {
             // return __imgPath + "image/header/panel/" + img;
-            return 'https://img.jx3box.com/image/box/pvp.svg'
+            return "https://img.jx3box.com/image/box/pvp.svg";
         },
     },
 };
@@ -92,7 +94,6 @@ export default {
         svg {
             .size(19px);
         }
-
     }
     .u-menu {
         .u-menu-item {
@@ -103,7 +104,7 @@ export default {
         .u-menu-icon {
             width: 16px;
             height: 16px;
-    }
+        }
     }
 }
 </style>

package/src/header/user.vue

@@ -17,13 +17,13 @@
             <asset :asset="asset" />
 
             <!-- manage -->
-            <manage />
+            <manage :isTeammate="isTeammate" />
 
             <!-- 语言切换 -->
             <!-- <lang-switch /> -->
 
             <!-- user info -->
-            <user-info :asset="asset" @logout="logout" />
+            <user-info :asset="asset" @logout="logout" @update="update" />
         </template>
         <template v-else>
             <div class="c-header-login">
@@ -43,12 +43,12 @@ import dayjs from "dayjs";
 import isToday from "dayjs/plugin/isToday";
 dayjs.extend(isToday);
 
-import message from "./message.vue"
-import publish from "./publish.vue"
-import vip from "./vip.vue"
-import asset from "./asset.vue"
-import manage from "./manage.vue"
-import userInfo from './userInfo.vue';
+import message from "./message.vue";
+import publish from "./publish.vue";
+import vip from "./vip.vue";
+import asset from "./asset.vue";
+import manage from "./manage.vue";
+import userInfo from "./userInfo.vue";
 // import langSwitch from "./langSwitch.vue";
 import shop from "./shop.vue";
 export default {
@@ -60,7 +60,7 @@ export default {
         manage,
         userInfo,
         // langSwitch,
-        shop
+        shop,
     },
     data: function () {
         return {
@@ -83,6 +83,8 @@ export default {
             // 链接
             login_url: __Links.account.login + "?redirect=" + location.href,
             register_url: __Links.account.register + "?redirect=" + location.href,
+
+            isTeammate: false,
         };
     },
     methods: {
@@ -133,7 +135,7 @@ export default {
         // 初始化
         init: function () {
             if (this.isLogin) {
-                this.loadAsset( )
+                this.loadAsset();
                 this.signIn();
             }
         },
@@ -142,6 +144,10 @@ export default {
         logout: function () {
             this.isLogin = false;
         },
+        // 更新用户信息
+        update: function ({ is_teammate }) {
+            this.isTeammate = is_teammate;
+        },
     },
     created: function () {
         this.init();

package/src/header/userInfo.vue

@@ -13,14 +13,14 @@
                     <li>
                         <a :href="url.publish">发布中心</a>
                     </li>
-                    <hr>
+                    <hr />
                     <li v-for="item in userPanel" :key="item.label">
                         <a :href="item.link" :target="item.target || '_self'">
                             <!-- <i :class="item.icon || 'el-icon-present'"></i> -->
                             {{ item.label }}
                         </a>
                     </li>
-                    <template v-if="isEditor">
+                    <template v-if="isTeammate">
                         <li v-for="item in adminPanel" :key="item.label">
                             <a :href="item.link" :target="item.target || '_self'">
                                 <!-- <i :class="item.icon || 'el-icon-present'"></i> -->
@@ -41,14 +41,27 @@
                                 showUserName(user.display_name)
                             }}</a>
                             <a class="u-sign" href="/dashboard/cooperation">
-                                <img :src="super_author_icon" class="u-superauthor-profile" alt="superauthor" title="签约作者" :class="{ off: !isSuperAuthor }" /></a>
-                            <a class="u-vip" href="/vip/premium?from=header_usermenu" target="_blank" title="专业版账号">
+                                <img
+                                    :src="super_author_icon"
+                                    class="u-superauthor-profile"
+                                    alt="superauthor"
+                                    title="签约作者"
+                                    :class="{ off: !isSuperAuthor }"
+                            /></a>
+                            <a
+                                class="u-vip"
+                                href="/vip/premium?from=header_usermenu"
+                                target="_blank"
+                                title="专业版账号"
+                            >
                                 <i class="i-icon-vip" :class="{ on: isPRO }">{{ vipType }}</i>
                                 <span class="u-expire" v-if="isPRO">（有效期至：{{ pro_expire_date }}）</span>
                             </a>
                         </div>
                         <div class="u-id">
-                            <span>魔盒UID：<b>{{ user.ID }}</b></span>
+                            <span
+                                >魔盒UID：<b>{{ user.ID }}</b></span
+                            >
                             <i class="el-icon-document-copy u-copy" @click.stop="copyText(user.ID)"></i>
                         </div>
                     </div>
@@ -62,7 +75,8 @@
                     <div class="u-other">
                         <a href="/dashboard/fav" class="u-item"><i class="el-icon-star-off"></i>收藏订阅 </a>
                         <a href="/team/role/manage" class="u-item"><i class="el-icon-user"></i>角色管理 </a>
-                        <a href="/dashboard/purchases" class="u-item"><i class="el-icon-shopping-cart-2"></i>已购资源
+                        <a href="/dashboard/purchases" class="u-item"
+                            ><i class="el-icon-shopping-cart-2"></i>已购资源
                         </a>
                         <a href="/dashboard/mall" class="u-item"><i class="el-icon-shopping-bag-1"></i>订单中心 </a>
                         <hr />
@@ -89,6 +103,7 @@ import { getMenu } from "../../service/header";
 export default {
     name: "info",
     props: ["asset"],
+    emits: ["update"],
     data() {
         return {
             isPhone: window.innerWidth < 768,
@@ -106,6 +121,7 @@ export default {
             isSuperAuthor: false,
 
             panel: [],
+            isTeammate: false,
         };
     },
     computed: {
@@ -134,11 +150,8 @@ export default {
                 return item.onlyAdmin;
             });
         },
-        isEditor() {
-            return User.isEditor();
-        },
-        pro_expire_date: function() {
-            return this.asset.pro_expire_date ? showDate(this.asset.pro_expire_date) : '-';
+        pro_expire_date: function () {
+            return this.asset.pro_expire_date ? showDate(this.asset.pro_expire_date) : "-";
         },
     },
     mounted() {
@@ -174,6 +187,8 @@ export default {
                 .then((data) => {
                     this.user = data;
                     this.isSuperAuthor = !!data.sign;
+                    this.isTeammate = this.user?.is_teammate;
+                    this.$emit("update", this.user);
                 })
                 .catch((err) => {
                     if (err?.data.code < -1) {