diff --git a/compoents/addressAdd.vue b/compoents/addressAdd.vue
index 71525ad..f66f060 100644
--- a/compoents/addressAdd.vue
+++ b/compoents/addressAdd.vue
@@ -27,7 +27,7 @@
设为默认
-
+
@@ -26,12 +26,17 @@
-
+
+
+
+ {{itemShow}}
+
+
@@ -44,7 +49,6 @@
- 售价
{{item.price/100}}
立即预定
@@ -118,23 +122,21 @@
},
'/api/Scenic/getScenicByType').then(res => {
let resData = res.data || []
- resData.forEach(v=>{
- // todo
- // v.product_data = [{"title":"住","intro":"[{\"title\":\"叠翠楼/浴霞楼园景标准客房1间\",\"unit\":\"1晚\"}]"},{"title":"食","intro":"[{\"title\":\"次日健康自助早餐/套餐\",\"unit\":\"2份\"}]"},{"title":"游","intro":"[{\"title\":\"江南第一楼雕花楼游览券\",\"unit\":\"2张\"},{\"title\":\"山麓园林启园游览券\",\"unit\":\"2张\"},{\"title\":\"苏州小镰仓\",\"unit\":\"2份\"}]"},{"title":"享","intro":"[{\"title\":\"健身房\",\"unit\":\"免费\"},{\"title\":\"亲子乐园\",\"unit\":\"免费\"}]"}]
- v.product_data_show = []
- if (v.product_data) {
- try{
- v.product_data.forEach(x=>{
- let [title,intro] = Object.entries(x)[0]
- intro = JSON.parse(intro)
- v.product_data_show.push({title: title, intro:intro})
- })
- } catch (e) {
- console.log(v)
- }
- }
- })
- console.log(resData)
+ // resData.forEach(v=>{
+ // v.product_data_show = []
+ // if (v.product_data) {
+ // try{
+ // v.product_data.forEach(x=>{
+ // let [title,intro] = Object.entries(x)[0]
+ // intro = JSON.parse(intro)
+ // v.product_data_show.push({title: title, intro:intro})
+ // })
+ // } catch (e) {
+ // console.log(v)
+ // }
+ // }
+ // })
+ // console.log(resData)
this.list = [...this.list, ...resData];
if (res.data.length < 10) {
this.finished = true
@@ -230,14 +232,14 @@
}
.type.active{
color: #FFFFFF;
- background: #248BAA;
+ background: #515150;
}
}
.goodItem{
width: 100%;
- height: 400rpx;
+ height: 314rpx;
background: #FFFFFF;
margin-bottom: 26rpx;
border-radius: 13rpx;
@@ -309,12 +311,12 @@
font-family: PingFang SC;
font-weight: bold;
font-size: 38rpx;
- color: #F02A2A;
+ color: #C3282E;
display: inline-block;
}
.price::before{
content: '¥';
- color: #F02A2A;
+ color: #C3282E;
font-size: 24rpx;
}
.price::after{
@@ -329,7 +331,7 @@
.order-btn{
width: 147rpx;
height: 53rpx;
- background: linear-gradient(-90deg, #EA280F, #FC5109, #FC930A);
+ background: #C3282E;
border-radius: 27rpx;
font-weight: bold;
font-size: 28rpx;
@@ -386,4 +388,22 @@
}
}
}
+ .tag-label{
+ width: 100%;
+ display: flex;
+ flex-wrap: nowrap;
+ overflow-x: auto;
+ margin-bottom: 34rpx;
+
+ .tag-item{
+ padding: 3rpx 15rpx;
+ border-radius: 19rpx 18rpx 18rpx 19rpx;
+ border: 1px solid #515150;
+ font-weight: 500;
+ font-size: 25rpx;
+ color: #515150;
+ flex-shrink: 0;
+ margin-right: 14rpx;
+ }
+ }
\ No newline at end of file
diff --git a/subPackages/hotelHomestay/order.vue b/subPackages/hotelHomestay/order.vue
index 192a8af..c15cc7d 100644
--- a/subPackages/hotelHomestay/order.vue
+++ b/subPackages/hotelHomestay/order.vue
@@ -6,7 +6,7 @@
{{skuInfo.title}}
房型信息
-
+
@@ -34,7 +34,7 @@
-
+
订单确认后,您在{{new Date(selectDate.startDay).Format('yyyy年MM月dd日')}}20:00前之免费取消或 变更订单,20:00后将收取30%房费作为违约费用。
@@ -44,7 +44,7 @@
-
+
证件要求:大陆居民身份证登记入住
@@ -107,7 +107,6 @@
合计:
{{ total() }}
-
立即预订
@@ -518,7 +517,7 @@
}
.notice-container{
- background:#E4F1F5;
+ background:#F2F2F2;
border-radius: 13rpx;
font-family: PingFang SC;
font-weight: 500;
@@ -545,7 +544,7 @@
}
}
.cal-day{
- background: #E4F1F5;
+ background: #F2F2F2;
border-radius: 17rpx;
padding: 5rpx 16rpx;
font-family: PingFang SC;
@@ -601,7 +600,7 @@
.btn {
width: 294rpx;
height: 88rpx;
- background: linear-gradient(-90deg, #FC5109, #FC930A);
+ background: #C3282E;
border-radius: 43rpx;
text-align: center;
line-height: 88rpx;
@@ -626,19 +625,14 @@
font-size: 36rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
- color: #F84A56;
+ color: #C3282E;
&:before {
content: '¥';
display: inline-block;
- color: #F84A56;
+ color: #C3282E;
font-size: 36rpx;
}
}
- .post-text {
- margin-left: 15rpx;
- color: #fc5109;
- font-size: 24rpx;
- }
}
}
@@ -689,7 +683,7 @@
.ctrl {
width: 47rpx;
height: 47rpx;
- background: #248BAA;
+ background: #515150;
border-radius: 50%;
font-family: PingFang SC;
font-weight: 400;
@@ -731,7 +725,7 @@
display: block;
width: 153rpx;
height: 40rpx;
- background: #EE3E3B;
+ background: #C3282E;
border-radius: 9rpx;
font-weight: 500;
font-size: 24rpx;
diff --git a/subPackages/hotelHomestay/policy.vue b/subPackages/hotelHomestay/policy.vue
index 37597f7..57a6981 100644
--- a/subPackages/hotelHomestay/policy.vue
+++ b/subPackages/hotelHomestay/policy.vue
@@ -8,7 +8,7 @@
联系电话:{{info.tel}}
-
+
diff --git a/subPackages/hotelHomestay/selectCalendar.vue b/subPackages/hotelHomestay/selectCalendar.vue
index f4299d7..913be73 100644
--- a/subPackages/hotelHomestay/selectCalendar.vue
+++ b/subPackages/hotelHomestay/selectCalendar.vue
@@ -4,7 +4,7 @@
+ @callback="getDate" :transition="'slide'" :theme-color="'#515150'" />
确定
@@ -59,7 +59,7 @@
.btn {
width: 697rpx;
height: 80rpx;
- background: #248BAA;
+ background: #C3282E;
border-radius: 40rpx;
line-height: 80rpx;
font-size: 36rpx;
diff --git a/subPackages/order/orderCoupon.vue b/subPackages/order/orderCoupon.vue
index 55a31f5..3b3d75d 100644
--- a/subPackages/order/orderCoupon.vue
+++ b/subPackages/order/orderCoupon.vue
@@ -24,7 +24,7 @@
{{item.open_time.slice(0,10)}}-{{item.end_time.slice(0,10)}}可用
-
+
@@ -292,7 +292,7 @@
.coupon-item .item-top .price {
font-size: 25rpx;
font-weight: bold;
- color: #FC5209;
+ color: #C3282E;
display: flex;
align-items: baseline;
justify-content: center;
@@ -306,7 +306,7 @@
.top-left .subtitle {
width: 100%;
font-size: 24rpx;
- color: #FC5209;
+ color: #C3282E;
padding-left: 6rpx;
overflow: hidden;
white-space: nowrap;
@@ -340,12 +340,12 @@
.item-bottom .use {
width: 133rpx;
height: 47rpx;
- border: 1px solid #FC5209;
+ border: 1px solid #C3282E;
border-radius: 23rpx;
text-align: center;
font-size: 25rpx;
font-weight: 500;
- color: #fc5209;
+ color: #C3282E;
line-height: 47rpx;
}
.coupon-list{
@@ -390,7 +390,7 @@
.sure {
width: 250rpx;
height: 80rpx;
- background: linear-gradient(270deg, #FC6712, #FD9526);
+ background: #C3282E;
color: #fff;
font-size: 32rpx;
font-weight: bold;
diff --git a/subPackages/search/search.vue b/subPackages/search/search.vue
index f9e3b3d..359c961 100644
--- a/subPackages/search/search.vue
+++ b/subPackages/search/search.vue
@@ -95,7 +95,7 @@
width: 697rpx;
height: 68rpx;
margin: 34rpx auto;
- border-radius: 13rpx;
+ border-radius: 33rpx;
padding: 6rpx 7rpx 6rpx 26rpx;
font-size: 26rpx;
display: flex;
@@ -119,8 +119,8 @@
}
.search-box .btn {
- background: #248BAA;
- border-radius: 7rpx;
+ background: #515150;
+ border-radius: 27rpx;
font-size: 28rpx;
color: #FFFFFF;
padding: 10rpx 26rpx;
diff --git a/subPackages/search/searchList.vue b/subPackages/search/searchList.vue
index c89a131..5200986 100644
--- a/subPackages/search/searchList.vue
+++ b/subPackages/search/searchList.vue
@@ -102,7 +102,7 @@
},
{
id: 'line',
- name: '特色体验'
+ name: '线路'
},
{
id: 'article',
@@ -203,7 +203,7 @@
width: 697rpx;
height: 68rpx;
margin: 34rpx auto 20rpx;
- border-radius: 13rpx;
+ border-radius: 33rpx;
padding: 6rpx 7rpx 6rpx 26rpx;
font-size: 26rpx;
display: flex;
@@ -227,8 +227,8 @@
}
.search-box .btn {
- background-color: #248BAA;
- border-radius: 7rpx;
+ background-color: #515150;
+ border-radius: 27rpx;
font-size: 28rpx;
color: #FFFFFF;
padding: 10rpx 26rpx;
@@ -372,7 +372,7 @@
right: 0;
bottom: 1rpx;
height: 4rpx;
- background: #248BAA;
+ background: #515150;
border-radius: 2rpx;
}
}
diff --git a/subPackages/techan/detail.vue b/subPackages/techan/detail.vue
index 8458b35..04f705a 100644
--- a/subPackages/techan/detail.vue
+++ b/subPackages/techan/detail.vue
@@ -60,7 +60,7 @@
-
@@ -90,7 +90,7 @@
-
@@ -498,11 +498,11 @@
font-family: PingFangSC;
padding: 8rpx 16rpx;
flex-shrink: 0;
- background: #EAF6F9;
+ border:1px solid #515150;
border-radius: 11rpx;
font-weight: 500;
font-size: 24rpx;
- color: #248BAA;
+ color: #515150;
}
}
@@ -687,7 +687,7 @@
.btn-buy {
width: 293rpx;
height: 78rpx;
- background: linear-gradient(-90deg, #FC5109, #FC930A);
+ background: #C3282E;
border-radius: 40rpx;
text-align: center;
line-height: 78rpx;
@@ -779,7 +779,7 @@
.botProducts {
// border: 1rpx solid #00AAFF;
// background-color: rgba(254, 180, 25, 1);
- background: #248BAA;
+ background: #515150;
color: #FFFFFF;
}
@@ -896,16 +896,18 @@
line-height: 77rpx;
text-align: center;
display: flex;
+
.left-btn-buy{
width: 207rpx;
height: 77rpx;
- background: #FD910A;
+ color: #C3282E;
border-radius: 39rpx 0rpx 0rpx 39rpx;
+ border: 1px solid #C3282E;
}
.right-btn-buy{
width: 207rpx;
height: 77rpx;
- background: #FC5409;
+ background: #C3282E;
border-radius: 0rpx 39rpx 39rpx 0rpx;
}
}
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index 48aa0e0..8a9ecea 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -197,7 +197,7 @@
取消
{{addressTitle}}
- 保存
+ 保存
@@ -458,11 +458,16 @@ export default {
// 总价
total() {
let price = 0
- let postPrice = this.info.is_post == 2?0:this.post
+ let postPrice = 0
let allPrice = 0
+
+
if (this.info && Array.isArray(this.info.goods)) {
this.info.goods.forEach(v=>{
allPrice += v.skuInfo.money*v.skuInfo.buyNum
+ if (this.info.is_post == 1) {
+ postPrice+=v.post
+ }
})
}
this.allprice = allPrice + postPrice
@@ -870,7 +875,7 @@ view {
.ctrl {
width: 47rpx;
height: 47rpx;
- background: #248BAA;
+ background: #515150;
border-radius: 50%;
font-family: PingFang SC;
font-weight: 400;
@@ -899,7 +904,7 @@ view {
.btn {
width: 294rpx;
height: 88rpx;
- background: linear-gradient(-90deg, #FC5109, #FC930A);
+ background: #C3282E;
border-radius: 43rpx;
text-align: center;
line-height: 88rpx;
@@ -924,11 +929,11 @@ view {
font-size: 36rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
- color: #F84A56;
+ color: #C3282E;
&:before {
content: '¥';
display: inline-block;
- color: #F84A56;
+ color: #C3282E;
font-size: 36rpx;
}
}
@@ -1055,7 +1060,7 @@ view {
font-family: PingFang SC;
font-weight: 500;
color: #ffffff;
- background: #248BAA;
+ background: #515150;
}
}
@@ -1124,7 +1129,7 @@ view {
}
.popup-item.active{
- background-image: linear-gradient(135deg, #9EE4FE, #7FD491);
+ background: #515150;
}
}
@@ -1287,7 +1292,7 @@ view {
.sendwayArea{
margin: 26rpx;
display: flex;
- border: 1px solid #248BAA;
+ border: 1px solid #515150;
border-radius: 13rpx;
width: fit-content;
background-color: white;
@@ -1323,7 +1328,7 @@ view {
display: block;
width: 153rpx;
height: 40rpx;
- background: #EE3E3B;
+ background: #C3282E;
border-radius: 9rpx;
font-weight: 500;
font-size: 24rpx;
diff --git a/subPackages/techan/selfPickUpPoint.vue b/subPackages/techan/selfPickUpPoint.vue
index ad1aaa2..a083c53 100644
--- a/subPackages/techan/selfPickUpPoint.vue
+++ b/subPackages/techan/selfPickUpPoint.vue
@@ -11,7 +11,7 @@
-
+
去这里
@@ -171,7 +171,7 @@
width:140rpx;
flex-shrink: 0;
border-left: 1px solid #D8D8D8;
- color: #248BAA;
+ color: #515150;
display: flex;
flex-direction: column;
align-items: center;
@@ -184,7 +184,7 @@
}
}
.item-bg.active{
- background: #248BAA;
+ background: #515150;
}
.name {
display: flex;
diff --git a/subPackages/techan/techanList.vue b/subPackages/techan/techanList.vue
index ad78484..8cb61ba 100644
--- a/subPackages/techan/techanList.vue
+++ b/subPackages/techan/techanList.vue
@@ -5,11 +5,11 @@
-
+
自提专区
-
+
邮寄专区
@@ -33,7 +33,7 @@
立即购买
-
+
@@ -49,7 +49,7 @@
-
+
@@ -401,8 +401,8 @@
.price {
font-size: 34.67rpx;
font-family: PingFangSC;
- font-weight: bold;
- color: #D60000;
+ // font-weight: bold;
+ color: #C3282E;
}
.price::before {
content: '¥';
@@ -418,7 +418,7 @@
.buy {
width: 140rpx;
height: 42rpx;
- background: linear-gradient(-90deg, #FC5109, #FC930A);
+ background: #C3282E;
border-radius: 21rpx;
text-align: center;
line-height: 42rpx;
@@ -448,7 +448,7 @@
padding: 4rpx;
background: #EAF6F9;
border-radius: 13rpx;
- border: 1px solid #248BAA;
+ border: 1px solid #525251;
display: flex;
.type{
@@ -459,7 +459,7 @@
border-radius: 13rpx;
font-weight: 500;
font-size: 28rpx;
- color: #248BAA;
+ color: #525251;
display: flex;
align-items: center;
justify-content: center;
@@ -471,7 +471,7 @@
}
.type.active{
color: #FFFFFF;
- background: #248BAA;
+ background: #525251;
}
}
@@ -499,7 +499,7 @@
content: '';
width: 67rpx;
height: 5rpx;
- background: #248BAA;
+ background: #525251;
border-radius: 3rpx;
position: absolute;
bottom: 0;
@@ -530,7 +530,7 @@
font-family: PingFang SC;
font-weight: bold;
font-size: 27rpx;
- color: #F84A56;
+ color: #C3282E;
padding: 0 33rpx;
.bottom-price-yuan{
font-size: 40rpx;
@@ -555,7 +555,7 @@
.btn-buy {
width: 254rpx;
height: 78rpx;
- background: linear-gradient(-90deg, #FC5109, #FC930A);
+ background: #C3282E;
border-radius: 40rpx;
text-align: center;
line-height: 78rpx;
@@ -647,7 +647,7 @@
.botProducts {
// border: 1rpx solid #00AAFF;
// background-color: rgba(254, 180, 25, 1);
- background: #248BAA;
+ background: #525251;
color: #FFFFFF;
}
diff --git a/subPackages/ticketBooking/detail.vue b/subPackages/ticketBooking/detail.vue
index 2c219b5..31dc503 100644
--- a/subPackages/ticketBooking/detail.vue
+++ b/subPackages/ticketBooking/detail.vue
@@ -57,7 +57,7 @@
-
+
去这里
@@ -71,14 +71,14 @@
+ activeColor='#12293C' :min='0' :max='currentAudio.video_length.toFixed(0)' :value='currentAudio.currentTime.toFixed(0)' :step='0.1'>
{{getTime(Math.round(currentAudio.video_length))}}
-
-
+
+
@@ -97,7 +97,7 @@
-
+
预订须知 >
@@ -109,7 +109,7 @@
{{showNoPriceNew(itemSku.price)}}
- 预订
+ 购买
@@ -759,21 +759,21 @@
font-family: PingFangSC;
font-weight: 500;
font-size: 36rpx;
- color: #EE3E3B;
+ color: #C3282E;
}
.price::before {
display: inline-block;
content: "¥";
font-size: 24rpx;
font-weight: 500;
- color: #EE3E3B;
+ color: #C3282E;
}
.btn {
margin-top: 20rpx;
width: 133rpx;
height: 53rpx;
- background: linear-gradient(-90deg, #FC5109, #FC930A);
+ background: #C3282E;
border-radius: 27rpx;
text-align: center;
line-height: 53rpx;
@@ -870,8 +870,10 @@
padding: 6rpx 0;
}
.item.active{
- background: rgba(36,139,170,0.12);
- border: 1px solid #248BAA;
+ background: #515150;
+ color: white;
+ border: 1px solid #12293C;
+ .price{color: white;}
}
.item.disabled{
color: #666;
@@ -910,8 +912,9 @@
color: #000;
}
.time-active {
- background: rgba(36,139,170,0.12);
- border: 1px solid #248BAA;
+ background: #515150;
+ color: white;
+ border: 1px solid #12293C;
}
.time-disable {
color: #666666;
@@ -950,7 +953,7 @@
.bottom-btn {
width: 250rpx;
height: 80rpx;
- background: linear-gradient(-90deg, #FC5109, #FC930A);
+ background: #C3282E;
border-radius: 40rpx;
font-size: 32rpx;
text-align: center;
@@ -977,7 +980,7 @@
justify-content: space-between;
font-weight: 500;
font-size: 20rpx;
- color: #248BAA;
+ color: #12293C;
}
.audio{
.play-icon{
@@ -995,7 +998,7 @@
color: #333 !important;
}
/deep/ .uni-calendar-item--isDay{
- background: #248BAA !important;
+ background: #12293C !important;
border-radius: 50%;
.uni-calendar-item--extra{
diff --git a/subPackages/ticketBooking/order.vue b/subPackages/ticketBooking/order.vue
index 7d25c75..10469bd 100644
--- a/subPackages/ticketBooking/order.vue
+++ b/subPackages/ticketBooking/order.vue
@@ -34,7 +34,7 @@
预订须知 >
-
+
@@ -98,7 +98,7 @@
手机号 {{person.tel}}
身份证 {{person.id_number}}
- 不符合适用人群年龄限制
+ 不符合适用人群年龄限制
-
+
出行人{{personIndex+1}}
点击填写1位出行人信息
-
+
@@ -138,7 +138,7 @@
手机号 {{skuItem.selPerson.tel}}
身份证 {{skuItem.selPerson.id_number}}
- 不符合适用人群年龄限制
+ 不符合适用人群年龄限制
-
+
出行人1
点击填写1位出行人信息
-
+
@@ -201,7 +201,7 @@