@jx3box/jx3box-common-ui 6.7.8 → 6.8.0

package/src/author/AuthorMedals.vue

@@ -1,20 +1,23 @@
 <template>
     <div class="c-author-medals" v-if="ready">
         <div class="u-label">
-            <i class="el-icon-trophy"></i>
+            <!-- <i class="el-icon-trophy"></i> -->
+            <img svg-inline src="../../assets/img/leftsidebar/medal.svg" />
             <span>作者荣誉</span>
         </div>
         <div class="u-medals" v-if="medals && medals.length">
-            <a
-                :href="getMedalLink(item)"
-                target="_blank"
-                class="u-medal"
+            <el-tooltip
+                class="item"
+                effect="dark"
+                :content="item.medal_desc"
+                placement="top"
                 v-for="item in medals"
                 :key="item.id"
-                :title="item.medal_desc"
             >
-                <img class="u-medal-img" :src="showIcon(item.medal)" />
-            </a>
+                <a :href="getMedalLink(item)" target="_blank" class="u-medal">
+                    <img class="u-medal-img" :src="showIcon(item.medal)" />
+                </a>
+            </el-tooltip>
         </div>
     </div>
 </template>
@@ -55,7 +58,7 @@ export default {
             return __imgPath + "image/medals/user/" + medal + ".gif";
         },
         getMedalLink(medal) {
-            return getMedalLink(medal.rank_id, medal.medal_type || 'rank');
+            return getMedalLink(medal.rank_id, medal.medal_type || "rank");
         },
     },
     created: function () {},
@@ -63,23 +66,17 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style lang="less">
 .c-author-medals {
-    .u-label {
-        i {
-            .y;
-        }
-    }
     .u-medals {
-        padding:0 3px;
         display: flex;
-        .u-medal {
-            cursor: pointer;
-            .mr(2px);
-            .u-medal-img {
-                width: 20px;
-                height: 20px;
-            }
+    }
+    .u-medal {
+        cursor: pointer;
+        .mr(2px);
+        .u-medal-img {
+            width: 20px;
+            height: 20px;
         }
     }
 }

package/src/author/AuthorPosts.vue

@@ -1,18 +1,21 @@
 <template>
     <div class="c-author-posts" v-if="ready">
         <div class="u-label">
-            <i class="el-icon-notebook-2"></i>
-            <span>作者最新作品</span>
-            <a :href="uid | authorLink" class="u-more" target="_blank">全部 &raquo;</a>
+            <!-- <i class="el-icon-notebook-2"></i> -->
+            <img svg-inline src="../../assets/img/leftsidebar/post.svg" />
+            <span>作品</span>
+            <a :href="uid | authorLink" class="u-more" target="_blank"
+                ><img svg-inline src="../../assets/img/leftsidebar/more.svg"
+            /></a>
         </div>
 
         <ul class="u-list" v-if="data && data.length">
             <li v-for="(item, i) in data" :key="i">
                 <a class="u-item" :href="url(item.ID, item.post_type)" target="_blank">
-                    <span
-                        ><i class="u-icon el-icon-arrow-right"></i>
-                        {{ item.post_title || item.post_type + "/无标题" }}</span
-                    >
+                    <span>
+                        <img svg-inline src="../../assets/img/leftsidebar/arrow.svg" class="u-icon" />
+                        {{ item.post_title || item.post_type + "/无标题" }}
+                    </span>
                 </a>
             </li>
         </ul>
@@ -63,9 +66,8 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style lang="less">
 .c-author-posts {
-    // margin:0 10px;
     ul {
         list-style: none;
         margin: 0;
@@ -76,7 +78,7 @@ export default {
     }
     .u-item {
         .db;
-        padding: 3px 10px 3px 5px;
+        padding: 3px 2px;
         .nobreak;
         .fz(12px,2);
         color: #666;
@@ -84,7 +86,10 @@ export default {
         &:hover {
             color: @pink;
             // background-color:#fff;
-            border-bottom: 1px solid @border;
+            // border-bottom: 1px solid @border;
+            .u-icon{
+                transform: translateX(5px);
+            }
         }
     }
     .u-icon {
@@ -93,20 +98,10 @@ export default {
         // .y;
         color: #999;
         // .mr(5px);
+        transition: all 0.3s;
     }
 
     .u-label {
-        margin: 15px 0 10px 0;
-        padding: 0 5px 10px 5px;
-        i {
-            .mr(5px);
-            .y;
-        }
-        span {
-            .fz(13px);
-        }
-        border-bottom: 1px solid @border;
-
         .pr;
         .u-more {
             .fz(12px);

package/src/author/AuthorTeams.vue

@@ -1,14 +1,24 @@
 <template>
     <div class="c-author-teams" v-if="ready">
         <div class="u-label">
-            <i class="el-icon-school"></i>
-            <span>所属团队</span>
+            <!-- <i class="el-icon-school"></i> -->
+            <img svg-inline src="../../assets/img/leftsidebar/united.svg" />
+            <span>所在团队</span>
         </div>
         <div class="u-teams">
-            <a class="u-team" v-for="(item, i) in teams" :key="i" :href="teamLink(item.team_id)" target="_blank">
-                <img class="u-team-logo" :src="showTeamLogo(item.team_logo)" />
-                <span class="u-team-name">{{ item.team_name }}@{{ item.team_server }}</span>
-            </a>
+            <el-tooltip
+                class="item"
+                effect="dark"
+                :content="item.team_name + '@' + item.team_server"
+                placement="top"
+                v-for="(item, i) in teams"
+                :key="i"
+            >
+                <a class="u-team" :href="teamLink(item.team_id)" target="_blank">
+                    <img class="u-team-logo" :src="showTeamLogo(item.team_logo)" />
+                    <span class="u-team-name">{{ item.team_name }}@{{ item.team_server }}</span>
+                </a>
+            </el-tooltip>
         </div>
     </div>
 </template>
@@ -48,7 +58,7 @@ export default {
     methods: {
         loadTeams: function () {
             getUserPublicTeams(this.uid).then((data) => {
-                this.teams = data && data.slice(0, 5);
+                this.teams = data && data.slice(0, 8);
             });
         },
         teamLink: function (team_id) {
@@ -63,36 +73,35 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style lang="less">
 .c-author-teams {
-    .mt(10px);
-    .u-label{
-        i{
-            .y;
-        }
+    .u-teams {
+        .flex;
     }
     .u-team {
         .db;
-        background-color: #f5f7fa;
-        .mb(6px);
+        // background-color: #f5f7fa;
+        // .mb(6px);
         &:hover {
             // background-color: #e6f0fb;
-            .u-team-name{
-                color:@pink;
+            .u-team-name {
+                color: @pink;
             }
         }
-        padding: 4px 4px;
+        // padding: 4px 0;
         .r(3px);
+        .mr(5px);
     }
     .u-team-logo {
-        .size(24px);
-        .y;
-        .mr(4px);
-        .r(4px);
+        .size(19px);
+        // .mr(4px);
+        .r(50%);
+        .db;
     }
     .u-team-name {
         .fz(12px);
-        color: #555;
+        color: #56677a;
+        .none;
     }
 }
 </style>

package/src/interact/batchReward.vue

@@ -1,165 +1,178 @@
 <template>
-    <div class="w-boxcoin-user">
-        <el-button @click="openBoxcoinPop" type="primary" size="mini">批量打赏</el-button>
-        <el-dialog
-            title="投币打赏"
-            :visible.sync="visible"
-            custom-class="w-boxcoin-pop"
-            append-to-body
-            :close-on-click-modal="false"
-        >
-            <div class="w-boxcoin-user-content">
-                <div class="u-left">
-                    <em class="u-label">当前拥有盒币</em>
-                    <b>{{ left }}</b>
-                    <a class="u-charge" :href="chargeLink" target="_blank">[充值]</a>
-                </div>
-                <div class="u-list">
-                    <em class="u-label">❤️ 打赏</em>
-                    <Contributors v-if="authors && authors.length" :authors="authors" @chosen="handleChosen" />
-                    <div class="u-points">
-                        <el-radio-group v-model="count">
-                            <el-radio :label="item" v-for="item in fitPoints" :key="item" border>
-                                <b>{{ item }}</b
-                                >盒币
-                            </el-radio>
-                        </el-radio-group>
-                    </div>
-                </div>
-                <div class="u-msg">
-                    <em class="u-label">📝 寄语</em>
-                    <div class="u-input">
-                        <el-input
-                            v-model="remark"
-                            placeholder="请输入寄语（必填）"
-                            :minlength="2"
-                            :maxlength="30"
-                            show-word-limit
-                        ></el-input>
-                    </div>
-                </div>
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="visible = false">取 消</el-button>
-                <el-button type="primary" @click="submit" :disabled="!ready">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
+  <div class="w-boxcoin-user">
+      <el-button @click="openBoxcoinPop" type="primary" size="mini">批量打赏</el-button>
+      <el-dialog
+          title="品鉴评分"
+          :visible.sync="visible"
+          custom-class="w-boxcoin-pop"
+          :close-on-click-modal="false"
+          append-to-body
+      >
+          <div class="w-boxcoin-admin-content">
+              <div class="u-left">
+                  <em class="u-label">本月状态</em>
+                  已用<b>{{ this.used }}</b> 剩余<b>{{ this.left }}</b> 总计<b>{{ this.total }}</b>
+                  <el-progress
+                      :percentage="100 - (this.used * 100) / this.total"
+                      :stroke-width="15"
+                      :text-inside="true"
+                  ></el-progress>
+              </div>
+              <div class="u-list">
+                  <em class="u-label">❤️ 品鉴</em>
+                  <Contributors v-if="authors && authors.length" :authors="authors" @chosen="handleChosen" />
+                  <div class="u-points">
+                      <el-radio-group v-model="count">
+                          <el-radio :label="item" v-for="item in fitPoints" :key="item" border>
+                              <b>{{ item }}</b
+                              >盒币
+                          </el-radio>
+                      </el-radio-group>
+                  </div>
+              </div>
+              <div class="u-msg">
+                  <em class="u-label">📝 寄语</em>
+                  <div class="u-input">
+                      <el-input
+                          v-model="remark"
+                          placeholder="请输入寄语（必填）"
+                          :minlength="2"
+                          :maxlength="30"
+                          show-word-limit
+                      ></el-input>
+                      <el-button :disabled="fetchingCurrentRelease" @click="insertCurrentRelease"
+                          >插入当前版本</el-button
+                      >
+                  </div>
+              </div>
+          </div>
+          <span slot="footer" class="dialog-footer">
+              <el-button @click="visible = false">取 消</el-button>
+              <el-button type="primary" @click="submit" :disabled="!ready || submitting">确 定</el-button>
+          </span>
+      </el-dialog>
+  </div>
 </template>
 
 <script>
 import { batchReward } from "../../service/thx.js";
-import User from "@jx3box/jx3box-common/js/user";
 import Contributors from "./Contributors.vue";
-export default {
-    name: "BatchReward",
-    props: ["boxcoin", "postType", "items", "own", "points", "authors", "client"],
-    components: {
-        Contributors,
-    },
-    data: function () {
-        return {
-            visible: false,
-
-            count: 0,
-            remark: "辛苦了，谢谢大大！",
+import { getBreadcrumb } from "@jx3box/jx3box-common/js/api_misc";
 
-            left: this.own,
+export default {
+  name: "BatchReward",
+  props: [
+      "boxcoin",
+      "postType",
+      "items",
+      "own",
+      "points",
+      "authors",
+      "client",
+      "postId",
+      "total",
+      "max",
+      "min",
+  ],
+  components: {
+      Contributors,
+  },
+  data: function () {
+      return {
+          visible: false,
+          count: 0,
 
-            chargeLink: "/vip/boxcoin?redirect=" + location.href,
+          remark: "辛苦，感谢！",
+          left: this.own,
+          chargeLink: "/vip/boxcoin?redirect=" + location.href,
+          chosen: "", // 被选中的人
 
-            chosen: "", // 被选中的人
-        };
-    },
-    computed: {
-        ready: function () {
-            return this.isEnough && this.count && this.remark;
-        },
-        isEnough: function () {
-            return this.left && this.left >= this.count;
-        },
-        allowBoxcoin: function () {
-            return this.postType && this.authors && this.authors.length;
-        },
-        hostClient: function () {
-            return location.href.includes("origin") ? "origin" : "std";
-        },
-        fitPoints: function () {
-            return this.points;
-        },
-    },
-    watch: {
-        own: function (val) {
-            this.left = val;
-        },
-    },
-    methods: {
-        openBoxcoinPop: function () {
-            if (!(this.items && this.items.length))
-                return this.$message({ message: `请选择需要打赏的作品`, type: "warning" });
-            if (User.isLogin()) {
-                this.visible = true;
-            } else {
-                User.toLogin();
-            }
-        },
-        // 选择要打赏的对象
-        handleChosen(userId) {
-            this.chosen = userId;
-        },
-        submit: function () {
-            batchReward(this.postType, this.count, {
-                items: this.items,
-                remark: this.remark,
-                client: this.client || this.hostClient,
-            })
-                .then((res) => {
-                    return res.data.data;
-                })
-                .then((data) => {
-                    // 1.扣除额度
-                    data.success.map((item) => {
-                        this.$message({
-                            message: `作品${this.items[item.index].article_id}打赏成功`,
-                            type: "success",
-                        });
-                        this.left -= this.count;
-                    });
-                    data.fail.map((item) => {
-                        this.$message({
-                            message: `作品${this.items[item.index].article_id}打赏失败,原因：${item.msg}`,
-                            type: "error",
-                        });
-                    });
-                })
-                .finally(() => {
-                    this.visible = false;
-                });
-        },
-    },
+          submitting: false,
+          fetchingCurrentRelease: false,
+      };
+  },
+  computed: {
+      used: function () {
+          return this.total - this.left;
+      },
+      ready: function () {
+          return this.isEnough && this.count && this.remark;
+      },
+      isEnough: function () {
+          return this.left && this.left >= this.count;
+      },
+      allowBoxcoin: function () {
+          return this.postType && this.authors && this.authors.length;
+      },
+      hostClient: function () {
+          return location.href.includes("origin") ? "origin" : "std";
+      },
+      fitPoints: function () {
+          return this.points.filter((item) => item <= this.left);
+      },
+  },
+  watch: {
+      own: function (val) {
+          this.left = val;
+      },
+  },
+  methods: {
+      openBoxcoinPop: function () {
+          if (!(this.items && this.items.length))
+              return this.$message({ message: `请选择需要打赏的作品`, type: "warning" });
+          this.visible = true;
+      },
+      // 选择要打赏的对象
+      handleChosen(userId) {
+          this.chosen = userId;
+      },
+      submit: function () {
+          this.submitting = true;
+          batchReward(this.postType, this.count, {
+              items: this.items,
+              remark: this.remark,
+              client: this.client || this.hostClient,
+          })
+              .then((res) => {
+                  return res.data.data;
+              })
+              .then((data) => {
+                  // 1.扣除额度
+                  data.success.map((item) => {
+                      this.$message({
+                          message: `作品${this.items[item.index].article_id}打赏成功`,
+                          type: "success",
+                      });
+                      this.left -= this.count;
+                  });
+                  data.fail.map((item) => {
+                      this.$message({
+                          message: `作品${this.items[item.index].article_id}打赏失败,原因：${item.msg}`,
+                          type: "error",
+                      });
+                  });
+              })
+              .finally(() => {
+                  this.submitting = false;
+                  this.visible = false;
+              });
+      },
+      insertCurrentRelease: function () {
+          this.fetchingCurrentRelease = true;
+          getBreadcrumb(`current-release-${this.hostClient}`)
+              .then((res) => {
+                  this.remark += res;
+              })
+              .catch((err) => {
+                  this.$message({
+                      message: "获取失败",
+                      type: "error",
+                  });
+              })
+              .finally(() => {
+                  this.fetchingCurrentRelease = false;
+              });
+      },
+  },
 };
 </script>
-
-<style scoped lang="less">
-.w-boxcoin-user {
-    .dbi;
-    .x(left);
-
-    .u-icon {
-        .size(26px);
-        .y;
-        .pr;
-        top: -2px;
-    }
-
-    .u-count {
-        color: #888;
-        .ml(10px);
-    }
-
-    .u-charge {
-        .underline(@color-link);
-        .ml(10px);
-    }
-}
-</style>

package/src/single/Thx.vue

@@ -2,8 +2,9 @@
     <div class="w-thx">
         <template v-if="type === 'batchReward'">
             <!-- 批量打赏 -->
-            <batch-reward :postType="postType" :items="postId" :boxcoin="boxcoin" :own="user_left" :points="user_points"
-                :authors="authors" :client="client" v-if="userBoxcoinEnable && boxcoin_enable"
+            <batch-reward :postType="postType" :items="postId" :boxcoin="boxcoin" :userId="userId" :own="admin_left" :points="admin_points"
+                :authors="authors" :client="client" v-if="hasRight && adminBoxcoinEnable && boxcoin_enable" :max="admin_max"
+                    :min="admin_min" :total="admin_total"
                 @updateRecord="updateRecord" />
         </template>
         <template v-else>