@jx3box/jx3box-common-ui 8.5.9 → 8.6.1

package/package.json

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

package/service/community.js

@@ -1,4 +1,5 @@
 import { $cms, $next } from "@jx3box/jx3box-common/js/https";
+
 const API_PREFIX = `/api/next2`;
 // 获取分类
 export function getTopicBucket(params) {
@@ -34,3 +35,12 @@ export const manageTopic = (id, action, value) => {
 export const getTopicDetails = (id) => {
     return $next().get(`${API_PREFIX}/community/discussion/topic/item/${id}`);
 };
+
+// 菜单
+export function getCommunityTags() {
+    return $cms()
+        .get(`/api/cms/menu-group/community_tags`)
+        .then((res) => {
+            return res.data.data.menus || [];
+        });
+}

package/src/App.vue

@@ -32,6 +32,7 @@
                     <!-- <Collection :id="59" :defaultVisible="true" /> -->
                     <UserPop title="添加用户" v-model="visible" @confirm="addUser" />
                     <el-button @click="visible = true">用户POP</el-button>
+                    <el-button @click="homeworkVisible=true">作业组件</el-button>
                     <!-- :postId="23865" -->
                     <!-- <Thx
                         postType="bps"
@@ -51,6 +52,8 @@
                     <QRcode />
                     <Sharing />
 
+                    <homework v-model="homeworkVisible" post-type="comment" :post-id="19382" :userId="8719" client="std"></homework>
+
                     <PostGuide :post="post" />
 
                     <hr />
@@ -198,6 +201,7 @@ import axios from "axios";
 import { __server } from "@jx3box/jx3box-common/data/jx3box.json";
 import { wiki } from "@jx3box/jx3box-common/js/wiki";
 import post_topics from "@jx3box/jx3box-common/data/post_topics.json";
+import Homework from './interact/Homework.vue';
 
 export default {
     name: "App",
@@ -232,6 +236,7 @@ export default {
         Down,
         Fav,
         Feed,
+        Homework,
 
         Print,
         Sharing,
@@ -273,7 +278,9 @@ export default {
             text: `<Text>text="使用：<BUFF 3222 1 desc>，持续<BUFF 3222 1 time>。\\\n" font=105 </text><Text>text="红豆沙做馅儿，精致细腻的广式月饼。" font=100 </text><Text>text="使用：能在唐门套装供应商处换取如下装备。\\\n" font=105 </text><Text>text="[燕云·重泉靴]" name="iteminfolink" eventid=513 script="this.nVersion=0 this.dwTabType=7 this.dwIndex=35244 this.OnItemLButtonDown=function() OnItemLinkDown(this) end" font=100 r=255 g=40 b=255 </text><Text>text="，" font=105 </text><Text>text="[燕云·铭松靴]" name="iteminfolink" eventid=513 script="this.nVersion=0 this.dwTabType=7 this.dwIndex=35245 this.OnItemLButtonDown=function() OnItemLinkDown(this) end" font=100 r=255 g=40 b=255 </text><Text>text="。" font=100 </text>`,
 
             post_topics: post_topics['pve'],
-            tag2: ''
+            tag2: '',
+
+            homeworkVisible: false,
         };
     },
     created: function () {

package/src/bread/CommunityAdmin.vue

@@ -10,11 +10,6 @@
     >
         <div class="c-admin-wrapper">
             <el-divider content-position="left">标签</el-divider>
-            <!-- <el-radio-group v-model="tags" class="c-admin-status" size="small">
-                <el-radio-button v-for="(option, key) in categoryList" :label="key" :key="key">{{
-                    option
-                }}</el-radio-button>
-            </el-radio-group> -->
 
             <div class="c-admin-extend">
                 <div class="u-condition u-map">
@@ -28,81 +23,78 @@
                         placeholder="请选择"
                         clearable
                     >
-                        <!-- <el-option v-for="item in categoryList" :value="item.name" :label="item.name" :key="item.id">
-                        </el-option> -->
-                    </el-select>
-                </div>
-                <!-- <div class="u-condition u-map">
-                    <span class="u-prepend el-input-group__prepend">分类</span>
-                    <el-select v-model="post.category" filterable placeholder="请选择" clearable>
-                        <el-option v-for="item in categoryList" :value="item.name" :label="item.name" :key="item.id">
+                        <el-option v-for="item in tags" :value="item.label" :label="item.label" :key="item.uuid">
                         </el-option>
                     </el-select>
-                </div> -->
+                </div>
             </div>
 
             <el-divider content-position="left">高亮置顶</el-divider>
-            <el-checkbox
-                class="c-admin-highlight-checkbox"
-                v-model="form.is_top"
-                @change="onManageTopic($event, 'top')"
-                :true-label="1"
-                :false-label="0"
-            >
-                置顶
-            </el-checkbox>
-            <el-checkbox
-                class="c-admin-highlight-checkbox"
-                v-model="form.is_category_top"
-                @change="onManageTopic($event, 'category_top')"
-                :true-label="1"
-                :false-label="0"
-            >
-                分类置顶
-            </el-checkbox>
 
-            <el-checkbox
-                class="c-admin-highlight-checkbox"
-                v-model="form.is_star"
-                @change="onManageTopic($event, 'star')"
-                :true-label="1"
-                :false-label="0"
-            >
-                精选
-            </el-checkbox>
-            <el-checkbox class="c-admin-highlight-checkbox" v-model="form.is_hight">高亮</el-checkbox>
-            <span v-show="showColors">
-                <el-color-picker
-                    class="c-admin-highlight-block"
-                    v-model="color"
-                    :predefine="color_options"
-                    size="mini"
-                ></el-color-picker>
-                <span class="c-admin-highlight-preview" :style="{ color: color }" style="margin-right: 10px"
-                    >预览高亮效果</span
+            <p class="c-admin-space">
+                <span class="c-admin-lable">置顶：</span>
+                <el-checkbox-group
+                    v-model="isTopStatus"
+                    @change="onTopStatusChange"
+                    class="c-admin-status"
+                    size="small"
                 >
-            </span>
+                    <el-checkbox-button :label="1">全局置顶</el-checkbox-button>
+                    <el-checkbox-button :label="2">版内置顶</el-checkbox-button>
+                </el-checkbox-group>
+            </p>
+            <p class="c-admin-space">
+                <span class="c-admin-lable">精选：</span>
+                <el-switch
+                    v-model="form.is_star"
+                    @change="onManageTopic($event, 'star')"
+                    :active-value="1"
+                    :inactive-value="0"
+                />
+            </p>
+
+            <p class="c-admin-space">
+                <span class="c-admin-lable">高亮：</span>
+                <el-switch
+                    @change="onManageTopic($event, 'hight')"
+                    v-model="form.is_hight"
+                    :active-value="1"
+                    :inactive-value="0"
+                />
+                <span v-show="showColors">
+                    <el-color-picker
+                        class="c-admin-highlight-block"
+                        v-model="color"
+                        :predefine="color_options"
+                        size="mini"
+                    ></el-color-picker>
+                    <span class="c-admin-highlight-preview" :style="{ color: color }" style="margin-right: 10px">
+                        预览高亮效果
+                    </span>
+                </span>
+            </p>
 
             <el-divider content-position="left">状态变更</el-divider>
             <div>
-                <el-button type="danger" @click="deleteTopic">删除帖子</el-button>
-                <el-button type="warning" @click="handleCheck">转为待审核</el-button>
+                <el-button type="danger" size="small" icon="el-icon-delete" @click="deleteTopic">删除帖子</el-button>
+                <el-button type="warning" size="small" icon="el-icon-refresh-left" @click="handleCheck"
+                    >转为待审核</el-button
+                >
             </div>
 
-            <el-divider content-position="left"></el-divider>
-            <div>
-                <!-- <el-button type="primary" @click="submit" :loading="pushing">提交修改</el-button> -->
-                <el-button type="primary" @click="close">关闭窗口</el-button>
+            <div class="c-admin-buttons">
+                <el-button type="primary" @click="submit" :loading="pushing">提交修改</el-button>
+                <el-button type="plain" @click="close">取消</el-button>
             </div>
         </div>
     </el-drawer>
 </template>
 
 <script>
-import { post } from "jquery";
 import {
     auditTopic,
     deleteTopic,
+    getCommunityTags,
     getTopicBucket,
     getTopicDetails,
     manageTopic,
@@ -128,6 +120,8 @@ export default {
     emits: ["update:modelValue"],
     data() {
         return {
+            tags: [],
+            isTopStatus: [],
             post: null,
             pushing: false,
             categoryList: [],
@@ -182,6 +176,16 @@ export default {
                 is_category_top: this.post.is_category_top,
             };
         },
+        form() {
+            const isTopStatus = [];
+            if (this.form.is_top == 1) {
+                isTopStatus.push(1);
+            }
+            if (this.form.is_category_top == 1) {
+                isTopStatus.push(2);
+            }
+            this.isTopStatus = isTopStatus;
+        },
         modelValue(val) {
             if (val) {
                 this.getTopicDetails();
@@ -190,11 +194,32 @@ export default {
     },
     created: function () {
         this.getCategoryList();
+        this.getCommunityTags();
     },
     methods: {
+        onTopStatusChange(vals) {
+            if (vals.includes(1) && this.form.is_top == 0) {
+                this.onManageTopic(true, "top");
+            }
+            if (!vals.includes(1) && this.form.is_top == 1) {
+                this.onManageTopic(false, "top");
+            }
+            if (vals.includes(2) && this.form.is_category_top == 0) {
+                this.onManageTopic(true, "category_top");
+            }
+            if (!vals.includes(2) && this.form.is_category_top == 1) {
+                this.onManageTopic(false, "category_top");
+            }
+        },
         onManageTopic(e, action) {
             const value = e ? 1 : 0;
             manageTopic(this.post.id, action, value).then(() => {
+                if (action === "top") {
+                    this.form.is_top = value;
+                }
+                if (action === "category_top") {
+                    this.form.is_category_top = value;
+                }
                 this.$message({
                     type: "success",
                     message: "操作成功!",
@@ -222,20 +247,30 @@ export default {
                 this.$message.error("ID不存在!");
                 return;
             }
-            updateTopicItem(id, this.params).then((res) => {
+            updateTopicItem(id, {
+                ...this.post,
+                tags: this.form.tags,
+                is_top: 0,
+            }).then((res) => {
                 this.$message.success("修改成功");
                 this.$emit("update:modelValue", false);
             });
         },
+        getCommunityTags() {
+            getCommunityTags().then((tags) => {
+                this.tags = tags;
+            });
+        },
         // 关闭
         close() {
             this.form = {
                 category: "",
                 tags: [],
-                is_top: false,
-                is_star: false,
-                is_hight: false,
+                is_top: 0,
+                is_star: 0,
+                is_hight: 0,
             };
+            this.isTopStatus = [];
             this.$nextTick(() => {
                 this.$emit("update:modelValue", false);
             });
@@ -277,4 +312,20 @@ export default {
 
 <style lang="less">
 @import "../../assets/css/admin.less";
+.c-admin-space {
+    .flex;
+    align-items: center;
+    flex-wrap: wrap;
+    height: 28px;
+    gap: 4px;
+}
+.c-admin-lable {
+    font-size: 14px;
+    font-weight: 500;
+}
+.c-admin-buttons {
+    width: 100%;
+    position: absolute;
+    bottom: 80px;
+}
 </style>

package/src/interact/Homework.vue

@@ -0,0 +1,254 @@
+<template>
+    <div class="w-boxcoin-admin">
+        <el-dialog title="批改作业" :visible="modelValue" custom-class="w-boxcoin-pop" :close-on-click-modal="false" append-to-body @close="onClose">
+            <div class="w-boxcoin-admin-content">
+                <div class="u-left" v-if="type=='grant'">
+                    <em class="u-label">本月状态</em>
+                    已用<b>{{this.used}}</b> 剩余<b>{{this.left}}</b> 总计<b>{{this.total}}</b>
+                    <el-progress :percentage="this.total ? 100 - (this.used * 100 / this.total) : 0" :stroke-width="15" :text-inside="true"></el-progress>
+                </div>
+                <div class="u-left" v-else>
+                    <em class="u-label">当前拥有盒币</em>
+                    <b>{{left}}</b>
+                    <!-- <a class="u-charge" :href="chargeLink" target="_blank">[充值]</a> -->
+                </div>
+                <el-radio-group class="u-homework-type" v-model="type" size="small" v-if="isSuperAdmin">
+                    <el-radio-button label="reward">打赏</el-radio-button>
+                    <el-radio-button label="grant">品鉴</el-radio-button>
+                </el-radio-group>
+                <div class="u-list">
+                    <em class="u-label">❤️ {{ type == 'reward' ? '打赏' : '品鉴' }}</em>
+                    <div class="u-points">
+                        <el-radio-group v-model="count">
+                            <el-radio :label="item" v-for="item in fitPoints" :key="item" border>
+                                <b>{{item}}</b>盒币
+                            </el-radio>
+                            <el-radio label="custom" border>自定义</el-radio>
+                            <el-input v-model="amount" v-show="count === 'custom'" placeholder="输入自定义数量"></el-input>
+                        </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>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="visible = false">取 消</el-button>
+                <el-button type="primary" @click="submit" :disabled="!ready || submitting">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { grantBoxcoin, getPostBoxcoinConfig,getBoxcoinStatus,rewardBoxcoin } from "../../service/thx.js";
+import User from "@jx3box/jx3box-common/js/user";
+import { getBreadcrumb } from "@jx3box/jx3box-common/js/api_misc";
+export default {
+    name: "Homework",
+    props: ["postType", "postId", "userId", "client", "modelValue"],
+    model: {
+        prop: "modelValue",
+        event: "update:modelValue"
+    },
+    data: function () {
+        return {
+            count: 0,
+
+            remark: "不错，加油！",
+            chosen: '', // 被选中的人
+            amount: "",
+
+            submitting: false,
+            fetchingCurrentRelease: false,
+
+            // 打赏or品鉴
+            type: "reward",
+
+            // config
+            admin_max: 0,
+            admin_min: 0,
+            admin_left: 0,
+            admin_total: 0,
+            admin_points: [100],
+
+            user_left: 0,
+            user_points: [100],
+            boxcoin_enable: false,
+        };
+    },
+    computed: {
+        left() {
+            return this.type === "reward" ? this.user_left : this.admin_left;
+        },
+        isSuperAdmin() {
+            return User.isSuperAdmin();
+        },
+        total: function () {
+            return this.admin_total;
+        },
+        used: function () {
+            return this.total - this.left;
+        },
+        ready: function () {
+            const count = this.count === "custom" ? this.amount : this.count;
+            // 不能给自己打赏，打赏目标不能是自己
+            // 打赏数量不能超过剩余数量
+            // 打赏数量不能为0
+            // 打赏寄语不能为空
+            return !!(
+                !this.isSelf &&
+                !this.targetIsSelf &&
+                this.isEnough &&
+                count &&
+                this.remark
+            );
+        },
+        isNotSelf: function () {
+            return this.userId != User.getInfo().uid;
+        },
+        targetIsSelf: function () {
+            return this.chosen == User.getInfo().uid;
+        },
+        isEnough: function () {
+            const count = this.count === "custom" ? this.amount : this.count;
+            return this.left && this.left >= count;
+        },
+        allowBoxcoin : function (){
+            return this.postType && this.postId && (this.userId || (this.authors && this.authors.length))
+        },
+        hostClient : function (){
+            return location.href.includes('origin') ? 'origin' : 'std'
+        },
+        points : function (){
+            return this.type === 'reward' ? this.user_points : this.admin_points
+        },
+        fitPoints : function (){
+            const points = this.points.filter(item => item <= this.left)
+            if (this.isSignAuthor) {
+                // 最大值为1000
+                return points.filter(item => item <= 1000)
+            }
+            return points
+        },
+        isSignAuthor : function (){
+            return User.getInfo().group == 32;
+        },
+        finalClient: function() {
+            if (this.client == 'wujie') {
+                return "std"
+            }
+            return this.client
+        }
+    },
+    watch: {
+        own : function (val){
+            this.left = val
+        },
+        modelValue: function (val) {
+            if (val) {
+                this.loadBoxcoinConfig();
+            }
+        }
+    },
+    methods: {
+        openBoxcoinPop: function () {
+            this.visible = true;
+        },
+        // 选择要打赏的对象
+        handleChosen(userId) {
+            this.chosen = userId
+        },
+        submit: function () {
+            this.submitting = true;
+            const count = this.count === "custom" ? this.amount : this.count;
+            let client = this.client || this.hostClient;
+            if (!['std', 'origin', 'all'].includes(client)) {
+                client = 'std'
+            }
+            const fn = this.type === 'reward' ? rewardBoxcoin : grantBoxcoin;
+            fn(this.postType, this.postId, this.userId, count, {
+                remark: this.remark,
+                client : client
+            })
+                .then((res) => {
+                    this.$message({
+                        message: "操作成功",
+                        type: "success",
+                    });
+                    return res.data.data
+                })
+                .then((data) => {
+                    // 1.扣除额度
+                    this.left -= this.count;
+                    // 2.将修改emit出去
+                    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;
+            }).catch(err => {
+                this.$message({
+                    message: "获取失败",
+                    type: "error",
+                });
+            }).finally(() => {
+                this.fetchingCurrentRelease = false;
+            });
+        },
+        loadBoxcoinConfig: function () {
+            User.isLogin() &&
+                getPostBoxcoinConfig(this.postType).then((res) => {
+                    this.admin_max = res.data.data.limit.admin_max || 0;
+                    this.admin_min = res.data.data.limit.admin_min || 0;
+                    this.admin_points = res.data.data.limit.admin_points || [10, 1000];
+                    this.admin_left = res.data.data.asManagerBoxCoinRemain || 0;
+                    this.admin_total = res.data.data.asManagerBoxCoinTotal || 0;
+
+                    this.user_points = res.data.data.limit.user_points || [10, 1000];
+                    // 根据多端展示剩余币
+                    // 作品是n端，接受n端币+all币
+                    if (this.finalClient == "origin") {
+                        this.user_left = res.data.data.asUserBoxCoinRemainOrigin + res.data.data.asUserBoxCoinRemainAll;
+                    } else if (this.finalClient == "std") {
+                        this.user_left = res.data.data.asUserBoxCoinRemainStd + res.data.data.asUserBoxCoinRemainAll;
+                    } else {
+                        this.user_left =
+                            res.data.data.asUserBoxCoinRemainAll +
+                            res.data.data.asUserBoxCoinRemainStd +
+                            res.data.data.asUserBoxCoinRemainOrigin;
+                    }
+                });
+            getBoxcoinStatus().then((res) => {
+                this.boxcoin_enable = !!~~res.data?.data?.val;
+            });
+        },
+        onClose() {
+            this.$emit("update:modelValue", false);
+        },
+    },
+};
+</script>
+
+<style lang="less">
+@import "../../assets/css/thx.less";
+.u-homework-type {
+    margin-top: 10px;
+}
+</style>

package/src/interact/boxcoin_user.vue

@@ -11,7 +11,7 @@
                 <div class="u-left">
                     <em class="u-label">当前拥有盒币</em>
                     <b>{{left}}</b>
-                    <a class="u-charge" :href="chargeLink" target="_blank">[充值]</a>
+                    <!-- <a class="u-charge" :href="chargeLink" target="_blank">[充值]</a> -->
                 </div>
                 <div class="u-list">
                     <em class="u-label">❤️ 打赏</em>