npm - @jx3box/jx3box-common-ui - Versions diffs - 5.5.23 → 5.5.26 - Mend

@jx3box/jx3box-common-ui 5.5.23 → 5.5.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/.editorconfig +13 -0
package/.prettierrc +21 -0
package/assets/css/author.less +51 -27
package/jsconfig.json +9 -0
package/package.json +65 -63
package/readme.md +0 -1
package/service/author.js +13 -4
package/src/Author.vue +66 -110
package/src/header/user.vue +42 -7
package/src/interact/Contributors.vue +110 -0
package/src/interact/boxcoin_admin.vue +14 -4
package/src/interact/boxcoin_records.vue +1 -2
package/src/interact/boxcoin_user.vue +13 -3
package/src/single/Creators.vue +17 -0
package/src/single/Thx.vue +3 -3
package/src/single/cms-single.vue +18 -3
package/vue.config.js +6 -0

package/.editorconfig ADDED Viewed

@@ -0,0 +1,13 @@
+# http://editorconfig.org
+root = true
+[*]
+indent_size = 4
+indent_style = space
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+[*.md]
+trim_trailing_whitespace = false

package/.prettierrc ADDED Viewed

@@ -0,0 +1,21 @@
+{
+    "tabWidth": 4,
+    "useTabs": false,
+    "endOfLine": "lf",
+    "printWidth": 120,
+    "semi": true,
+    "singleQuote": false,
+    "quoteProps": "as-needed",
+    "jsxSingleQuote": false,
+    "trailingComma": "es5",
+    "bracketSpacing": true,
+    "bracketSameLine": false,
+    "jsxBracketSameLine": false,
+    "arrowParens": "always",
+    "requirePragma": false,
+    "insertPragma": false,
+    "proseWrap": "preserve",
+    "htmlWhitespaceSensitivity": "css",
+    "vueIndentScriptAndStyle": false,
+    "embeddedLanguageFormatting": "auto"
+}

package/assets/css/author.less CHANGED Viewed

@@ -3,6 +3,7 @@
         .clearfix;
         .db;
         .mb(10px);
+        .pr;
     }
     .u-avatar {
         .fl;
@@ -10,12 +11,19 @@
         .size(68px);
     }
     .u-name {
-        .lh(2);
+        .lh(1.6);
         .bold;
         color: @darkblue;
         &:hover {
             color: #f39;
         }
+        .break(2);
+    }
+    .u-info{
+        .h(68px);
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
     }
     .u-bio {
         .mb(10px);
@@ -24,6 +32,46 @@
         color: #888;
         padding: 0 5px;
     }
+    .u-extend {
+        display: flex;
+    }
+    .u-level {
+        padding: 2px 15px;
+        .fz(12px, 14px);
+        color: #fff;
+        background-color: #aad2fd;
+        border-radius: 2px;
+    }
+    .u-vip {
+        .ml(5px);
+        .db;
+        .i-icon-vip {
+            .db;
+            vertical-align: baseline;
+            padding: 2px 6px;
+            .fz(12px, 14px);
+            font-style: normal;
+            border-radius: 2px;
+            background-color: #ddd;
+            color: #fff;
+            &.on {
+                background-color: #6f42c1;
+            }
+        }
+    }
+    .u-superauthor {
+        margin-left: 4px;
+        display: inline-block;
+        vertical-align: -2px;
+        img {
+            width: 16px;
+        }
+    }
+    .u-tips {
+        .db;
+        color: #555;
+        font-size: 12px;
+    }
     .u-link {
         border-top: 1px dashed #eee;
         border-bottom: 1px dashed #eee;
@@ -109,11 +157,11 @@
             .db;
             background-color: #f2f6fc;
             .mb(6px);
-            &:hover{
+            &:hover {
                 background-color: #e6f0fb;
                 // color:@color-link;
             }
-            padding:2px 0;
+            padding: 2px 0;
         }
         .u-team-logo {
             .size(26px);
@@ -125,30 +173,6 @@
             color: #555;
         }
     }
-    .u-vip {
-        margin-left: 4px;
-        .i-icon-vip{
-            .dbi;vertical-align: baseline;
-            padding:2px 5px;
-            .fz(12px,14px);
-            font-style: normal;
-            border-radius: 2px;
-            background-color:#ddd;
-            color:#fff;
-            &.on{
-                background-color: #6f42c1;
-            }
-        }
-    }
-    .u-superauthor {
-        margin-left: 4px;
-        display: inline-block;
-        vertical-align: -2px;
-        img {
-            width: 16px;
-        }
-    }
 }
 .c-sidebar-left .c-author {

package/jsconfig.json ADDED Viewed

@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "@/*": ["./src/*"]
+        }
+    },
+    "exclude": ["node_modules"]
+}

package/package.json CHANGED Viewed

@@ -1,68 +1,70 @@
 {
-    "name": "@jx3box/jx3box-common-ui",
-    "version": "5.5.23",
-    "description": "JX3BOX UI",
-    "main": "index.js",
-    "scripts": {
-        "dev": "env DEV_SERVER=true vue-cli-service serve",
-        "serve": "vue-cli-service serve",
-        "build": "vue-cli-service build",
-        "lint": "vue-cli-service lint",
-        "inspect": "vue inspect > output.js",
-        "update": "npm --registry https://registry.npmjs.org install @jx3box/jx3box-common@latest @jx3box/jx3box-data@latest @jx3box/jx3box-editor@latest @jx3box/jx3box-comment-ui@latest",
-        "header": "vue-cli-service build --target lib --name newheader src/Header.vue && cp public/index.html dist/newheader.html"
+  "name": "@jx3box/jx3box-common-ui",
+  "version": "5.5.26",
+  "description": "JX3BOX UI",
+  "main": "index.js",
+  "scripts": {
+    "dev": "cross-env DEV_SERVER=true vue-cli-service serve",
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint",
+    "inspect": "vue inspect > output.js",
+    "update": "npm --registry https://registry.npmjs.org install @jx3box/jx3box-common@latest @jx3box/jx3box-data@latest @jx3box/jx3box-editor@latest @jx3box/jx3box-comment-ui@latest",
+    "header": "vue-cli-service build --target lib --name newheader src/Header.vue && cp public/index.html dist/newheader.html"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
     },
-    "eslintConfig": {
-        "root": true,
-        "env": {
-            "node": true
-        },
-        "extends": [
-            "plugin:vue/essential"
-        ],
-        "rules": {},
-        "parserOptions": {
-            "parser": "babel-eslint"
-        }
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions"
+    "extends": [
+      "plugin:vue/essential"
     ],
-    "dependencies": {
-        "@jx3box/jx3box-comment-ui": "^1.6.8",
-        "@jx3box/jx3box-common": "^7.0.19",
-        "@jx3box/jx3box-data": "^1.8.3",
-        "@jx3box/jx3box-editor": "^1.2.4",
-        "axios": "^0.19.2",
-        "element-ui": "^2.13.2",
-        "jquery": "^3.5.1",
-        "lodash": "^4.17.15",
-        "qrcode.vue": "^1.7.0",
-        "url": "^0.11.0",
-        "vue": "^2.6.11"
-    },
-    "devDependencies": {
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-        "@vue/cli-plugin-babel": "~4.3.0",
-        "@vue/cli-plugin-eslint": "~4.3.0",
-        "@vue/cli-plugin-vuex": "^4.0.0",
-        "@vue/cli-service": "~4.3.0",
-        "babel-eslint": "^10.1.0",
-        "core-js": "^3.6.5",
-        "csslab": "^4.0.3",
-        "eslint": "^6.7.2",
-        "eslint-plugin-vue": "^6.2.2",
-        "less": "^3.0.4",
-        "less-loader": "^5.0.0",
-        "style-resources-loader": "^1.3.3",
-        "vue-cli-plugin-element": "~1.0.1",
-        "vue-svg-inline-loader": "^1.4.6",
-        "vue-template-compiler": "^2.6.11",
-        "weixin-js-sdk": "^1.6.0"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/JX3BOX/jx3box-common-ui.git"
+    "rules": {},
+    "parserOptions": {
+      "parser": "babel-eslint"
     }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ],
+  "dependencies": {
+    "@jx3box/jx3box-comment-ui": "^1.6.8",
+    "@jx3box/jx3box-common": "^7.0.21",
+    "@jx3box/jx3box-data": "^1.8.6",
+    "@jx3box/jx3box-editor": "^1.2.6",
+    "axios": "^0.26.1",
+    "dayjs": "^1.11.0",
+    "element-ui": "^2.13.2",
+    "jquery": "^3.5.1",
+    "lodash": "^4.17.15",
+    "qrcode.vue": "^1.7.0",
+    "url": "^0.11.0",
+    "vue": "^2.6.11"
+  },
+  "devDependencies": {
+    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+    "@vue/cli-plugin-babel": "~4.3.0",
+    "@vue/cli-plugin-eslint": "~4.3.0",
+    "@vue/cli-plugin-vuex": "^4.0.0",
+    "@vue/cli-service": "~4.3.0",
+    "babel-eslint": "^10.1.0",
+    "core-js": "^3.6.5",
+    "cross-env": "^7.0.3",
+    "csslab": "^4.0.3",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
+    "less": "^3.0.4",
+    "less-loader": "^5.0.0",
+    "style-resources-loader": "^1.3.3",
+    "vue-cli-plugin-element": "~1.0.1",
+    "vue-svg-inline-loader": "^1.4.6",
+    "vue-template-compiler": "^2.6.11",
+    "weixin-js-sdk": "^1.6.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/JX3BOX/jx3box-common-ui.git"
+  }
 }

package/readme.md CHANGED Viewed

@@ -1,5 +1,4 @@
 # JX3BOX UI
-手动更新cdn `https://oss.jx3box.com/static/`
 通用 UI 组件

package/service/author.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import axios from "axios";
 import { __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
-import { $next, $cms, $team } from "@jx3box/jx3box-common/js/https.js";
+import { $next, $cms, $team, $pay } from "@jx3box/jx3box-common/js/https.js";
 function getUserInfo(uid) {
     return $cms({ mute: true })
@@ -10,6 +10,14 @@ function getUserInfo(uid) {
         });
 }
+function getMyInfo(){
+    return $cms({ mute: true })
+        .get(`/api/cms/user/my/info`)
+        .then(res => {
+            return res.data.data
+        })
+}
 function getUserPosts(uid) {
     return $cms({ mute: true })
         .get(`/api/cms/posts/user/${uid}/latest`)
@@ -56,8 +64,8 @@ function getSuperAuthor(uid) {
     return $cms().get('/api/cms/user/is_super_author/' + uid)
 }
-function getIdentity(uid) {
-    return $cms().get(`/api/cms/user/${uid}/identity`)
+function userSignIn(){
+    return $pay({ mute: true }).get(`/api/personal/task/everyday/sign-in`)
 }
 export {
@@ -68,5 +76,6 @@ export {
     getFrames,
     getUserPublicTeams,
     getSuperAuthor,
-    getIdentity
+    getMyInfo,
+    userSignIn,
 };

package/src/Author.vue CHANGED Viewed

@@ -1,56 +1,38 @@
 <template>
     <div class="c-author" v-if="data">
         <div class="u-author">
-            <Avatar
-                class="u-avatar"
-                :uid="uid"
-                :url="data.user_avatar"
-                :size="68"
-                :frame="data.user_avatar_frame"
-            />
-            <a class="u-name" :href="authorLink(uid)">
-                <span>{{ data.display_name }}</span>
+            <Avatar class="u-avatar" :uid="uid" :url="data.user_avatar" :size="68" :frame="data.user_avatar_frame" />
+            <div class="u-info">
+                <a class="u-name" :href="authorLink(uid)">
+                <span>{{ data.display_name.slice(0, 12) }}</span>
+                <el-tooltip class="item" effect="dark" content="签约作者" placement="top" v-if="isSuperAuthor">
+                    <a class="u-superauthor" href="/dashboard/#/cooperation" target="_blank">
+                        <img :src="super_author_icon" alt="superauthor" />
+                    </a>
+                </el-tooltip>
             </a>
-            <el-tooltip
-                class="item"
-                effect="dark"
-                content="签约作者"
-                placement="top"
-                v-if="isSuperAuthor"
-            >
-                <a class="u-superauthor" href="/dashboard/#/cooperation" target="_blank">
-                    <img :src="super_author_icon" alt="superauthor" />
-                </a>
-            </el-tooltip>
-            <el-tooltip
-                class="item"
-                effect="dark"
-                :content="vipTypeTitle"
-                placement="top"
-                v-if="isPRO || isVIP"
-            >
-                <a class="u-vip" href="/vip/premium?from=sidebar_author" target="_blank">
-                    <i class="i-icon-vip on">{{ vipType }}</i>
-                </a>
-            </el-tooltip>
+            <div class="u-extend">
+                <el-tooltip class="item u-level" effect="dark" placement="top">
+                    <div slot="content">
+                        <span class="u-tips">经验值：{{ data.experience }}</span>
+                    </div>
+                    <span>Lv.{{ level }}</span>
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" :content="vipTypeTitle" placement="top" v-if="isVip">
+                    <a class="u-vip" href="/vip/premium?from=sidebar_author" target="_blank">
+                        <i class="i-icon-vip on">{{ vipType }}</i>
+                    </a>
+                </el-tooltip>
+            </div>
+            </div>
         </div>
         <div class="u-bio">{{ data.user_bio }}</div>
         <div class="u-link" v-if="hasLink">
-            <a
-                v-if="data.weibo_name"
-                class="u-weibo"
-                :href="weiboLink(data.weibo_id)"
-                target="_blank"
-            >
+            <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" />
                 {{ data.weibo_name }}
             </a>
-            <a
-                v-if="data.github_name"
-                class="u-github"
-                :href="githubLink(data.github_name)"
-                target="_blank"
-            >
+            <a v-if="data.github_name" class="u-github" :href="githubLink(data.github_name)" target="_blank">
                 <img svg-inline src="../assets/img/author/github.svg" />
                 {{ data.github_name }}
             </a>
@@ -87,9 +69,9 @@
                 <i class="el-icon-school"></i>
                 <span>所属团队</span>
             </div>
-            <a class="u-team" v-for="(item,i) in teams" :key="i" :href="teamLink(item.team_id)" target="_blank">
+            <a class="u-team" v-for="(item, i) in teams" :key="i" :href="teamLink(item.team_id)" target="_blank">
                 <img class="u-team-logo" :src="showTeamLogo(item.team_logo)" />
-                <span class="u-team-name">{{item.team_name}}@{{item.team_server}}</span>
+                <span class="u-team-name">{{ item.team_name }}@{{ item.team_server }}</span>
             </a>
         </div>
         <Authorposts :uid="uid" />
@@ -100,27 +82,16 @@
 const liveStatusMap = ["等待开播", "直播中", "直播结束"];
 import Avatar from "./author/Avatar.vue";
 import Authorposts from "./author/Authorposts.vue";
-import {
-    authorLink,
-    tvLink,
-    getLink,
-    getThumbnail,
-} from "@jx3box/jx3box-common/js/utils";
+import { authorLink, tvLink, getLink, getThumbnail } from "@jx3box/jx3box-common/js/utils";
 import { __server, __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
-import {
-    getUserInfo,
-    getDouyu,
-    getUserMedals,
-    getUserPublicTeams,
-    getSuperAuthor,
-    getIdentity,
-} from "../service/author";
+import { getUserInfo, getDouyu, getUserMedals, getUserPublicTeams } from "../service/author";
 import { user as medal_map } from "@jx3box/jx3box-common/data/medals.json";
 import User from "@jx3box/jx3box-common/js/user";
+import { __userLevel } from "@jx3box/jx3box-common/data/jx3box.json";
 export default {
     name: "Author",
     props: ["uid"],
-    data: function () {
+    data: function() {
         return {
             data: "",
             tv: "",
@@ -133,50 +104,52 @@ export default {
                 //     team_server : "蝶恋花"
                 // }
             ],
-            isSuperAuthor: false,
-            isPRO: false,
             isVIP: false,
         };
     },
     computed: {
-        tv_type: function () {
+        tv_type: function() {
             return this.data && this.data.tv_type;
         },
-        tv_id: function () {
+        tv_id: function() {
             return (this.data && this.data.tv_id) || 0;
         },
-        tv_img: function () {
+        tv_img: function() {
             return __imgPath + "image/tv/" + this.tv_type + ".png";
         },
-        tv_link: function () {
+        tv_link: function() {
             return tvLink(this.tv_type, this.tv_id) || "";
         },
-        tv_status: function () {
+        tv_status: function() {
             return (this.tv && this.tv.show_status == 1) || false;
         },
-        super_author_icon: function () {
+        super_author_icon: function() {
             return __imgPath + "image/user/" + "superauthor.svg";
         },
-        hasLink: function () {
-            return (
-                this.data.weibo_name ||
-                this.data.github_name ||
-                this.data.tuilan_id ||
-                this.data.tv_id
-            );
+        hasLink: function() {
+            return this.data.weibo_name || this.data.github_name || this.data.tuilan_id || this.data.tv_id;
         },
-        hasTrophy: function () {
+        hasTrophy: function() {
             return this.medals.length;
         },
-        vipType: function () {
-            return this.isPRO ? "PRO" : "PRE";
+        vipType: function() {
+            return this.data?.is_pro ? "PRO" : "PRE";
+        },
+        vipTypeTitle: function() {
+            return this.data?.is_pro ? "专业版会员" : "高级版会员";
+        },
+        isVip: function() {
+            return this.data?.is_pro || this.data?.is_pre;
+        },
+        isSuperAuthor: function() {
+            return this.data?.sign;
         },
-        vipTypeTitle: function () {
-            return this.isPRO ? "专业版会员" : "高级版会员";
+        level: function() {
+            return User.getLevel(this.data?.experience);
         },
     },
     methods: {
-        loadData: function () {
+        loadData: function() {
             return getUserInfo(this.uid)
                 .then((data) => {
                     this.data = data;
@@ -184,11 +157,9 @@ export default {
                 .then(() => {
                     this.loadMedals();
                     this.loadTeams();
-                    this.checkSuperAuthor();
-                    this.loadIdentity();
                 });
         },
-        loadTV: function () {
+        loadTV: function() {
             if (this.tv_type == "douyu") {
                 if (!this.tv_id || isNaN(this.tv_id)) return;
                 getDouyu(this.tv_id).then((data) => {
@@ -196,59 +167,44 @@ export default {
                 });
             }
         },
-        loadMedals: function () {
+        loadMedals: function() {
             getUserMedals(this.uid).then((data) => {
                 this.medals = data;
             });
         },
-        loadTeams: function () {
+        loadTeams: function() {
             getUserPublicTeams(this.uid).then((data) => {
                 this.teams = data && data.slice(0, 5);
             });
         },
-        async checkVIP() {
-            this.isPRO = await User.isPRO();
-            this.isVIP = await User.isVIP();
-        },
-        checkSuperAuthor: function () {
-            getSuperAuthor(this.uid).then((res) => {
-                this.isSuperAuthor = res.data.data;
-            });
-        },
-        loadIdentity: function () {
-            getIdentity(this.uid).then((res) => {
-                this.isPRO = res.data.data.isPRO;
-                this.isVIP = res.data.data.isPRE;
-            });
-        },
         // filters
-        showMedalIcon: function (val) {
+        showMedalIcon: function(val) {
             return __imgPath + "image/medals/user/" + val + ".gif";
         },
-        showMedalDesc : function (item){
-            return item.medal_desc || medal_map[item.medal]
+        showMedalDesc: function(item) {
+            return item.medal_desc || medal_map[item.medal];
         },
         authorLink,
-        weiboLink: function (val) {
+        weiboLink: function(val) {
             return "https://weibo.com/" + val;
         },
-        githubLink: function (val) {
+        githubLink: function(val) {
             return "https://github.com/" + val;
         },
-        teamLink: function (team_id) {
+        teamLink: function(team_id) {
             return getLink("org", team_id);
         },
-        showTeamLogo: function (val) {
+        showTeamLogo: function(val) {
             return getThumbnail(val, 32);
         },
     },
     watch: {
-        uid: function () {
+        uid: function() {
             this.loadData();
         },
     },
-    mounted: function () {
+    mounted: function() {
         this.uid && this.loadData();
     },
     components: {

package/src/header/user.vue CHANGED Viewed

@@ -119,7 +119,10 @@ import {
 } from "@jx3box/jx3box-common/data/jx3box.json";
 import panel from "../../assets/data/panel.json";
 import { getMsg, getMenu } from "../../service/header";
-import { getSuperAuthor } from "../../service/author";
+import { getMyInfo, userSignIn } from "../../service/author";
+import dayjs from 'dayjs';
+import isToday from 'dayjs/plugin/isToday';
+dayjs.extend(isToday);
 export default {
     props: [],
     data: function () {
@@ -201,6 +204,12 @@ export default {
             return __imgPath + "image/user/" + "superauthor.svg";
         },
     },
+    watch: {
+        fold(val) {
+            if (!val) {
+            }
+        }
+    },
     methods: {
         // 消息
         checkMSG: function () {
@@ -242,6 +251,31 @@ export default {
                     });
                 });
         },
+        // 签到
+        signIn: function (){
+            try {
+                let user_last_login = localStorage.getItem('user_last_login');
+                user_last_login = user_last_login && JSON.parse(user_last_login) || ''
+                if (user_last_login && dayjs(user_last_login).isToday()) {
+                    console.log('已签到')
+                } else {
+                    userSignIn().then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: '签到成功',
+                            customClass: 'c-header-signin'
+                        })
+                        localStorage.setItem('user_last_login', JSON.stringify(dayjs()))
+                    }).catch(err => {
+                        localStorage.setItem('user_last_login', JSON.stringify(dayjs()))
+                        console.log(dayjs.tz.guess())
+                    }).finally(() => {})
+                }
+            } catch(e) {
+                console.log(e)
+            }
+        },
         // 资产
         loadAsset: function () {
@@ -249,10 +283,10 @@ export default {
                 this.asset = data;
             });
         },
-        checkSuperAuthor: function () {
-            getSuperAuthor(this.user?.uid).then((res) => {
-                this.isSuperAuthor = res.data.data;
-            });
+        loadMyInfo: function () {
+            getMyInfo().then(res => {
+                this.isSuperAuthor = !!res.sign
+            })
         },
         // 初始化
@@ -262,7 +296,8 @@ export default {
                 this.checkMSG();
                 this.loadPanel();
                 this.loadAsset();
-                this.checkSuperAuthor();
+                this.loadMyInfo()
+                this.signIn()
             }
         },
@@ -284,4 +319,4 @@ export default {
     },
     components: {},
 };
-</script>
+</script>

package/src/interact/Contributors.vue ADDED Viewed

@@ -0,0 +1,110 @@
+<template>
+    <section class="m-contributor">
+        <div class="m-author">
+            <el-radio
+                v-for="(item, i) in authors"
+                v-model="value"
+                :label="String(item.user_id)"
+                :key="i"
+                @change="handleAuthorChange"
+            >
+                <img
+                    class="u-pic"
+                    :src="showAvatar(item.user_avatar)"
+                    :alt="item.display_name"
+                />
+                <span class="u-txt" :title="item.display_name">
+                    {{ item.display_name }}
+                </span>
+            </el-radio>
+        </div>
+    </section>
+</template>
+<script>
+import { showAvatar } from "@jx3box/jx3box-common/js/utils";
+export default {
+    name: "Contributors",
+    props: {
+        authors: {
+            type: Array,
+            default: () => [],
+        },
+    },
+    data() {
+        return {
+            value: "",
+        };
+    },
+    watch: {
+        authors: {
+            deep: true,
+            immediate: true,
+            handler(val) {
+                if (val && val.length) this.value = String(val[0]?.user_id)
+            }
+        },
+        value: {
+            immediate: true,
+            handler(val) {
+                val && this.$emit('chosen', this.value)
+            }
+        }
+    },
+    methods: {
+        handleAuthorChange() {},
+        showAvatar,
+    },
+};
+</script>
+<style lang="less">
+.m-contributor {
+    padding: 10px 10px 0 10px;
+    .m-author {
+        .u-pic {
+            .db;
+            .size(48px);
+            background-color: @bg-black;
+            .r(4px);
+            transition: 0.1s ease-in;
+            // .tm(0.4);
+            box-sizing: border-box;
+            &:hover {
+                .tm(1);
+            }
+        }
+        .u-txt {
+            .db;
+            .x;
+            .fz(12px, 2);
+            white-space: nowrap;
+            overflow: hidden;
+            .w(48px);
+        }
+        .el-radio {
+            .ml(0);
+            .mr(15px);
+        }
+        .el-radio__input {
+            .none;
+        }
+        .el-radio__label {
+            .db;
+            padding-left: 0;
+        }
+        .is-checked {
+            .u-pic {
+                border: 3px solid @primary;
+                .tm(1);
+            }
+            .u-txt {
+                .bold;
+            }
+        }
+    }
+}
+</style>

package/src/interact/boxcoin_admin.vue CHANGED Viewed

@@ -18,6 +18,7 @@
                 </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="count">
                             <el-radio :label="item" v-for="item in points" :key="item" border>
@@ -50,10 +51,13 @@
 <script>
 import { grantBoxcoin } from "../../service/thx.js";
 import User from "@jx3box/jx3box-common/js/user";
+import Contributors from './Contributors.vue';
 export default {
     name: "BoxcoinAdmin",
-    props: ["postType", "postId", "userId", "own", "points"],
-    components: {},
+    props: ["postType", "postId", "userId", "own", "points", 'authors'],
+    components: {
+        Contributors
+    },
     data: function () {
         return {
             visible: false,
@@ -61,7 +65,9 @@ export default {
             count: 0,
             remark: "辛苦，感谢！",
-            left : this.own
+            left : this.own,
+            chosen: '', // 被选中的人
         };
     },
     computed: {
@@ -90,8 +96,12 @@ export default {
         openBoxcoinPop: function () {
             this.visible = true;
         },
+        // 选择要打赏的对象
+        handleChosen(userId) {
+            this.chosen = userId
+        },
         submit: function () {
-            grantBoxcoin(this.postType, this.postId, this.userId, this.count, {
+            grantBoxcoin(this.postType, this.postId, this.chosen || this.userId, this.count, {
                 remark: this.remark,
                 client : this.client
             })

package/src/interact/boxcoin_records.vue CHANGED Viewed

@@ -7,7 +7,7 @@
                         <i class="el-icon-trophy"></i>
                     </span>
                     <span class="u-meta u-user">参与打赏</span>
-                    <span class="u-meta u-user" v-if="mode== 'wiki'">收益作者</span>
+                    <span class="u-meta u-user">收益作者</span>
                     <span class="u-meta u-count">盒币</span>
                     <span class="u-meta u-remark">寄语</span>
                     <time class="u-meta u-time"></time>
@@ -30,7 +30,6 @@
                         <span>{{item.ext_operate_user_info.display_name}}</span>
                     </a>
                     <a
-                        v-if="mode== 'wiki'"
                         class="u-meta u-user"
                         :href="authorLink(item.user_id)"
                         target="_blank"

package/src/interact/boxcoin_user.vue CHANGED Viewed

@@ -15,6 +15,7 @@
                 </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="count">
                             <el-radio :label="item" v-for="item in points" :key="item" border>
@@ -47,10 +48,13 @@
 <script>
 import { rewardBoxcoin } from "../../service/thx.js";
 import User from "@jx3box/jx3box-common/js/user";
+import Contributors from './Contributors.vue';
 export default {
     name: "BoxcoinUser",
-    props: ["boxcoin", "postType", "postId", "userId", "own", "points"],
-    components: {},
+    props: ["boxcoin", "postType", "postId", "userId", "own", "points", "authors"],
+    components: {
+        Contributors
+    },
     data: function () {
         return {
             visible: false,
@@ -61,6 +65,8 @@ export default {
             left : this.own,
             chargeLink: "/vip/boxcoin?redirect=" + location.href,
+            chosen: '', // 被选中的人
         };
     },
     computed: {
@@ -93,8 +99,12 @@ export default {
                 User.toLogin();
             }
         },
+        // 选择要打赏的对象
+        handleChosen(userId) {
+            this.chosen = userId
+        },
         submit: function () {
-            rewardBoxcoin(this.postType, this.postId, this.userId, this.count, {
+            rewardBoxcoin(this.postType, this.postId, this.chosen || this.userId, this.count, {
                 remark: this.remark,
                 client : this.client
             })

package/src/single/Creators.vue CHANGED Viewed

@@ -84,6 +84,23 @@ export default {
             getPostAuthors(this.id).then((res) => {
                 this.super_author = res.data?.data.super_author;
                 this.other_authors = res.data?.data.other_authors;
+                const super_author = {
+                    user_id: this.super_author.ID,
+                    display_name: this.super_author.display_name,
+                    user_avatar: this.super_author.user_avatar,
+                }
+                const other_authors = this.other_authors?.map(item => {
+                    return {
+                        user_id: item.post_author_info?.ID,
+                        display_name: item.post_author_info?.display_name,
+                        user_avatar: item.post_author_info?.user_avatar,
+                    }
+                })
+                // 将联合创作者传出去
+                this.$emit('load-authors', { super_author, other_authors })
             });
         },
         showAvatar: function (val) {

package/src/single/Thx.vue CHANGED Viewed

@@ -1,10 +1,10 @@
 <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" @updateRecord="updateRecord" />
+            <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>
-            <boxcoin-user :postId="postId" :postType="postType" :boxcoin="boxcoin" :userId="userId" :own="user_left" :points="user_points" 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" />
             <Share :postId="postId" :postType="postType" />
         </div>
         <div class="w-thx-records">
@@ -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'],
+    props: ["postId", "postType","userId","adminBoxcoinEnable","userBoxcoinEnable",'mode', 'authors'],
     components: {
         Like,
         Share,

package/src/single/cms-single.vue CHANGED Viewed

@@ -8,7 +8,7 @@
         <!-- 文章前 -->
         <div class="m-single-prepend">
             <!-- 联合创作者 -->
-            <Creators class="m-single-creators" :postId="id" :postType="post_type" />
+            <Creators class="m-single-creators" :postId="id" :postType="post_type" @load-authors="loadAuthors" />
             <!-- 文集小册 -->
             <Collection class="m-single-collection" :id="collection_id" :defaultVisible="collection_collapse" @collectionUpdate="updateCollection"/>
             <slot name="single-prepend"></slot>
@@ -33,7 +33,7 @@
             <slot name="single-append"></slot>
             <!-- 打赏 -->
-            <Thx class="m-single-thx" :postId="id" :postType="post_type" :userId="author_id" :adminBoxcoinEnable="true" :userBoxcoinEnable="true"/>
+            <Thx class="m-single-thx" :postId="id" :postType="post_type" :userId="author_id" :adminBoxcoinEnable="true" :userBoxcoinEnable="true" :authors="authors" />
             <!-- 评论 -->
             <div class="m-single-comment">
@@ -74,7 +74,11 @@ export default {
     data: function() {
         return {
             collection_data : '',
-            directory : false
+            directory : false,
+            // 创作者
+            other_authors: [],
+            super_author: "",
         };
     },
     computed: {
@@ -119,6 +123,13 @@ export default {
                 collection_data : this.collection_data,
                 directory : this.directory
             }
+        },
+        authors: function (){
+            if (this.other_authors && this.other_authors.length) {
+                return [this.super_author, ...this.other_authors]
+            }
+            return []
         }
     },
     methods : {
@@ -127,6 +138,10 @@ export default {
         },
         updateDirectory : function (val){
             this.directory = val
+        },
+        loadAuthors({super_author, other_authors}) {
+            this.super_author = super_author;
+            this.other_authors = other_authors
         }
     },
     watch : {

package/vue.config.js CHANGED Viewed

@@ -57,6 +57,12 @@ module.exports = {
             "/api/wiki": {
                 target: "https://helper.jx3box.com",
             },
+            "/api/personal": {
+                target: "https://pay.jx3box.com",
+                onProxyReq: function(request) {
+                    request.setHeader("origin", "");
+                },
+            },
             "/api": {
                 target: "https://next.jx3box.com",
                 onProxyReq: function(request) {