@jx3box/jx3box-common-ui 6.0.0 → 6.0.3

package/assets/css/thx.less

@@ -179,6 +179,10 @@
             color:#f00;
         }
     }
+    .u-client{
+        margin-left:5px;
+        color:#09f;
+    }
 }
 
 @media screen and (max-width:@phone){
@@ -197,4 +201,4 @@
             .none;
         }
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "6.0.0",
+  "version": "6.0.3",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -31,7 +31,7 @@
   ],
   "dependencies": {
     "@jx3box/jx3box-comment-ui": "^1.7.0",
-    "@jx3box/jx3box-common": "^7.3.5",
+    "@jx3box/jx3box-common": "^7.3.6",
     "@jx3box/jx3box-data": "^1.10.2",
     "@jx3box/jx3box-editor": "^1.4.3",
     "axios": "^0.26.1",

package/src/Author.vue

@@ -27,7 +27,7 @@
             </div>
         </div>
         <div class="u-bio">{{ data.user_bio }}</div>
-        <AuthorFollow v-if="isLogin" class="u-follow-box" :uid="uid" />
+        <AuthorFollow class="u-follow-box" :uid="uid" />
         <div class="u-link" v-if="hasLink">
             <a v-if="data.weibo_name" class="u-weibo" :href="weiboLink(data.weibo_id)" target="_blank">
                 <img svg-inline src="../assets/img/author/weibo.svg" />
@@ -152,9 +152,6 @@ export default {
         level: function() {
             return User.getLevel(this.data?.experience);
         },
-        isLogin: function() {
-            return User.isLogin();
-        },
     },
     methods: {
         loadData: function() {

package/src/author/AuthorFollow.vue

@@ -1,34 +1,49 @@
 <template>
     <div class="u-follow">
-        <el-button
-            :class="{ 'is-follow': isFollow }"
-            size="mini"
-            :icon="btnIcon"
-            @click="follow"
-            :type="btnType"
-            v-if="!isFollow"
-            :loading="loading"
-        >
-            {{ btnText }}<span class="u-follow-count">{{ formatFansNum(fansNum) }}</span>
+        <template v-if="isLogin">
+            <template v-if="isSelf">
+                <div class="u-fans-box">
+                    <span class="u-fans-label">粉丝数</span>
+                    <span class="u-fans">{{ formatFansNum(fansNum) }}</span>
+                </div>
+            </template>
+            <template v-else>
+                <el-button
+                    v-if="!isFollow"
+                    :class="{ 'is-follow': isFollow }"
+                    size="mini"
+                    :icon="btnIcon"
+                    @click="follow"
+                    :type="btnType"
+                    :loading="loading"
+                >
+                    {{ btnText }}<span class="u-follow-count">{{ formatFansNum(fansNum) }}</span>
+                </el-button>
+                <el-popover
+                    v-else
+                    placement="bottom"
+                    trigger="hover"
+                    popper-class="u-follow-popover"
+                    :visible-arrow="false"
+                >
+                    <div class="u-action-list">
+                        <div class="u-action-item" v-for="item in actions" :key="item.label" @click.stop="item.action">{{ item.label }}</div>
+                    </div>
+                    <el-button class="u-unfollow-btn" size="mini" :type="btnType" slot="reference">{{ btnText }}<span class="u-follow-count">{{ formatFansNum(fansNum) }}</span></el-button>
+                </el-popover>
+                <el-button size="mini" icon="el-icon-message" disabled title="Lv4+可用">私信</el-button>
+            </template>
+        </template>
+        <el-button class="u-fans-box" disabled size="mini" v-else>
+            <span class="u-fans-label">粉丝数</span>
+            <span class="u-fans">{{ formatFansNum(fansNum) }}</span>
         </el-button>
-        <el-popover
-            v-else
-            placement="bottom"
-            trigger="hover"
-            popper-class="u-follow-popover"
-            :visible-arrow="false"
-        >
-            <div class="u-action-list">
-                <div class="u-action-item" v-for="item in actions" :key="item.label" @click.stop="item.action">{{ item.label }}</div>
-            </div>
-            <el-button class="u-unfollow-btn" size="mini" :type="btnType" slot="reference">{{ btnText }}<span class="u-follow-count">{{ formatFansNum(fansNum) }}</span></el-button>
-        </el-popover>
-        <el-button size="mini" icon="el-icon-message" disabled title="Lv4+可用">私信</el-button>
     </div>
 </template>
 
 <script>
-import { follow, unfollow, getMyFollowList, getFansCount } from "../../service/follow";
+import { follow, unfollow, getFansCount } from "../../service/follow";
+import User from "@jx3box/jx3box-common/js/user";
 export default {
     name: "AuthorFollow",
     props: {
@@ -49,7 +64,7 @@ export default {
             return this.isFollow ? "已关注" : "关注";
         },
         btnIcon() {
-            return this.isFollow ? "" : "el-icon-plus";
+            return this.isSelf ? "" : (this.isFollow ? "" : "el-icon-plus");
         },
         btnType() {
             return this.isFollow ? "info" : "warning"
@@ -63,16 +78,30 @@ export default {
                     },
                 },
             ];
-        }
+        },
+        isSelf() {
+            return this.uid == this.user.uid;
+        },
+        user() {
+            return User.getInfo();
+        },
+        isLogin: function() {
+            return User.isLogin();
+        },
     },
-    mounted () {
-        this.loadFans();
+    watch: {
+        uid: {
+            immediate: true,
+            handler(val) {
+                val && this.loadFans();
+            },
+        }
     },
     methods: {
         // 格式化粉丝数
         formatFansNum(num) {
             if (num < 10000) {
-                return num;
+                return num === 0 ? "" : num;
             } else {
                 return (num / 10000).toFixed(1) + "万";
             }
@@ -151,4 +180,15 @@ export default {
     color:#fff;
     margin-left:5px;
 }
+
+.u-fans-box {
+    cursor: default !important;
+    .u-fans-label {
+        color: #999;
+        margin-right: 5px;
+    }
+    .u-fans {
+        color: #333;
+    }
+}
 </style>

package/src/interact/boxcoin_records.vue

@@ -43,7 +43,8 @@
                     </span>
                     <span class="u-meta u-remark">{{item.remark}}</span>
                     <time class="u-meta u-time">{{showTime(item.created_at)}}</time>
-                    <span class="u-delete" v-if="isSuperAdmin && !item.is_user_gift" @click="recovery(item,i)">
+                    <span class="u-client" v-if="isSuperAdmin">{{item.client}}</span>
+                    <span class="u-delete" v-if="isSuperAdmin" @click="recovery(item,i)">
                         <i class="el-icon-delete"></i>撤销
                     </span>
                 </li>
@@ -89,7 +90,7 @@ export default {
             return {
                 pageSize: this.per,
                 pageIndex: this.page,
-                client : this.postClient,
+                //client : this.postClient,
             };
         },
     },

package/src/single/Thx.vue

@@ -4,7 +4,7 @@
             <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" :client="client" />
             <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" />
+            <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" :client="client" />
             <Share :postId="postId" :postType="postType" :client="client" />
         </div>
         <div class="w-thx-records">