@jx3box/jx3box-common-ui 7.2.4 → 7.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "7.2.4",
+  "version": "7.2.6",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -31,9 +31,9 @@
   ],
   "dependencies": {
     "@jx3box/jx3box-comment-ui": "^1.7.12",
-    "@jx3box/jx3box-common": "^7.8.7",
-    "@jx3box/jx3box-data": "^3.0.9",
-    "@jx3box/jx3box-editor": "^1.8.2",
+    "@jx3box/jx3box-common": "^7.8.9",
+    "@jx3box/jx3box-data": "^3.1.0",
+    "@jx3box/jx3box-editor": "^1.8.6",
     "axios": "^0.26.1",
     "dayjs": "^1.11.0",
     "element-ui": "^2.13.2",

package/src/author/Avatar.vue

@@ -1,5 +1,5 @@
 <template>
-    <a class="c-avatar" :href="authorLink(uid)" :class="size" :style="style">
+    <a class="c-avatar" :href="authorLink(uid)" :class="size" :style="style" target="_blank">
         <img :src="showAvatar(url)" class="c-avatar-pic" />
         <i class="c-avatar-frame" v-if="frame">
             <img :src="frameUrl" />

package/src/interact/boxcoin_admin.vue

@@ -25,6 +25,8 @@
                             <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>
@@ -69,6 +71,7 @@ export default {
             remark: "辛苦，感谢！",
             left : this.own,
             chosen: '', // 被选中的人
+            amount: "",
 
             submitting: false,
             fetchingCurrentRelease: false,
@@ -79,6 +82,7 @@ export default {
             return this.total - this.left;
         },
         ready: function () {
+            const count = this.count === "custom" ? this.amount : this.count;
             // 不能给自己打赏，打赏目标不能是自己
             // 打赏数量不能超过剩余数量
             // 打赏数量不能为0
@@ -87,7 +91,7 @@ export default {
                 !this.isSelf &&
                 !this.targetIsSelf &&
                 this.isEnough &&
-                this.count &&
+                count &&
                 this.remark
             );
         },
@@ -98,7 +102,8 @@ export default {
             return this.chosen == this.userId;
         },
         isEnough: function () {
-            return this.left && this.left >= this.count;
+            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))
@@ -125,7 +130,8 @@ export default {
         },
         submit: function () {
             this.submitting = true;
-            grantBoxcoin(this.postType, this.postId, this.chosen || this.userId, this.count, {
+            const count = this.count === "custom" ? this.amount : this.count;
+            grantBoxcoin(this.postType, this.postId, this.chosen || this.userId, count, {
                 remark: this.remark,
                 client : this.client || this.hostClient
             })

package/src/interact/boxcoin_user.vue

@@ -21,6 +21,8 @@
                             <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>
@@ -61,6 +63,7 @@ export default {
 
             count: 0,
             remark: "辛苦了，谢谢大大！",
+            amount: "",
 
             left : this.own,
 
@@ -71,13 +74,15 @@ export default {
     },
     computed: {
         ready: function () {
-            return this.isNotSelf && this.isEnough && this.count && this.remark;
+            const count = this.count === 'custom' ? this.amount : this.count
+            return this.isNotSelf && this.isEnough && count && this.remark;
         },
         isNotSelf: function () {
             return this.userId != User.getInfo().uid;
         },
         isEnough: function () {
-            return this.left && this.left >= this.count;
+            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))
@@ -87,6 +92,9 @@ export default {
         },
         fitPoints : function (){
             return this.points//.filter(item => item <= this.left)
+        },
+        isCustom(){
+            return this.count === 'custom'
         }
     },
     watch: {
@@ -107,7 +115,8 @@ export default {
             this.chosen = userId
         },
         submit: function () {
-            rewardBoxcoin(this.postType, this.postId, this.chosen || this.userId, this.count, {
+            const count = this.count === 'custom' ? this.amount : this.count
+            rewardBoxcoin(this.postType, this.postId, this.chosen || this.userId, count, {
                 remark: this.remark,
                 client : this.client || this.hostClient
             })
@@ -127,12 +136,8 @@ export default {
                 .finally(() => {
                     this.visible = false;
                 });
-
         },
-        init: function () {},
     },
-    created: function () {},
-    mounted: function () {},
 };
 </script>