@jx3box/jx3box-common-ui 6.6.6 → 6.6.8

package/index.js

@@ -46,7 +46,7 @@ const components = {
     RightSideMsg,
     Author,
     Avatar,
-
+    
     Thx,
     Like,
     Down,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "6.6.6",
+  "version": "6.6.8",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -30,10 +30,10 @@
     "last 2 versions"
   ],
   "dependencies": {
-    "@jx3box/jx3box-comment-ui": "^1.7.6",
+    "@jx3box/jx3box-comment-ui": "^1.7.8",
     "@jx3box/jx3box-common": "^7.6.2",
     "@jx3box/jx3box-data": "^3.0.3",
-    "@jx3box/jx3box-editor": "^1.6.6",
+    "@jx3box/jx3box-editor": "^1.6.9",
     "axios": "^0.26.1",
     "dayjs": "^1.11.0",
     "element-ui": "^2.13.2",

package/service/thx.js

@@ -42,6 +42,10 @@ function checkGiftStatus(accessUserId){
     return $pay().get(`/api/cny/consume/user-charge/to/${accessUserId}/check-status`)
 }
 
+function batchReward(articleType,count,data){
+    return $pay().post(`/api/inspire/batch/article/${articleType}/coins/${count}`, data);
+}
+
 export {
     getPostBoxcoinRecords,
     grantBoxcoin,
@@ -52,4 +56,5 @@ export {
     sendCny,
     checkCnyStatus,
     checkGiftStatus,
+    batchReward,
 };

package/src/App.vue

@@ -1,42 +1,19 @@
 <template>
   <div class="container-page">
     <Header></Header>
-    <Breadcrumb
-      name="频道名称"
-      slug="slug"
-      root="/slug"
-      :publishEnable="true"
-      :feedbackEnable="true"
-      :adminEnable="true"
-    >
-      <img
-        slot="logo"
-        svg-inline
-        src="../assets/img/jx3.svg"
-      />
+    <Breadcrumb name="频道名称" slug="slug" root="/slug" :publishEnable="true" :feedbackEnable="true" :adminEnable="true">
+      <img slot="logo" svg-inline src="../assets/img/jx3.svg" />
       bread info
     </Breadcrumb>
 
     <LeftSidebar :open="true" :uid="8">
-      <LeftSideToggle :mobileOnly="true"/>
-      <Author
-        :author="author"
-        :uid="8"
-      />
+      <LeftSideToggle :mobileOnly="true" />
+      <Author :author="author" :uid="8" />
     </LeftSidebar>
 
-    <Main
-      :withoutLeft="false"
-      :withoutRight="false"
-    >
-      <el-tabs
-        v-model="tab"
-        type="card"
-      >
-        <el-tab-pane
-          label="CMS作品"
-          name="post"
-        >
+    <Main :withoutLeft="false" :withoutRight="false">
+      <el-tabs v-model="tab" type="card">
+        <el-tab-pane label="CMS作品" name="post">
           <el-radio-group v-model="post_id">
             <el-radio label="41346">临时测试</el-radio>
             <el-radio label="35605">Markdown</el-radio>
@@ -45,66 +22,23 @@
             <el-radio label="30582">小册和联合创作者</el-radio>
             <el-radio label="31129">无小册和联合创作者</el-radio>
           </el-radio-group>
-          <singlebox
-            :post="post"
-            @extendUpdate="updateExtend"
-          />
+          <singlebox :post="post" @extendUpdate="updateExtend" />
         </el-tab-pane>
-        <el-tab-pane
-          label="通用组件"
-          name="widget"
-        >
+        <el-tab-pane label="通用组件" name="widget">
           <PostHeader :post="post" />
-          <Creators
-            :postId="30432"
-            style="margin-bottom: 10px"
-          />
-          <Collection
-            :id="59"
-            :defaultVisible="true"
-          />
-          <UserPop
-            title="添加用户"
-            v-model="visible"
-            @confirm="addUser"
-          />
+          <Creators :postId="30432" 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"
-            postTitle="bbs23865的标题"
-            :userId="7"
-            :adminBoxcoinEnable="true"
-            :userBoxcoinEnable="true"
-          />
-
+          <Thx :postId="23865" postType="bbs" postTitle="bbs23865的标题" type="batchReward" :userId="7"
+            :adminBoxcoinEnable="true" :userBoxcoinEnable="true"
+            :items="[{ user_id: 10, article_id: '11111', article_type: '' }]" />
           <hr />
-
-          <Like
-            mode="heart"
-            :count="100"
-            :showCount="true"
-          />
-          <Down
-            :count="100"
-            :showCount="true"
-          />
-          <Mark
-            label="KEY"
-            value="VALUE"
-            BGL="#000"
-            BGR="#F39"
-          />
-          <Fav
-            post-id="90"
-            post-type="jx3dat"
-            post-title="jx3dat测试标题"
-          />
-          <Feed
-            post-id="90"
-            post-type="jx3dat"
-          />
+          <Like mode="heart" :count="100" :showCount="true" />
+          <Down :count="100" :showCount="true" />
+          <Mark label="KEY" value="VALUE" BGL="#000" BGR="#F39" />
+          <Fav post-id="90" post-type="jx3dat" post-title="jx3dat测试标题" />
+          <Feed post-id="90" post-type="jx3dat" />
           <Print title="传入标题" />
           <QRcode />
           <Sharing />
@@ -114,24 +48,15 @@
           <markBy />
           <menuBy :data="['test1', 'test2']" />
           <orderBy />
-          <tagBy
-            :data="['PVE', 'PVX']"
-            :type="tag"
-          />
+          <tagBy :data="['PVE', 'PVX']" :type="tag" />
           <clientBy type="" />
           <zlpBy />
 
           <hr />
-          <uploadImage
-            v-model="upload"
-            info="非必选。首页海报尺寸1100*300（推荐2200*600支持高分屏），最大20M。"
-          ></uploadImage>
+          <uploadImage v-model="upload" info="非必选。首页海报尺寸1100*300（推荐2200*600支持高分屏），最大20M。"></uploadImage>
           <AuthorMedal :author-id="8"></AuthorMedal>
         </el-tab-pane>
-        <el-tab-pane
-          label="百科组件"
-          name="wiki"
-        >
+        <el-tab-pane label="百科组件" name="wiki">
           <WikiPanel :wiki-post="wikiPost">
             <template slot="head-title">
               <i class="el-icon-location-information"></i>
@@ -148,22 +73,13 @@
           </WikiPanel>
           <hr />
 
-          <WikiRevisions
-            type="achievement"
-            source-id="2996"
-          />
+          <WikiRevisions type="achievement" source-id="2996" />
           <hr />
 
-          <WikiComments
-            type="achievement"
-            source-id="2996"
-          />
+          <WikiComments type="achievement" source-id="2996" />
           <hr />
         </el-tab-pane>
-        <el-tab-pane
-          label="头像"
-          name="avatar"
-        >
+        <el-tab-pane label="头像" name="avatar">
           <el-radio-group v-model="avatar_size">
             <el-radio label="xxs">xxs-36/48</el-radio>
             <el-radio label="xs">xs-48/68</el-radio>
@@ -173,12 +89,8 @@
             <el-radio label="xl">xl-150/210</el-radio>
           </el-radio-group>
           <div style="padding:60px;background-color: #e3e3e3;">
-            <Avatar
-              :id="8"
-              url="https://console.cnyixun.com/upload/avatar/2022/3/2/8_9860765.png"
-              :size="avatar_size"
-              frame="moon_1"
-            />
+            <Avatar :id="8" url="https://console.cnyixun.com/upload/avatar/2022/3/2/8_9860765.png" :size="avatar_size"
+              frame="moon_1" />
           </div>
         </el-tab-pane>
       </el-tabs>
@@ -349,6 +261,6 @@ export default {
 
 <style lang="less">
 body {
-    padding-top: 0;
+  padding-top: 0;
 }
 </style>

package/src/Header.vue

@@ -10,7 +10,10 @@
             <header-logo />
 
             <!-- origin -->
-            <clientSwitch :defaultValue="client" />
+            <!-- <clientSwitch :defaultValue="client" /> -->
+
+            <!-- game -->
+            <gameSwitch />
 
             <!-- search -->
             <header-search :client="client" />
@@ -38,6 +41,7 @@ import search from "./header/search.vue";
 import nav from "./header/nav.vue";
 import user from "./header/user.vue";
 import Box from "../src/Box2.vue";
+import gameSwitch from "./header/gameSwitch.vue";
 
 export default {
     name: "Header",
@@ -82,11 +86,12 @@ export default {
     mounted: function () {},
     components: {
         "header-logo": logo,
-        clientSwitch,
+        // clientSwitch,
         "header-search": search,
         "header-nav": nav,
         "header-user": user,
         Box,
+        gameSwitch,
     },
 };
 </script>

package/src/LeftSidebar.vue

@@ -88,7 +88,7 @@ export default {
         this.setDecoration(JSON.parse(decoration_sidebar))
         return;
       }
-      getDecoration({using:1,user_id:this.user_id}).then(data=>{
+      getDecoration({using:1,user_id:this.user_id,type:'sidebar'}).then(data=>{
         let res=data.data.data
         if(res.length==0){
           //空 则为无主题，不再加载接口，界面设No
@@ -96,17 +96,19 @@ export default {
           this.bg =""
           return;
         }
-        let decoration=res.filter(val => {
-          return val.type === 'sidebar'
-        })
-        if(decoration.length>0){
-          sessionStorage.setItem('decoration_sidebar'+this.user_id,JSON.stringify(decoration[0]))
-          this.setDecoration(decoration[0])
-        }else{
-          //空 则为无主题，不再加载接口，界面设No
-          sessionStorage.setItem('decoration_sidebar'+this.user_id,'no')
-          this.bg =""
-        }
+        sessionStorage.setItem('decoration_sidebar'+this.user_id,JSON.stringify(res[0]))
+        this.setDecoration(res[0])
+        // let decoration=res.filter(val => {
+        //   return val.type === 'sidebar'
+        // })
+        // if(decoration.length>0){
+         
+        //   this.setDecoration(decoration[0])
+        // }else{
+        //   //空 则为无主题，不再加载接口，界面设No
+        //   sessionStorage.setItem('decoration_sidebar'+this.user_id,'no')
+        //   this.bg =""
+        // }
       })
     },
     setDecoration(decoration_sidebar){

package/src/header/gameSwitch.vue

@@ -0,0 +1,227 @@
+<template>
+    <div class="c-game-switch">
+        <div class="u-current on" @click.stop="onShow">
+            <span>{{ currentGame.name }}</span>
+        </div>
+
+        <div class="c-game-list" v-show="showMore">
+            <a
+                class="u-game-item"
+                v-for="item in games"
+                :key="item.key"
+                :class="{ active: current === item.key, disabled: item.disabled }"
+                :href="itemHref(item)"
+                @click.stop="handleClick(item)"
+            >
+                <img class="u-img" :src="item.img" alt="" />
+                <span>{{ item.name }}</span>
+            </a>
+        </div>
+    </div>
+</template>
+
+<script>
+import { __imgPath } from "@jx3box/jx3box-common/data/jx3box.json";
+export default {
+    name: "gameSwitch",
+    data() {
+        return {
+            games: [
+                {
+                    name: "剑网3",
+                    img: __imgPath + "image/xsj/jx3czb.png",
+                    key: "jx3",
+                    path: "https://www.jx3box.com",
+                    disabled: false,
+                },
+                {
+                    name: "剑网3缘起",
+                    img: __imgPath + "image/xsj/jx3yq.png",
+                    key: "jx3origin",
+                    path: "https://origin.jx3box.com",
+                    disabled: false,
+                },
+                {
+                    name: "指尖江湖",
+                    img: __imgPath + "image/xsj/zjjh.png",
+                    key: "zjjh",
+                    path: "https://zjjh.jx3box.com",
+                    disabled: true,
+                },
+                {
+                    name: "指尖对弈",
+                    img: __imgPath + "image/xsj/zjdy.png",
+                    key: "zjdy",
+                    path: "https://zjdy.jx3box.com",
+                    disabled: true,
+                },
+                {
+                    name: "剑侠世界3",
+                    img: __imgPath + "image/xsj/jxsj3.png",
+                    key: "jxsj3",
+                    path: "https://jxsj3.jx3box.com",
+                    disabled: true,
+                },
+                {
+                    name: "剑侠世界",
+                    img: __imgPath + "image/xsj/jxsj.png",
+                    key: "jxsj",
+                    path: "https://jxsj.jx3box.com",
+                    disabled: true,
+                },
+                {
+                    name: "剑网1:归来",
+                    img: __imgPath + "image/xsj/jx1gl.png",
+                    key: "jx1",
+                    path: "https://jx1.jx3box.com",
+                    disabled: true,
+                },
+                {
+                    name: "双生视界",
+                    img: __imgPath + "image/xsj/sssj.png",
+                    key: "sssj",
+                    path: "https://sssj.jx3box.com",
+                    disabled: true,
+                },
+            ],
+            current: "jx3",
+
+            showMore: false,
+        };
+    },
+    computed: {
+        currentGame() {
+            return this.games.find((item) => item.key == this.current);
+        },
+    },
+    mounted() {
+        const _host = window.location.host;
+        const _game = this.games.find((item) => item.path.indexOf(_host) > -1);
+        if (_game) {
+            this.current = _game.key;
+        }
+        this.close();
+    },
+    methods: {
+        handleClick(item) {
+            if (item.disabled) {
+                return;
+            }
+            this.current = item.key;
+        },
+        itemHref(item) {
+            if (item.disabled) {
+                return "javascript:;";
+            }
+            return item.path;
+        },
+        onShow() {
+            this.showMore = !this.showMore;
+        },
+        close() {
+            document.addEventListener("click", () => {
+                this.showMore = false;
+            });
+        },
+    },
+};
+</script>
+
+<style lang="less">
+.arrow(t,@width,@color,@x:50%) {
+    &:before {
+        bottom: 100%;
+        left: @x;
+        content: " ";
+        height: 0;
+        width: 0;
+        position: absolute;
+        pointer-events: none;
+        border-style: solid;
+        border-color: transparent;
+        border-bottom-color: @color;
+        border-width: unit(@width, px);
+        @margin: -@width;
+        margin-left: unit(@margin, px);
+    }
+}
+.c-game-switch {
+    .fl;
+    margin: 15px 0;
+    .mr(10px);
+    .pr;
+    .u-current {
+        .flex;
+        align-items: center;
+        .pointer;
+        .dbi;
+        .y(top);
+        font-size: 14px;
+        color: #fff;
+        padding: 5px 10px;
+        background-color: #7d7d7d;
+        border: 2px solid #303133;
+        border-radius: 4px;
+        .pr;
+        .z(1);
+        .u-img {
+            width: 20px;
+            height: 20px;
+            margin-right: 5px;
+        }
+
+        &.on {
+            background-color: @primary;
+            .pointer;
+        }
+    }
+}
+.c-game-list {
+        .arrow(t,5px,@bg-black,12%);
+        position: absolute;
+        top: calc(100% + 14px);
+        left: -10px;
+        width: 300px;
+        background-color: #24292e;
+        padding: 10px;
+        border: 1px solid rgba(27, 31, 35, 0.15);
+        border-radius: 4px;
+        box-shadow: 0 3px 12px rgba(27, 31, 35, 0.15);
+        margin-top: 6px;
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        // gap:10px;
+        grid-row-gap: 8px;
+        grid-column-gap: 10px;
+        .u-game-item {
+            .flex;
+            align-items: center;
+            padding: 6px;
+            .pointer;
+            border-radius: 4px;
+            color: #fff;
+            font-size: 14px;
+            .u-img {
+                width: 24px;
+                height: 24px;
+                margin-right: 5px;
+                border-radius: 4px;
+            }
+            &.active {
+                background-color: @primary;
+                color: #fff;
+            }
+            &:not(.disabled) {
+                &:hover {
+                    background-color: @primary;
+                    color: #fff;
+                }
+            }
+            &.disabled {
+                filter: grayscale(100%);
+                color: #c0c4cc;
+                cursor: not-allowed;
+            }
+        }
+    }
+</style>