@jx3box/jx3box-common-ui 5.5.26 → 5.5.29

package/assets/css/author.less

@@ -36,10 +36,10 @@
         display: flex;
     }
     .u-level {
-        padding: 2px 15px;
+        padding: 2px 8px;
         .fz(12px, 14px);
         color: #fff;
-        background-color: #aad2fd;
+        background-color: #f39;
         border-radius: 2px;
     }
     .u-vip {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "5.5.26",
+  "version": "5.5.29",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -31,7 +31,7 @@
   ],
   "dependencies": {
     "@jx3box/jx3box-comment-ui": "^1.6.8",
-    "@jx3box/jx3box-common": "^7.0.21",
+    "@jx3box/jx3box-common": "^7.0.24",
     "@jx3box/jx3box-data": "^1.8.6",
     "@jx3box/jx3box-editor": "^1.2.6",
     "axios": "^0.26.1",

package/service/author.js

@@ -22,7 +22,7 @@ function getUserPosts(uid) {
     return $cms({ mute: true })
         .get(`/api/cms/posts/user/${uid}/latest`)
         .then((res) => {
-            return res.data.data;
+            return res.data.data.list || [];
         });
 }
 

package/service/fav.js

@@ -1,44 +1,61 @@
-import qs from "qs";
-import { $helper } from "@jx3box/jx3box-common/js/https.js";
+// import qs from "qs";
+// import { $helper } from "@jx3box/jx3box-common/js/https.js";
+
+// function hasFav(post_type, post_id) {
+//     if (post_type && post_id) {
+//         return $helper({ popType: "notify" }).get(
+//             `/api/post/favorite/favorited`,
+//             {
+//                 params: {
+//                     post_type: post_type,
+//                     post_id: post_id,
+//                 },
+//             }
+//         );
+//     } else return null;
+// }
+
+// function addFav(post_type, post_id) {
+//     if (post_type && post_id) {
+//         return $helper({ popType: "notify" }).post(
+//             `/api/post/favorite`,
+//             qs.stringify({
+//                 post_type: post_type,
+//                 post_id: post_id,
+//                 cancel: 0,
+//             })
+//         );
+//     } else return null;
+// }
+
+// function delFav(post_type, post_id) {
+//     if (post_type && post_id) {
+//         return $helper({ popType: "notify" }).post(
+//             `/api/post/favorite`,
+//             qs.stringify({
+//                 post_type: post_type,
+//                 post_id: post_id,
+//                 cancel: 1,
+//             })
+//         );
+//     } else return null;
+// }
+
+// export { hasFav, addFav, delFav };
+import { $next } from "@jx3box/jx3box-common/js/https.js";
+const $n = $next();
 
 function hasFav(post_type, post_id) {
-    if (post_type && post_id) {
-        return $helper({ popType: "notify" }).get(
-            `/api/post/favorite/favorited`,
-            {
-                params: {
-                    post_type: post_type,
-                    post_id: post_id,
-                },
-            }
-        );
-    } else return null;
+    return $n.get(`api/article/favorites/is-my/${post_id}/${post_type}`).then((res) => {
+        return res.data.data;
+    });
 }
-
-function addFav(post_type, post_id) {
-    if (post_type && post_id) {
-        return $helper({ popType: "notify" }).post(
-            `/api/post/favorite`,
-            qs.stringify({
-                post_type: post_type,
-                post_id: post_id,
-                cancel: 0,
-            })
-        );
-    } else return null;
+function addFav(post_type, post_id, post_title) {
+    return $n.post(`api/article/favorites/add/${post_id}/${post_type}`, { post_title }).then((res) => {
+        return res.data.data;
+    });
 }
-
-function delFav(post_type, post_id) {
-    if (post_type && post_id) {
-        return $helper({ popType: "notify" }).post(
-            `/api/post/favorite`,
-            qs.stringify({
-                post_type: post_type,
-                post_id: post_id,
-                cancel: 1,
-            })
-        );
-    } else return null;
+function delFav(id) {
+    return $n.delete(`api/article/favorites/my/${id}`);
 }
-
 export { hasFav, addFav, delFav };

package/src/App.vue

@@ -41,15 +41,15 @@
                     <UserPop title="添加用户" v-model="visible" @confirm="addUser" />
                     <el-button @click="visible = true">用户POP</el-button>
 
-                    <Thx :postId="23865" postType="bbs" :userId="7" :adminBoxcoinEnable="true" :userBoxcoinEnable="true" />
+                    <Thx :postId="23865" postType="bbs" postTitle="bbs23865的标题" :userId="7" :adminBoxcoinEnable="true" :userBoxcoinEnable="true" />
 
                     <hr />
 
                     <Like mode="heart" :count="100" :showCount="true" />
                     <Down :count="100" :showCount="true" />
                     <Mark label="KEY" value="VALUE" BGL="#000" BGR="#F39" />
-                    <Fav post-id="90" post-type="jx3dat" />
-                    <Feed post-id="90" post-type="jx3dat" />
+                    <Fav post-id="90" post-type="jx3dat" post-title="jx3dat测试标题" />
+                    <Feed post-id="90" post-type="jx3dat"/>
                     <Print title="传入标题" />
                     <QRcode />
                     <Sharing />

package/src/author/Authorposts.vue

@@ -1,19 +1,18 @@
 <template>
-    <div class="c-authorposts">
+    <div class="c-authorposts" v-if="uid">
         <div class="u-label">
             <i class="el-icon-notebook-2"></i>
             <span>作者最新作品</span>
-            <a :href="id | authorLink" class="u-more" target="_blank">全部 &raquo;</a>
+            <a :href="uid | authorLink" class="u-more" target="_blank">全部 &raquo;</a>
         </div>
-        
+
         <ul v-if="data && data.length">
             <li v-for="(item, i) in data" :key="i">
-                <a
-                    class="u-item"
-                    :href="url(item.ID, item.post_type)"
-                    target="_blank"
-                >
-                    <span><i class="u-icon el-icon-reading"></i> {{ item.post_title || item.post_type + '/无标题' }}</span>
+                <a class="u-item" :href="url(item.ID, item.post_type)" target="_blank">
+                    <span
+                        ><i class="u-icon el-icon-reading"></i>
+                        {{ item.post_title || item.post_type + "/无标题" }}</span
+                    >
                 </a>
             </li>
         </ul>
@@ -22,42 +21,40 @@
 
 <script>
 import { getUserPosts } from "../../service/author";
-import {authorLink,getLink} from '@jx3box/jx3box-common/js/utils'
+import { authorLink, getLink } from "@jx3box/jx3box-common/js/utils";
 export default {
     name: "Authorposts",
     props: ["uid"],
     data: function() {
         return {
             data: [],
-            id : this.uid || 0,
         };
     },
-    computed : {
-    },
-    watch : {
-        uid : function (newid){
-            this.id = newid
-            this.init()
-        }
+    computed: {},
+    watch: {
+        uid: {
+            immediate: true,
+            handler: function(user_id) {
+                if (user_id) this.init();
+            },
+        },
     },
     methods: {
         url: function(pid, type) {
-            return getLink(type,pid)
+            return getLink(type, pid);
+        },
+        init: function() {
+            getUserPosts(this.uid)
+                .then((data) => {
+                    this.data = data.slice(0, 5);
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
         },
-        init : function (){
-            if (!this.id) return;
-            getUserPosts(this.id).then((data) => {
-                this.data = data.slice(0, 5);
-            }).catch((err) => {
-                console.log(err)
-            })
-        }
-    },
-    filters : {
-        authorLink
     },
-    mounted: function() {
-        this.init()
+    filters: {
+        authorLink,
     },
 };
 </script>

package/src/interact/Fav.vue

@@ -1,9 +1,7 @@
 <template>
     <el-button class="w-fav" size="mini" type="primary" @click="doFav">
-        <i v-if="!favorited" class="el-icon-star-off"></i>
-        <i v-else class="el-icon-star-on"></i>
-        <span v-if="!favorited">收藏</span>
-        <span v-else>取消收藏</span>
+        <i :class="favorite ? 'el-icon-star-on' : 'el-icon-star-off'"></i>
+        <span>{{ favorite ? "取消收藏" : "收藏" }}</span>
     </el-button>
 </template>
 
@@ -12,63 +10,41 @@ import User from "@jx3box/jx3box-common/js/user";
 import { hasFav, addFav, delFav } from "../../service/fav";
 export default {
     name: "Fav",
-    props: ["postType", "postId"],
-    data: function() {
+    props: ["postType", "postId", "postTitle"],
+    data: function () {
         return {
             login: User.isLogin(),
-            favorited: false,
+            favorite: false,
         };
     },
     methods: {
-        doFav: function() {
+        doFav: function () {
             if (this.login) {
-                this.favorited ? this.delFav() : this.addFav();
+                this.favorite ? this.delFav() : this.addFav();
             } else {
                 User.toLogin();
             }
         },
-        hasFav: function() {
-            hasFav(this.postType, this.postId).then(
-                (data) => {
-                    data = data.data;
-                    this.favorited = data.code === 200 && data.data.favorited > 0;
-                },
-                (err) => {
-                    this.fail(err);
-                }
-            );
+        hasFav: function () {
+            hasFav(this.postType, this.postId).then((res) => {
+                this.favorite = res.id || false;
+            });
         },
-        addFav: function() {
-            addFav(this.postType, this.postId).then(
-                (data) => {
-                    if (data.data.code === 200) {
-                        this.favorited = true;
-                    } else this.fail(data.data.message);
-                },
-                (err) => {
-                    this.fail(err);
-                }
-            );
+        addFav: function () {
+            addFav(this.postType, this.postId, this.postTitle).then((res) => {
+                this.favorite = res.id;
+            });
         },
-        delFav: function() {
-            delFav(this.postType, this.postId).then(
-                (data) => {
-                    if (data.data.code === 200) {
-                        this.favorited = false;
-                    } else this.fail(data.data.message);
-                },
-                (err) => {
-                    this.fail(err);
-                }
-            );
+        delFav: function () {
+            delFav(this.favorite).then(() => {
+                this.favorite = false;
+            });
         },
-        fail: function(err) {
+        fail: function (err) {
             if (err.response && err.response.data && err.response.data.code) {
-                this.$message.error(
-                    `[${err.response.data.code}] ${err.response.data.msg}`
-                );
+                this.$message.error(`[${err.response.data.code}] ${err.response.data.msg}`);
             } else {
-                this.$message.error(typeof err === 'string' ? err : "网络请求异常");
+                this.$message.error(typeof err === "string" ? err : "网络请求异常");
             }
             console.log(err);
         },
@@ -78,8 +54,8 @@ export default {
             immediate: true,
             handler() {
                 if (this.login && this.postType && this.postId) this.hasFav();
-            }
-        }
+            },
+        },
     },
 };
 </script>

package/src/interact/Fav2.vue

@@ -1,126 +1,89 @@
-<template>
-    <div class="w-fav2" :class="{ disabled:favorited }" @click="doFav">
-        <el-tooltip effect="dark" :content="favContent" placement="top-start">
-            <div>
-                <img class="u-icon" svg-inline src="../../assets/img/widget/star.svg" />
-                <span class="u-count" v-if="total">{{ total }}</span>
-            </div>
-        </el-tooltip>
-    </div>
-</template>
-
-<script>
-import User from "@jx3box/jx3box-common/js/user";
-import { hasFav, addFav, delFav } from "../../service/fav";
-export default {
-    name: "Fav2",
-    props: ["postType", "postId"],
-    data: function () {
-        return {
-            login: User.isLogin(),
-            favorited: false,
-            total: 0,
-        };
-    },
-    computed: {
-        favContent() {
-            return this.favorited ? "取消收藏" : "收藏";
-        },
-    },
-    methods: {
-        doFav: function () {
-            if (this.login) {
-                this.favorited ? this.delFav() : this.addFav();
-            } else {
-                User.toLogin();
-            }
-        },
-        hasFav: function () {
-            hasFav(this.postType, this.postId).then(
-                (data) => {
-                    data = data.data;
-                    this.favorited =
-                        data.code === 200 && data.data.favorited > 0;
-                    this.total = data.data?.total || 0;
-                },
-                (err) => {
-                    this.fail(err);
-                }
-            );
-        },
-        addFav: function () {
-            addFav(this.postType, this.postId).then(
-                (data) => {
-                    if (data.data.code === 200) {
-                        this.favorited = true;
-                        this.total++;
-                    } else {
-                        this.fail(data.data.message);
-                    }
-                },
-                (err) => {
-                    this.fail(err);
-                }
-            );
-        },
-        delFav: function () {
-            delFav(this.postType, this.postId).then(
-                (data) => {
-                    if (data.data.code === 200) {
-                        this.favorited = false;
-                        this.total--;
-                    } else {
-                        this.fail(data.data.message);
-                    }
-                },
-                (err) => {
-                    this.fail(err);
-                }
-            );
-        },
-        fail: function (err) {
-            if (err.response && err.response.data && err.response.data.code) {
-                this.$message.error(
-                    `[${err.response.data.code}] ${err.response.data.msg}`
-                );
-            } else {
-                this.$message.error(
-                    typeof err === "string" ? err : "网络请求异常"
-                );
-            }
-            console.log(err);
-        },
-    },
-    watch: {
-        postId: {
-            immediate: true,
-            handler() {
-                if (this.postType && this.postId) this.hasFav();
-            },
-        },
-    },
-};
-</script>
-
-<style lang="less" scoped>
-.w-fav2 {
-    .pointer;
-    .dbi;
-    .u-icon {
-        .size(32px);
-        .y;
-        .pr;
-        top: -1px;
-    }
-    .u-count {
-        color: #888;
-        .ml(10px);
-    }
-
-    &.disabled {
-        svg * {
-            fill: #aaa;
-        }
-    }
-}
-</style>
+<template>
+    <div class="w-fav2" :class="{ disabled: favorite }" @click="doFav">
+        <el-tooltip effect="dark" :content="favContent" placement="top-start">
+            <div>
+                <img class="u-icon" svg-inline src="../../assets/img/widget/star.svg" />
+                <span class="u-count" v-if="total">{{ total }}</span>
+            </div>
+        </el-tooltip>
+    </div>
+</template>
+
+<script>
+import User from "@jx3box/jx3box-common/js/user";
+import { hasFav, addFav, delFav } from "../../service/fav";
+export default {
+    name: "Fav2",
+    props: ["postType", "postId", "postTitle"],
+    data: function () {
+        return {
+            login: User.isLogin(),
+            favorite: false,
+            total: 0,
+        };
+    },
+    computed: {
+        favContent() {
+            return this.favorite ? "取消收藏" : "收藏";
+        },
+    },
+    methods: {
+        doFav: function () {
+            if (this.login) {
+                this.favorite ? this.delFav() : this.addFav();
+            } else {
+                User.toLogin();
+            }
+        },
+        hasFav: function () {
+            hasFav(this.postType, this.postId).then((res) => {
+                this.favorite = res.id || false;
+                this.total = res.totalFavorites || 0;
+            });
+        },
+        addFav: function () {
+            addFav(this.postType, this.postId, this.postTitle).then((res) => {
+                this.favorite = res.id;
+                this.total++;
+            });
+        },
+        delFav: function () {
+            delFav(this.favorite).then(() => {
+                this.favorite = false;
+                this.total && this.total--;
+            });
+        },
+    },
+    watch: {
+        postId: {
+            immediate: true,
+            handler() {
+                if (this.postType && this.postId) this.hasFav();
+            },
+        },
+    },
+};
+</script>
+
+<style lang="less" scoped>
+.w-fav2 {
+    .pointer;
+    .dbi;
+    .u-icon {
+        .size(32px);
+        .y;
+        .pr;
+        top: -1px;
+    }
+    .u-count {
+        color: #888;
+        .ml(10px);
+    }
+
+    &.disabled {
+        svg * {
+            fill: #aaa;
+        }
+    }
+}
+</style>

package/src/interact/boxcoin_admin.vue

@@ -81,7 +81,7 @@ export default {
             return this.left && this.left >= this.count;
         },
         allowBoxcoin : function (){
-            return this.postType && this.postId && this.userId
+            return this.postType && this.postId && (this.userId || (this.authors && this.authors.length))
         },
         client : function (){
             return location.href.includes('origin') ? 'origin' : 'std'

package/src/interact/boxcoin_user.vue

@@ -80,7 +80,7 @@ export default {
             return this.left && this.left >= this.count;
         },
         allowBoxcoin : function (){
-            return this.postType && this.postId && this.userId
+            return this.postType && this.postId && (this.userId || (this.authors && this.authors.length))
         },
         client : function (){
             return location.href.includes('origin') ? 'origin' : 'std'
@@ -152,4 +152,4 @@ export default {
         .ml(10px);
     }
 }
-</style>
+</style>

package/src/single/Thx.vue

@@ -3,7 +3,7 @@
         <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" />
             <Like :postId="postId" :postType="postType"></Like>
-            <fav :postId="postId" :postType="postType"></fav>
+            <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" />
             <Share :postId="postId" :postType="postType" />
         </div>
@@ -28,7 +28,7 @@ import User from '@jx3box/jx3box-common/js/user'
 import {getPostBoxcoinConfig,getBoxcoinStatus} from '../../service/thx'
 export default {
     name: "Thx",
-    props: ["postId", "postType","userId","adminBoxcoinEnable","userBoxcoinEnable",'mode', 'authors'],
+    props: ["postId", "postType", "postTitle", "userId","adminBoxcoinEnable","userBoxcoinEnable",'mode', 'authors'],
     components: {
         Like,
         Share,

package/vue.config.js

@@ -39,8 +39,7 @@ module.exports = {
                 },
             },
             "/api/team": {
-                target: "http://gray.team.api.jx3box.com",
-                // "target": "https://team.api.jx3box.com",
+                "target": "https://team.api.jx3box.com",
                 onProxyReq: function(request) {
                     request.setHeader("origin", "");
                 },
@@ -48,6 +47,9 @@ module.exports = {
             "/api/cms": {
                 target: process.env["DEV_SERVER"] == "true" ? "http://localhost:5120" : "https://cms.jx3box.com",
             },
+			"/api/article": {
+				target: "https://next2.jx3box.com",
+			},
             "/api/messages": {
                 target: "https://helper.jx3box.com",
             },
@@ -64,7 +66,7 @@ module.exports = {
                 },
             },
             "/api": {
-                target: "https://next.jx3box.com",
+                target: "https://next2.jx3box.com",
                 onProxyReq: function(request) {
                     request.setHeader("origin", "");
                 },