diff --git a/dist01.zip b/1.5dist.zip
similarity index 90%
rename from dist01.zip
rename to 1.5dist.zip
index d40da14..3dd479a 100644
Binary files a/dist01.zip and b/1.5dist.zip differ
diff --git a/dist5.31.zip b/122dist.zip
similarity index 93%
rename from dist5.31.zip
rename to 122dist.zip
index 191faee..0b9b8f9 100644
Binary files a/dist5.31.zip and b/122dist.zip differ
diff --git a/src/App.vue b/src/App.vue
index 1aa3ca0..05df485 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,16 +3,18 @@
-
+
+
+
diff --git a/src/api/request.js b/src/api/request.js
index a2d78c1..0e9cb73 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -12,6 +12,7 @@ const instance = axios.create({
timeout: 100000,
headers: {
Authorization: mode == 'dev' ? devToken : proToken,
+ 'User-Type':'2',
'Content-Type': 'application/json;charset=UTF-8'
}
})
diff --git a/src/components/CircleProgress/index.vue b/src/components/CircleProgress/index.vue
index b7f406e..0ee459e 100644
--- a/src/components/CircleProgress/index.vue
+++ b/src/components/CircleProgress/index.vue
@@ -57,7 +57,7 @@
top: '20%',
textStyle: {
color: '#00D0FF',
- fontSize: fitChartSize(18)
+ fontSize: fitChartSize(24)
}
},
{
@@ -66,7 +66,7 @@
top: '50%',
textStyle: {
color: '#fff',
- fontSize: fitChartSize(16)
+ fontSize: fitChartSize(22)
}
}
],
@@ -91,13 +91,13 @@
[0, '#075199'],
[1, '#075199']
],
- width: fitChartSize(6)
+ width: fitChartSize(10)
}
},
progress: {
show: true,
roundCap: false,
- width: fitChartSize(6)
+ width: fitChartSize(10)
},
pointer: {
// 指针
@@ -143,13 +143,13 @@
[0, '#075199'],
[1, '#075199']
],
- width: fitChartSize(6)
+ width: fitChartSize(10)
}
},
progress: {
show: true,
roundCap: false,
- width: fitChartSize(6)
+ width: fitChartSize(10)
},
pointer: {
// 指针
diff --git a/src/components/CountItem/index.vue b/src/components/CountItem/index.vue
index 2e6abbd..ced7fd3 100644
--- a/src/components/CountItem/index.vue
+++ b/src/components/CountItem/index.vue
@@ -52,32 +52,34 @@
flex: 1;
.label {
font-weight: 400;
- font-size: vw(14);
+ font-size: font-vw(20);
margin-left: vw(4);
color: rgba(255, 255, 255, 0.9);
}
.count {
position: relative;
- margin-top: vh(10);
+ margin-top: vh(30);
z-index: 1;
.value {
padding-left: vw(20);
font-weight: bold;
- font-size: vw(28);
+ font-size: font-vw(38);
color: #02f9fa;
}
.suffix {
- margin-top: vh(4);
+ // margin-top: vh(34);
font-weight: bold;
- font-size: vw(12);
+ font-size: font-vw(18);
color: #02f9fa;
+ margin-left:vw(5);
}
.bg {
position: absolute;
left: 0;
top: 0;
- width: vw(134);
- height: vh(30);
+ width: vw(184);
+ height: vh(50);
+ line-height: vh(50);
z-index: -1;
}
}
diff --git a/src/components/Line/index.vue b/src/components/Line/index.vue
index 11f3cc1..aab6cc3 100644
--- a/src/components/Line/index.vue
+++ b/src/components/Line/index.vue
@@ -84,7 +84,7 @@
border: 1px solid #0096FF;
color: #fff;
font-weight: bold;
- font-size: ${fitChartSize(16)}px;
+ font-size: ${fitChartSize(18)}px;
border-radius: ${fitChartSize(4)}px;
padding: ${fitChartSize(4)}px ${fitChartSize(12)}px;">
${valueStr}`
@@ -103,12 +103,12 @@
x: 'center',
y: 'top',
icon: 'rect',
- itemWidth: fitChartSize(8),
- itemHeight: fitChartSize(4),
- itemGap: fitChartSize(10),
+ itemWidth: fitChartSize(12),
+ itemHeight: fitChartSize(12),
+ itemGap: fitChartSize(12),
textStyle: {
color: '#ffffff',
- fontSize: fitChartSize(12)
+ fontSize: fitChartSize(22)
}
},
title: {
@@ -127,14 +127,14 @@
}
},
axisLabel: {
- fontSize: fitChartSize(12),
+ fontSize: fitChartSize(18),
color: 'rgba(255,255,255,0.9)'
}
},
yAxis: {
type: 'value',
axisLabel: {
- fontSize: fitChartSize(12),
+ fontSize: fitChartSize(18),
color: 'rgba(255,255,255,0.9)'
},
splitLine: {
diff --git a/src/components/PieRow/index.vue b/src/components/PieRow/index.vue
index 812855e..2b21035 100644
--- a/src/components/PieRow/index.vue
+++ b/src/components/PieRow/index.vue
@@ -113,20 +113,21 @@
color: colorList,
legend: {
orient: 'vertical',
- x: '64%',
- y: 'center',
- itemWidth: fitChartSize(12),
- itemHeight: fitChartSize(12),
+ x: 'center',
+ y: '80%',
+ bottom:'20%',
+ itemWidth: fitChartSize(22),
+ itemHeight: fitChartSize(22),
itemGap: fitChartSize(10),
textStyle: {
color: '#ffffff',
- fontSize: fitChartSize(14)
+ fontSize: fitChartSize(22)
}
},
series: [
{
type: 'pie',
- center: ['30%', '50%'],
+ center: ['50%', '30%'],
radius: ['40%', '55%'],
itemStyle: {
borderWidth: fitChartSize(4),
@@ -142,13 +143,13 @@
rich: {
value: {
color: '#fff',
- fontSize: fitChartSize(24),
+ fontSize: fitChartSize(22),
fontWeight: 'bold',
padding: [0, 0, 5, 0]
},
name: {
color: '#fff',
- fontSize: fitChartSize(12)
+ fontSize: fitChartSize(20)
}
}
},
@@ -182,7 +183,7 @@
top:0;
width: 100%;
height: 100%;
- font-size:vw(18);
+ font-size:font-vw(22);
// color:#999;
color:#02f9fa;
display: flex;
diff --git a/src/components/RegionTop/index.vue b/src/components/RegionTop/index.vue
index aa84a1c..b8373c1 100644
--- a/src/components/RegionTop/index.vue
+++ b/src/components/RegionTop/index.vue
@@ -81,7 +81,8 @@
show: false
},
legend: {
- show: false
+ show: false,
+
},
grid: {
left: '4%',
@@ -114,7 +115,7 @@
show: true,
axisLabel: {
color: '#fff',
- fontSize: fitChartSize(18),
+ fontSize: fitChartSize(11),
verticalAlign: 'bottom',
padding: [0, -fitChartSize(10), fitChartSize(10), 0],
inside: true,
@@ -125,7 +126,7 @@
value: {
align: 'center',
color: '#fff',
- fontSize: fitChartSize(14)
+ fontSize: fitChartSize(20)
}
}
},
@@ -148,7 +149,7 @@
fontWeight: 500,
position: 'left',
align: 'left',
- fontSize: fitChartSize(14),
+ fontSize: fitChartSize(20),
formatter: function (params) {
return params.data.name ?? '其他'
}
@@ -186,7 +187,7 @@
top:0;
width: 100%;
height: 100%;
- font-size:vw(18);
+ font-size:vw(20);
// color:#999;
color:#02f9fa;
display: flex;
@@ -194,7 +195,7 @@
justify-content: center;
}
.top {
- width: vw(250);
- height: vh(366);
+ width: vw(290);
+ height: vh(650);
}
diff --git a/src/components/TicketSource/index.vue b/src/components/TicketSource/index.vue
index 46235ed..439f075 100644
--- a/src/components/TicketSource/index.vue
+++ b/src/components/TicketSource/index.vue
@@ -93,7 +93,7 @@
legend: {
show: true,
x: 'center',
- y: 'bottom',
+ y: '75%',
itemHeight: fitChartSize(12),
itemWidth: fitChartSize(12),
itemGap: fitChartSize(6),
@@ -113,12 +113,12 @@
rich: {
name: {
color: '#fff',
- fontSize: fitChartSize(12)
+ fontSize: fitChartSize(18)
},
value: {
color: '#00D5F6',
fontWeight: 600,
- fontSize: fitChartSize(12)
+ fontSize: fitChartSize(18)
}
}
}
@@ -165,7 +165,7 @@
top:0;
width: 100%;
height: 100%;
- font-size:vw(18);
+ font-size:fonnt-vw(20);
// color:#999;
color:#02f9fa;
display: flex;
@@ -228,12 +228,12 @@
}
&-item-label {
font-weight: 400;
- font-size: vw(12);
+ font-size: vw(18);
line-height: vh(14);
}
&-item-value {
font-weight: bold;
- font-size: vw(16);
+ font-size: vw(22);
line-height: vh(18);
}
}
diff --git a/src/components/Title1/index.vue b/src/components/Title1/index.vue
index 607123e..de35ed8 100644
--- a/src/components/Title1/index.vue
+++ b/src/components/Title1/index.vue
@@ -20,9 +20,9 @@
.title-1 {
position: relative;
.title {
- margin: vh(10) auto;
- width: vw(468);
- height: vh(32);
+ margin: vh(20) auto;
+ width: vw(600);
+ height: vh(88);
display: flex;
align-items: center;
justify-content: center;
@@ -30,7 +30,7 @@
background-size: 100% 100%;
& > span {
font-weight: 800;
- font-size: vw(16);
+ font-size: font-vw(22);
background-image: linear-gradient(to bottom, #ffffff 0%, #75c1ff 100%);
-webkit-background-clip: text;
background-clip: text;
diff --git a/src/components/Title2/index.vue b/src/components/Title2/index.vue
index d0c2e83..bea1cb7 100644
--- a/src/components/Title2/index.vue
+++ b/src/components/Title2/index.vue
@@ -33,8 +33,8 @@
diff --git a/src/views/home/components/box-1.vue b/src/views/home/components/box-1.vue
index 8a65217..952640c 100644
--- a/src/views/home/components/box-1.vue
+++ b/src/views/home/components/box-1.vue
@@ -36,8 +36,8 @@
@@ -192,12 +192,12 @@
.select-box {
width:vw(200);
height:vh(30);
- font-size:vw(16);
+ font-size: font-vw(16);
}
.box-2 {
margin-top: vh(120);
- width: vw(800);
- height: vh(953);
+ width: vw(1200);
+ // height: vh(953);
padding: vw(8);
box-sizing: border-box;
background-image: url('@/assets/images/bg-2.png');
@@ -209,11 +209,11 @@
z-index: 990;
}
.list {
- height: vh(72);
+ height: vh(104);
}
.item {
position: relative;
- height: vh(52);
+ height: vh(104);
margin: 0 vh(10);
flex: 1;
z-index: 1;
@@ -223,35 +223,35 @@
&-icon {
position: absolute;
width: 100%;
- height: auto;
+ // height: 100%;
z-index: -1;
}
&-label {
position: absolute;
- left: vw(70);
- top: vh(-10);
+ left: vw(120);
+ top: vh(-20);
font-weight: 400;
- font-size: vw(16);
+ font-size: font-vw(20);
color: #ffffff;
}
&-value {
position: absolute;
- left: vw(70);
+ left: vw(120);
.countup-wrap {
color: #02f9fa;
- font-size: vw(28);
+ font-size: font-vw(28);
font-weight: bold;
}
}
}
.unit {
color: #02f9fa;
- font-size: vw(14);
+ font-size: font-vw(14);
margin-bottom: vh(4);
}
.box {
- width: vw(384);
- height: vh(320);
+ width: 50%;
+ // height: vh(820);
background-image: url('@/assets/images/bg-3.png');
background-size: 100% 100%;
&:nth-child(1) {
@@ -262,7 +262,7 @@
display: flex;
margin-top: vh(12);
width: 100%;
- height: vh(88);
+ height: vh(150);
background-image: url('@/assets/images/bg-4.png');
background-size: 100% 100%;
&-item {
@@ -274,20 +274,20 @@
cursor:pointer;
}
&-title {
- font-size: vw(16);
+ font-size: font-vw(18);
color: #fff;
}
&-value {
margin-top: vh(10);
font-weight: bold;
- font-size: vw(20);
+ font-size: font-vw(20);
color: #02f9fa;
display: flex;
align-items: flex-end;
}
.value {
font-weight: bold;
- font-size: vw(28);
+ font-size: font-vw(28);
}
.active{
@@ -295,14 +295,14 @@
}
.prefix,
.suffix {
- font-size: vw(12);
+ font-size: font-vw(12);
margin-bottom: vh(4);
}
}
}
.age-box {
- width: vw(320);
- height: vh(303);
+ width: vw(400);
+ height: vh(693);
background-image: url('@/assets/images/bg-3.png');
background-size: 100% 100%;
&:nth-child(1) {
@@ -310,8 +310,9 @@
}
}
.box-1 {
- width: vw(230);
- height: vh(303);
+ width: vw(400);
+ height: 100%;
+ height: vh(693);
background-image: url('@/assets/images/bg-3.png');
background-size: 100% 100%;
&:nth-child(2) {
@@ -322,7 +323,7 @@
margin: vh(10) vw(20) 0 vw(20);
height: vh(24);
font-weight: bold;
- font-size: vw(14);
+ font-size: font-vw(14);
color: #ffffff;
display: flex;
align-items: center;
@@ -350,7 +351,7 @@
}
.text {
font-weight: 400;
- font-size: vw(14);
+ font-size: font-vw(14);
color: rgba(255, 255, 255, 0.9);
}
.progress {
@@ -362,13 +363,13 @@
}
.man {
font-weight: bold;
- font-size: vw(14);
+ font-size: font-vw(14);
color: #02f9fa;
margin-left: vw(10);
}
.woman {
font-weight: bold;
- font-size: vw(14);
+ font-size: font-vw(14);
color: #f15a25;
margin-left: vw(10);
}
@@ -376,7 +377,7 @@
.ticket-box {
margin-top: vh(20);
width: 100%;
- height: vh(106);
+ // height: vh(106);
background: linear-gradient(to right, rgba(0, 77, 136, 0) 0%, rgba(0, 77, 136, 0.6) 100%);
.title {
width: vw(253);
@@ -388,7 +389,7 @@
& > span {
padding-left: vw(22);
font-weight: bold;
- font-size: vw(15);
+ font-size: font-vw(15);
background-image: linear-gradient(to bottom, #ffffff 0%, #75c1ff 100%);
-webkit-background-clip: text;
background-clip: text;
@@ -398,12 +399,13 @@
}
}
.ticket-wrap {
- margin-top: vh(8);
+ // margin-top: vh(18);
+ // margin-bottom: vh(18);
display: flex;
align-items: center;
justify-content: space-between;
& > img {
- width: vw(74);
+ width: vw(124);
height: auto;
}
& > div {
@@ -417,12 +419,12 @@
.label {
padding-left: vw(10);
font-weight: 400;
- font-size: vw(14);
+ font-size: font-vw(20);
color: rgba(255, 255, 255, 0.9);
}
.countup-wrap {
color: #02f9fa;
- font-size: vw(28);
+ font-size: font-vw(28);
font-weight: bold;
}
}
diff --git a/src/views/home/components/box-2.vue b/src/views/home/components/box-2.vue
index b7c0a72..bc08c90 100644
--- a/src/views/home/components/box-2.vue
+++ b/src/views/home/components/box-2.vue
@@ -49,9 +49,55 @@