@jx3box/jx3box-common-ui 5.8.2 → 5.8.5

package/assets/css/header.less

@@ -251,7 +251,7 @@ body {
     }
     .mt(0px) !important;
 }
-@media screen and (max-width: @ipad-y) {
+@media screen and (max-width: @ipad) {
     .c-header-nav {
         display: none;
     }

package/package.json

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

package/src/header/user.vue

@@ -116,6 +116,7 @@ import {
     __Links,
     __Root,
     __imgPath,
+    __OriginRoot,
 } from "@jx3box/jx3box-common/data/jx3box.json";
 import panel from "../../assets/data/panel.json";
 import { getMsg, getMenu } from "../../service/header";
@@ -203,6 +204,9 @@ export default {
         super_author_icon: function () {
             return __imgPath + "image/user/" + "superauthor.svg";
         },
+        siteRoot : function (){
+            return location.host.includes('origin') ? __OriginRoot : __Root
+        }
     },
     watch: {
         fold(val) {
@@ -250,7 +254,7 @@ export default {
                 .then((res) => {
                     this.isLogin = false;
                     if (location.pathname.startsWith('/dashboard') || location.pathname.startsWith('/publish')) {
-                        location.href = __Root;
+                        location.href = this.siteRoot;
                     }
                 })
                 .then(() => {

package/src/interact/boxcoin_admin.vue

@@ -57,7 +57,7 @@ import { getBreadcrumb } from "@jx3box/jx3box-common/js/api_misc";
 import Contributors from './Contributors.vue';
 export default {
     name: "BoxcoinAdmin",
-    props: ["postType", "postId", "userId", "own", "total", "points", "max", "min", 'authors'],
+    props: ["postType", "postId", "userId", "own", "total", "points", "max", "min", 'authors','client'],
     components: {
         Contributors
     },
@@ -89,9 +89,9 @@ export default {
         allowBoxcoin : function (){
             return this.postType && this.postId && (this.userId || (this.authors && this.authors.length))
         },
-        client : function (){
+        hostClient : function (){
             return location.href.includes('origin') ? 'origin' : 'std'
-        }
+        },
     },
     watch: {
         own : function (val){
@@ -110,7 +110,7 @@ export default {
             this.submitting = true;
             grantBoxcoin(this.postType, this.postId, this.chosen || this.userId, this.count, {
                 remark: this.remark,
-                client : this.client
+                client : this.client || this.hostClient
             })
                 .then((res) => {
                     this.$message({

package/src/interact/boxcoin_user.vue

@@ -51,7 +51,7 @@ import User from "@jx3box/jx3box-common/js/user";
 import Contributors from './Contributors.vue';
 export default {
     name: "BoxcoinUser",
-    props: ["boxcoin", "postType", "postId", "userId", "own", "points", "authors"],
+    props: ["boxcoin", "postType", "postId", "userId", "own", "points", "authors",'client'],
     components: {
         Contributors
     },
@@ -82,7 +82,7 @@ export default {
         allowBoxcoin : function (){
             return this.postType && this.postId && (this.userId || (this.authors && this.authors.length))
         },
-        client : function (){
+        hostClient : function (){
             return location.href.includes('origin') ? 'origin' : 'std'
         }
     },
@@ -106,7 +106,7 @@ export default {
         submit: function () {
             rewardBoxcoin(this.postType, this.postId, this.chosen || this.userId, this.count, {
                 remark: this.remark,
-                client : this.client
+                client : this.client || this.hostClient
             })
                 .then((res) => {
                     this.$message({

package/src/single/Thx.vue

@@ -1,11 +1,11 @@
 <template>
     <div class="w-thx">
         <div class="w-thx-panel">
-            <boxcoin-admin :postId="postId" :postType="postType" v-if="hasRight && adminBoxcoinEnable && boxcoin_enable" :userId="userId" :max="admin_max" :min="admin_min" :own="admin_left" :total="admin_total" :points="admin_points" :authors="authors" @updateRecord="updateRecord" />
+            <boxcoin-admin :postId="postId" :postType="postType" v-if="hasRight && adminBoxcoinEnable && boxcoin_enable" :userId="userId" :max="admin_max" :min="admin_min" :own="admin_left" :total="admin_total" :points="admin_points" :authors="authors" @updateRecord="updateRecord" :client="client" />
             <Like :postId="postId" :postType="postType"></Like>
             <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" />
+            <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" :client="client" />
         </div>
         <div class="w-thx-records">
             <boxcoin-records :postId="postId" :postType="postType" :cacheRecord="cacheRecord" :mode="mode"/>
@@ -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", "postTitle", "userId","adminBoxcoinEnable","userBoxcoinEnable",'mode', 'authors'],
+    props: ["postId", "postType", "postTitle", "userId","adminBoxcoinEnable","userBoxcoinEnable",'mode', 'authors',"client"],
     components: {
         Like,
         Share,
@@ -97,4 +97,4 @@ export default {
 
 <style lang="less">
 @import "../../assets/css/thx.less";
-</style>
+</style>

package/src/single/cms-single.vue

@@ -33,7 +33,7 @@
             <slot name="single-append"></slot>
 
             <!-- 打赏 -->
-            <Thx class="m-single-thx" :postId="id" :postType="post_type" :postTitle="post_title" :userId="author_id" :adminBoxcoinEnable="true" :userBoxcoinEnable="true" :authors="authors" />
+            <Thx class="m-single-thx" :postId="id" :postType="post_type" :postTitle="post_title" :userId="author_id" :adminBoxcoinEnable="true" :userBoxcoinEnable="true" :authors="authors" :client="post_client"/>
 
             <!-- 评论 -->
             <div class="m-single-comment">
@@ -133,6 +133,9 @@ export default {
             }
 
             return []
+        },
+        post_client : function (){
+            return this.post?.client || 'all'
         }
     },
     methods : {