@jx3box/jx3box-common-ui 6.0.2 → 6.0.5

package/package.json

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

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,30 +1,44 @@
 <template>
     <div class="u-follow">
+        <!-- <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>
+
+            </template>
+        </template>
+        <el-button class="u-fans-box" @click="follow" size="mini" v-else>
+            <span class="u-fans-label">关注</span>
+            <span class="u-fans">{{ formatFansNum(fansNum) }}</span>
+        </el-button> -->
         <el-button
             v-if="!isFollow"
-            :class="{ 'is-follow': isFollow }"
+            :class="{ 'is-follow': isFollow, 'u-fans-box': isSelf }"
             size="mini"
-            :icon="btnIcon"
+            :icon="!isSelf && btnIcon"
             @click="follow"
-            :disabled="isSelf"
-            :type="btnType"
+            :type="isSelf ? '' : btnType"
             :loading="loading"
+            :disabled="isSelf"
         >
             {{ btnText }}<span class="u-follow-count">{{ formatFansNum(fansNum) }}</span>
         </el-button>
-        <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-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>
@@ -73,6 +87,9 @@ export default {
         user() {
             return User.getInfo();
         },
+        isLogin: function() {
+            return User.isLogin();
+        },
     },
     watch: {
         uid: {
@@ -93,6 +110,10 @@ export default {
         },
         // 关注
         follow() {
+            if (!this.isLogin) {
+                User.toLogin();
+                return;
+            }
             follow(this.uid)
                 .then((res) => {
                     this.$message.success("关注成功");
@@ -153,7 +174,7 @@ export default {
             .u-action-item {
                 text-align: center;
                 cursor: pointer;
-                padding: 12px 15px;
+                padding: 8px 10px;
                 &:hover {
                     background: rgb(248,248,251);
                 }
@@ -162,7 +183,17 @@ export default {
     }
 }
 .u-follow-count{
-    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/single/cms-single.vue

@@ -59,6 +59,7 @@ import Article from "@jx3box/jx3box-editor/src/Article.vue";
 import ArticleMarkdown from "@jx3box/jx3box-editor/src/ArticleMarkdown.vue";
 import Comment from "@jx3box/jx3box-comment-ui/src/Comment.vue";
 import { __visibleMap } from "@jx3box/jx3box-common/data/jx3box.json";
+import { getAppType } from '@jx3box/jx3box-common/js/utils'
 export default {
     name: "cms-single",
     components: {
@@ -85,6 +86,9 @@ export default {
         id: function() {
             return ~~this.post?.ID || 0;
         },
+        app_type: function() {
+            return getAppType();
+        },
         post_type: function() {
             return this.post?.post_type;
         },
@@ -157,6 +161,15 @@ export default {
             handler : function (val){
                 this.$emit('extendUpdate',val)
             }
+        },
+        post_type: {
+            deep : true,
+            immediate : true,
+            handler : function (val){
+                if (val && val !== this.app_type) {
+                    location.href = `/${val}/${this.id}`
+                }
+            }
         }
     }
 };