@jx3box/jx3box-common-ui 5.5.19 → 5.5.23

package/index.js

@@ -5,7 +5,7 @@ import Breadcrumb from './src/Breadcrumb.vue'
 import LeftSidebar from './src/LeftSidebar.vue'
 import LeftSideToggle from './src/LeftSideToggle.vue'
 import Author from './src/Author.vue'
-import Avatar from './src/Avatar.vue'
+import Avatar from './src/author/Avatar.vue'
 import RightSidebar from './src/RightSidebar.vue'
 import RightSideMsg from './src/RightSideMsg.vue'
 import Main from './src/Main.vue'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-common-ui",
-    "version": "5.5.19",
+    "version": "5.5.23",
     "description": "JX3BOX UI",
     "main": "index.js",
     "scripts": {
@@ -30,8 +30,8 @@
         "last 2 versions"
     ],
     "dependencies": {
-        "@jx3box/jx3box-comment-ui": "^1.6.7",
-        "@jx3box/jx3box-common": "^7.0.17",
+        "@jx3box/jx3box-comment-ui": "^1.6.8",
+        "@jx3box/jx3box-common": "^7.0.19",
         "@jx3box/jx3box-data": "^1.8.3",
         "@jx3box/jx3box-editor": "^1.2.4",
         "axios": "^0.19.2",

package/service/author.js

@@ -39,7 +39,7 @@ function getUserMedals(uid) {
 }
 
 function getFrames() {
-    return axios.get(__imgPath + "data/user_avatar_frame.json");
+    return axios.get(__imgPath + "avatar/index.json");
 }
 
 function getUserPublicTeams(uid) {

package/src/Breadcrumb.vue

@@ -12,8 +12,9 @@
                 src="../assets/img/bread/menu.svg"
             />
         </div>
-        <a class="u-channel" :href="root" :class="{on:withoutLeft}">
+        <a class="u-channel" :href="rootLink" :class="{on:withoutLeft}">
             <i class="u-channel-logo">
+                <img :src="getAppIcon(slug)" v-if="!$slots.logo"/>
                 <slot name="logo"></slot>
             </i>
             <span class="u-title">{{ name }}</span>
@@ -50,7 +51,7 @@
 
 <script>
 import _ from "lodash";
-import { publishLink } from "@jx3box/jx3box-common/js/utils";
+import { publishLink,getAppIcon } from "@jx3box/jx3box-common/js/utils";
 import { __Links, feedback } from "@jx3box/jx3box-common/data/jx3box.json";
 import User from "@jx3box/jx3box-common/js/user";
 import Admin from "./bread/Admin";
@@ -87,13 +88,18 @@ export default {
             isApp: isApp(),
         };
     },
-    computed: {},
+    computed: {
+        rootLink : function (){
+            return this.root || `/${this.slug}`
+        }
+    },
     methods: {
         toggleLeftSide: function () {
             let status = !this.isOpen;
             Bus.$emit("toggleLeftSide", status);
         },
         publishLink,
+        getAppIcon,
     },
     mounted: function () {
         Bus.$on("toggleLeftSide", (data) => {

package/src/author/Avatar.vue

@@ -14,7 +14,7 @@ import { __server, __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
 import { getFrames } from "../../service/author";
 import { showAvatar, authorLink } from "@jx3box/jx3box-common/js/utils";
 export default {
-    name: "",
+    name: "Avatar",
     props: ["uid", "url", "size", "frame"],
     components: {},
     data: function() {
@@ -35,7 +35,7 @@ export default {
         frameUrl: function() {
             if (this.frameName) {
                 let fileName = this.frames[this.frameName].files[this.style].file;
-                return __imgPath + `image/avatar/${this.frameName}/${fileName}`;
+                return __imgPath + `avatar/images/${this.frameName}/${fileName}`;
             }
             return "";
         },
@@ -45,7 +45,7 @@ export default {
         style: function() {
             let style = ~~this.size;
             for(let [i,v] of this.styles.entries()){
-                if(style < v){
+                if(style < v.size){
                     return this.styles[i]['cls']
                 }
             }

package/src/interact/boxcoin_admin.vue

@@ -100,12 +100,13 @@ export default {
                         message: "操作成功",
                         type: "success",
                     });
+                    return res.data.data
                 })
-                .then(() => {
+                .then((data) => {
                     // 1.扣除额度
                     this.left -= this.count;
                     // 2.将修改emit出去
-                    this.$emit('updateRecord', { count: this.count, remark: this.remark, is_user_gift: 0 });
+                    this.$emit('updateRecord', data);
                 })
                 .finally(() => {
                     this.visible = false;

package/src/interact/boxcoin_records.vue

@@ -109,9 +109,9 @@ export default {
         },
         cacheRecord: {
             deep: true,
-            handler: function (val) {
-                if (val) {
-                    this.list.push(val);
+            handler: function (data) {
+                if (data) {
+                    this.list.push(data)
                     // 清空父组件的cache
                     this.$parent.cacheRecord = null;
                 }

package/src/interact/boxcoin_user.vue

@@ -103,12 +103,13 @@ export default {
                         message: "操作成功",
                         type: "success",
                     });
+                    return res.data.data
                 })
-                .then(() => {
+                .then((data) => {
                     // 1.扣除额度
                     this.left -= this.count;
                     // 2. 将新增emit出去
-                    this.$emit('updateRecord', { count: this.count, remark: this.remark, is_user_gift: 1 });
+                    this.$emit('updateRecord', data);
                 })
                 .finally(() => {
                     this.visible = false;

package/src/single/Thx.vue

@@ -79,18 +79,8 @@ export default {
             })
         },
         // 用户打赏
-        updateRecord: function ({ count, remark, is_user_gift }){
-            this.cacheRecord = {
-                count,
-                remark,
-                is_user_gift,
-                operate_user_id: this.user.uid,
-                created_at: Date.now(),
-                ext_operate_user_info: {
-                    avatar: this.user.avatar_origin,
-                    display_name: this.user.name
-                },
-            }
+        updateRecord: function (data){
+            this.cacheRecord = data
         },
     },
     created: function () {},