@jx3box/jx3box-common-ui 8.2.2 → 8.2.3

package/package.json

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

package/service/author.js

@@ -46,10 +46,19 @@ function getDouyu(ids) {
             return res.data.data;
         });
 }
-
+// 获取用户勋章
 function getUserMedals(uid) {
     return $next({ mute: true })
-        .get("/api/user/" + uid + "/medals")
+        .get("/api/next2/user/" + uid + "/medals")
+        .then((res) => {
+            return res.data.data;
+        });
+}
+
+// 获取用户称号
+function getUserHonors(uid) {
+    return $next({ mute: true })
+        .get("/api/next2/user/" + uid + "/honors")
         .then((res) => {
             return res.data.data;
         });
@@ -92,5 +101,6 @@ export {
     getMyInfo,
     userSignIn,
     getFansList,
-    getUserInfoByUidOrName
+    getUserInfoByUidOrName,
+    getUserHonors
 };

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,4 +73,5 @@ function setUserMeta(key,data) {
     return $cms().post(`/api/cms/user/my/meta?key=${key}`, data);
 }
 
-export { getPostAuthors, uploadImage, upload, getDecoration, getDecorationJson, checkTeamMember, getHonorJson, getSliders, getCollection, getTopicBucket, getConfig, getUserMeta, setUserMeta };
+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="2">
+        <LeftSidebar :open="true" :uid="1005">
             <LeftSideToggle :mobileOnly="true" />
-            <Author :author="author" :uid="2" />
+            <Author :author="author" :uid="1005" />
         </LeftSidebar>
 
         <Main :withoutLeft="false" :withoutRight="false">

package/src/author/AuthorHonor.vue

@@ -1,12 +1,11 @@
 <template>
     <div class="c-author-honor" :style="{ backgroundImage: `url(${imgUrl()})` }" v-if="honor">
-        <span v-if="!isJdt" :style="{ color: honor.color }">{{ honor.honor }}</span>
+        <span v-if="!isJdt" :style="{ color: honor.color }">{{ honorName }}</span>
     </div>
 </template>
 <script>
 import { __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
-import { getDecoration, getHonorJson } from "../../service/cms";
-import { inRange } from "lodash";
+import { getUserHonors } from "../../service/author";
 const HONOR_IMG_KEY = "honor_img";
 export default {
     props: ["uid"],
@@ -26,16 +25,16 @@ export default {
     computed: {
         isJdt() {
             return this.honor?.val?.toLowerCase()?.includes('jdt')
+        },
+        honorName({ honor }) {
+            return `${honor.year}${honor.prefix}${honor.suffix}`
         }
     },
     methods: {
         imgUrl: function () {
             let item = this.honor;
             if (!item) return;
-            if (item.isImgIndex) {
-                return __imgPath + `decoration/honor/${item.val}/${item.val}_${item.imgIndex}.${item.ext}`;
-            }
-            return __imgPath + `decoration/honor/${item.val}/${item.val}.${item.ext}`;
+            return __imgPath + `decoration/honor/${item.img}/${item.img}.${item.img_ext}`;
         },
         getHonor() {
             let user_id = this.uid;
@@ -46,8 +45,8 @@ export default {
             try {
                 this.honor = JSON.parse(honor_local);
             } catch (err) {
-                getDecoration({ using: 1, user_id: user_id, type: "honor" }).then((data) => {
-                    let res = data.data.data || [];
+                getUserHonors(user_id).then((data) => {
+                    let res = data?.filter(item => item.using);
                     if (res.length == 0) {
                         //空 则为无主题，不再加载接口，界面设No
                         sessionStorage.setItem(HONOR_IMG_KEY + user_id, "no");
@@ -60,46 +59,9 @@ export default {
         },
         //有称号后，获取样式配置
         getHonorStyle(data) {
-            getHonorJson().then((res) => {
-                let honorList = res.data;
-                let honorConfig = honorList[data.val];
-                let prefix = honorConfig.prefix;
-                let regPrefix = honorConfig.prefix.match(/\{([^{}]+?)\}/g);
-                let ranking = honorConfig.ranking;
-                let honorStr = honorConfig.year || "";
-                if (regPrefix) {
-                    honorStr = honorStr + (data[regPrefix[0].slice(1, -1)] || "");
-                } else {
-                    honorStr = honorStr + prefix;
-                }
-                if (ranking.length > 0) {
-                    data.imgIndex = 0;
-                    for (let i = 0; i < ranking.length; i++) {
-                        if (data.ranking !== undefined && inRange(Number(data.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 = data.honor;
+            sessionStorage.setItem(HONOR_IMG_KEY + this.uid, JSON.stringify(data));
+            this.honor = data;
         },
     },
 };

package/src/author/AuthorInfo.vue

@@ -45,11 +45,8 @@ import { __server, __imgPath, __userLevel, __userLevelColor } from "@jx3box/jx3b
 import { authorLink } from "@jx3box/jx3box-common/js/utils";
 import User from "@jx3box/jx3box-common/js/user";
 import { getUserInfo } from "../../service/author";
-import { getDecoration, getHonorJson } from "../../service/cms";
 import Avatar from "./Avatar.vue";
 import Honor from "./AuthorHonor.vue";
-import { cloneDeep, inRange } from "lodash";
-const HONOR_IMG_KEY = "honor_img";
 export default {
     name: "AuthorInfo",
     props: ["uid"],