Skip to content

Commit 397dcd5

Browse files
committed
Merge branch 'master' into dev
2 parents f7c01e9 + 9708af3 commit 397dcd5

14 files changed

Lines changed: 92 additions & 26 deletions

File tree

.env.production

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
STATIC_PATH=mirror
22
BASE_URL=/
3+
DEV_PORT=12028
34

45
VUE_APP_CMS_API=https://cms.jx3box.com
5-
VUE_APP_NEXT_API=https://next2.jx3box.com
6-
VUE_APP_PAY_API=https://pay.jx3box.com
7-
VUE_APP_TEAM_API=https://team.jx3box.com
8-
VUE_APP_LUA_API=https://lua.jx3box.com
6+
VUE_APP_NEXT_API=/next2.jx3box.com
7+
VUE_APP_PAY_API=/pay.jx3box.com
8+
VUE_APP_TEAM_API=/team.jx3box.com
9+
VUE_APP_LUA_API=/lua.team.jx3box.com
910

1011

1112
# cdn地址

src/assets/css/community/list.less

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@
163163
}
164164

165165
.u-item {
166+
background-color:@bg-light;
166167
border-bottom: 1px solid @border-hr;
167-
padding-bottom: 20px;
168+
padding: 16px;
169+
.r(6px);
168170
.mb(20px);
169171
.clearfix;
170172
.pr;
@@ -242,7 +244,7 @@
242244
.u-push {
243245
.pa;
244246
top: 0;
245-
right: 8px;
247+
right: 0;
246248
.flex;
247249
align-items: center;
248250
gap: 2px;
@@ -367,7 +369,7 @@
367369
.u-misc {
368370
.db;
369371
.pa;
370-
.rb(10px, 24px);
372+
.rb(16px, 24px) !important;
371373
.x(right);
372374
.fz(12px, 20px);
373375
color: #777;
2.9 KB
Loading

src/assets/img/community/category/all.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 45 additions & 0 deletions
Loading
Lines changed: 11 additions & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
3.92 KB
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)