From dd0862fa1ad63d47c8b3120a89298c8c0c9d2d67 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 24 Aug 2023 11:35:31 +0800
Subject: [PATCH] up
---
components/plate/index.vue | 4 +--
node_modules/uview-ui/theme.scss | 2 +-
pages/activity/book.vue | 20 ++++++-------
pages/activity/index.vue | 4 +--
pages/activity/info.vue | 6 ++--
pages/index/index.vue | 4 +--
pages/mine/recommend.vue | 4 +--
pages/order/activityorder.vue | 6 ++--
pages/order/activityorderinfo.vue | 10 +++----
pages/order/parkorder.vue | 6 ++--
pages/order/parkorderinfo.vue | 8 ++---
pages/order/visitorder.vue | 6 ++--
pages/order/visitorderinfo.vue | 10 +++----
pages/park/book.vue | 16 +++++-----
pages/park/index.vue | 12 ++++----
pages/success/success.vue | 4 +--
pages/visit/book.vue | 32 ++++++++++----------
pages/visit/teambook.vue | 12 ++++----
pages/vr/index.vue | 48 ++++++++++++++++++++----------
pages/vr/vrpage.vue | 22 +++++++++++++-
static/css/activitybox.css | 2 +-
static/css/bookbox.css | 10 +++----
static/img/vrimg.png | Bin 24144 -> 0 bytes
uni.scss | 2 +-
utils/util.js | 4 +--
25 files changed, 146 insertions(+), 108 deletions(-)
delete mode 100644 static/img/vrimg.png
diff --git a/components/plate/index.vue b/components/plate/index.vue
index de7582f..44a009e 100644
--- a/components/plate/index.vue
+++ b/components/plate/index.vue
@@ -140,7 +140,7 @@
width: 66upx;
height: 66upx;
background-color: #fffbe9;
- border: 1px solid #EF9525;
+ border: 1px solid #cf995a;
border-radius: 10upx;
display: flex;
align-items: center;
@@ -155,7 +155,7 @@
}
&.active {
- background-color: #EF9525;
+ background-color: #cf995a;
}
}
}
diff --git a/node_modules/uview-ui/theme.scss b/node_modules/uview-ui/theme.scss
index 0ef4a09..d756f61 100644
--- a/node_modules/uview-ui/theme.scss
+++ b/node_modules/uview-ui/theme.scss
@@ -10,7 +10,7 @@ $u-border-color: #dadbde;
$u-bg-color: #f3f4f6;
$u-disabled-color: #c8c9cc;
-$u-primary: #EF9525;
+$u-primary: #cf995a;
$u-primary-dark: #398ade;
$u-primary-disabled: #9acafc;
$u-primary-light: #ecf5ff;
diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index 598fa2f..90dd422 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -50,7 +50,7 @@
-
@@ -118,13 +118,13 @@
@@ -189,7 +189,7 @@
@@ -224,7 +224,7 @@
@@ -247,7 +247,7 @@
mode="center" width="600rpx" height="150rpx">
-
+
您已经预约成功
报名成功后具体事宜请联系：金老师，65166121
即将跳转到活动预约 {{time}} s
@@ -788,7 +788,7 @@
.box-button {
display: flex;
background: #FCF6E3;
- border: 1px solid #EF9525;
+ border: 1px solid #cf995a;
border-radius: 5px;
padding: 20rpx 0rpx;
width: 100%;
@@ -876,7 +876,7 @@
.pinkBtn {
width: 50%;
- background-image: linear-gradient(45deg, #EF9525 0%, #EF9525 100%);
+ background-image: linear-gradient(45deg, #cf995a 0%, #cf995a 100%);
border-radius: 44rpx;
font-size: 30rpx;
font-weight: 500;
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 360c600..b09a75d 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -184,7 +184,7 @@
display: inline-block;
margin: 4rpx;
background: #FCF6E3;
- border: 2rpx solid #EF9525;
+ border: 2rpx solid #cf995a;
border-radius: 20rpx;
color: #4E4E4E;
margin-right: 10rpx;
@@ -194,7 +194,7 @@
font-family: PingFang SC;
font-weight: 400;
display: flex;
- color: #EF9525;
+ color: #cf995a;
flex-direction: column-reverse;
margin-left:10rpx
}
diff --git a/pages/activity/info.vue b/pages/activity/info.vue
index fd123f0..259dcb7 100644
--- a/pages/activity/info.vue
+++ b/pages/activity/info.vue
@@ -102,7 +102,7 @@
@@ -164,7 +164,7 @@
+ color="#cf995a" round="20" defaultDate="2022-02-15" @confirm="handleSelectDate" @close="closecalendar">
diff --git a/pages/mine/recommend.vue b/pages/mine/recommend.vue
index 7c38334..ee7a4fc 100644
--- a/pages/mine/recommend.vue
+++ b/pages/mine/recommend.vue
@@ -110,10 +110,10 @@
width: 560rpx;
height: 90rpx;
background: #FFFFFF;
- border: 2rpx solid #EF9525;
+ border: 2rpx solid #cf995a;
border-radius: 45rpx;
font-size: 32rpx;
- color: #EF9525;
+ color: #cf995a;
letter-spacing: 0.92px;
text-align: center;
line-height: 90rpx;
diff --git a/pages/order/activityorder.vue b/pages/order/activityorder.vue
index 68c51bf..c633668 100644
--- a/pages/order/activityorder.vue
+++ b/pages/order/activityorder.vue
@@ -1,7 +1,7 @@
-
@@ -166,7 +166,7 @@
}
.fbtn {
- background: #EF9525;
+ background: #cf995a;
border-radius: 8rpx;
font-size: 24rpx;
color: #FFFFFF;
@@ -236,7 +236,7 @@
}
.orderBoxStatus {
- background: #EF9525;
+ background: #cf995a;
border-top-right-radius: 16rpx;
border-bottom-left-radius: 16rpx;
font-size: 24rpx;
diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue
index 51a2fea..f0be701 100644
--- a/pages/order/activityorderinfo.vue
+++ b/pages/order/activityorderinfo.vue
@@ -239,7 +239,7 @@
}
.fbtn {
- background: #EF9525;
+ background: #cf995a;
border-radius: 8rpx;
font-size: 24rpx;
color: #FFFFFF;
@@ -295,7 +295,7 @@
}
.orderBoxStatus {
- background: #EF9525;
+ background: #cf995a;
border-top-right-radius: 16rpx;
border-bottom-left-radius: 16rpx;
font-size: 24rpx;
@@ -327,7 +327,7 @@
.p0 {
padding-top: 0;
- border-left: 32rpx solid #ef9525
+ border-left: 32rpx solid #cf995a
}
.ewmcode {
@@ -401,7 +401,7 @@
.share {
background: url(../../static/img/share.png) no-repeat left center;
background-size: 21rpx;
- background-color: #EF9525;
+ background-color: #cf995a;
background-position: 18rpx;
padding: 7rpx 20rpx;
padding-left: 46rpx;
@@ -418,7 +418,7 @@
}
.stars {
- color: #EF9525;
+ color: #cf995a;
margin-right: 12rpx
}
diff --git a/pages/order/parkorder.vue b/pages/order/parkorder.vue
index 45ca769..43cc05f 100644
--- a/pages/order/parkorder.vue
+++ b/pages/order/parkorder.vue
@@ -1,7 +1,7 @@
-
@@ -165,7 +165,7 @@
}
.fbtn {
- background: #EF9525;
+ background: #cf995a;
border-radius: 8rpx;
font-size: 24rpx;
color: #FFFFFF;
@@ -226,7 +226,7 @@
}
.orderBoxStatus {
- background: #EF9525;
+ background: #cf995a;
border-top-right-radius: 16rpx;
border-bottom-left-radius: 16rpx;
font-size: 24rpx;
diff --git a/pages/order/parkorderinfo.vue b/pages/order/parkorderinfo.vue
index a74d48a..5829bec 100644
--- a/pages/order/parkorderinfo.vue
+++ b/pages/order/parkorderinfo.vue
@@ -117,7 +117,7 @@
}
.fbtn {
- background: #EF9525;
+ background: #cf995a;
border-radius: 8rpx;
font-size: 24rpx;
color: #FFFFFF;
@@ -174,7 +174,7 @@
}
.orderBoxStatus {
- background: #EF9525;
+ background: #cf995a;
border-top-right-radius: 16rpx;
border-bottom-left-radius: 16rpx;
font-size: 24rpx;
@@ -253,7 +253,7 @@
.share {
background: url(../../static/img/share.png) no-repeat left center;
background-size: 21rpx;
- background-color: #EF9525;
+ background-color: #cf995a;
background-position: 18rpx;
padding: 7rpx 20rpx;
padding-left: 46rpx;
@@ -270,7 +270,7 @@
}
.stars {
- color: #EF9525;
+ color: #cf995a;
margin-right: 12rpx
}
diff --git a/pages/order/visitorder.vue b/pages/order/visitorder.vue
index 2e33745..49292bf 100644
--- a/pages/order/visitorder.vue
+++ b/pages/order/visitorder.vue
@@ -1,7 +1,7 @@
-
@@ -140,7 +140,7 @@
}
.fbtn {
- background: #EF9525;
+ background: #cf995a;
border-radius: 8rpx;
font-size: 24rpx;
color: #FFFFFF;
@@ -210,7 +210,7 @@
}
.orderBoxStatus {
- background: #EF9525;
+ background: #cf995a;
border-top-right-radius: 16rpx;
border-bottom-left-radius: 16rpx;
font-size: 24rpx;
diff --git a/pages/order/visitorderinfo.vue b/pages/order/visitorderinfo.vue
index 12c79aa..d6a93e9 100644
--- a/pages/order/visitorderinfo.vue
+++ b/pages/order/visitorderinfo.vue
@@ -254,7 +254,7 @@
}
.fbtn {
- background: #EF9525;
+ background: #cf995a;
border-radius: 8rpx;
font-size: 24rpx;
color: #FFFFFF;
@@ -324,7 +324,7 @@
}
.orderBoxStatus {
- background: #EF9525;
+ background: #cf995a;
border-top-right-radius: 16rpx;
border-bottom-left-radius: 16rpx;
font-size: 24rpx;
@@ -356,7 +356,7 @@
.p0 {
padding-top: 0;
- border-left: 32rpx solid #ef9525
+ border-left: 32rpx solid #cf995a
}
.ewmcode {
@@ -431,7 +431,7 @@
.share {
background: url(../../static/img/share.png) no-repeat left center;
background-size: 21rpx;
- background-color: #EF9525;
+ background-color: #cf995a;
background-position: 18rpx;
padding: 7rpx 20rpx;
padding-left: 46rpx;
@@ -448,7 +448,7 @@
}
.stars {
- color: #EF9525;
+ color: #cf995a;
margin-right: 12rpx
}
diff --git a/pages/park/book.vue b/pages/park/book.vue
index 047db96..b95fcb1 100644
--- a/pages/park/book.vue
+++ b/pages/park/book.vue
@@ -8,7 +8,7 @@
-
+
{{selectInfo}}
@@ -26,10 +26,10 @@
-
+
请认真阅读、知悉并遵守《本馆停车须知》
+ style="color: #cf995a;">《本馆停车须知》
@@ -67,7 +67,7 @@
+ color="#cf995a">
{{$u.timeFormat(new Date(item.date), 'mm月dd日')}}
@@ -84,7 +84,7 @@
+ color="#cf995a">
活动时间：{{item.activity.start_time}}
@@ -102,7 +102,7 @@
mode="center" width="600rpx" height="150rpx">
-
+
您已经预约成功
即将跳转到车位预约 {{time}} s
@@ -419,7 +419,7 @@
.box-tipbtn {
font-size: 24rpx;
text-decoration: underline;
- color: #EF9525;
+ color: #cf995a;
}
.box-content {
@@ -471,7 +471,7 @@
.pinkBtn {
width: 50%;
- background-image: linear-gradient(45deg, #EF9525 0%, #EF9525 100%);
+ background-image: linear-gradient(45deg, #cf995a 0%, #cf995a 100%);
border-radius: 44rpx;
font-size: 30rpx;
font-weight: 500;
diff --git a/pages/park/index.vue b/pages/park/index.vue
index 613b1e9..c1a4d9f 100644
--- a/pages/park/index.vue
+++ b/pages/park/index.vue
@@ -87,7 +87,7 @@
-
选择信息：{{selectInfo.info||"暂未选择"}}
@@ -115,7 +115,7 @@
+ :color="(item.checked?'#cf995a':'#828282')">
{{$u.timeFormat(new Date(item.date), 'mm月dd日')}}
@@ -132,7 +132,7 @@
+ :color="(item.checked?'#cf995a':'#828282')">
活动时间：{{item.activity.start_time}}
@@ -355,7 +355,7 @@
position: absolute;
right: 0;
top: 0;
- background: #EF9525;
+ background: #cf995a;
border-top-right-radius: 5rpx;
border-bottom-left-radius: 5rpx;
font-size: 20rpx;
@@ -372,7 +372,7 @@
.parkbox-item-on {
background: #FCF6E3 !important;
- border: 2rpx solid #EF9525 !important;
+ border: 2rpx solid #cf995a !important;
}
.parkbox-content {
@@ -389,7 +389,7 @@
display: flex;
justify-content: center;
font-size: 26rpx;
- color: #EF9525;
+ color: #cf995a;
box-sizing: border-box;
}
diff --git a/pages/success/success.vue b/pages/success/success.vue
index cf71d0f..d9c110b 100644
--- a/pages/success/success.vue
+++ b/pages/success/success.vue
@@ -2,7 +2,7 @@
-
+
您已经{{option}}成功
即将跳转到{{tips}} {{time}} s
@@ -109,7 +109,7 @@
.pinkBtn {
width: 670rpx;
height: 88rpx;
- background-image: linear-gradient(45deg, #EF9525 0%, #EF9525 100%);
+ background-image: linear-gradient(45deg, #cf995a 0%, #cf995a 100%);
border-radius: 44rpx;
font-size: 36rpx;
font-weight: 500;
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index b1dcc3d..25631d0 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -36,7 +36,7 @@
日期
-
+
@@ -72,7 +72,7 @@
预约须知
-
+
@@ -85,7 +85,7 @@
-
@@ -152,13 +152,13 @@
@@ -254,10 +254,10 @@
-
-
+
@@ -290,7 +290,7 @@
- 下载模版
+ 下载模版
@@ -304,7 +304,7 @@
mode="center" width="600rpx" height="150rpx">
-
+
您已经预约成功
即将跳转到参观预约 {{time}} s
@@ -329,7 +329,7 @@
+ color="#cf995a" round="20" defaultDate="2022-02-15" @confirm="handleSelectDate" @close="closecalendar">
@@ -1207,7 +1207,7 @@
.box-button {
display: flex;
background: #FCF6E3;
- border: 1px solid #EF9525;
+ border: 1px solid #cf995a;
border-radius: 5px;
padding: 20rpx 0rpx;
width: 100%;
@@ -1304,7 +1304,7 @@
.pinkBtn {
width: 50%;
- background-image: linear-gradient(45deg, #EF9525 0%, #EF9525 100%);
+ background-image: linear-gradient(45deg, #cf995a 0%, #cf995a 100%);
border-radius: 44rpx;
font-size: 30rpx;
font-weight: 500;
diff --git a/pages/visit/teambook.vue b/pages/visit/teambook.vue
index f01daa1..dd60266 100644
--- a/pages/visit/teambook.vue
+++ b/pages/visit/teambook.vue
@@ -38,7 +38,7 @@
日期
-
+
@@ -71,7 +71,7 @@
已选：5月6日 09:00-10:00
预约须知
-
+
@@ -85,7 +85,7 @@
-
@@ -112,13 +112,13 @@
-
- ![]()
+
+ ![]()
![]()
{{item.name}}
@@ -26,21 +26,38 @@
return {
topimg: require('@/static/img/vrbg.png'),
party: require('@/static/img/party.png'),
- vrList: [{
- name: '习近平新时代中国特色社会主义思想指引下的苏州实践',
- picture: require('@/static/img/vrimg.png'),
- },
- {
- name: '习近平新时代中国特色社会主义思想指引下的苏州实践',
- picture: require('@/static/img/vrimg.png'),
- }
- ]
+ vrList: []
}
},
- onReady() {},
+ onReady() {
+
+ },
+ onLoad() {
+ this.getVr()
+ },
onShow() {},
- methods: {
-
+ methods: {
+ toVr(link){
+ uni.navigateTo({
+ url:'/pages/vr/vrpage?link='+link
+ })
+ },
+ getVr(){
+ var that = this;
+ this.util.request({
+ api: '/api/mobile/vr-exhibit/index',
+ data:{
+ page:1,
+ page_size:99,
+ },
+ utilSuccess: function(res) {
+ that.vrList = res.data
+ },
+ utilFail: function(res) {
+
+ }
+ })
+ }
}
}
@@ -66,7 +83,8 @@
margin-left: 50rpx;
display: flex;
justify-content: space-between;
- overflow: auto;
+ overflow: auto;
+ padding-right: 50rpx;
}
.vritem {
diff --git a/pages/vr/vrpage.vue b/pages/vr/vrpage.vue
index 91c70c2..745d95b 100644
--- a/pages/vr/vrpage.vue
+++ b/pages/vr/vrpage.vue
@@ -1,8 +1,28 @@
-
+
+
+