@jx3box/jx3box-common-ui 6.6.8 → 6.6.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/css/header.less +12 -0
- package/package.json +1 -1
- package/src/App.vue +3 -3
- package/src/header/gameSwitch.vue +44 -39
- package/src/header/user.vue +76 -43
- package/src/single/Thx.vue +2 -3
package/assets/css/header.less
CHANGED
|
@@ -594,6 +594,12 @@ body {
|
|
|
594
594
|
}
|
|
595
595
|
}
|
|
596
596
|
|
|
597
|
+
@media screen and (max-width: @ipad) {
|
|
598
|
+
.c-header-msg {
|
|
599
|
+
display: none;
|
|
600
|
+
}
|
|
601
|
+
}
|
|
602
|
+
|
|
597
603
|
//操作面板
|
|
598
604
|
.c-header-panel {
|
|
599
605
|
float: left;
|
|
@@ -628,6 +634,12 @@ body {
|
|
|
628
634
|
}
|
|
629
635
|
}
|
|
630
636
|
|
|
637
|
+
@media screen and (max-width: @ipad) {
|
|
638
|
+
.c-header-panel {
|
|
639
|
+
display: none;
|
|
640
|
+
}
|
|
641
|
+
}
|
|
642
|
+
|
|
631
643
|
// 用户资产
|
|
632
644
|
.c-header-assets {
|
|
633
645
|
float: left;
|
package/package.json
CHANGED
package/src/App.vue
CHANGED
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
<Collection :id="59" :defaultVisible="true" />
|
|
31
31
|
<UserPop title="添加用户" v-model="visible" @confirm="addUser" />
|
|
32
32
|
<el-button @click="visible = true">用户POP</el-button>
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
:
|
|
33
|
+
<!-- :postId="23865" -->
|
|
34
|
+
<Thx postType="bbs" postTitle="bbs23865的标题" type="batchReward" :userId="7" :adminBoxcoinEnable="true"
|
|
35
|
+
:userBoxcoinEnable="true" :postId="[{ user_id: 10, article_id: '11111', article_type: '' }]" />
|
|
36
36
|
<hr />
|
|
37
37
|
<Like mode="heart" :count="100" :showCount="true" />
|
|
38
38
|
<Down :count="100" :showCount="true" />
|
|
@@ -176,52 +176,57 @@ export default {
|
|
|
176
176
|
}
|
|
177
177
|
}
|
|
178
178
|
}
|
|
179
|
+
@media screen and (max-width: @phone) {
|
|
180
|
+
.c-game-switch {
|
|
181
|
+
margin-left: 15px;
|
|
182
|
+
}
|
|
183
|
+
}
|
|
179
184
|
.c-game-list {
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
185
|
+
.arrow(t,5px,@bg-black,12%);
|
|
186
|
+
position: absolute;
|
|
187
|
+
top: calc(100% + 14px);
|
|
188
|
+
left: -10px;
|
|
189
|
+
width: 300px;
|
|
190
|
+
background-color: #24292e;
|
|
191
|
+
padding: 10px;
|
|
192
|
+
border: 1px solid rgba(27, 31, 35, 0.15);
|
|
193
|
+
border-radius: 4px;
|
|
194
|
+
box-shadow: 0 3px 12px rgba(27, 31, 35, 0.15);
|
|
195
|
+
margin-top: 6px;
|
|
196
|
+
display: grid;
|
|
197
|
+
grid-template-columns: repeat(2, 1fr);
|
|
198
|
+
// gap:10px;
|
|
199
|
+
grid-row-gap: 8px;
|
|
200
|
+
grid-column-gap: 10px;
|
|
201
|
+
.u-game-item {
|
|
202
|
+
.flex;
|
|
203
|
+
align-items: center;
|
|
204
|
+
padding: 6px;
|
|
205
|
+
.pointer;
|
|
188
206
|
border-radius: 4px;
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
grid-column-gap: 10px;
|
|
196
|
-
.u-game-item {
|
|
197
|
-
.flex;
|
|
198
|
-
align-items: center;
|
|
199
|
-
padding: 6px;
|
|
200
|
-
.pointer;
|
|
207
|
+
color: #fff;
|
|
208
|
+
font-size: 14px;
|
|
209
|
+
.u-img {
|
|
210
|
+
width: 24px;
|
|
211
|
+
height: 24px;
|
|
212
|
+
margin-right: 5px;
|
|
201
213
|
border-radius: 4px;
|
|
214
|
+
}
|
|
215
|
+
&.active {
|
|
216
|
+
background-color: @primary;
|
|
202
217
|
color: #fff;
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
height: 24px;
|
|
207
|
-
margin-right: 5px;
|
|
208
|
-
border-radius: 4px;
|
|
209
|
-
}
|
|
210
|
-
&.active {
|
|
218
|
+
}
|
|
219
|
+
&:not(.disabled) {
|
|
220
|
+
&:hover {
|
|
211
221
|
background-color: @primary;
|
|
212
222
|
color: #fff;
|
|
213
223
|
}
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
}
|
|
220
|
-
&.disabled {
|
|
221
|
-
filter: grayscale(100%);
|
|
222
|
-
color: #c0c4cc;
|
|
223
|
-
cursor: not-allowed;
|
|
224
|
-
}
|
|
224
|
+
}
|
|
225
|
+
&.disabled {
|
|
226
|
+
filter: grayscale(100%);
|
|
227
|
+
color: #c0c4cc;
|
|
228
|
+
cursor: not-allowed;
|
|
225
229
|
}
|
|
226
230
|
}
|
|
231
|
+
}
|
|
227
232
|
</style>
|
package/src/header/user.vue
CHANGED
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
<span class="u-item">
|
|
34
34
|
<!-- <span class="u-item-primary>" -->
|
|
35
35
|
<span class="u-label"><i class="el-icon-user"></i> 等级</span>
|
|
36
|
-
<span class="u-value">Lv.{{ level }}</span>
|
|
36
|
+
<span class="u-value" :style="levelStyle">Lv.{{ level }}</span>
|
|
37
37
|
<!-- </span> -->
|
|
38
38
|
<!-- <span class="u-item-extend"><a href="/notice/28917" target="_blank">[权益]</a></span> -->
|
|
39
39
|
</span>
|
|
@@ -111,53 +111,78 @@
|
|
|
111
111
|
<div class="c-header-info">
|
|
112
112
|
<div class="c-header-profile" id="c-header-profile" @click="showmenu">
|
|
113
113
|
<img class="u-avatar" :src="user.avatar" />
|
|
114
|
-
<
|
|
115
|
-
<
|
|
116
|
-
<
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
114
|
+
<template v-if="isPhone">
|
|
115
|
+
<ul class="u-menu" v-show="!fold">
|
|
116
|
+
<li>
|
|
117
|
+
<a href="/dashboard">个人中心</a>
|
|
118
|
+
</li>
|
|
119
|
+
<li>
|
|
120
|
+
<a :href="url.msg">消息中心</a>
|
|
121
|
+
</li>
|
|
122
|
+
<li>
|
|
123
|
+
<a :href="url.publish">发布中心</a>
|
|
124
|
+
</li>
|
|
125
|
+
<li v-if="isAdmin">
|
|
126
|
+
<a href="/admin">站点配置</a>
|
|
127
|
+
</li>
|
|
128
|
+
<li v-if="isEditor">
|
|
129
|
+
<a href="https://os.jx3box.com/admin">管理平台</a>
|
|
130
|
+
</li>
|
|
131
|
+
<hr>
|
|
132
|
+
<li>
|
|
133
|
+
<a @click="logout">退出登录</a>
|
|
134
|
+
</li>
|
|
135
|
+
</ul>
|
|
136
|
+
</template>
|
|
137
|
+
<template v-else>
|
|
138
|
+
<div class="m-info" v-show="!fold">
|
|
139
|
+
<div class="u-profile">
|
|
140
|
+
<b :title="user.name">{{ showUserName(user.name) }}</b>
|
|
141
|
+
<div class="u-id">
|
|
142
|
+
<span>魔盒UID：{{ user.uid }}</span>
|
|
143
|
+
<i class="el-icon-document-copy u-copy" @click.stop="copyText(user.uid)"></i>
|
|
144
|
+
</div>
|
|
145
|
+
<div class="m-vip">
|
|
146
|
+
<a href="/dashboard/cooperation">
|
|
147
|
+
<img
|
|
148
|
+
:src="super_author_icon"
|
|
149
|
+
class="u-superauthor-profile"
|
|
150
|
+
alt="superauthor"
|
|
151
|
+
title="签约作者"
|
|
152
|
+
:class="{ off: !isSuperAuthor }"
|
|
153
|
+
/></a>
|
|
130
154
|
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
155
|
+
<a
|
|
156
|
+
class="u-vip"
|
|
157
|
+
href="/vip/premium?from=header_usermenu"
|
|
158
|
+
target="_blank"
|
|
159
|
+
title="专业版"
|
|
160
|
+
>
|
|
161
|
+
<i class="i-icon-vip" :class="{ on: isPRO }">{{ vipType }}</i>
|
|
162
|
+
</a>
|
|
163
|
+
</div>
|
|
139
164
|
</div>
|
|
140
|
-
</div>
|
|
141
165
|
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
166
|
+
<el-button-group class="u-actions">
|
|
167
|
+
<a class="el-button el-button--default" :href="url.profile">资料设置</a>
|
|
168
|
+
<a class="el-button el-button--default" :href="url.homepage">个人主页</a>
|
|
169
|
+
<a class="el-button el-button--default" href="/dashboard/frame">主题风格</a>
|
|
170
|
+
</el-button-group>
|
|
147
171
|
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
172
|
+
<div class="m-other">
|
|
173
|
+
<a href="/dashboard/fav" class="u-item"> 我的收藏 </a>
|
|
174
|
+
<a href="/team/role/manage" class="u-item"> 我的角色 </a>
|
|
175
|
+
<a href="/dashboard/purchases" class="u-item"> 付费购买的资源 </a>
|
|
176
|
+
<a href="/vip/mall" class="u-item"> 积分商城兑好礼 </a>
|
|
177
|
+
<hr />
|
|
178
|
+
<a href="/dashboard/feedback" class="u-item"> 反馈中心 </a>
|
|
179
|
+
<hr />
|
|
180
|
+
<div class="u-logout">
|
|
181
|
+
<el-button @click="logout">退出登录</el-button>
|
|
182
|
+
</div>
|
|
158
183
|
</div>
|
|
159
184
|
</div>
|
|
160
|
-
</
|
|
185
|
+
</template>
|
|
161
186
|
</div>
|
|
162
187
|
</div>
|
|
163
188
|
</template>
|
|
@@ -174,7 +199,7 @@
|
|
|
174
199
|
<script>
|
|
175
200
|
import User from "@jx3box/jx3box-common/js/user";
|
|
176
201
|
import { showDate } from "@jx3box/jx3box-common/js/moment";
|
|
177
|
-
import { __Links, __Root, __imgPath, __OriginRoot } from "@jx3box/jx3box-common/data/jx3box.json";
|
|
202
|
+
import { __Links, __Root, __imgPath, __OriginRoot, __userLevelColor } from "@jx3box/jx3box-common/data/jx3box.json";
|
|
178
203
|
import panel from "../../assets/data/panel.json";
|
|
179
204
|
import { getMsg, getMenu } from "../../service/header";
|
|
180
205
|
import { getMyInfo, userSignIn } from "../../service/author";
|
|
@@ -269,6 +294,14 @@ export default {
|
|
|
269
294
|
level: function () {
|
|
270
295
|
return User.getLevel(this.asset.experience);
|
|
271
296
|
},
|
|
297
|
+
levelStyle: function () {
|
|
298
|
+
return {
|
|
299
|
+
color: __userLevelColor[this.level],
|
|
300
|
+
};
|
|
301
|
+
},
|
|
302
|
+
isPhone: function () {
|
|
303
|
+
return window.innerWidth < 768;
|
|
304
|
+
},
|
|
272
305
|
},
|
|
273
306
|
watch: {
|
|
274
307
|
fold(val) {
|
package/src/single/Thx.vue
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div class="w-thx">
|
|
3
3
|
<template v-if="type === 'batchReward'">
|
|
4
4
|
<!-- 批量打赏 -->
|
|
5
|
-
<
|
|
5
|
+
<batch-reward :postType="postType" :items="postId" :boxcoin="boxcoin" :own="user_left" :points="user_points"
|
|
6
6
|
:authors="authors" :client="client" v-if="userBoxcoinEnable && boxcoin_enable"
|
|
7
7
|
@updateRecord="updateRecord" />
|
|
8
8
|
</template>
|
|
@@ -56,13 +56,12 @@ export default {
|
|
|
56
56
|
"mode",
|
|
57
57
|
"authors",
|
|
58
58
|
"client",
|
|
59
|
-
"items"
|
|
60
59
|
],
|
|
61
60
|
components: {
|
|
62
61
|
Like,
|
|
63
62
|
Share,
|
|
64
63
|
Fav,
|
|
65
|
-
BatchReward,
|
|
64
|
+
"batch-reward": BatchReward,
|
|
66
65
|
"boxcoin-records": BoxcoinRecords,
|
|
67
66
|
"boxcoin-admin": BoxcoinAdmin,
|
|
68
67
|
"boxcoin-user": BoxcoinUser,
|