@jx3box/jx3box-vue3-ui 0.9.13 → 0.9.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-vue3-ui",
-    "version": "0.9.13",
+    "version": "0.9.15",
     "description": "JX3BOX Vue3 UI",
     "main": "index.js",
     "scripts": {

package/service/author.js

@@ -63,15 +63,19 @@ function userSignIn() {
     return $pay({ mute: true }).get(`/api/personal/task/everyday/sign-in`);
 }
 
-function getFansList(userid) {
-    return $pay().get(`/api/cny/consume/user-charge/rank/of/${userid}?limit=0`);
-}
-
 // 获取指定表情
 function getEmotion(id) {
     return $cms().get(`/api/cms/post/emotion/${id}`);
 }
 
+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 {
     getUserInfo,
     getUserPosts,
@@ -85,4 +89,6 @@ export {
     getFansList,
     getUserInfoByUidOrName,
     getEmotion,
+    getSummary
+
 };

package/src/Header.vue

@@ -37,6 +37,7 @@ import nav from "./header/Nav.vue";
 import user from "./header/User.vue";
 import Box from "../src/Box.vue";
 import { isMiniProgram, miniprogramHack } from "@jx3box/jx3box-common/js/utils";
+import miniprogram from "@jx3box/jx3box-common/data/miniprogram.json";
 
 export default {
     name: "CommonHeader",
@@ -60,10 +61,24 @@ export default {
             }
 
             if (isMiniProgram()) {
-                document.documentElement.classList.add("wechat-miniprogram");
+                const urlParams = new URLSearchParams(window.location.search);
+                const appid = urlParams.get("appid");
+                const item = miniprogram?.find((item) => item.appid === appid);
 
-                // 微信小程序hack
-                miniprogramHack();
+                document.documentElement.classList.add("v-miniprogram");
+
+                if (appid && item) {
+                    document.documentElement.classList.add("env-miniprogram" + item.id);
+
+                    window.JX3BOX_ENV = item.id?.toUpperCase() + "_MINIPROGRAM";
+                } else {
+                    document.documentElement.classList.add("wechat-miniprogram");
+
+                    window.JX3BOX_ENV = "MINIPROGRAM";
+
+                    // 微信小程序hack
+                    miniprogramHack();
+                }
             }
         },
 

package/src/author/AuthorFans.vue

@@ -8,27 +8,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"
             >
-                <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)"
-                        ><el-icon><Avatar/></el-icon></el-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
+            ><template v-if="boxcoin_count">，累计收到盒币打赏: <span class="u-count">{{ boxcoin_count }}</span></template>
+        </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",
@@ -42,14 +41,22 @@ export default {
         return {
             list: [],
             total: 0,
-            MAX_LENGTH : 8,
+            MAX_LENGTH: 8,
+
+            fans_count: 0,
+            boxcoin_count: 0,
         };
     },
     methods: {
         getData() {
-            getFansList(this.uid).then((res) => {
-                this.list = res.data.data.list?.slice(0,this.MAX_LENGTH) || [];
-                this.total = res.data.data.totalUser || 0;
+            if (!~~this.uid) return;
+            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,

package/src/author/AuthorRss.vue

@@ -40,7 +40,7 @@ export default {
     },
     computed: {
         btnText() {
-            return this.subscribed ? "已订阅" : "订阅";
+            return this.subscribed ? "已关注" : "关注";
         },
         btnType() {
             return !this.subscribed ? "info" : "warning";
@@ -87,7 +87,7 @@ export default {
                 subscribeAuthor({ id: this.uid, data: { title: this.data?.display_name } })
                     .then(() => {
                         this.subscribed = true;
-                        this.$message.success("订阅成功");
+                        this.$message.success("关注成功");
                     })
                     .catch((err) => {
                         console.log(err);

package/src/editor/components/Author.vue

@@ -276,7 +276,6 @@ export default {
 @import "../../../assets/css/module/author.less";
 .w-author {
     .w-author-wrapper {
-        // background-image: url(https://img.jx3box.com/decoration/images/1_CAT/atcard.png);
         background-repeat: no-repeat;
         background-position: top right;
         background-size: 100% auto;

package/src/interact/WatchLater.vue

@@ -25,6 +25,14 @@ export default {
             type: String,
             default: "",
         },
+        authorId: {
+            type: Number,
+            default: 0,
+        },
+        banner: {
+            type: String,
+            default: "",
+        },
     },
     data: function () {
         return {
@@ -47,6 +55,8 @@ export default {
                 category: this.category,
                 link: location.href,
                 title: this.title,
+                author_id: this.authorId,
+                banner: this.banner,
             }
         }
     },

package/src/single/Author.vue

@@ -6,13 +6,13 @@
                 <!-- <AuthorFollow style="margin-right: 8px;" :uid="uid" /> -->
                 <AuthorRss style="margin-right: 8px" :uid="uid" :data="data" />
                 <!-- <AuthorGift :uid="uid" /> -->
-                <el-button class="u-btn" @click="onMessage"><img class="u-msg-icon" svg-inline :src="src" />
+                <el-button class="u-btn" size="small" @click="onMessage"><img class="u-msg-icon" svg-inline :src="src" />
                     私信</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" />
+            <!-- <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" />
@@ -22,13 +22,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 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";
 const jx3box = require("@jx3box/jx3box-common/data/jx3box.json");
@@ -51,12 +51,12 @@ export default {
     },
     components: {
         AuthorInfo,
-        AuthorLink,
+        // AuthorLink,
         // AuthorFollow,
         // AuthorMsg,
         // AuthorGift,
         AuthorMedals,
-        AuthorTeams,
+        // AuthorTeams,
         AuthorPosts,
         // AuthorFans,
         AuthorRss,

package/src/single/PostTopic.vue

@@ -48,7 +48,7 @@ export default {
         },
         topicImage() {
             const img = this.postBanner || this.topicInfo?.img;
-            if (img && img.indexOf(".gif") > -1) {
+            if (img && (img.indexOf(".gif") > -1 || img.indexOf(".webp") > -1)) {
                 return img;
             }
             return getThumbnail(img, [260*2, 78*2])