diff --git a/App.vue b/App.vue
index a1cd955..1e4f5d0 100644
--- a/App.vue
+++ b/App.vue
@@ -80,7 +80,7 @@
.u-popup__content {
- background: linear-gradient(0deg, #ffffff 85%, #E4C8A2);
+ /* background: linear-gradient(0deg, #ffffff 85%, #E4C8A2); */
}
.mpopup-content {
diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 3a16670..740c65c 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -248,7 +248,7 @@
您已经预约成功
- 报名成功后具体事宜请联系：金老师，65166121
+ 报名成功
即将跳转到活动预约 {{time}} s
返回首页
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 678b031..ac6fc05 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -180,6 +180,12 @@
}
.activityBox{
position: relative;
+ }
+ .activityBox-title {
+ font-size: 32rpx;
+ }
+ .activityBox-row{
+ font-size: 28rpx;
}
.activityBox-top{
font-size: 0;
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index 795ed48..80339f3 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -337,9 +337,15 @@
background: #FFFFFF;
margin-bottom: 40rpx;
}
-
+ .activityBox-title{
+ font-size: 32rpx;
+ }
+ .activityBox-row{
+ font-size: 28rpx;
+ }
.infoBox-title {
- border-left: 3px solid #cf995a;
+ border-left: 3px solid #cf995a;
+ font-size: 32rpx;
}
.infoBox-titletxt {
@@ -426,8 +432,12 @@
color: #828282;
padding: 7rpx;
}
+ .infoBox-content{
+ font-size: 28rpx;
+ }
.infoBox-content img{
width:100%;
margin:10rpx 0;
+
}
\ No newline at end of file
diff --git a/pages/exhibit/detail.vue b/pages/exhibit/detail.vue
index 12dde1e..c31154b 100644
--- a/pages/exhibit/detail.vue
+++ b/pages/exhibit/detail.vue
@@ -157,6 +157,7 @@
padding:35rpx;
margin:30rpx 0;
margin-bottom:0;
+ font-size: 28rpx;
}
.head_unit>view{
display: flex;
@@ -181,6 +182,7 @@
padding-top: 30rpx;
border-radius: 30rpx 30rpx 0 0;
padding-bottom:180rpx;
+ font-size: 28rpx;
}
.detail img {
width: 100%;
diff --git a/pages/exhibit/index.vue b/pages/exhibit/index.vue
index a9fe368..8659d5f 100644
--- a/pages/exhibit/index.vue
+++ b/pages/exhibit/index.vue
@@ -152,7 +152,8 @@
.exhibit {
color: #fff;
- padding: 0 30rpx
+ padding: 0 30rpx;
+ font-size: 36rpx;
}
.exhibit>view:first-child {
@@ -163,7 +164,7 @@
.exhibit>view:first-child span:first-child {
background-color: #fff;
width: 5rpx;
- height: 40rpx;
+ height: 50rpx;
margin-right: 22rpx;
display: inline-block;
vertical-align: text-top;
@@ -267,7 +268,7 @@
-webkit-line-clamp: 3;
/* 这里是超出几行省略 */
overflow: hidden;
- font-size: 26rpx;
+ font-size: 28rpx;
margin-top:20rpx;
}
\ No newline at end of file
diff --git a/pages/guide/index.vue b/pages/guide/index.vue
index e6321a9..f6640e2 100644
--- a/pages/guide/index.vue
+++ b/pages/guide/index.vue
@@ -168,7 +168,11 @@
api: '/api/mobile/other/tip-store',
data: this.form,
method: "POST",
- utilSuccess: function(res) {
+ utilSuccess: function(res) {
+ uni.showToast({
+ icon: "none",
+ title: "提交成功"
+ })
that.newsSubscription();
},
utilFail: function(res) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ce2ac9d..b10cb98 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,16 +1,16 @@
-
+
-
+
-
+
@@ -201,6 +201,7 @@
return {
// 状态栏高度
statusBarHeight: 0,
+ navBarBoxHeight:0,
exhibitObj:{},
showBook: false,
minDate: `${year}-${month}-${date + 1}`,
@@ -223,6 +224,7 @@
//获取手机状态栏高度
this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
+ this.navBarBoxHeight = 80 + this.statusBarHeight*2
this.loadInfo();
this.getExhibit()
},
@@ -574,13 +576,14 @@
background-color: #cf995a;
}
.navBarBox {
- background-color: #cf995a;
+ /* background-color: #cf995a; */
position: fixed;
top:0;
left:0;
width:100%;
z-index:999;
- height:190rpx;
+ background: linear-gradient(to bottom,#f6d593,#cf995a);
+ /* height:190rpx; */
}
.navBarBox .statusBar {}
@@ -588,7 +591,8 @@
.navBarBox .navBar {
padding: 20rpx 50rpx;
padding-left: 30rpx;
- text-align: left;
+ text-align: left;
+ height:80rpx;
/* display: flex;
flex-direction: row;
justify-content: center;
@@ -613,7 +617,7 @@
align-items: center;
justify-content: center;
padding-bottom:120rpx;
- padding-top:190rpx;
+ /* padding-top:190rpx; */
}
.box-top {
@@ -639,7 +643,7 @@
.box-row {
display: flex;
- padding: 0 30rpx;
+ padding: 0 50rpx;
justify-content: space-between;
}
@@ -648,16 +652,19 @@
}
.box-body-icon {
- width: 125rpx;
- height: 125rpx;
+ width: 102rpx;
+ height: 102rpx;
}
.box-body-title {
- margin-top: 10rpx
+ margin-top: 10rpx;
+ font-size:28rpx;
+
}
.box-bottom{
background-color: #fff;
- padding:48rpx 30rpx;
+ padding:50rpx 30rpx;
+ padding-top:35rpx;
width:100%;
}
.exhibit{
@@ -666,11 +673,12 @@
.exhibit>view:first-child{
display: flex;
justify-content: space-between;
+ font-size: 36rpx;
}
.exhibit>view:first-child span:first-child{
background-color: #DEA166;
width:5rpx;
- height:40rpx;
+ height:50rpx;
margin-right:22rpx;
display: inline-block;
vertical-align: text-top;
@@ -695,12 +703,12 @@
bottom:0;
left:0;
color:#fff;
- font-size: 28rpx;
+ font-size: 32rpx;
padding:20rpx 32rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
- background: linear-gradient(to bottom,rgba(255,255,255,0),rgba(0,0,0,0.2));
+ background: linear-gradient(to bottom,rgba(255,255,255,0),rgba(0,0,0,0.5));
}
.footer-img {
width: 421rpx;
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 4e0d2fd..9cb34cb 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -286,7 +286,7 @@
}
.user_phone {
- font-size: 24rpx;
+ font-size: 28rpx;
color: #fff;
line-height: 40rpx;
}
@@ -332,7 +332,7 @@
}
.mine-box-navitemtxt {
- font-size: 24rpx;
+ font-size: 28rpx;
font-family: PingFang SC;
/* color: #4E4E4E; */
margin-top: 30rpx;
@@ -347,8 +347,8 @@
}
.mine-box-navitemimg {
- width: 125rpx;
- height: 125rpx;
+ width: 102rpx;
+ height: 102rpx;
}
.list-item {
diff --git a/pages/park/index.vue b/pages/park/index.vue
index b4a2f2c..8719b98 100644
--- a/pages/park/index.vue
+++ b/pages/park/index.vue
@@ -119,7 +119,7 @@
{{$u.timeFormat(new Date(item.date), 'mm月dd日')}}
- {{item.time}}丨{{item.details_count}} 位观众
+ {{item.time||""}}丨{{item.details_count}} 位观众
@@ -135,7 +135,7 @@
:color="(item.checked?'#cf995a':'#828282')">
- 活动时间：{{item.activity.start_time}}
+ 活动时间：{{item.activity.start_time||""}}
报名数量：{{item.total}}
@@ -278,7 +278,7 @@
api: '/api/mobile/user/my-activity-order',
data: {
status: 1,
- not_expire: 1
+ not_expire: 0
},
utilSuccess: function(res) {
for (var mod of res) {
diff --git a/pages/relic/detail.vue b/pages/relic/detail.vue
index 6b136d4..c7dc39d 100644
--- a/pages/relic/detail.vue
+++ b/pages/relic/detail.vue
@@ -130,6 +130,7 @@
padding-top: 30rpx;
/* border-radius: 30rpx 30rpx 0 0; */
padding-bottom:180rpx;
+ font-size: 28rpx;
}
.detail img {
width: 100%;
diff --git a/pages/relic/list.vue b/pages/relic/list.vue
index 5306869..9b10a68 100644
--- a/pages/relic/list.vue
+++ b/pages/relic/list.vue
@@ -128,7 +128,7 @@
.relic_item {
width: 100%;
- padding: 30rpx 0;
+ padding: 20rpx 0;
padding-top: 20rpx;
border-bottom: 1px solid #fafaf9;
display: flex;
diff --git a/static/img/index_icon_1.png b/static/img/index_icon_1.png
index 4d7d624..843058c 100644
Binary files a/static/img/index_icon_1.png and b/static/img/index_icon_1.png differ
diff --git a/static/img/index_icon_2.png b/static/img/index_icon_2.png
index 643fa7f..6fcfb60 100644
Binary files a/static/img/index_icon_2.png and b/static/img/index_icon_2.png differ
diff --git a/static/img/index_icon_3.png b/static/img/index_icon_3.png
index 2c79ce3..b5b6bba 100644
Binary files a/static/img/index_icon_3.png and b/static/img/index_icon_3.png differ
diff --git a/static/img/index_icon_4.png b/static/img/index_icon_4.png
index 999c780..c7d3387 100644
Binary files a/static/img/index_icon_4.png and b/static/img/index_icon_4.png differ