diff --git a/pages/index/index.vue b/pages/index/index.vue
index e46e36f..96ad463 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,11 +1,11 @@
-
-
+
@@ -14,38 +14,76 @@
-
-
-
-
-
-
-
+
+
+
+
+
+ 全城导览
+
+
+
+
+
+ 游玩攻略
+
-
-
+
+
+
+ 品质住宿
+
-
-
+
+
+
+ 特色美食
+
-
-
+
+
+
+ 名俗文化
+
-
-
+
+
+
+ 导游讲解
+
-
-
+
+
+
+ 智慧停车
+
-
-
+
+
+
+ 名优特产
+
+
+
+
+
+
+ 景区门票
+
+
+
+
+
+
+ 投诉意见
+
@@ -70,13 +108,10 @@
-
-
+
+
-
+
{{formatGonggaoTitle(ggobj[0] && ggobj[0].title)}}
@@ -84,45 +119,83 @@
-
-
-
+
+
+
+
+ 全城导览
+
-
-
+
+
+
+
+ 景区门票
+
+
+
+
+
+ 游玩攻略
+
-
-
+
+
+
+ 品质住宿
+
-
-
+
+
+
+ 特色美食
+
-
-
+
+
+
+ 名俗文化
+
-
-
+
+
+
+ 导游讲解
+
-
-
+
+
+
+ 智慧停车
+
-
-
+
+
+
+ 名优特产
+
+
+
+
+
+
+ 投诉意见
+
-
+
@@ -153,7 +226,8 @@
-
+
+ 热门推荐
@@ -185,11 +259,13 @@
-
+
+
-
-
+ -->
+ 更多
@@ -203,9 +279,11 @@
-
+
+
- 攻略推荐
+ 更多
+
@@ -797,6 +875,14 @@
uni.navigateTo({
url:'/page_user/techan/index'
})
+ }else if(num == 11){
+ uni.navigateTo({
+ url:'/page_fenbao/remen'
+ })
+ }else if(num == 22){
+ uni.navigateTo({
+ url:'/page_user/caozuo/tousu'
+ })
}
},
// 点击攻略跳转到攻略详情
@@ -977,7 +1063,7 @@
border-radius: 0 !important;
}
page {
- background: #E5F9F3;
+ background: #FDFDF9;
border-radius: 0rpx 0rpx 0rpx 0rpx;
position: fixed;
top: 0;
@@ -1123,7 +1209,7 @@
flex-shrink: 0;
min-width: 120rpx;
text-align: center;
- transition: all 0.3s;
+ // transition: all 0.3s;
position: relative;
padding: 10rpx 20rpx;
background-repeat: no-repeat;
@@ -1131,7 +1217,7 @@
color: #05895D;
font-weight: 700;
font-size: 32rpx;
- background-image: url('/static/image/two.png');
+ background-image: url('/static/image/tt.png');
background-size: contain;
background-position: right center;
padding-top: 20rpx;
@@ -1251,7 +1337,7 @@
flex-shrink: 0;
min-width: 120rpx;
text-align: center;
- transition: all 0.3s;
+ // transition: all 0.3s;
position: relative;
padding: 10rpx 20rpx;
background-repeat: no-repeat;
@@ -1259,8 +1345,8 @@
color: #05895D;
font-weight: 700;
font-size: 32rpx;
- background-image: url('/static/image/one.png');
- background-size: 80rpx 60rpx;
+ background-image: url('/static/image/tt.png');
+ background-size: contain;
background-position: right center;
}
}
@@ -1279,15 +1365,16 @@
.meishirt {
width: 352rpx;
height: 514rpx;
- background: #F7B782;
+ // background: #F7B782;
border-radius: 10rpx 10rpx 10rpx 10rpx;
+ padding-top: 20rpx;
.mieshilist {
width: 342rpx;
height: 456rpx;
- background: linear-gradient(153deg, #FFFFFF 20%, rgba(255, 255, 255, 0) 100%);
+ // background: linear-gradient(153deg, #FFFFFF 20%, rgba(255, 255, 255, 0) 100%);
border-radius: 10rpx 10rpx 10rpx 10rpx;
margin-top: 12rpx;
- padding-top: 22rpx;
+ padding-top: 56rpx;
.meishiitem {
display: flex;
align-items: center;
@@ -1330,16 +1417,20 @@
}
}
.meishitop {
- font-weight: 600;
- font-size: 28rpx;
- color: #664608;
- width: 100%;
+ width: 92rpx;
+ height: 38rpx;
+ background: #EBEBEB;
+ border-radius: 18rpx 18rpx 18rpx 18rpx;
+ color: #7C7C7C;
display: flex;
+ font-size: 22rpx;
align-items: center;
justify-content: space-between;
- padding: 0 24rpx;
- padding-top: 8rpx;
- box-sizing: border-box;
+ padding-left: 8rpx;
+ padding-right: 4rpx;
+ position: absolute;
+ right: 14rpx;
+ top: 10rpx;
image {
width: 32rpx;
height: 32rpx;
@@ -1349,13 +1440,14 @@
.meishilt {
width: 342rpx;
height: 514rpx;
- background: linear-gradient(41deg, #82D3F7 0%, rgba(218, 190, 255, 0) 100%);
+ // background: linear-gradient(41deg, #82D3F7 0%, rgba(218, 190, 255, 0) 100%);
border-radius: 10rpx 10rpx 10rpx 10rpx;
padding: 0 20rpx;
box-sizing: border-box;
+ padding-top: 80rpx;
.daimg {
width: 1;
- height: 278rpx;
+ height: 250rpx;
border-radius: 14rpx 14rpx 14rpx 14rpx;
margin-top: 4rpx;
margin-bottom: 14rpx;
@@ -1372,11 +1464,20 @@
}
}
.meishitop {
+ width: 92rpx;
+ height: 38rpx;
+ background: #EBEBEB;
+ border-radius: 18rpx 18rpx 18rpx 18rpx;
+ color: #7C7C7C;
display: flex;
+ font-size: 22rpx;
align-items: center;
- display: flex;
justify-content: space-between;
- width: 100%;
+ padding-left: 8rpx;
+ padding-right: 4rpx;
+ position: absolute;
+ right: 14rpx;
+ top: 10rpx;
.dibiaoimg {
width: 168rpx;
height: 54rpx;
@@ -1393,9 +1494,17 @@
padding: 0 20rpx;
box-sizing: border-box;
.rementitle {
+ font-size: 36rpx;
+ color: #153833;
+ position: relative;
+ font-weight: 600;
image {
- width: 150rpx;
- height: 102rpx;
+ width: 153rpx;
+ height: 50rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
}
}
.rmtopimg {
@@ -1504,7 +1613,7 @@
top: -40rpx;
width: 100%;
height: 440rpx;
- background-color: #E5F9F3;
+ background-color: #FDFDF9;
border-radius: 20rpx 20rpx 0 0;
overflow: hidden;
padding: 68rpx 50rpx 68rpx 60rpx;
@@ -1559,7 +1668,7 @@
display: flex;
align-items: center;
justify-content: center;
- transition: all 0.3s;
+ // transition: all 0.3s;
&:active {
background-color: rgba(255, 107, 153, 0.7);
@@ -1586,24 +1695,30 @@
.fenlei {
width: 750rpx;
height: 280rpx;
- overflow: scroll;
- background: linear-gradient(17deg, #2FC1DE 0%, #9CF1BB 62%, rgba(212, 248, 174, 1) 100%), rgba(0, 0, 0, 0.1);
+ // overflow: scroll;
+ background: #FDFDF9;
border-radius: 0rpx 0rpx 0rpx 0rpx;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 20rpx;
- gap: 30rpx;
+ gap: 10rpx;
.icon {
flex-shrink: 0;
width: 104rpx;
- height: 136rpx;
- display: flex;
- align-items: center;
- justify-content: center;
+ // height: 136rpx;
+ text-align: center;
+ // display: flex;
+ // align-items: center;
+ // justify-content: center;
image {
width: 104rpx;
- height: 136rpx;
+ height: 54rpx;
+ }
+ view{
+ margin-top: 10rpx;
+ font-size: 24rpx;
+ color: #153833;
}
}
}
@@ -1611,14 +1726,14 @@
.gonggao {
width: 670rpx;
height: 66rpx;
- background: linear-gradient( 90deg, rgba(255,255,255,0.05) 0%, rgba(255,255,255,0.5) 49.7%, rgba(255,255,255,0.05) 100%);
+ background: linear-gradient( 90deg, rgba(229,213,173,0) 0%, #fdefdb 49.7%, rgba(229,213,173,0) 100%);
// border-radius: 37rpx 37rpx 37rpx 37rpx;
display: flex;
align-items: center;
padding-left: 26rpx;
padding-right: 30rpx;
position: absolute;
- top: 26rpx;
+ top: 34rpx;
left: 50%;
transform: translateX(-50%);
z-index: 2;
@@ -1650,7 +1765,7 @@
display: flex;
align-items: center;
font-size: 28rpx;
- color: #05895D;
+ color: #8F4335;
height: 66rpx;
flex-shrink: 0;
white-space: nowrap;
@@ -1707,7 +1822,7 @@
left: 0;
z-index: 999;
margin-top: 0;
- background: linear-gradient(17deg, #2FC1DE 0%, #9CF1BB 62%, #d4f8ae 100%), rgba(0, 0, 0, 0.1);
+ background: #f3f3eb;
width: 100%;
}
diff --git a/pages/myorder/returned/index.vue b/pages/myorder/returned/index.vue
index c6860a2..982d1d7 100644
--- a/pages/myorder/returned/index.vue
+++ b/pages/myorder/returned/index.vue
@@ -4,7 +4,7 @@
title-size='36' height='36' id="navbar" :custom-back="btnfh">
-
+
diff --git a/static/image/tt.png b/static/image/tt.png
new file mode 100644
index 0000000000000000000000000000000000000000..9957b00b1c8392c25926d472f1950c1362fae6f5
GIT binary patch
literal 4199
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