@jx3box/jx3box-common-ui 6.1.8 → 6.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "6.1.8",
+  "version": "6.2.1",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -33,7 +33,7 @@
     "@jx3box/jx3box-comment-ui": "^1.7.1",
     "@jx3box/jx3box-common": "^7.4.2",
     "@jx3box/jx3box-data": "^1.11.1",
-    "@jx3box/jx3box-editor": "^1.5.0",
+    "@jx3box/jx3box-editor": "^1.5.3",
     "axios": "^0.26.1",
     "dayjs": "^1.11.0",
     "element-ui": "^2.13.2",

package/src/author/AuthorGift.vue

@@ -20,7 +20,8 @@
             <div class="u-content">
                 <div class="u-left">
                     <em class="u-label">🌟 金箔</em>
-                    <b>{{ this.left }}</b>
+                    <b>{{ left }}</b>
+                    <a class="u-charge" :href="chargeLink" target="_blank">[充值]</a>
                 </div>
                 <div class="u-list">
                     <em class="u-label">❤️ 赠送</em>
@@ -71,6 +72,7 @@ export default {
 
             left: 0, //剩余量
             status: true, //默认可打赏
+            chargeLink: "/vip/cny?redirect=" + location.href,
 
             count: 0, //打赏数量
             remark: "辛苦，感谢！",
@@ -227,6 +229,8 @@ export default {
     }
 
     .u-left {
+        display: flex;
+        align-items: center;
         .fz(14px,24px);
         .u-label {
             .mr(10px);
@@ -240,6 +244,9 @@ export default {
             .y;
             vertical-align: text-bottom;
         }
+        .u-charge{
+            .ml(8px);
+        }
         .el-progress {
             margin: 10px;
         }

package/src/single/Thx.vue

@@ -123,13 +123,16 @@ export default {
 
                     this.user_points = res.data.data.limit.user_points || [10, 1000];
                     // 根据多端展示剩余币
-                    // 作品是n端，接受n端币+all币，但转化为n端币
+                    // 作品是n端，接受n端币+all币
                     if (this.client == "origin") {
                         this.user_left = res.data.data.asUserBoxCoinRemainOrigin + res.data.data.asUserBoxCoinRemainAll;
                     } else if (this.client == "std") {
                         this.user_left = res.data.data.asUserBoxCoinRemainStd + res.data.data.asUserBoxCoinRemainAll;
                     } else {
-                        this.user_left = res.data.data.asUserBoxCoinRemainAll
+                        this.user_left =
+                            res.data.data.asUserBoxCoinRemainAll +
+                            res.data.data.asUserBoxCoinRemainStd +
+                            res.data.data.asUserBoxCoinRemainOrigin;
                     }
                 });
             getBoxcoinStatus().then((res) => {

package/yarn-error.log

@@ -1,95 +0,0 @@
-Arguments: 
-  C:\Program Files\nodejs\node.exe C:\Program Files\nodejs\node_modules\yarn\bin\yarn.js add @jx3box/jx3box-editor@latest
-
-PATH: 
-  C:\Program Files (x86)\PowerShell\7;C:\Python310\Scripts\;C:\Python310\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\cmd;D:\Program Files (x86)\Xftp\;D:\Program Files (x86)\Xshell\;C:\Program Files (x86)\PowerShell\7\;D:\Program Files (x86)\Bandizip;d:\Program Files (x86)\Tencent\微信web开发者工具\dll;%NVM_HOME%;%NVM_SYMLINK%;C:\Program Files (x86)\oh-my-posh\bin;;C:\Program Files\Docker\Docker\resources\bin;C:\ProgramData\DockerDesktop\version-bin;C:\Users\ljw\AppData\Local\pnpm;C:\Users\ljw\.cargo\bin;C:\Users\ljw\AppData\Local\Microsoft\WindowsApps;D:\Microsoft VS Code\bin;d:\Program Files\JetBrains\WebStorm 2022.2\bin;;C:\Users\ljw\AppData\Roaming\nvm;C:\Program Files\nodejs
-
-Yarn version: 
-  1.22.19
-
-Node version: 
-  14.18.2
-
-Platform: 
-  win32 x64
-
-Trace: 
-  Error: ENOENT: no such file or directory, copyfile 'C:\Users\ljw\AppData\Local\Yarn\Cache\v6\npm-yallist-2.1.2-1c11f9218f076089a47dd512f93c6699a6a81d52-integrity\node_modules\yallist\LICENSE' -> 'D:\Projects\Personal\JX3BOX\jx3box-common-ui\node_modules\@vue\component-compiler-utils\node_modules\yallist\LICENSE'
-
-npm manifest: 
-  {
-    "name": "@jx3box/jx3box-common-ui",
-    "version": "6.1.7",
-    "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
-      },
-      "extends": [
-        "plugin:vue/essential"
-      ],
-      "rules": {},
-      "parserOptions": {
-        "parser": "babel-eslint"
-      }
-    },
-    "browserslist": [
-      "> 1%",
-      "last 2 versions"
-    ],
-    "dependencies": {
-      "@jx3box/jx3box-comment-ui": "^1.7.1",
-      "@jx3box/jx3box-common": "^7.4.2",
-      "@jx3box/jx3box-data": "^1.11.1",
-      "@jx3box/jx3box-editor": "^1.4.12",
-      "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"
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  No lockfile