@jx3box/jx3box-common-ui 5.5.24 → 5.5.27

package/.editorconfig

@@ -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

@@ -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

@@ -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 8px;
+        .fz(12px, 14px);
+        color: #fff;
+        background-color: #f39;
+        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

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

package/package.json

@@ -1,68 +1,70 @@
 {
-    "name": "@jx3box/jx3box-common-ui",
-    "version": "5.5.24",
-    "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.27",
+  "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.21",
-        "@jx3box/jx3box-data": "^1.8.3",
-        "@jx3box/jx3box-editor": "^1.2.6",
-        "axios": "^0.26.1",
-        "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.24",
+    "@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/service/author.js

@@ -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,11 +10,19 @@ 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`)
         .then((res) => {
-            return res.data.data;
+            return res.data.data.list || [];
         });
 }
 
@@ -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/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 />