@jx3box/jx3box-common-ui 5.1.0 → 5.1.4

package/package.json

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

package/service/author.js

@@ -4,7 +4,7 @@ import { $next, $cms, $team } from "@jx3box/jx3box-common/js/https.js";
 
 function getUserInfo(uid) {
     return $cms({ mute: true })
-        .get(`api/cms/user/${uid}/info`)
+        .get(`/api/cms/user/${uid}/info`)
         .then((res) => {
             return res.data.data;
         });

package/src/App.vue

@@ -24,6 +24,8 @@
             
             <Creators :postId="28" style="margin-bottom:10px"/>
             <Collection :id="59" :defaultVisible="true"/>
+            <UserPop title="添加用户" v-model="visible" @confirm="addUser"/>
+            <el-button @click="visible = true">用户POP</el-button>
 
             <Thx :postId="23865" postType="bbs" :userId="7" :adminBoxcoinEnable="true" :userBoxcoinEnable="true"/>
 
@@ -94,6 +96,7 @@ import Breadcrumb from "./Breadcrumb.vue";
 import LeftSidebar from "./LeftSidebar.vue";
 import LeftSideToggle from "./LeftSideToggle.vue";
 import Author from "./Author.vue";
+import UserPop from "./author/UserPop.vue";
 
 import Main from "./Main.vue";
 import RightSidebar from "./RightSidebar.vue";
@@ -170,12 +173,15 @@ export default {
         WikiPanel,
         WikiRevisions,
         WikiComments,
+
+        UserPop
     },
     data: function() {
         return {
             author: "",
             wikiPost: null,
-            tag : ''
+            tag : '',
+            visible : false,
         };
     },
     created: function() {
@@ -186,6 +192,10 @@ export default {
             }
         );
     },
-    methods: {},
+    methods: {
+        addUser : function (val){
+            console.log(val)
+        }
+    },
 };
 </script>

package/src/author/UserPop.vue

@@ -0,0 +1,124 @@
+<template>
+    <el-dialog
+        class="w-userpop"
+        :title="title"
+        :visible.sync="visible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+    >
+        <div class="u-tip">
+            <slot></slot>
+        </div>
+        <div class="u-input">
+            <el-input v-model.number="uid" placeholder="请输入UID（数字）"></el-input>
+        </div>
+        <div class="u-preview">
+            <img class="u-avatar" :src="userdata.user_avatar | showAvatar" />
+            <span class="u-name">{{ userdata.display_name || "-" }}</span>
+        </div>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="visible = false">取 消</el-button>
+            <el-button type="primary" @click="confirm">确 定</el-button>
+        </span>
+    </el-dialog>
+</template>
+
+<script>
+import { showAvatar } from "@jx3box/jx3box-common/js/utils";
+import { getUserInfo } from "../../service/author";
+export default {
+    name: "userpop",
+    props: ["title", "show"],
+    data: function () {
+        return {
+            visible: false,
+            uid: "",
+            userdata: {
+                name: "",
+                avatar: "",
+            },
+            status: false,
+        };
+    },
+    model: {
+        prop: "show",
+        event: "switchUserPop",
+    },
+    watch: {
+        uid: function (newval) {
+            getUserInfo(newval).then((data) => {
+                if (data) {
+                    this.status = true;
+                    this.userdata = data;
+                } else {
+                    this.status = false;
+                    this.userdata = {
+                        name: "",
+                        avatar: "",
+                    };
+                }
+            });
+        },
+        show: function (newval) {
+            this.visible = newval;
+        },
+        visible: function (newval) {
+            this.$emit("switchUserPop", newval);
+        },
+    },
+    filters: {
+        showAvatar: function (val) {
+            return showAvatar(val, "l");
+        },
+    },
+    computed: {},
+    methods: {
+        confirm: function () {
+            if (this.status) {
+                this.visible = false;
+                this.$emit("confirm", this.userdata);
+            } else {
+                this.$alert("用户不存在 或 UID不正确", "提醒", {
+                    confirmButtonText: "确定",
+                });
+            }
+        },
+    },
+    mounted: function () {},
+    components: {},
+};
+</script>
+
+<style lang="less">
+.w-userpop {
+    .fz(1rem, 2.5);
+    .el-dialog {
+        min-width: 520px;
+    }
+    .el-dialog__body {
+        padding: 0 20px;
+    }
+    .u-avatar {
+        .mt(20px);
+        .size(120px);
+        .db;
+        .auto(x);
+        border: 1px solid #eee;
+        padding: 5px;
+    }
+    .u-name {
+        .bold;
+        .x;
+        .db;
+    }
+    .u-tip {
+        .fz(13px);
+    }
+}
+
+@media screen and (max-width: @phone) {
+    .w-userpop .el-dialog {
+        .w(100%) !important;
+    }
+}
+</style>

package/src/header/user.vue

@@ -173,7 +173,7 @@ export default {
     methods: {
         // 消息
         checkMSG: function () {
-            getMsg().then((res) => {
+            this.isLogin && getMsg().then((res) => {
                 this.pop = !!res.data.data.unread;
             });
         },

package/src/single/Collection.vue

@@ -57,6 +57,9 @@ export default {
                 !!~~val && this.loadData();
             },
         },
+        defaultVisible : function (val){
+            this.visible = val
+        }
     },
     methods: {
         handleShow: function () {

package/src/single/Creators.vue

@@ -18,10 +18,11 @@
                 :key="i"
                 :href="item.post_author_info.ID | authorLink"
                 target="_blank"
+                v-show="item.status"
             >
                 <img class="u-avatar" :src="item.post_author_info.user_avatar | showAvatar" />
                 <span class="u-name">{{item.post_author_info.display_name}}</span>
-                <i class="u-label">{{item.label}}</i>
+                <i class="u-label">{{item.label | formatLabel}}</i>
             </a>
         </div>
         <a class="w-creators-edit" :href="editLink" v-if="isCreator">
@@ -91,6 +92,9 @@ export default {
             return showAvatar(val, 48);
         },
         authorLink,
+        formatLabel : function (str){
+            return str && str.slice(0,8)
+        }
     },
     created: function () {},
     mounted: function () {},
@@ -114,7 +118,7 @@ export default {
     .lt(0);
     writing-mode: vertical-rl;
     .fz(12px);
-    background: #49c10f;
+    background: @primary;
     color: #fff;
     .h(100%);
     .x;