@jx3box/jx3box-common-ui 8.8.4 → 8.8.6

package/package.json

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

package/src/interact/Homework.vue

@@ -12,7 +12,7 @@
                     <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-group class="u-homework-type" v-model="type" size="small" v-if="hasPermission">
                     <el-radio-button label="reward">打赏</el-radio-button>
                     <el-radio-button label="grant">品鉴</el-radio-button>
                 </el-radio-group>
@@ -91,8 +91,8 @@ export default {
         left() {
             return this.type === "reward" ? this.user_left : this.admin_left;
         },
-        isSuperAdmin() {
-            return User.isSuperAdmin();
+        hasPermission() { 
+            return User.hasPermission('manage_bbs_reward');
         },
         total: function () {
             return this.admin_total;

package/src/interact/batchReward.vue

@@ -73,6 +73,7 @@ export default {
       "total",
       "max",
       "min",
+      "category"
   ],
   components: {
       Contributors,
@@ -136,6 +137,7 @@ export default {
               items: this.items,
               remark: this.remark,
               client: client,
+              category: this.category,
           })
               .then((res) => {
                   return res.data.data;

package/src/interact/boxcoin_admin.vue

@@ -59,7 +59,7 @@ import { getBreadcrumb } from "@jx3box/jx3box-common/js/api_misc";
 import Contributors from './Contributors.vue';
 export default {
     name: "BoxcoinAdmin",
-    props: ["postType", "postId", "userId", "own", "total", "points", "max", "min", 'authors','client'],
+    props: ["postType", "postId", "userId", "own", "total", "points", "max", "min", 'authors','client',"category"],
     components: {
         Contributors
     },
@@ -145,7 +145,9 @@ export default {
             }
             grantBoxcoin(this.postType, this.postId, this.chosen || this.userId, count, {
                 remark: this.remark,
-                client : client
+                client : client,
+                // 如果有category，传入category
+                category : this.category
             })
                 .then((res) => {
                     this.$message({

package/src/interact/boxcoin_user.vue

@@ -54,7 +54,7 @@ import Contributors from './Contributors.vue';
 import _ from "lodash";
 export default {
     name: "BoxcoinUser",
-    props: ["boxcoin", "postType", "postId", "userId", "own", "points", "authors",'client'],
+    props: ["boxcoin", "postType", "postId", "userId", "own", "points", "authors",'client',"category"],
     components: {
         Contributors
     },
@@ -130,7 +130,8 @@ export default {
             }
             rewardBoxcoin(this.postType, this.postId, this.chosen || this.userId, count, {
                 remark: this.remark,
-                client: client
+                client: client,
+                category: this.category
             })
                 .then((res) => {
                     this.$message({

package/src/single/Thx.vue

@@ -3,6 +3,7 @@
         <template v-if="type === 'batchReward'">
             <!-- 批量打赏 -->
             <batch-reward
+                v-if="hasRight && adminBoxcoinEnable && boxcoin_enable"
                 :postType="postType"
                 :items="postId"
                 :boxcoin="boxcoin"
@@ -11,19 +12,19 @@
                 :points="admin_points"
                 :authors="authors"
                 :client="finalClient"
-                v-if="hasRight && adminBoxcoinEnable && boxcoin_enable"
                 :max="admin_max"
                 :min="admin_min"
                 :total="admin_total"
+                :category="category"
                 @updateRecord="updateRecord"
             />
         </template>
         <template v-else>
             <div class="w-thx-panel">
                 <boxcoin-admin
+                    v-if="hasRight && adminBoxcoinEnable && boxcoin_enable"
                     :postId="postId"
                     :postType="postType"
-                    v-if="hasRight && adminBoxcoinEnable && boxcoin_enable"
                     :userId="userId"
                     :max="admin_max"
                     :min="admin_min"
@@ -31,12 +32,14 @@
                     :total="admin_total"
                     :points="admin_points"
                     :authors="authors"
-                    @updateRecord="updateRecord"
                     :client="finalClient"
+                    :category="category"
+                    @updateRecord="updateRecord"
                 />
                 <Like :postId="postId" :postType="postType"></Like>
                 <fav :postId="postId" :postType="postType" :postTitle="postTitle"></fav>
                 <boxcoin-user
+                    v-if="userBoxcoinEnable && boxcoin_enable && allowGift"
                     :postId="postId"
                     :postType="postType"
                     :boxcoin="boxcoin"
@@ -44,9 +47,9 @@
                     :own="user_left"
                     :points="user_points"
                     :authors="authors"
-                    v-if="userBoxcoinEnable && boxcoin_enable && allowGift"
-                    @updateRecord="updateRecord"
                     :client="finalClient"
+                    :category="category"
+                    @updateRecord="updateRecord"
                 />
                 <Share :postId="postId" :postType="postType" :client="client" />
             </div>
@@ -125,6 +128,9 @@ export default {
             type: Boolean,
             default: false,
         },
+        category: {
+            default: undefined,
+        },
     },
     components: {
         Like,