@jx3box/jx3box-common-ui 5.3.3 → 5.3.7

package/assets/css/author.less

@@ -108,13 +108,15 @@
         .u-team {
             .db;
             background-color: #f2f6fc;
-            .mb(5px);
-            &:hover span {
-                color: @pink;
+            .mb(6px);
+            &:hover{
+                background-color: #e6f0fb;
+                // color:@color-link;
             }
+            padding:2px 0;
         }
         .u-teamlogo {
-            .size(32px);
+            .size(26px);
             .y;
             .mr(10px);
         }

package/assets/data/nav.json

@@ -96,9 +96,9 @@
         "parentKey": "fb"
     },
     {
-        "key": "battle_raid",
-        "link": "/battle",
-        "label": "战斗分析",
+        "key": "rank",
+        "link": "/rank",
+        "label": "秘境百强",
         "client": "all",
         "status": true,
         "parentKey": "fb"

package/assets/data/zlp.json

@@ -1,5 +1,5 @@
 {
     "std":["北天药宗","奉天证道"],
-    "origin":["物华天宝"],
-    "all":["北天药宗","物华天宝","奉天证道"]
+    "origin":["藏剑山庄","物华天宝"],
+    "all":["北天药宗","奉天证道","藏剑山庄","物华天宝"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-common-ui",
-    "version": "5.3.3",
+    "version": "5.3.7",
     "description": "JX3BOX UI",
     "main": "index.js",
     "scripts": {
@@ -30,8 +30,8 @@
         "last 2 versions"
     ],
     "dependencies": {
-        "@jx3box/jx3box-common": "^6.7.0",
-        "@jx3box/jx3box-data": "^1.7.2",
+        "@jx3box/jx3box-common": "^6.7.8",
+        "@jx3box/jx3box-data": "^1.8.3",
         "axios": "^0.19.2",
         "element-ui": "^2.13.2",
         "jquery": "^3.5.1",

package/src/Author.vue

@@ -87,7 +87,7 @@
                 <i class="el-icon-school"></i>
                 <span>所属团队</span>
             </div>
-            <a class="u-team" v-for="(item,i) in teams" :key="i" :href="item.team_id | teamLink">
+            <a class="u-team" v-for="(item,i) in teams" :key="i" :href="item.team_id | teamLink" target="_blank">
                 <img class="u-teamlogo" :src="item.team_logo | showTeamLogo" />
                 <span class="u-teamname">{{item.team_name}}@{{item.team_server}}</span>
             </a>
@@ -180,7 +180,7 @@ export default {
     },
     filters: {
         showTeamMedal: function (val) {
-            return __imgPath + "image/medals/team/" + val + "-20.gif";
+            return __imgPath + "image/medals/team/" + val + ".gif";
         },
         authorLink,
         weiboLink: function (val) {

package/src/bread/Admin.vue

@@ -10,14 +10,16 @@
         v-if="hasRight"
     >
         <div class="c-admin-wrapper">
-            <el-divider content-position="left">状态变更</el-divider>
-            <el-radio-group v-model="post_status" size="small" class="c-admin-status">
-                <el-radio-button
-                    v-for="(option, key) in status_options"
-                    :label="key"
-                    :key="key"
-                >{{ option }}</el-radio-button>
-            </el-radio-group>
+            <template v-if="isAdmin">
+                <el-divider content-position="left">状态变更</el-divider>
+                <el-radio-group v-model="post_status" size="small" class="c-admin-status">
+                    <el-radio-button
+                        v-for="(option, key) in status_options"
+                        :label="key"
+                        :key="key"
+                    >{{ option }}</el-radio-button>
+                </el-radio-group>
+            </template>
 
             <el-divider content-position="left">可见性变更</el-divider>
             <el-radio-group v-model="visible" size="small" class="c-admin-status">
@@ -140,6 +142,7 @@ export default {
             status_options: {
                 publish: "默认",
                 draft: "草稿",
+                pending: "待审核",
                 dustbin: "删除",
             },
             visible: "0",
@@ -192,6 +195,9 @@ export default {
                 sticky: this.isSticky ? Date.now() : null,
             };
         },
+        isAdmin : function (){
+            return User.isAdmin()
+        }
     },
     methods: {
         // 是否有权限

package/src/interact/boxcoin_admin.vue

@@ -76,6 +76,9 @@ export default {
         },
         allowBoxcoin : function (){
             return this.postType && this.postId && this.userId
+        },
+        client : function (){
+            return location.href.includes('origin') ? 'origin' : 'std'
         }
     },
     watch: {
@@ -90,6 +93,7 @@ export default {
         submit: function () {
             grantBoxcoin(this.postType, this.postId, this.userId, this.count, {
                 remark: this.remark,
+                client : this.client
             })
                 .then((res) => {
                     this.$message({

package/src/interact/boxcoin_user.vue

@@ -75,6 +75,9 @@ export default {
         },
         allowBoxcoin : function (){
             return this.postType && this.postId && this.userId
+        },
+        client : function (){
+            return location.href.includes('origin') ? 'origin' : 'std'
         }
     },
     watch: {
@@ -93,6 +96,7 @@ export default {
         submit: function () {
             rewardBoxcoin(this.postType, this.postId, this.userId, this.count, {
                 remark: this.remark,
+                client : this.client
             })
                 .then((res) => {
                     this.$message({