Skip to content

Commit addae8b

Browse files
committed
fix:adv
1 parent 0755fea commit addae8b

5 files changed

Lines changed: 41 additions & 125 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
},
3131
"dependencies": {
3232
"@element-plus/icons-vue": "^2.3.2",
33-
"@jx3box/jx3box-common": "^9.1.7",
33+
"@jx3box/jx3box-common": "^9.1.8",
3434
"@jx3box/jx3box-data": "^3.9.4",
35-
"@jx3box/jx3box-editor": "^3.0.9",
35+
"@jx3box/jx3box-editor": "^3.0.10",
3636
"@jx3box/jx3box-emotion": "^1.3.0",
3737
"@jx3box/jx3box-facedat": "^2.7.3",
3838
"@jx3box/jx3box-map": "^1.0.0",

src/assets/css/adventure/landscape.less

Lines changed: 37 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.p-adventure-treasure-landscape {
2-
32
overflow-x: auto;
43

54
.m-body {
@@ -31,7 +30,7 @@
3130
.color(white);
3231
.bold();
3332
}
34-
background-color:#fff;
33+
background-color: #fff;
3534
.r(10px);
3635
.w(400px);
3736
}
@@ -677,120 +676,45 @@
677676
align-items: center;
678677
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.25);
679678
.el-select {
680-
width: 258px;
681-
border: none;
682-
background-color: rgba(243, 244, 245, 0.96);
683-
line-height: 40px;
684-
height: 40px;
685-
.r(30px);
686-
.color(white);
687-
}
688-
.m-related-roles {
689-
.fz(12px);
690-
.r(10px);
691-
background-color: white;
692-
padding: 10px 15px;
693-
.pa();
694-
left: 50%;
695-
top: 30px;
696-
transform: translateX(-50%);
697-
display: flex;
698-
align-items: center;
699-
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.25);
700-
.el-select {
701-
width: 258px;
702-
border: none;
703-
background-color: rgba(243, 244, 245, 0.96);
704-
line-height: 40px;
705-
height: 40px;
706-
.r(30px);
707-
.el-select__wrapper {
708-
height: 40px;
709-
.fz(16px, 40px);
710-
.bold();
711-
background-color: transparent;
712-
box-shadow: none;
713-
}
714-
.el-select__caret {
715-
color: black;
716-
.fz(16px);
717-
}
718-
&:not(:first-child) {
719-
margin-left: 10px;
720-
}
721-
}
722-
.u-tip {
723-
.mb(10px);
724-
i {
725-
.fz(16px);
726-
.mr(3px);
727-
}
728-
a {
729-
padding: 0 2px;
730-
box-shadow: 0 1px 0 @color-link;
731-
}
732-
}
733-
.el-input__prefix {
734-
left: 1px;
735-
top: 1px;
736-
.r(5px);
737-
}
738-
.u-prefix {
739-
.db;
740-
.h(30px);
741-
.lh(30px);
742-
743-
background-color: #f5f7fa;
744-
color: #909399;
745-
746-
border-right: 1px solid #dcdfe6;
747-
border-top-left-radius: 4px;
748-
border-bottom-left-radius: 4px;
749-
750-
padding: 0 10px;
751-
white-space: nowrap;
752-
}
753-
.el-input--prefix .el-input__inner {
754-
padding-left: 85px;
755-
}
756-
.u-refresh {
757-
margin-left: 20px;
758-
}
759-
.el-button span {
760-
.flex(y);
761-
gap: 3px;
762-
}
679+
width: 200px;
680+
margin-right: 10px;
681+
// border: none;
682+
// background-color: rgba(243, 244, 245, 0.96);
683+
// line-height: 40px;
684+
// height: 40px;
685+
// .r(30px);
686+
// .color(white);
763687
}
688+
}
764689

765-
.m-related-roles-options {
766-
.u-role {
767-
display: flex;
768-
justify-content: space-between;
769-
}
770-
.u-role-name {
771-
.flex;
772-
align-items: center;
773-
}
774-
.u-role-icon {
775-
.size(20px);
776-
.y;
777-
.mr(3px);
778-
.r(50%);
779-
}
780-
.u-role-server {
781-
color: #999;
782-
.fz(12px);
783-
}
784-
}
785-
@media screen and (max-width: 720px) {
786-
.m-related-roles {
787-
.ps();
788-
transform: none;
789-
}
690+
@media screen and (max-width: 720px) {
691+
.m-related-roles {
692+
.ps();
693+
transform: none;
790694
}
695+
}
791696

792-
.m-treasure-footer {
793-
.x;
794-
}
697+
.m-treasure-footer {
698+
.x;
699+
}
700+
}
701+
.m-related-roles-options {
702+
.u-role {
703+
display: flex;
704+
justify-content: space-between;
705+
}
706+
.u-role-name {
707+
.flex;
708+
align-items: center;
709+
}
710+
.u-role-icon {
711+
.size(20px);
712+
.y;
713+
.mr(3px);
714+
.r(50%);
715+
}
716+
.u-role-server {
717+
color: #999;
718+
.fz(12px);
795719
}
796720
}

src/assets/css/exam/exam.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@
128128
.v-paper-single{
129129
.back-wrap{
130130
.u-edit{
131-
color:@v4text;
131+
.fz(13px);
132+
color:@v4tip;
132133
.flex(y);
133134
gap:5px;
134135
&:hover{

src/views/adventure/landscape.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
placeholder="请选择当前角色"
3535
:disabled="!isLogin"
3636
popper-class="m-related-roles-options"
37-
size="small"
3837
>
3938
<el-option v-for="role in roleList" :key="role.ID" :value="role" :label="role.name">
4039
<span class="u-role">
@@ -50,7 +49,6 @@
5049
v-model="currentCamp"
5150
placeholder="请选择阵营"
5251
popper-class="m-related-roles-options"
53-
size="small"
5452
>
5553
<el-option value="hq" label="浩气盟阵营"> </el-option>
5654
<el-option value="er" label="恶人谷阵营"> </el-option>

vue.config.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ const pages = {
77
filename: "index.html",
88
},
99

10-
qqbot: {
11-
title: "QQRobot - JX3BOX",
12-
entry: "src/pages/qqbot/index.js",
13-
template: "public/index.html",
14-
filename: "qqbot/index.html",
15-
},
16-
1710
face: {
1811
title: "捏脸数据",
1912
entry: "src/pages/face/index.js",

0 commit comments

Comments
 (0)