diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index 0f9a539..dbd04f1 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -11,8 +11,11 @@
-
-
+
+
+
+ 福崽
+
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 0000000..9957b00
Binary files /dev/null and b/static/image/tt.png differ