@jx3box/jx3box-common-ui 8.2.16 → 8.3.0

package/package.json

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

package/src/header/manage.vue

@@ -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;
             });
         },
-        isTeammate() {
-            return JSON.parse(sessionStorage.getItem("is_teammate"));
-        },
     },
     mounted() {
         this.loadPanel();

package/src/header/shop.vue

@@ -29,9 +29,15 @@ export default {
             /**
              * 1. 用户第一次进入页面时，没有记录，则显示，并记录到meta
              * 2. 用户第二次进入页面，此时meta有记录，但是用户并未进入会员中心，则显示
+             *
+             * meta如果为null，说明用户未登录，不显示
+             * meta如果为0，说明用户已经看过，不显示，同时比较config的值，如果config的值大于local，更新local为config的值和meta为1
+             * meta如果为1，说明用户未看过，显示
              */
             let meta = null
-            meta = meta = User.isLogin() && await getUserMeta({ key: "mall_pop" });
+            if (User.isLogin()) {
+                meta = await getUserMeta({ key: "mall_pop" });
+            }
             let config = await getConfig({ key: "mall" });
 
             if (meta == null) {

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

@@ -103,6 +103,7 @@ import { getMenu } from "../../service/header";
 export default {
     name: "info",
     props: ["asset"],
+    emits: ["update"],
     data() {
         return {
             isPhone: window.innerWidth < 768,
@@ -120,6 +121,7 @@ export default {
             isSuperAuthor: false,
 
             panel: [],
+            isTeammate: false,
         };
     },
     computed: {
@@ -148,9 +150,6 @@ export default {
                 return item.onlyAdmin;
             });
         },
-        isTeammate() {
-            return JSON.parse(sessionStorage.getItem("is_teammate"));
-        },
         pro_expire_date: function () {
             return this.asset.pro_expire_date ? showDate(this.asset.pro_expire_date) : "-";
         },
@@ -188,7 +187,8 @@ export default {
                 .then((data) => {
                     this.user = data;
                     this.isSuperAuthor = !!data.sign;
-                    sessionStorage.setItem("is_teammate", JSON.stringify(data.is_teammate));
+                    this.isTeammate = this.user?.is_teammate;
+                    this.$emit("update", this.user);
                 })
                 .catch((err) => {
                     if (err?.data.code < -1) {

package/src/header/vip.vue

@@ -31,7 +31,9 @@ export default {
              * 2. 用户第二次进入页面，此时meta有记录，但是用户并未进入会员中心，则显示
              */
             let meta = null
-            meta = User.isLogin() && await getUserMeta({ key: 'vip_pop' });
+            if (User.isLogin()) {
+                meta = await getUserMeta({ key: "vip_pop" });
+            }
             let config = await getConfig({ key: "vip" });