@jx3box/jx3box-common-ui 5.6.4 → 5.6.7

package/assets/css/thx.less

@@ -49,8 +49,12 @@
                 // color:#49c10f;
                 // color:@color-link;
                 color:#fba524;
-                .fz(24px,1);
+                .fz(20px,1);
                 .dbi;.y;
+                vertical-align: text-bottom;
+            }
+            .el-progress {
+                margin: 10px;
             }
         }
         .u-list{
@@ -67,6 +71,11 @@
                     .mr(5px);
                 }
             }
+            .el-input-number{
+                .ml(0) !important;
+                .mb(10px);
+                .w(140px);
+            }
         }
 
         .u-label{

package/package.json

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

package/src/Author.vue

@@ -196,7 +196,7 @@ export default {
             return getLink("org", team_id);
         },
         showTeamLogo: function(val) {
-            return getThumbnail(val, 32);
+            return getThumbnail(val, 96);
         },
     },
     watch: {

package/src/author/Avatar.vue

@@ -83,7 +83,7 @@ export default {
             }
         },
         showAvatar: function(val) {
-            return showAvatar(val, this.size);
+            return showAvatar(val, this.size*3);
         },
         authorLink,
     },

package/src/interact/boxcoin_admin.vue

@@ -13,17 +13,28 @@
         <el-dialog title="品鉴评分" :visible.sync="visible" custom-class="w-boxcoin-pop" :close-on-click-modal="false">
             <div class="w-boxcoin-admin-content">
                 <div class="u-left">
-                    <em class="u-label">本月剩余额度</em>
-                    <b>{{left}}</b>
+                    <em class="u-label">本月状态</em>
+                    <b>已用 {{this.used}} 剩余 {{this.left}} 总计 {{this.total}}</b>
+                    <el-progress :percentage="100 - (this.used * 100 / this.total)" :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="fixedCount">-->
                         <el-radio-group v-model="count">
                             <el-radio :label="item" v-for="item in points" :key="item" border>
                                 <b>{{item}}</b>盒币
                             </el-radio>
+                            <!--<el-radio label="custom" border><b>自定义</b></el-radio>
+                            <el-input-number 
+                                    :disabled="this.fixedCount !== 'custom'"
+                                    v-model="customCount" 
+                                    :min="this.allowedMin" 
+                                    :max="this.allowedMax"
+                                    :controls="false">
+                            </el-input-number>
+                            -->
                         </el-radio-group>
                     </div>
                 </div>
@@ -42,7 +53,7 @@
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="visible = false">取 消</el-button>
-                <el-button type="primary" @click="submit" :disabled="!ready">确 定</el-button>
+                <el-button type="primary" @click="submit" :disabled="!ready || submitting">确 定</el-button>
             </span>
         </el-dialog>
     </div>
@@ -54,23 +65,37 @@ import User from "@jx3box/jx3box-common/js/user";
 import Contributors from './Contributors.vue';
 export default {
     name: "BoxcoinAdmin",
-    props: ["postType", "postId", "userId", "own", "points", 'authors'],
+    props: ["postType", "postId", "userId", "own", "total", "points", "max", "min", 'authors'],
     components: {
         Contributors
     },
     data: function () {
         return {
             visible: false,
-
             count: 0,
-            remark: "辛苦，感谢！",
+            //fixedCount: 0,
+            //customCount: 0,
 
+            remark: "辛苦，感谢！",
             left : this.own,
-
             chosen: '', // 被选中的人
+
+            submitting: false,
         };
     },
     computed: {
+        /*allowedMax: function () {
+            return this.max;
+        },
+        allowedMin: function () {
+            return this.min;
+        },*/
+        used: function () {
+            return this.total - this.left;
+        },
+        /*count: function() {
+            return this.fixedCount === "custom" ? this.customCount : this.fixedCount;
+        },*/
         ready: function () {
             return this.isNotSelf && this.isEnough && this.count && this.remark;
         },
@@ -95,12 +120,14 @@ export default {
     methods: {
         openBoxcoinPop: function () {
             this.visible = true;
+            //this.customCount = this.max / 2;
         },
         // 选择要打赏的对象
         handleChosen(userId) {
             this.chosen = userId
         },
         submit: function () {
+            this.submitting = true;
             grantBoxcoin(this.postType, this.postId, this.chosen || this.userId, this.count, {
                 remark: this.remark,
                 client : this.client
@@ -119,10 +146,9 @@ export default {
                     this.$emit('updateRecord', data);
                 })
                 .finally(() => {
+                    this.submitting = false;
                     this.visible = false;
                 });
-
-
         },
         init: function () {},
     },

package/src/interact/boxcoin_records.vue

@@ -29,7 +29,7 @@
                         <img class="u-user-avatar" :src="showAvatar(item.ext_operate_user_info.avatar)" alt />
                         <span>{{item.ext_operate_user_info.display_name}}</span>
                     </a>
-                    <a  
+                    <a
                         class="u-meta u-user"
                         :href="authorLink(item.user_id)"
                         target="_blank"
@@ -141,7 +141,7 @@ export default {
                             });
                             this.list.splice(i,1)
                         })
-                        
+
                     }
                 },
             });
@@ -149,8 +149,8 @@ export default {
         authorLink,
         showTime,
         showAvatar: function (val) {
-            return showAvatar(val, 24);
+            return showAvatar(val, 72);
         },
     },
 };
-</script>
+</script>

package/src/single/Creators.vue

@@ -104,7 +104,7 @@ export default {
             });
         },
         showAvatar: function (val) {
-            return showAvatar(val, 48);
+            return showAvatar(val, 144);
         },
         authorLink,
         formatLabel : function (str){
@@ -211,4 +211,4 @@ export default {
         .none;
     }
 }
-</style>
+</style>

package/src/single/PostHeader.vue

@@ -133,7 +133,7 @@ export default {
 .m-single-header {
     padding-top: 20px;
     padding-bottom: 20px;
-    padding-right: 280px;
+    // padding-right: 280px;
     .pr;
     .u-sub-block {
         .dbi;

package/src/single/Thx.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="w-thx">
         <div class="w-thx-panel">
-            <boxcoin-admin :postId="postId" :postType="postType" v-if="hasRight && adminBoxcoinEnable && boxcoin_enable" :userId="userId" :own="admin_left" :points="admin_points" :authors="authors" @updateRecord="updateRecord" />
+            <boxcoin-admin :postId="postId" :postType="postType" v-if="hasRight && adminBoxcoinEnable && boxcoin_enable" :userId="userId" :max="admin_max" :min="admin_min" :own="admin_left" :total="admin_total" :points="admin_points" :authors="authors" @updateRecord="updateRecord" />
             <Like :postId="postId" :postType="postType"></Like>
             <fav :postId="postId" :postType="postType" :postTitle="postTitle"></fav>
             <boxcoin-user :postId="postId" :postType="postType" :boxcoin="boxcoin" :userId="userId" :own="user_left" :points="user_points" :authors="authors" v-if="userBoxcoinEnable && boxcoin_enable" @updateRecord="updateRecord" />
@@ -43,8 +43,12 @@ export default {
             hasRight : User.getInfo().group >= 32,
             user: User.getInfo(),
 
+            admin_max : 0,
+            admin_min : 0,
             admin_left : 0,
+            admin_total: 0,
             admin_points : [100],
+
             user_left : 0,
             user_points : [100],
 
@@ -69,8 +73,12 @@ export default {
     methods: {
         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];
                 this.user_left = res.data.data.asUserBoxCoinRemain || 0;
             });