diff --git a/components/xi-waterfall/xi-waterfall.vue b/components/xi-waterfall/xi-waterfall.vue index 251ecdc..4a67b00 100644 --- a/components/xi-waterfall/xi-waterfall.vue +++ b/components/xi-waterfall/xi-waterfall.vue @@ -4,20 +4,14 @@ - - - - + {{ item.title }} - - - - + {{ item.title }} diff --git a/pages.json b/pages.json index c2c1568..64d8a93 100644 --- a/pages.json +++ b/pages.json @@ -92,7 +92,6 @@ } }, - { "path": "method/methodlist/methodlist", "style": { @@ -183,7 +182,8 @@ { "path": "personcenter/aboutus", "style": { - "navigationBarTitleText": "关于我们" + "navigationBarTitleText": "关于我们", + "navigationBarBackgroundColor": "transparent" } }, { diff --git a/static/ancss/an.css b/static/ancss/an.css index be2f755..4917fa6 100644 --- a/static/ancss/an.css +++ b/static/ancss/an.css @@ -839,7 +839,7 @@ s首页菜单 box-sizing: border-box; padding: 30rpx 20rpx; width: 100%; - color: #969696; + color: #999; text-align: center; font-size: 28rpx; } @@ -1163,11 +1163,11 @@ s首页菜单 } .h_define_cont { - max-height: 510rpx; + position: relative; - overflow: hidden; - text-overflow: ellipsis; - white-space: pre-wrap; + /*overflow: hidden;*/ + /*text-overflow: ellipsis;*/ + /*white-space: pre-wrap;*/ -webkit-box-orient: vertical; -webkit-line-clamp: 10; display: -webkit-box; @@ -2411,13 +2411,13 @@ s首页菜单 .myd1_jd, .sell_jd { - color: #969696; + color: #999; font-size: 28rpx; line-height: 40rpx; } .price_jd { - color: #969696; + color: #999; font-size: 24rpx; line-height: 40rpx; } diff --git a/subPageA/food/fooddetial/fooddetial.css b/subPageA/food/fooddetial/fooddetial.css index 0412667..18d2018 100644 --- a/subPageA/food/fooddetial/fooddetial.css +++ b/subPageA/food/fooddetial/fooddetial.css @@ -18,14 +18,16 @@ .ms_warp .fod_shop_list:last-child{ box-shadow: none !important; } /* 控制内容显示 */ -.h_define_cont{max-height: 510rpx; position: relative; overflow: hidden;text-overflow: ellipsis; - white-space: pre-wrap; +.h_define_cont{ position: relative; + /*overflow: hidden;*/ + /*text-overflow: ellipsis;*/ + /*white-space: pre-wrap;*/ -webkit-box-orient: vertical; -webkit-line-clamp: 10; display: -webkit-box; } .hide{ display: none -} +} .nr_hide{ position: absolute; z-index: 6; bottom: 0; width: 100%; background:linear-gradient( top, rgba(255,255,255,.8), rgba(255,255,255,1)) ; height: 100rpx; line-height: 100rpx; text-align: center; font-size: 30rpx; color: #555;} -.pic_fod_duo{ width: 40rpx; height: 40rpx; display: inline-block; margin-left: 10rpx; position: relative; top:10rpx} \ No newline at end of file +.pic_fod_duo{ width: 40rpx; height: 40rpx; display: inline-block; margin-left: 10rpx; position: relative; top:10rpx} diff --git a/subPageA/food/fooddetial/fooddetial.vue b/subPageA/food/fooddetial/fooddetial.vue index 25f7a97..f59b206 100644 --- a/subPageA/food/fooddetial/fooddetial.vue +++ b/subPageA/food/fooddetial/fooddetial.vue @@ -8,8 +8,10 @@ {{ foodDetail.title }} - + + +