@jx3box/jx3box-common-ui 8.2.5 → 8.2.7

package/package.json

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

package/service/author.js

@@ -64,6 +64,11 @@ function getUserHonors(uid) {
         });
 }
 
+function getUserHonor(uid) {
+    return $cms({ mute: true })
+        .get(`/api/cms/user/honor/${uid}/using`)
+}
+
 function getFrames() {
     return axios.get(__imgPath + "avatar/index.json");
 }
@@ -102,5 +107,6 @@ export {
     userSignIn,
     getFansList,
     getUserInfoByUidOrName,
-    getUserHonors
+    getUserHonors,
+    getUserHonor
 };

package/service/cms.js

@@ -18,10 +18,6 @@ function getDecorationJson() {
     let url = __imgPath + "decoration/index.json";
     return axios.get(url);
 }
-function getHonorJson() {
-    let url = __imgPath + "decoration/honor.json";
-    return axios.get(url);
-}
 // 通用上传
 function upload(formData) {
     return $cms().post(`/api/cms/upload`, formData);
@@ -77,5 +73,5 @@ function setUserMeta(key,data) {
     return $cms().post(`/api/cms/user/my/meta?key=${key}`, data);
 }
 
-export { getPostAuthors, uploadImage, upload, getDecoration, getDecorationJson, getHonorJson, checkTeamMember,
+export { getPostAuthors, uploadImage, upload, getDecoration, getDecorationJson, checkTeamMember,
     getSliders, getCollection, getTopicBucket, getConfig, getUserMeta, setUserMeta };

package/src/App.vue

@@ -15,9 +15,9 @@
             bread info
         </Breadcrumb>
 
-        <LeftSidebar :open="true" :uid="8">
+        <LeftSidebar :open="true" :uid="8719">
             <LeftSideToggle :mobileOnly="true" />
-            <Author :author="author" :uid="8" />
+            <Author :author="author" :uid="8719" />
         </LeftSidebar>
 
         <Main :withoutLeft="false" :withoutRight="false">

package/src/author/AuthorHonor.vue

@@ -5,8 +5,7 @@
 </template>
 <script>
 import { __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
-import { getHonorJson } from "../../service/cms";
-import { getUserHonors } from "../../service/author";
+import { getUserHonor } from "../../service/author";
 import { inRange } from "lodash";
 const HONOR_IMG_KEY = "honor_img";
 export default {
@@ -47,69 +46,68 @@ export default {
             try {
                 this.honor = JSON.parse(honor_local);
             } catch (err) {
-                getUserHonors(user_id).then((data) => {
-                    let res = data?.filter((item) => item.using);
-                    if (res.length == 0) {
+                getUserHonor(user_id).then((res) => {
+                    this.honor = res.data.data;
+                    if (!this.honor) {
                         //空 则为无主题，不再加载接口，界面设No
                         sessionStorage.setItem(HONOR_IMG_KEY + user_id, "no");
                         return;
                     }
-                    let honor = res[0];
-                    this.getHonorStyle(honor);
+                    this.getHonorStyle(this.honor);
                 });
             }
         },
         //有称号后，获取样式配置
         getHonorStyle(honor) {
-            const data = honor?.honor || {};
-            getHonorJson().then((res) => {
-                let honorList = res.data;
-                let honorConfig = honorList[data.img];
-                let only = honorConfig.only;
-                let prefix = honorConfig.prefix;
-                let regPrefix = honorConfig.prefix.match(/\{([^{}]+?)\}/g);
-                let ranking = honorConfig.ranking;
-                let honorStr = honorConfig.year || "";
-                if (!only) {
-                    if (regPrefix) {
-                        honorStr = honorStr + (data[regPrefix[0].slice(1, -1)] || "");
-                    } else {
-                        honorStr = honorStr + prefix;
-                    }
+            const data = honor
+            let honorConfig = honor?.honor_info;
+            let only = honorConfig.only;
+            let prefix = honorConfig.prefix;
+            let regPrefix = honorConfig.prefix.match(/\{([^{}]+?)\}/g);
+            let ranking = honorConfig.ranking;
+            let honorStr = honorConfig.year || "";
+
+            console.log(honorConfig, regPrefix)
+            if (!only) {
+                if (regPrefix) {
+                    honorStr = honorStr + (data[regPrefix[0].slice(1, -1)] || "");
                 } else {
-                    honorStr = prefix;
+                    honorStr = honorStr + prefix;
                 }
-                if (ranking.length > 0) {
-                    data.imgIndex = 0;
-                    for (let i = 0; i < ranking.length; i++) {
-                        if (
-                            honor.ranking !== undefined &&
-                            inRange(Number(honor.ranking), ranking[i][0], ranking[i][1])
-                        ) {
-                            data.imgIndex = i;
-                            let str = ranking[i][2];
-                            let regStr = str.match(/\{([^{}]+?)\}/g);
-                            if (regStr) {
-                                honorStr =
-                                    honorStr +
-                                    str.replace(/\{([^{}]+?)\}/g, function (match, p1) {
-                                        return data[p1] || "";
-                                    });
-                            } else {
-                                honorStr = honorStr + str;
-                            }
-                            break;
+            } else {
+                honorStr = prefix;
+            }
+            if (ranking.length > 0) {
+                data.imgIndex = 0;
+                for (let i = 0; i < ranking.length; i++) {
+                    if (
+                        honor.ranking !== undefined &&
+                        inRange(Number(honor.ranking), ranking[i][0], ranking[i][1])
+                    ) {
+                        data.imgIndex = i;
+                        let str = ranking[i][2];
+                        let regStr = str.match(/\{([^{}]+?)\}/g);
+                        if (regStr) {
+                            honorStr =
+                                honorStr +
+                                str.replace(/\{([^{}]+?)\}/g, function (match, p1) {
+                                    return data[p1] || "";
+                                });
+                        } else {
+                            honorStr = honorStr + str;
                         }
+                        break;
                     }
                 }
-                data.honor = honorStr + honorConfig.suffix;
-                data.color = honorConfig.color;
-                data.ext = honorConfig.ext;
-                data.isHave = true;
-                data.isImgIndex = ranking.length > 0;
-                sessionStorage.setItem(HONOR_IMG_KEY + this.uid, JSON.stringify(data));
-                this.honor = data;
-            });
+            }
+            data.honor = honorStr + honorConfig.suffix;
+            data.color = honorConfig.color;
+            data.img = honorConfig.img;
+            data.img_ext = honorConfig.img_ext;
+            data.isHave = true;
+            data.isImgIndex = ranking.length > 0;
+            sessionStorage.setItem(HONOR_IMG_KEY + this.uid, JSON.stringify(data));
+            this.honor = data;
         },
     },
 };

package/src/header/shop.vue

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

package/src/header/vip.vue

@@ -13,6 +13,7 @@
 
 <script>
 import { getConfig, getUserMeta, setUserMeta } from "../../service/cms";
+import User from "@jx3box/jx3box-common/js/user";
 export default {
     name: "vip",
     data: function () {
@@ -29,7 +30,8 @@ export default {
              * 1. 用户第一次进入页面时，没有记录，则显示，并记录到meta
              * 2. 用户第二次进入页面，此时meta有记录，但是用户并未进入会员中心，则显示
              */
-            let meta = await getUserMeta({ key: 'vip_pop' });
+            let meta = null
+            meta = User.isLogin() && await getUserMeta({ key: 'vip_pop' });
             let config = await getConfig({ key: "vip" });