@jx3box/jx3box-common-ui 5.3.4 → 5.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-common-ui",
-    "version": "5.3.4",
+    "version": "5.3.8",
     "description": "JX3BOX UI",
     "main": "index.js",
     "scripts": {
@@ -30,8 +30,8 @@
         "last 2 versions"
     ],
     "dependencies": {
-        "@jx3box/jx3box-common": "^6.7.2",
-        "@jx3box/jx3box-data": "^1.7.6",
+        "@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

@@ -78,7 +78,7 @@
             </div>
             <div class="u-medals" v-if="medals && medals.length">
                 <span class="u-medal" v-for="(item, i) in medals" :key="i">
-                    <img :src="item.medal | showTeamMedal" :title="medal_map[item.medal]" />
+                    <img :src="item.medal | showMedalIcon" :title="item | showMedalDesc" />
                 </span>
             </div>
         </div>
@@ -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>
@@ -179,8 +179,11 @@ export default {
         },
     },
     filters: {
-        showTeamMedal: function (val) {
-            return __imgPath + "image/medals/team/" + val + ".gif";
+        showMedalIcon: function (val) {
+            return __imgPath + "image/medals/user/" + val + ".gif";
+        },
+        showMedalDesc : function (item){
+            return item.medal_desc || medal_map[item.medal]
         },
         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({

package/src/single/Collection.vue

@@ -4,7 +4,7 @@
             <span>
                 <i class="el-icon-notebook-1"></i> 该作品已被收录至作者的剑三小册
             </span>
-            <a @click.stop :href="id | collectionLink">《{{ title }}》</a>
+            <a @click.stop :href="id | collectionLink" target="_blank">《{{ title }}》</a>
         </div>
         <transition name="fade">
             <div class="w-collection-list" v-if="visible">