@jx3box/jx3box-common-ui 5.9.9 → 6.0.2

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": "5.9.9",
+  "version": "6.0.2",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -31,9 +31,9 @@
   ],
   "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.2",
+    "@jx3box/jx3box-editor": "^1.4.3",
     "axios": "^0.26.1",
     "dayjs": "^1.11.0",
     "element-ui": "^2.13.2",

package/src/author/AuthorFollow.vue

@@ -1,34 +1,37 @@
 <template>
     <div class="u-follow">
         <el-button
+            v-if="!isFollow"
             :class="{ 'is-follow': isFollow }"
             size="mini"
             :icon="btnIcon"
             @click="follow"
+            :disabled="isSelf"
             :type="btnType"
-            v-if="!isFollow"
             :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>
+        <template v-else>
+            <el-popover
+                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>
+        </template>
         <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 +52,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 +66,27 @@ export default {
                     },
                 },
             ];
-        }
+        },
+        isSelf() {
+            return this.uid == this.user.uid;
+        },
+        user() {
+            return User.getInfo();
+        },
     },
-    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) + "万";
             }
@@ -125,28 +139,30 @@ export default {
 </script>
 
 <style lang="less">
-.u-follow {
-}
 .u-unfollow-btn {
-    margin-right: 10px;
+    &.el-button {
+        margin-right: 10px;
+    }
 }
 .u-follow-popover {
-    min-width: 100px;
-    padding: 0;
-    margin: 0;
-    .u-action-list {
-        .u-action-item {
-            text-align: center;
-            cursor: pointer;
-            padding: 12px 15px;
-            &:hover {
-                background: rgb(248,248,251);
+    &.el-popover {
+        min-width: 100px;
+        padding: 0;
+        margin: 0;
+        .u-action-list {
+            .u-action-item {
+                text-align: center;
+                cursor: pointer;
+                padding: 12px 15px;
+                &:hover {
+                    background: rgb(248,248,251);
+                }
             }
         }
     }
 }
 .u-follow-count{
-    color:#ffdea8;
+    color:#fff;
     margin-left:5px;
 }
 </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">