Skip to content

Commit 6345711

Browse files
author
zhusha
committed
fix:资历宝典
1 parent 9d44101 commit 6345711

13 files changed

Lines changed: 545 additions & 231 deletions

File tree

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
"vue-waterfall-rapid": "^1.0.25",
7777
"vuedraggable": "^4.1.0",
7878
"vuex": "^4.0.2",
79-
"weixin-js-sdk": "^1.6.5"
79+
"weixin-js-sdk": "^1.6.5",
80+
"xlsx": "^0.18.5"
8081
},
8182
"devDependencies": {
8283
"@babel/core": "^7.12.16",

src/assets/css/common/face-body-mixins.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,8 @@
724724

725725
.m-body-tips,
726726
.m-face-tips {
727-
.size(100%, 44px);
727+
.size(100%, auto);
728+
min-height: 44px;
728729
.r(10px);
729730
.fz(14px, 20px);
730731
margin-top: 20px;

src/assets/css/furniture/index.less

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,21 @@
2424
max-width: 100%;
2525

2626
.search-item {
27+
overflow: hidden;
28+
29+
// .w(100%);
30+
.el-select {
31+
border: 2px solid #f3f4f5;
32+
// background: #f3f4f5;
33+
color: #b0b0b0;
34+
35+
.el-select__wrapper {
36+
border: none;
37+
box-shadow: none;
38+
background: #f3f4f5;
39+
}
40+
}
41+
2742
&.type-list {
2843
.type-item {
2944

@@ -86,6 +101,15 @@
86101
.pt(20px);
87102
gap: 20px;
88103
flex-wrap: wrap;
104+
105+
.u-image {
106+
.flex;
107+
.flex(o);
108+
109+
img {
110+
object-fit: contain;
111+
}
112+
}
89113
}
90114

91115
.m-furniture-null {
@@ -183,6 +207,15 @@
183207
.flex;
184208
flex-wrap: wrap;
185209
gap: 20px;
210+
211+
.u-img {
212+
.flex;
213+
.flex(o);
214+
215+
img {
216+
object-fit: contain;
217+
}
218+
}
186219
}
187220
}
188221
}
@@ -231,9 +264,7 @@
231264

232265
.u-image {
233266
width: 100%;
234-
text-align: center;
235267

236-
img {}
237268
}
238269
}
239270
}

src/assets/css/horse/card.less

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import "./pop.less";
2+
23
.m-horse-card {
34
flex-shrink: 0;
45
.pointer;
@@ -13,35 +14,46 @@
1314
color: #24292e;
1415
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
1516
transition: 0.3s ease-out;
17+
1618
&:hover {
1719
border: 1px solid #e86f00;
1820
box-shadow: 0 0 10px 0 rgba(232, 111, 0, 0.4);
1921
background-color: rgba(232, 111, 0, 0.1);
22+
2023
.u-more {
2124
background-color: #fff;
2225
}
2326
}
27+
2428
.image-slot img {
2529
.w(100%);
2630
}
31+
2732
.u-image {
28-
.size(100%,160px);
33+
.size(100%, 160px);
2934
.r(10px);
3035
box-sizing: border-box;
3136
background: url("../../img/horse/horse_item_bg_sm.jpg") no-repeat center center;
3237
background-size: cover;
3338
transition: all 0.5s;
39+
40+
img {
41+
object-fit: contain;
42+
}
3443
}
44+
3545
.u-name {
3646
.mt(10px);
3747
.fz(16px);
3848
font-weight: 700;
3949
}
50+
4051
.u-desc {
41-
.fz(12px,1.2);
52+
.fz(12px, 1.2);
4253
width: 100%;
4354
font-weight: 400;
4455
}
56+
4557
.u-img {
4658
.flex;
4759
.scrollbar;
@@ -56,18 +68,22 @@
5668
.size(30px);
5769
box-sizing: border-box;
5870
}
71+
5972
.u-attr-wrap {
6073
display: flex;
6174
justify-content: flex-start;
6275
flex-direction: row;
76+
6377
.u-attr {
6478
position: relative;
6579
margin: 2px;
80+
6681
img {
6782
max-width: 36px;
6883
}
6984
}
7085
}
86+
7187
.u-more {
7288
.flex;
7389
.r(5px);

src/assets/css/pet/list.less

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
.mt(40px);
44
justify-content: space-between;
55
align-items: baseline;
6+
67
.u-all {
78
cursor: pointer;
89
color: #a5a5a5;
9-
.fz(16px,21px);
10+
.fz(16px, 21px);
1011
}
1112

1213
.u-title {
13-
.fz(28px,42px);
14+
.fz(28px, 42px);
1415
.bold(700);
1516
color: #24292e;
1617
}
@@ -26,6 +27,7 @@
2627
gap: 20px;
2728
overflow-x: auto;
2829
overflow-y: hidden;
30+
2931
.m-luckey-item {
3032
flex-shrink: 0;
3133
}
@@ -34,29 +36,35 @@
3436
.mr(0);
3537
}
3638
}
39+
3740
.p-pet-list {
3841
.el-select .el-input .el-input__inner {
3942
border: 2px solid #f3f4f5;
4043
background: #f3f4f5;
4144
color: #b0b0b0;
4245
}
46+
4347
.active .el-input .el-input__inner,
4448
.el-select .el-input.is-focus .el-input__inner {
4549
.bold;
4650
border: 2px solid #d16400;
4751
background: rgba(209, 100, 0, 0.1);
4852
color: #000;
53+
4954
&::placeholder {
5055
color: #000;
5156
}
5257
}
58+
5359
.active .el-input__prefix {
5460
color: #d16400;
5561
}
62+
5663
.c-public-notice {
5764
.mt(40px);
5865
}
5966
}
67+
6068
.m-pet-list {
6169
.grid;
6270
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
@@ -74,15 +82,18 @@
7482
align-items: center;
7583
color: #949494;
7684
}
85+
7786
.u-icon-img {
7887
.size(24px);
7988
.mr(6px);
8089
}
90+
8191
.m-archive-more {
8292
.mt(40px);
8393
.w(100%);
8494
background-color: @petColor;
8595
border-color: @petColor;
96+
8697
&:hover {
8798
background-color: @petColor;
8899
border-color: @petColor;
@@ -91,8 +102,9 @@
91102

92103
.m-archive-pages {
93104
overflow-x: auto;
105+
94106
.active {
95-
background-color: @petColor !important;
107+
background-color: @petColor !important;
96108
}
97109
}
98110

@@ -101,6 +113,7 @@
101113
.u-type {
102114
.mt(20px);
103115
}
116+
104117
.u-title {
105118
.fz(24px);
106119
}
@@ -109,18 +122,26 @@
109122

110123
@media screen and (max-width: @phone) {
111124
.p-pet {
125+
.u-select {
126+
width: 100% !important;
127+
}
128+
112129
.u-lucky-title {
113130
.mt(84px);
114131
}
132+
115133
.u-title {
116134
.fz(24px);
117135
}
136+
118137
.m-pet-tabs {
119138
gap: 20px;
139+
120140
.m-common-card {
121141
justify-content: flex-start;
122142
}
123143
}
144+
124145
.m-pet-tabs,
125146
.m-lucky-list {
126147
.scrollbar(2px);
Lines changed: 1 addition & 0 deletions
Loading

src/views/furniture/Index.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ export default {
169169
furniture: [],
170170
buttonWidth: 0,
171171
versions: [
172+
{
173+
name: "丝路风雨(130级)",
174+
nDlcID: 8,
175+
},
172176
{
173177
name: "横刀断浪(120级)",
174178
nDlcID: 7,
@@ -182,7 +186,7 @@ export default {
182186
nDlcID: 5,
183187
},
184188
],
185-
version: 7,
189+
version: 8,
186190
};
187191
},
188192
filters: {

0 commit comments

Comments
 (0)