@jx3box/jx3box-common-ui 9.0.24 → 9.0.26

package/package.json

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

package/service/author.js

@@ -91,8 +91,12 @@ function userSignIn(){
     return $pay({ mute: true }).get(`/api/personal/task/everyday/sign-in`)
 }
 
-function getFansList(userid,limit) {
-    return $pay().get(`/api/cny/consume/user-charge/rank/of/${userid}?limit=0`,);
+function getFansList(userid, limit) {
+    return $next().get(`/api/next2/rss/user-list/author/${userid}/vip-subscriber?limit=${limit}`)
+}
+
+function getSummary(uid) {
+    return $next().get(`/api/next2/rss/summary/author/${uid}`)
 }
 
 export {
@@ -108,5 +112,6 @@ export {
     getFansList,
     getUserInfoByUidOrName,
     getUserHonors,
-    getUserHonor
+    getUserHonor,
+    getSummary
 };

package/src/Author.vue

@@ -12,10 +12,10 @@
                 </el-button>
             </div>
             <!-- <AuthorMsg :uid="uid" /> -->
-            <AuthorLink class="u-block u-links" :uid="uid" :data="data" />
+            <!-- <AuthorLink class="u-block u-links" :uid="uid" :data="data" /> -->
             <AuthorMedals class="u-block u-trophy" :uid="uid" />
-            <AuthorTeams class="u-block u-teams" :uid="uid" />
-            <!-- <AuthorFans class="u-block u-fans" :uid="uid" /> -->
+            <!-- <AuthorTeams class="u-block u-teams" :uid="uid" /> -->
+            <AuthorFans class="u-block u-fans" :uid="uid" />
             <slot></slot>
             <AuthorPosts class="u-block u-posts" :uid="uid" />
         </template>
@@ -24,13 +24,13 @@
 
 <script>
 import AuthorInfo from "./author/AuthorInfo.vue";
-import AuthorLink from "./author/AuthorLink.vue";
+// import AuthorLink from "./author/AuthorLink.vue";
 // import AuthorFollow from "./author/AuthorFollow.vue";
 // import AuthorMsg from "./author/AuthorMsg.vue";
 // import AuthorGift from "./author/AuthorGift.vue";
-// import AuthorFans from "./author/AuthorFans.vue";
+import AuthorFans from "./author/AuthorFans.vue";
 import AuthorMedals from "./author/AuthorMedals.vue";
-import AuthorTeams from "./author/AuthorTeams.vue";
+// import AuthorTeams from "./author/AuthorTeams.vue";
 import AuthorPosts from "./author/AuthorPosts.vue";
 import AuthorRss from "./author/AuthorRss.vue";
 import {__cdn} from "@jx3box/jx3box-common/data/jx3box.json";
@@ -53,14 +53,14 @@ export default {
     },
     components: {
         AuthorInfo,
-        AuthorLink,
+        // AuthorLink,
         // AuthorFollow,
         // AuthorMsg,
         // AuthorGift,
         AuthorMedals,
-        AuthorTeams,
+        // AuthorTeams,
         AuthorPosts,
-        // AuthorFans,
+        AuthorFans,
         AuthorRss,
     },
 };

package/src/Header.vue

@@ -72,6 +72,8 @@ export default {
                 const appid = urlParams.get("appid");
                 const item = miniprogram?.find((item) => item.appid === appid);
 
+                document.documentElement.classList.add("v-miniprogram");
+
                 if (appid && item) {
                     document.documentElement.classList.add("env-miniprogram" + item.id);
 

package/src/author/AuthorFans.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="c-author-fans" v-if="list && list.length">
+    <div class="c-author-fans">
         <div class="u-label">
             <!-- <i class="el-icon-star-off"></i> -->
             <img svg-inline src="../../assets/img/leftsidebar/fans.svg" />
@@ -9,27 +9,26 @@
             <el-tooltip
                 class="item"
                 effect="dark"
-                :content="'累计打赏' + item.money.toString() + '金箔'"
+                :content="'累计打赏' + item.summary.toString() + '盒币'"
                 placement="top"
                 v-for="item in list"
-                :key="item.pay_user_id"
+                :key="item.user_id"
             >
-                <a class="u-fan" :href="authorLink(item.pay_user_id)"
-                    ><el-avatar class="u-avatar" shape="circle" :size="20" :src="showAvatar(item.pay_user.avatar)"
+                <a class="u-fan" :href="authorLink(item.user_id)"
+                    ><el-avatar class="u-avatar" shape="circle" :size="20" :src="showAvatar(item.user_info.avatar)"
                         ><i class="el-icon-s-custom"></i></el-avatar
                 ></a>
             </el-tooltip>
-            <el-avatar class="u-avatar u-more" shape="circle" :size="20" v-if="total > MAX_LENGTH">
-                <span class="f-avatar-num" v-if="total > 99">···</span>
-                <span class="f-avatar-num" v-else>+{{ total - MAX_LENGTH }}</span>
-            </el-avatar>
         </div>
-        <div class="f-bottom">本赛季共 {{ total }} 人为TA赠礼</div>
+        <div class="f-bottom">
+            粉丝数: <span class="u-count">{{ fans_count }}</span
+            >，累计收到盒币打赏: <span class="u-count">{{ boxcoin_count }}</span>
+        </div>
     </div>
 </template>
 
 <script>
-import { getFansList } from "../../service/author";
+import { getFansList, getSummary } from "../../service/author";
 import { showAvatar, authorLink } from "@jx3box/jx3box-common/js/utils";
 export default {
     name: "AuthorFans",
@@ -38,20 +37,31 @@ export default {
             type: Number,
             default: 0,
         },
+        fansLimit: {
+            type: Number,
+            default: 8,
+        },
     },
     data() {
         return {
             list: [],
             total: 0,
-            MAX_LENGTH : 8,
+            MAX_LENGTH: 8,
+
+            fans_count: 0,
+            boxcoin_count: 0,
         };
     },
     methods: {
         getData() {
             if (!~~this.uid) return;
-            getFansList(this.uid).then((res) => {
-                this.list = res.data.data.list?.slice(0,this.MAX_LENGTH) || [];
-                this.total = res.data.data.totalUser || 0;
+            getSummary(this.uid).then((res) => {
+                this.fans_count = res.data.data?.fans_count || 0;
+                this.boxcoin_count = res.data.data?.boxcoin_count || 0;
+            });
+
+            getFansList(this.uid, this.fansLimit).then((res) => {
+                this.list = res.data.data.list;
             });
         },
         showAvatar,
@@ -69,6 +79,7 @@ export default {
 </script>
 
 <style lang="less">
+@import "../../assets//css/mixin.less";
 .c-author-fans {
     box-sizing: border-box;
     // padding: 10px;
@@ -76,80 +87,20 @@ export default {
     font-family: "Microsoft YaHei";
     font-style: normal;
     // .h(133px);
-    .f-main-box {
-        display: flex;
-        justify-content: center;
-        width: 100%;
-        .f-left {
-            .w(65.3%);
-            .f-l-box {
-                .w(100%);
-                .h(50px);
-                background: #ff7cab;
-                border-radius: 5px 0px 0px 5px;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                flex: none;
-                .f-l-title {
-                    .w(48px);
-                    .h(21px);
-                    .fz(16px, 21px);
-                    font-weight: 700;
-                    color: #ffffff;
-                }
-            }
-        }
-        .f-right {
-            position: relative;
-            .w(34.7%);
-            .f-r-box {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                flex: none;
-                .h(50px);
-                .w(100%);
-                z-index: 2;
-                position: absolute;
-                .f-r-num {
-                    font-weight: 700;
-                    .fz(10px, 13px);
-                    .w(100%);
-                    color: rgba(0, 0, 0, 0.5);
-                    padding-left: 37.5%;
-                }
-            }
-            .f-r-line {
-                .h(5px);
-                background: #ff7cab;
-                border-radius: 0px 5px 5px 0px;
-            }
-            .f-r-mb {
-                .mb(2.5px);
-            }
-            .f-r-w-80 {
-                .w(100%);
-            }
-            .f-r-w-70 {
-                .w(87.5%);
-            }
-            .f-r-w-30 {
-                .w(37.5%);
-            }
-            .f-r-w-20 {
-                .w(25%);
-            }
-        }
-    }
+
     .f-avatar {
-        height: 30px;
+        height: 40px;
+        .flex;
+        align-items: center;
+        overflow: auto hidden;
+        align-items: center;
+        .scrollbar();
         .f-avatar-num {
             .fz(12px);
             color: #888;
             font-weight: 700;
         }
-        .u-fan{
+        .u-fan {
             .mr(5px);
         }
     }
@@ -158,8 +109,72 @@ export default {
         .fz(12px, 14px);
         font-weight: 400;
         color: #888;
-        // transform: scale(0.8);
-        // transform-origin: 0 0;
+    }
+}
+.f-main-box {
+    display: flex;
+    justify-content: center;
+    width: 100%;
+    .f-left {
+        .w(65.3%);
+        .f-l-box {
+            .w(100%);
+            .h(50px);
+            background: #ff7cab;
+            border-radius: 5px 0px 0px 5px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex: none;
+            .f-l-title {
+                .w(48px);
+                .h(21px);
+                .fz(16px, 21px);
+                font-weight: 700;
+                color: #ffffff;
+            }
+        }
+    }
+    .f-right {
+        position: relative;
+        .w(34.7%);
+        .f-r-box {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex: none;
+            .h(50px);
+            .w(100%);
+            z-index: 2;
+            position: absolute;
+            .f-r-num {
+                font-weight: 700;
+                .fz(10px, 13px);
+                .w(100%);
+                color: rgba(0, 0, 0, 0.5);
+                padding-left: 37.5%;
+            }
+        }
+        .f-r-line {
+            .h(5px);
+            background: #ff7cab;
+            border-radius: 0px 5px 5px 0px;
+        }
+        .f-r-mb {
+            .mb(2.5px);
+        }
+        .f-r-w-80 {
+            .w(100%);
+        }
+        .f-r-w-70 {
+            .w(87.5%);
+        }
+        .f-r-w-30 {
+            .w(37.5%);
+        }
+        .f-r-w-20 {
+            .w(25%);
+        }
     }
 }
 </style>