@jx3box/jx3box-ui 2.1.9 → 2.1.11

package/index.js

@@ -32,6 +32,7 @@ import Thx from "./src/single/Thx.vue";
 import UserPop from "./src/author/UserPop.vue";
 import SuspendCommon from "./src/SuspendCommon.vue";
 import AdminDrop from "./src/bread/AdminDrop.vue";
+import Copy from "./src/interact/Copy.vue";
 
 import {
     Jx3boxUiI18n,
@@ -72,6 +73,7 @@ const components = {
     UserPop,
     SuspendCommon,
     AdminDrop,
+    Copy,
 };
 
 const install = function (app) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-ui",
-    "version": "2.1.9",
+    "version": "2.1.11",
     "description": "JX3BOX Vue3 UI",
     "main": "index.js",
     "scripts": {
@@ -32,12 +32,12 @@
     },
     "dependencies": {
         "@element-plus/icons-vue": "^2.3.2",
-        "@jx3box/jx3box-common": "^9.2.0",
+        "@jx3box/jx3box-common": "^9.2.1",
         "@jx3box/jx3box-data": "^3.9.4",
-        "@jx3box/jx3box-editor": "^3.1.1",
+        "@jx3box/jx3box-editor": "^3.1.3",
         "@jx3box/jx3box-emotion": "^1.3.0",
         "@jx3box/jx3box-macro": "^1.0.3",
-        "@jx3box/jx3box-talent": "^1.3.12",
+        "@jx3box/jx3box-talent": "^1.3.13",
         "@tinymce/tinymce-vue": "^5.1.1",
         "@vueuse/core": "^9.13.0",
         "@vueuse/head": "^0.7.6",

package/service/cms.js

@@ -7,7 +7,7 @@ function getPostAuthors(post_id) {
 
 // 获取文章内容
 function getPost(post_id) {
-    return $cms().get(`/api/cms/post/${post_id}`)
+    return $cms().get(`/api/cms/post/${post_id}`);
 }
 
 function uploadImage(formData) {
@@ -50,6 +50,10 @@ function getSliders(source_type, source_ids, client = "std") {
     });
 }
 
+function getSlider(params) {
+    return $cms({ mute: true }).get(`/api/cms/news/item`, { params });
+}
+
 function getCollection(id) {
     return $cms({ mute: true }).get(`/api/cms/post/collection/${id}`);
 }
@@ -130,7 +134,7 @@ function refreshQQBotImage(data) {
 
 // 获取用户permission
 function getUserPermission() {
-    return $cms().get(`/api/cms/account/permission/i`)
+    return $cms().get(`/api/cms/account/permission/i`);
 }
 
 export {
@@ -142,6 +146,7 @@ export {
     getDecorationJson,
     checkTeamMember,
     getSliders,
+    getSlider,
     getCollection,
     getTopicBucket,
     getConfig,

package/src/App.vue

@@ -36,7 +36,7 @@
                     </div>
                     <h1 class="m-title">复制组件</h1>
                     <div class="m-block">
-                        <CopyComp value="xfbsyxj">xfbsyxj</CopyComp>
+                        <Copy value="xfbsyxj">xfbsyxj</Copy>
                     </div>
 
                     <h1 class="m-title">切换侧边栏</h1>
@@ -199,7 +199,7 @@ import PostCollection from "./single/PostCollection.vue";
 import QRcode from "./interact/QRcode.vue";
 import UploadBanner from "./upload/UploadBanner.vue";
 import Mark from "./interact/Mark.vue";
-import CopyComp from "./interact/Copy.vue";
+import Copy from "./interact/Copy.vue";
 
 import GamePrice from "./wiki/GamePrice.vue";
 import WikiComments from "./wiki/WikiComments.vue";
@@ -209,7 +209,7 @@ export default {
     name: "App",
     components: {
         Mark,
-        CopyComp,
+        Copy,
         Author,
         // PostHeader,
         PostTopic,

package/src/filters/orderBy.vue

@@ -123,6 +123,7 @@ export default {
         user-select: none;
         padding: 5px 0;
         padding-right: 20px;
+        .w(150px);
 
         &.on {
             .u-options {

package/src/interact/BatchReward.vue

@@ -0,0 +1,222 @@
+<template>
+    <div class="w-boxcoin-user">
+        <el-button @click="openBoxcoinPop" type="primary" size="small">批量打赏</el-button>
+        <el-dialog
+            title="品鉴评分"
+            v-model="visible"
+            class="w-boxcoin-pop"
+            :close-on-click-modal="false"
+            append-to-body
+        >
+            <div class="w-boxcoin-admin-content">
+                <div class="u-left">
+                    <em class="u-label">本月状态</em>
+                    已用<b>{{ used }}</b> 剩余<b>{{ left }}</b> 总计<b>{{ total }}</b>
+                    <el-progress
+                        :percentage="total ? 100 - (used * 100) / total : 0"
+                        :stroke-width="15"
+                        :text-inside="true"
+                    ></el-progress>
+                </div>
+                <div class="u-list">
+                    <em class="u-label">❤️ 品鉴</em>
+                    <Contributors v-if="authors && authors.length" :authors="authors" @chosen="handleChosen" />
+                    <div class="u-points">
+                        <el-radio-group v-model="count">
+                            <el-radio :value="item" v-for="item in fitPoints" :key="item" border>
+                                <b>{{ item }}</b
+                                >盒币
+                            </el-radio>
+                        </el-radio-group>
+                    </div>
+                </div>
+                <div class="u-msg">
+                    <em class="u-label">📝 寄语</em>
+                    <div class="u-input">
+                        <el-input
+                            v-model="remark"
+                            placeholder="请输入寄语（必填）"
+                            :minlength="2"
+                            :maxlength="30"
+                            show-word-limit
+                        ></el-input>
+                        <el-button :disabled="fetchingCurrentRelease" @click="insertCurrentRelease">插入当前版本</el-button>
+                    </div>
+                </div>
+            </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="visible = false">取消</el-button>
+                    <el-button type="primary" @click="submit" :disabled="!ready || submitting">确定</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { batchReward } from "../../service/thx.js";
+import Contributors from "./Contributors.vue";
+import { getBreadcrumb } from "../../service/breadcrumb.js";
+
+export default {
+    name: "BatchReward",
+    emits: ["updateRecord"],
+    components: {
+        Contributors,
+    },
+    props: {
+        boxcoin: {
+            type: Number,
+            default: 0,
+        },
+        postType: {
+            type: String,
+            default: "",
+        },
+        items: {
+            type: Array,
+            default: () => [],
+        },
+        own: {
+            type: Number,
+            default: 0,
+        },
+        points: {
+            type: Array,
+            default: () => [],
+        },
+        authors: {
+            type: Array,
+            default: () => [],
+        },
+        client: {
+            type: String,
+            default: "",
+        },
+        postId: {
+            type: [Number, String, Array],
+            default: 0,
+        },
+        total: {
+            type: Number,
+            default: 0,
+        },
+        max: {
+            type: Number,
+            default: 0,
+        },
+        min: {
+            type: Number,
+            default: 0,
+        },
+        category: {
+            type: String,
+            default: "",
+        },
+    },
+    data: function () {
+        return {
+            visible: false,
+            count: 0,
+            remark: "辛苦，感谢！",
+            left: this.own,
+            chargeLink: "/vip/boxcoin?redirect=" + location.href,
+            chosen: "",
+            submitting: false,
+            fetchingCurrentRelease: false,
+        };
+    },
+    computed: {
+        used: function () {
+            return this.total - this.left;
+        },
+        ready: function () {
+            return this.isEnough && this.count && this.remark;
+        },
+        isEnough: function () {
+            return this.left && this.left >= this.count;
+        },
+        hostClient: function () {
+            return location.href.includes("origin") ? "origin" : "std";
+        },
+        fitPoints: function () {
+            return this.points.filter((item) => item <= this.left);
+        },
+    },
+    watch: {
+        own: function (val) {
+            this.left = val;
+        },
+    },
+    methods: {
+        openBoxcoinPop: function () {
+            if (!(this.items && this.items.length)) {
+                this.$message({ message: "请选择需要打赏的作品", type: "warning" });
+                return;
+            }
+            this.visible = true;
+        },
+        handleChosen(userId) {
+            this.chosen = userId;
+        },
+        submit: function () {
+            this.submitting = true;
+            let client = this.client || this.hostClient;
+            if (!["std", "origin", "all"].includes(client)) {
+                client = "std";
+            }
+
+            batchReward(this.postType, this.count, {
+                items: this.items,
+                remark: this.remark,
+                client: client,
+                redirect: this.category ? `/${this.category}/${this.postId}` : undefined,
+            })
+                .then((res) => {
+                    return res.data.data;
+                })
+                .then((data) => {
+                    const success = data?.success || [];
+                    const fail = data?.fail || [];
+                    success.forEach((item) => {
+                        const articleId = this.items?.[item.index]?.article_id ?? item?.article_id ?? "-";
+                        this.$message({
+                            message: `作品${articleId}打赏成功`,
+                            type: "success",
+                        });
+                        this.left -= this.count;
+                    });
+                    fail.forEach((item) => {
+                        const articleId = this.items?.[item.index]?.article_id ?? item?.article_id ?? "-";
+                        this.$message({
+                            message: `作品${articleId}打赏失败,原因：${item.msg}`,
+                            type: "error",
+                        });
+                    });
+                    this.$emit("updateRecord", data);
+                })
+                .finally(() => {
+                    this.submitting = false;
+                    this.visible = false;
+                });
+        },
+        insertCurrentRelease: function () {
+            this.fetchingCurrentRelease = true;
+            getBreadcrumb(`current-release-${this.hostClient}`)
+                .then((res) => {
+                    this.remark += res.data.data.html;
+                })
+                .catch(() => {
+                    this.$message({
+                        message: "获取失败",
+                        type: "error",
+                    });
+                })
+                .finally(() => {
+                    this.fetchingCurrentRelease = false;
+                });
+        },
+    },
+};
+</script>

package/src/single/PostTopic.vue

@@ -5,18 +5,17 @@
                 <div class="c-topic-text__year">{{ year }}</div>
                 <div class="c-topic-text__text">{{ topicText }}</div>
             </div>
-            <img class="c-topic-bg" src="../../assets/img/rightsidebar/topic_bg_bps.svg" alt="">
+            <img class="c-topic-bg" src="../../assets/img/rightsidebar/topic_bg_bps.svg" alt="" />
         </div>
         <div class="c-post-topic__img">
-            <img :src="topicImage" alt="">
+            <img :src="topicImage" alt="" />
         </div>
     </div>
 </template>
 
 <script>
-import { getSliders } from "../../service/cms";
-import * as utilModule from "@jx3box/jx3box-common/js/utils";
-const { getThumbnail } = utilModule;
+import { getSlider } from "../../service/cms";
+import { getThumbnail } from "@jx3box/jx3box-common/js/utils";
 import dayjs from "dayjs";
 export default {
     name: "PostTopic",
@@ -32,26 +31,26 @@ export default {
         postBanner: {
             type: String,
             default: "",
-        }
+        },
     },
     data() {
         return {
-            topicInfo: null
-        }
+            topicInfo: null,
+        };
     },
     computed: {
         topicText() {
-            return this.topicInfo ? `${dayjs(this.topicInfo?.created_at).format('MM月DD日')}荣登头条榜` : ''
+            return this.topicInfo ? `${dayjs(this.topicInfo?.created_at).format("MM月DD日")}荣登头条榜` : "";
         },
         year() {
-            return dayjs(this.topicInfo?.created_at).format('YYYY年')
+            return dayjs(this.topicInfo?.created_at).format("YYYY年");
         },
         topicImage() {
             const img = this.postBanner || this.topicInfo?.img;
             if (img && (img.indexOf(".gif") > -1 || img.indexOf(".webp") > -1)) {
                 return img;
             }
-            return getThumbnail(img, [260*2, 78*2])
+            return getThumbnail(img, [260 * 2, 78 * 2]);
         },
         client() {
             return location.href.includes("origin") ? "origin" : "std";
@@ -63,21 +62,20 @@ export default {
             handler(val) {
                 if (!val) return;
                 this.loadData();
-            }
-        }
+            },
+        },
     },
     methods: {
         loadData() {
-            getSliders(this.type, this.id, this.client).then((res) => {
-                if (res.data.data?.list) {
-                    // 取创建时间最新的一条
-                    const list = res.data.data.list.sort((a, b) => dayjs(b.created_at).isAfter(dayjs(a.created_at)) ? 1 : -1);
-                    this.topicInfo = list[0];
-                }
+            getSlider({
+                source_type: this.type,
+                source_id: this.id,
+            }).then((res) => {
+                this.topicInfo = res.data?.data;
             });
         },
-    }
-}
+    },
+};
 </script>
 
 <style lang="less">
@@ -98,7 +96,7 @@ export default {
         // left: 50%;
         // transform: translate(-50%, -50%);
         z-index: 1;
-        color: #FFD28F;
+        color: #ffd28f;
         letter-spacing: 1px;
         white-space: nowrap;
     }
@@ -119,7 +117,7 @@ export default {
     overflow: hidden;
     .r(4px);
     min-height: 71px;
-    img{
+    img {
         .pa;
         left: 50%;
         transform: translateX(-50%);

package/src/single/Thx.vue

@@ -1,81 +1,103 @@
 <template>
     <div class="w-thx">
-        <div class="w-thx-panel">
-            <boxcoin-admin
-                :postId="postId"
+        <template v-if="type === 'batchReward'">
+            <batch-reward
+                v-if="hasRight && adminBoxcoinEnable && boxcoin_enable"
                 :postType="postType"
-                v-if="hasRight && adminBoxcoinEnable && boxcoin_enable && hasPermission"
+                :items="postId"
+                :boxcoin="boxcoin"
                 :userId="userId"
-                :max="admin_max"
-                :min="admin_min"
                 :own="admin_left"
-                :total="admin_total"
                 :points="admin_points"
                 :authors="authors"
-                @updateRecord="updateRecord"
                 :client="finalClient"
-                :totalLimit="total_limit"
-                :postTypeUsed="post_type_used"
+                :max="admin_max"
+                :min="admin_min"
+                :total="admin_total"
                 :category="category"
-            />
-            <Like :postId="postId" :postType="postType"></Like>
-            <fav :postId="postId" :postType="postType" :postTitle="postTitle"></fav>
-            <Rss v-if="showRss" :type="postType" :id="postId" :title="postTitle"></Rss>
-            <boxcoin-user
                 :postId="postId"
-                :postType="postType"
-                :boxcoin="boxcoin"
-                :userId="userId"
-                :own="user_left"
-                :points="user_points"
-                :authors="authors"
-                v-if="userBoxcoinEnable && boxcoin_enable && allowGift"
                 @updateRecord="updateRecord"
-                :client="finalClient"
-                :category="category"
-                :can-gift="lvEnough"
             />
-            <Share :postId="postId" :postType="postType" :client="client" />
-            <watch-later
-                :category="postType"
-                :title="postTitle"
-                :author-id="authorId"
-                :banner="banner"
-                :content-id="contentMetaId"
-            ></watch-later>
-        </div>
-        <div class="w-thx-records">
-            <boxcoin-records
-                :postId="postId"
-                :postType="postType"
-                :postClient="finalClient"
-                :cacheRecord="cacheRecord"
-                :mode="mode"
-                @update:boxcoin="updateBoxcoin"
-                v-if="showRecord"
-            />
-        </div>
-        <div class="w-thx-copyright">
-            &copy;
-            {{
-                $jx3boxT(
-                    "jx3boxUi.thx.copyright1",
-                    "所有原创作品，著作权归作者所有，所有未经授权的非署名转载或抄袭将有权追究法律责任，所有法律事务由专聘律师代理。"
-                )
-            }}<br />
-            {{
-                $jx3boxT(
-                    "jx3boxUi.thx.copyright2",
-                    "签约作者独家特约稿件，及所有魔盒官方评分作品用户一经兑现则视为有偿付费稿件，所有商业稿件的转载引用需同时征得魔盒平台授权。"
-                )
-            }}
-        </div>
+        </template>
+        <template v-else>
+            <div class="w-thx-panel">
+                <boxcoin-admin
+                    :postId="postId"
+                    :postType="postType"
+                    v-if="hasRight && adminBoxcoinEnable && boxcoin_enable && hasPermission"
+                    :userId="userId"
+                    :max="admin_max"
+                    :min="admin_min"
+                    :own="admin_left"
+                    :total="admin_total"
+                    :points="admin_points"
+                    :authors="authors"
+                    @updateRecord="updateRecord"
+                    :client="finalClient"
+                    :totalLimit="total_limit"
+                    :postTypeUsed="post_type_used"
+                    :category="category"
+                />
+                <Like :postId="postId" :postType="postType"></Like>
+                <fav :postId="postId" :postType="postType" :postTitle="postTitle"></fav>
+                <Rss v-if="showRss" :type="postType" :id="postId" :title="postTitle"></Rss>
+                <boxcoin-user
+                    :postId="postId"
+                    :postType="postType"
+                    :boxcoin="boxcoin"
+                    :userId="userId"
+                    :own="user_left"
+                    :points="user_points"
+                    :authors="authors"
+                    v-if="userBoxcoinEnable && boxcoin_enable && allowGift"
+                    @updateRecord="updateRecord"
+                    :client="finalClient"
+                    :category="category"
+                    :can-gift="lvEnough"
+                />
+                <watch-later
+                    :category="postType"
+                    :title="postTitle"
+                    :author-id="authorId"
+                    :banner="banner"
+                    :content-id="contentMetaId"
+                ></watch-later>
+                <Share :postId="postId" :postType="postType" :client="client" />
+            </div>
+            <div class="w-thx-records">
+                <boxcoin-records
+                    :postId="postId"
+                    :postType="postType"
+                    :postClient="finalClient"
+                    :cacheRecord="cacheRecord"
+                    :mode="mode"
+                    @update:boxcoin="updateBoxcoin"
+                    v-if="showRecord"
+                />
+            </div>
+            <div class="w-thx-copyright">
+                &copy;
+                {{
+                    $jx3boxT(
+                        "jx3boxUi.thx.copyright1",
+                        "所有原创作品，著作权归作者所有，所有未经授权的非署名转载或抄袭将有权追究法律责任，所有法律事务由专聘律师代理。"
+                    )
+                }}<br />
+                {{
+                    $jx3boxT(
+                        "jx3boxUi.thx.copyright2",
+                        "签约作者独家特约稿件，及所有魔盒官方评分作品用户一经兑现则视为有偿付费稿件，所有商业稿件的转载引用需同时征得魔盒平台授权。"
+                    )
+                }}
+            </div>
+        </template>
     </div>
 </template>
 
 <script>
 import Like from "../interact/Like.vue";
 import Fav from "../interact/Fav.vue";
+import BatchReward from "../interact/BatchReward.vue";
 import BoxcoinAdmin from "../interact/BoxcoinAdmin.vue";
 import BoxcoinUser from "../interact/BoxcoinUser.vue";
 import BoxcoinRecords from "../interact/BoxcoinRecords.vue";
@@ -94,6 +116,7 @@ export default {
     components: {
         Like,
         Fav,
+        BatchReward,
         BoxcoinAdmin,
         BoxcoinUser,
         BoxcoinRecords,
@@ -107,7 +130,7 @@ export default {
             default: "normal",
         },
         postId: {
-            type: [Number, String],
+            type: [Number, String, Array],
             default: 0,
         },
         postType: {