Skip to content

严立 / mini-shimao

Go to a project
Commit 89084e91 by wjw
Options

ww-ui调整

parent bbb4c84b
Inline Side-by-side
Showing with 167 additions and 144 deletions
pages/commodity/home/home.wxss
......@@ -123,7 +123,7 @@
height: 64rpx;
top: 308rpx;
left: 276rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #86c5e1;
font-weight: 500;
color: #fff;
......@@ -150,7 +150,7 @@
.seeHouse {
position: absolute;
background: #86c5e1;
border-radius: 4px;
border-radius: 4rpx;
top: 294rpx;
width: 200rpx;
height: 64rpx;
......@@ -308,7 +308,7 @@ swiper {
display: block;
width: 670rpx;
height: 329rpx;
border-radius: 4px;
border-radius: 4rpx;
}
/* 能量补给站样式 */
......@@ -347,7 +347,7 @@ swiper {
display: block;
width: 670rpx;
height: 329rpx;
border-radius: 4px;
border-radius: 4rpx;
}
.reception-list-item > text {
......
pages/commodity/menu-art/menu-art.wxss
......@@ -153,7 +153,7 @@ page {
.item-price-discount {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FAEDEA;
text-align: center;
......@@ -166,7 +166,7 @@ page {
.item-price-special {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center;
......@@ -277,7 +277,7 @@ page {
width: 90rpx;
height: 36rpx;
margin-right: 16rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FAEDEA;
text-align: center;
......@@ -291,7 +291,7 @@ page {
width: 90rpx;
height: 36rpx;
margin-right: 16rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center;
......@@ -354,7 +354,7 @@ image {
position: relative;
width: 606rpx;
height: 382rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FFFFFF;
}
......
pages/commodity/menu-food/menu-food.wxss
......@@ -152,7 +152,7 @@ page {
.item-price-discount {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FAEDEA;
text-align: center;
......@@ -165,7 +165,7 @@ page {
.item-price-special {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center;
......@@ -276,7 +276,7 @@ page {
width: 90rpx;
height: 36rpx;
margin-right: 16rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FAEDEA;
text-align: center;
......@@ -290,7 +290,7 @@ page {
width: 90rpx;
height: 36rpx;
margin-right: 16rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center;
......@@ -353,7 +353,7 @@ image {
position: relative;
width: 606rpx;
height: 382rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FFFFFF;
}
......
pages/commodity/menu-snacks/menu-snacks.wxss
......@@ -153,7 +153,7 @@ page {
.item-price-discount {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FAEDEA;
text-align: center;
......@@ -166,7 +166,7 @@ page {
.item-price-special {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center;
......@@ -277,7 +277,7 @@ page {
width: 90rpx;
height: 36rpx;
margin-right: 16rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FAEDEA;
text-align: center;
......@@ -291,7 +291,7 @@ page {
width: 90rpx;
height: 36rpx;
margin-right: 16rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center;
......@@ -354,7 +354,7 @@ image {
position: relative;
width: 606rpx;
height: 382rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FFFFFF;
}
......
pages/commodity/project-detail/project-detail.wxss
......@@ -63,7 +63,7 @@
width: 78rpx;
height: 32rpx;
margin-right: 12rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FAEDEA;
font-size: 18rpx;
......@@ -75,7 +75,7 @@
.item-price-special {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
font-size: 18rpx;
......
pages/commodity/project/project.wxss
......@@ -39,7 +39,7 @@
width: 670rpx;
margin: 48rpx 40rpx 0 40rpx;
padding: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FFFFFF;
}
......@@ -123,7 +123,7 @@
width: 78rpx;
height: 32rpx;
margin: 0 0 0 8rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center;
......@@ -150,7 +150,7 @@
width: 120rpx;
height: 56rpx;
margin-top: 24rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #86C5E1;
font-size: 22rpx;
......
pages/commodity/shopping-cart/shopping-cart.wxss
......@@ -95,7 +95,7 @@
.list-item-price-main .price-discount {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FAEDEA;
text-align: center;
......@@ -108,7 +108,7 @@
.list-item-price-main .price-special {
width: 78rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center;
......@@ -137,7 +137,7 @@
height: 48rpx;
padding: 0 16rpx;
border: 1px solid #DBDFE5;
border-radius: 4px;
border-radius: 4rpx;
}
.list-item-quantity-operation text:nth-child(1) {
......
pages/home/home/home.wxml
......@@ -24,7 +24,7 @@
<view class="banner-notice login-notice row align-c" bindtap="onLogin" wx:if="{{!isLogin}}">
<view class="row align-c">
<image src="/image/wechat.png"></image>
<text>微信登陆</text>
<image src="./image/login.png"></image>
</view>
<view class="row con-b align-c">
<view class="notice-bar row con-e" bind:lintap="noticClick">
......@@ -37,7 +37,7 @@
<view class="banner-notice row align-c">
<view class="row align-c" bindtap="onNotice">
<image src="./image/inform.png"></image>
<text>最新动态</text>
<image src="./image/title-news.png"></image>
</view>
<view class="row con-b align-c">
<l-notice-bar show="{{true}}" type="swip" swip-arr="{{noticeTitles}}" speed="2000" l-class="notice-bar" bind:lintap="noticClick"></l-notice-bar>
......@@ -50,18 +50,17 @@
<view class="detail {{!isLogin ? 'login-detail' : ''}}">
<!-- 预约公告 -->
<view class="night row con-b" bindtap="onAppointmentInto">
<image src="./image/into.png" mode="aspectFit"></image>
<image src="{{resourcesBase + 'home/into.png'}}" mode="aspectFit"></image>
<view class="night-content">
<view class="night-info-title row align-c">
<image src="./image/night.png"></image>
<text>夜间入园预约</text>
<image src="./image/title-night.png"></image>
</view>
<view class="night-info-describe">
<text>20:00后入园需提前预约，每日限流200人</text>
</view>
</view>
<view class="night-info-more row align-c">
<text>去预约</text>
<image src="{{imageBase + 'more-w.png'}}"></image>
</view>
</view>
......@@ -70,9 +69,9 @@
<view class="guide detail-item" bind:tap="onGuide">
<image src="./image/title-guide.png"></image>
<view class="guide-content">
<image class="background-image" src="./image/guide.png" mode="aspectFit"></image>
<image class="background-image" src="{{resourcesBase + 'home/guide.png'}}" mode="aspectFit"></image>
<view class="operation col">
<text>探索精彩去处</text>
<image src="./image/explore.png"></image>
<button class="row con-c align-c">进入电子地图</button>
</view>
</view>
......
pages/home/home/home.wxss
......@@ -17,6 +17,7 @@
.container {
position: relative;
background: linear-gradient(#ffffff, #F2F2F2);
}
......@@ -79,16 +80,12 @@
.banner-notice image:nth-child(1) {
width: 40rpx;
height: 40rpx;
margin-right: 16rpx;
margin-right: 12rpx;
}
.banner-notice text:nth-child(2) {
width: 120rpx;
height: 42rpx;
font-size: 30rpx;
font-weight: bold;
color: #15191F;
line-height: 42rpx;
.banner-notice image:nth-child(2) {
width: 122rpx;
height: 30rpx;
}
.banner-notice text:nth-child(3) {
......@@ -100,7 +97,7 @@
line-height: 36rpx;
}
.banner-notice image:nth-child(4) {
.banner-notice image:nth-child(3) {
width: 40rpx;
height: 40rpx;
}
......@@ -108,7 +105,6 @@
.detail {
margin-top: 60rpx;
padding: 0 40rpx;
background: linear-gradient(#ffffff, #F2F2F2);
}
.login-detail {
......@@ -155,16 +151,21 @@
line-height: 42rpx;
}
.night-info-title image {
.night-info-title image:nth-child(1) {
width: 40rpx;
height: 40rpx;
margin-right: 16rpx;
margin-right: 12rpx;
}
.night-info-title image:nth-child(2) {
width: 184rpx;
height: 30rpx;
}
.night-info-describe {
margin-top: 20rpx;
font-size: 22rpx;
color: #ffffff;
color: #B8CBDC;
letter-spacing: 1rpx;
}
.night-info-more {
......@@ -196,11 +197,9 @@
padding: 48rpx 0;
}
.guide-content .operation text {
height: 40rpx;
font-size: 38rpx;
font-weight: 800;
color: #ffffff;
.guide-content .operation image {
width: 224rpx;
height: 34rpx;
}
.guide-content .operation button {
......@@ -308,8 +307,8 @@
}
.banner-image {
width: 32rpx;
height: 32rpx;
width: 32rpx !important;
height: 32rpx !important;
}
.test-button {
......
pages/login/login.wxss
......@@ -55,7 +55,7 @@
width: 558rpx;
height: 96rpx;
background: rgba(134, 197, 225, 1);
border-radius: 4px;
border-radius: 4rpx;
line-height: 96rpx;
text-align: center;
color: rgba(255, 255, 255, 1);
......
pages/mine/appointment-ticket/appointment-ticket.wxss
......@@ -100,7 +100,7 @@
width: 622rpx;
height: 96rpx;
background: rgba(134, 197, 225, 1);
border-radius: 4px;
border-radius: 4rpx;
margin-top: 72rpx;
line-height: 96rpx;
text-align: center;
......
pages/mine/appointment/appointment.wxss
......@@ -67,7 +67,7 @@
font-weight: 400;
line-height: 96rpx;
background: rgba(134, 197, 225, 1);
border-radius: 4px;
border-radius: 4rpx;
color: rgba(255, 255, 255, 1);
font-size: 30rpx;
margin: 0 auto;
......@@ -79,7 +79,7 @@
margin: auto;
margin-bottom: 50rpx;
background-color: rgb(220, 214, 220);
border-radius: 4px;
border-radius: 4rpx;
position: relative;
overflow: hidden;
}
......
pages/mine/authentication-input/authentication-input.wxss
......@@ -98,7 +98,7 @@
.form-input {
width: 510rpx;
height: 80rpx;
border-radius: 4px;
border-radius: 4rpx;
border: 1px solid rgba(200, 200, 200, 1);
font-size: 32rpx;
margin-left: 40rpx;
......@@ -109,7 +109,7 @@
width: 510rpx;
height: 80rpx;
font-size: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
border: 1px solid rgba(217, 43, 58, 1);
margin-left: 40rpx;
padding-left: 24rpx;
......
pages/mine/home/home.js
......@@ -181,7 +181,7 @@ Page({
pageSize: -1
},
success: function (res) {
console.log('that.shopConfig', that.data.shopConfig);
// console.log('that.shopConfig', that.data.shopConfig);
let list = res.data.map(item => {
let shopFilter = that.data.shopConfig.filter(k => {
......
pages/mine/home/home.wxss
.container {
background: linear-gradient(180deg, #fff 10%, #F3F4F6 20%);
min-height: 100vh;
/* background: #F3F4F6 */
}
......@@ -151,7 +152,7 @@
height: 130rpx;
margin-top: 48rpx;
padding: 24rpx 32rpx 24rpx 40rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, rgba(63, 67, 87, 1) 0%, rgba(37, 37, 50, 1) 100%);
}
......@@ -171,7 +172,7 @@
.status-operation {
width: 176rpx;
height: 52rpx;
border-radius: 4px;
border-radius: 4rpx;
/* border: 1px solid rgba(72, 53, 34, 1) !important; */
background: linear-gradient(180deg, rgba(255, 243, 227, 1) 0%, rgba(255, 227, 195, 1) 100%);
color: #282836;
......@@ -328,7 +329,7 @@
text-align: center;
margin-left: -60rpx;
z-index: -1;
border-radius: 4px;
border-radius: 4rpx;
border: 1px solid;
border-image: linear-gradient(180deg, rgba(255, 237, 215, 1), rgba(113, 95, 76, 1)) 2 2;
margin-top: 10rpx;
......@@ -660,7 +661,7 @@
width: 150rpx;
height: 70rpx;
border: 1px solid #15191f;
border-radius: 4px;
border-radius: 4rpx;
line-height: 70rpx;
text-align: center;
font-size: 26rpx;
......
pages/mine/order/order.wxss
page {
height: 100%;
min-height: 100vh;
background: #F3F4F6;
}
.fixed-tab {
......@@ -122,7 +123,6 @@ page {
width: 750rpx;
height: 100%;
padding-bottom: 120rpx;
background: #F3F4F6;
}
.order-list-item {
......@@ -164,7 +164,7 @@ page {
width: 140rpx;
height: 140rpx;
margin-right: 20rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #999999;
}
......@@ -195,7 +195,7 @@ page {
.order-list-item-operation .delete {
width: 120rpx;
height: 56rpx;
border-radius: 4px;
border-radius: 4rpx;
border: 1px solid #C2C7CF;
font-size: 22rpx;
......@@ -208,7 +208,7 @@ page {
width: 120rpx;
height: 56rpx;
margin-left: 20rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #86C5E1;
font-size: 22rpx;
......@@ -262,7 +262,7 @@ page {
width: 526rpx;
height: 666rpx;
margin-top: 56rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FFFFFF;
}
......@@ -271,7 +271,7 @@ page {
height: 96rpx;
margin-top: 56rpx;
padding: 0 24rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #F2F3F5;
}
......
pages/pay/order-detail/order-detail.wxss
......@@ -11,7 +11,7 @@
width: 670rpx;
height: 240rpx;
padding: 0 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #F3E1E1;
}
......@@ -50,7 +50,7 @@
min-height: 206rpx;
padding: 48rpx 32rpx;
background: #F3F4F6;
border-radius: 4px;
border-radius: 4rpx;
overflow: hidden;
}
......@@ -146,7 +146,7 @@
width: 606rpx;
height: 96rpx;
margin-top: 40rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #86C5E1;
font-size: 30rpx;
......@@ -181,7 +181,7 @@
width: 670rpx;
margin-top: 40rpx;
padding: 40rpx 32rpx 0 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #F3F4F6;
}
......@@ -211,7 +211,7 @@
.commodity-item-operation>button {
width: 120rpx;
height: 56rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #86C5E1;
font-size: 22rpx;
......@@ -317,7 +317,7 @@
width: 526rpx;
height: 666rpx;
margin-top: 56rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FFFFFF;
}
......@@ -326,7 +326,7 @@
height: 96rpx;
margin-top: 56rpx;
padding: 0 24rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #F2F3F5;
}
......
pages/pay/order-input/order-input.wxss
......@@ -47,7 +47,7 @@
}
.buy-content {
border-radius: 4px;
border-radius: 4rpx;
}
/* 购买内容 - pass */
......@@ -55,7 +55,7 @@
position: relative;
width: 670rpx;
height: 356rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #808080;
}
......@@ -104,7 +104,7 @@
width: 670rpx;
height: 216rpx;
padding: 0 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #F5F6F8;
}
......@@ -113,7 +113,7 @@
width: 140rpx;
height: 140rpx;
margin-right: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #808080;
}
......@@ -152,7 +152,7 @@
height: 216rpx;
margin-top: 40rpx;
padding: 0 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #F5F6F8;
}
......@@ -161,7 +161,7 @@
width: 140rpx;
height: 140rpx;
margin-right: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #808080;
}
......@@ -211,7 +211,7 @@
width: 670rpx;
height: 280rpx;
padding: 0 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #F5F6F8;
}
......@@ -219,7 +219,7 @@
display: block;
width: 150rpx;
height: 200rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #808080;
}
......@@ -271,7 +271,7 @@
.shopping-cart-list {
width: 670rpx;
margin-top: 40rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #F5F6F8;
}
......@@ -287,7 +287,7 @@
display: block;
width: 140rpx;
height: 140rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #808080;
}
......@@ -386,7 +386,7 @@
width: 670rpx;
height: 80rpx;
margin-top: 16rpx;
border-radius: 4px;
border-radius: 4rpx;
border: 1px solid #DBDFE5;
}
......@@ -422,7 +422,7 @@
width: 670rpx;
height: 80rpx;
margin-top: 40rpx;
border-radius: 4px;
border-radius: 4rpx;
border: 1px solid #DBDFE5;
}
......@@ -518,7 +518,7 @@
height: 80rpx;
margin: 16rpx 0 8rpx 0;
padding: 0 24rpx;
border-radius: 4px;
border-radius: 4rpx;
border: 1px solid #DBDFE5;
font-size: 30rpx;
......@@ -554,7 +554,7 @@
height: 72rpx;
margin-top: 40rpx;
padding: 0 40rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #F5EEDF;
font-size: 22rpx;
......@@ -632,7 +632,7 @@
.pay-operation-confirm {
width: 248rpx;
height: 96rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #86C5E1;
text-align: center;
......@@ -659,7 +659,7 @@
width: 670rpx;
height: 96rpx;
background: #86C5E1;
border-radius: 4px;
border-radius: 4rpx;
text-align: center;
font-size: 30rpx;
......@@ -962,7 +962,7 @@
.stock-close > button {
width: 526rpx;
height: 80rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #86C5E1;
font-size: 30rpx;
......
pages/pay/order-state/order-state.wxss
......@@ -51,7 +51,7 @@
.operation-home {
width: 670rpx;
height: 96rpx;
border-radius: 4px;
border-radius: 4rpx;
border: 1px solid #86C5E1;
background: #FFFFFF;
......@@ -66,7 +66,7 @@
height: 96rpx;
margin: 40rpx 0 130rpx 0;
background: #86C5E1;
border-radius: 4px;
border-radius: 4rpx;
font-size: 30rpx;
font-weight: 500;
......
pages/play/activity-detail/activity-detail.js
......@@ -103,8 +103,13 @@ Page({
address: funcResponse.address,
quota: funcResponse.enrollNum,
describe: funcResponse.content,
price: funcItem.price, // 普通价
priceText: funcItem.priceText,
priceSpecial: funcItem.priceSpecial, // 业主价
priceSpecialText: funcItem.priceSpecialText,
priceDiscount: funcItem.priceDiscount, // 活动价
priceDiscountText: funcItem.priceDiscountText,
priceType: funcItem.priceType
// contact: response.contact,
}
......
pages/play/activity-detail/activity-detail.wxml
......@@ -51,37 +51,37 @@
<view wx:if="{{info.priceType === 1}}">
<view class="info-price row align-c">
<text class="item-price-discount">活动价</text>
<text>￥</text>
<text>{{info.priceDiscountText}}</text>
<text>/人</text>
<text>{{info.priceDiscount === 0 ? '' : '￥'}}</text>
<text>{{info.priceDiscount === 0 ? '免费' : info.priceDiscountText}}</text>
<text>{{info.priceDiscount === 0 ? '' : '/人'}}</text>
</view>
<view class="item-info-old-price row align-c">
<text>￥</text>
<text>{{info.priceText}}</text>
<text>/人</text>
<text>{{info.price === 0 ? '' : '￥'}}</text>
<text>{{info.price === 0 ? '免费' : info.priceText}}</text>
<text>{{info.price === 0 ? '' : '/人'}}</text>
</view>
</view>
<!-- 业主价样式 -->
<view class="row" wx:if="{{info.priceType === 2}}">
<view class="item-price row align-c">
<text class="item-price-special">业主价</text>
<text>￥</text>
<text>{{info.priceSpecialText}}</text>
<text>/人</text>
<text>{{info.priceSpecial === 0 ? '' : '￥'}}</text>
<text>{{info.priceSpecial === 0 ? '免费' : info.priceSpecialText}}</text>
<text>{{info.priceSpecial === 0 ? '' : '/人'}}</text>
</view>
<view class="item-info-old-price row align-c">
<text>￥</text>
<text>{{info.priceText}}</text>
<text>/人</text>
<text>{{info.price === 0 ? '' : '￥'}}</text>
<text>{{info.price === 0 ? '免费' : info.priceText}}</text>
<text>{{info.price === 0 ? '' : '/人'}}</text>
</view>
</view>
<!-- 普通价样式 -->
<view class="row" wx:if="{{info.priceType === 3}}">
<view class="item-price row align-c">
<text></text>
<text>￥</text>
<text>{{info.priceText}}</text>
<text>/人</text>
<text>{{info.price === 0 ? '' : '￥'}}</text>
<text>{{info.price === 0 ? '免费' : info.priceText}}</text>
<text>{{info.price === 0 ? '' : '/人'}}</text>
</view>
</view>
<button class="{{isSubmit ? 'button' : 'button-disable'}} row con-c align-c" size="long" bindtap="onReport">{{stateText}}</button>
......
pages/play/home/home.wxss
......@@ -284,7 +284,7 @@
height: 32rpx;
margin-right: 16rpx;
padding: 0 12rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #15191F;
white-space: nowrap;
......
pages/play/service-detail/service-detail.wxml
......@@ -67,22 +67,22 @@
<!-- 活动价样式 -->
<view class="row align-c" wx:if="{{item.priceType === 1}}">
<text class="detail-price-discount">活动价</text>
<text class="price-symbol">￥</text>
<text>{{item.priceDiscountText == '0' ? '免费' : item.priceDiscountText}}</text>
<text class="price-symbol">{{item.priceDiscount == '0' ? '' : '￥'}}</text>
<text>{{item.priceDiscount == '0' ? '免费' : item.priceDiscountText}}</text>
<text>{{'￥' + item.priceText}}</text>
</view>
<!-- 业主价样式 -->
<view class="row align-c" wx:if="{{item.priceType === 2}}">
<text class="detail-price-special">业主价</text>
<text class="price-symbol">￥</text>
<text>{{item.priceSpecialText == '0' ? '免费' : item.priceSpecialText}}</text>
<text class="price-symbol">{{item.priceSpecial == '0' ? '' : '￥'}}</text>
<text>{{item.priceSpecial == '0' ? '免费' : item.priceSpecialText}}</text>
<text>{{'￥' + item.priceText}}</text>
</view>
<!-- 普通价样式 -->
<view class="row align-c" wx:if="{{item.priceType === 3}}">
<text class="">业主价</text>
<text class="price-symbol">￥</text>
<text>{{item.priceText == '0' ? '免费' : item.priceText}}</text>
<text class="price-symbol">{{item.price == '0' ? '' : '￥'}}</text>
<text>{{item.price == '0' ? '免费' : item.priceText}}</text>
</view>
<view>
<button class="row con-c align-c">报名</button>
......@@ -90,7 +90,6 @@
</view>
</view>
</block>
<block wx:if="{{detailActivity.length === 0}}">
<view class="commodity-card-item-nothing col con-c align-c">
<image src="{{imageBase + 'icon/fireworks-2.png'}}"></image>
......@@ -385,25 +384,25 @@
</view>
<!-- 评价 -->
<view class="evaluate movie-evaluate" wx:if="{{contentType === 'evaluate'}}">
<view class="evaluate" wx:if="{{contentType === 'evaluate'}}">
<view class="evaluate-option row con-b align-c">
<view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/evaluate-2.png'}}"></image>
<text>服务</text>
<text>{{officeServiceText}}</text>
<text>分</text>
<text class="color-white">{{officeServiceText}}</text>
<text class="color-white">分</text>
</view>
<view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/shop-2.png'}}"></image>
<text>产品</text>
<text>{{officeProductText}}</text>
<text>分</text>
<text class="color-white">{{officeProductText}}</text>
<text class="color-white">分</text>
</view>
<view class="evaluate-option-item row align-c">
<image src="{{imageBase + 'icon/album-2.png'}}"></image>
<text>环境</text>
<text>{{officeEnvironmentalText}}</text>
<text>分</text>
<text class="color-white">{{officeEnvironmentalText}}</text>
<text class="color-white">分</text>
</view>
</view>
......@@ -428,10 +427,10 @@
<view class="evaluate-item-content">
<view>
<text>{{item.content}}</text>
<text class="color-white">{{item.content}}</text>
</view>
<view class="evaluate-item-content-more">
<text>...　</text>
<view class="evaluate-item-content-more-movie">
<text class="color-white">...　</text>
<text>全文</text>
</view>
</view>
......
pages/play/service-detail/service-detail.wxss
......@@ -286,13 +286,13 @@
width: 562rpx;
margin-right: 24rpx;
padding-bottom: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
}
.movie-card-item {
width: 300rpx;
margin-right: 24rpx;
padding-bottom: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
background:#303041;
}
......@@ -332,7 +332,7 @@
.commodity-card-item-title text:nth-child(2) {
width: 96rpx;
height: 32rpx;
border-radius: 4px;
border-radius: 4rpx;
border: 1px solid #86C5E1;
background: #EAF0F5;
......@@ -374,7 +374,7 @@
height: 256rpx;
margin-top: 80rpx;
padding: 0 40rpx;
border-radius: 4px;
border-radius: 4rpx;
overflow: hidden;
}
......@@ -455,7 +455,7 @@
height: 32rpx;
margin-right: 12rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
border-radius: 4px;
border-radius: 4rpx;
text-align: center;
font-size: 18rpx;
......@@ -516,7 +516,7 @@
flex-grow: 1;
width: 132rpx;
height: 56rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #86C5E1;
color: #FFFFFF;
font-size: 26rpx;
......@@ -661,9 +661,7 @@
line-height: 40rpx;
color: #15191F;
}
.movie-evaluate {
color: #fff;
}
/* 评论详情 */
.evaluate-item {
position: relative;
......@@ -771,6 +769,19 @@
font-weight: 400;
line-height: 44rpx;
}
.evaluate-item-content-more-movie {
position: absolute;
bottom: 0;
right: 18rpx;
width: 106rpx;
height: 44rpx;
background: #1C1C25;
text-align: right;
font-size: 26rpx;
font-weight: 400;
line-height: 44rpx;
}
.evaluate-item-content-more text:nth-child(1) {
color: #15191F;
......@@ -780,6 +791,10 @@
color: #86C5E1;
}
.evaluate-item-content-more-movie text:nth-child(2) {
color: #86C5E1;
}
.evaluate-item-album {
position: relative;
display: flex;
......@@ -798,7 +813,7 @@
width: 160rpx;
height: 160rpx;
margin: 0 10rpx 10rpx 0;
border-radius: 4px;
border-radius: 4rpx;
background: #999999;
}
......@@ -812,7 +827,7 @@
width: 160rpx;
height: 160rpx;
margin: 0 0 10rpx 0;
border-radius: 4px;
border-radius: 4rpx;
background: rgba(0, 0, 0, .4);
}
......@@ -851,7 +866,7 @@
width: 90rpx;
height: 36rpx;
margin-right: 16rpx;
border-radius: 4px;
border-radius: 4rpx;
background: #FAEDEA;
text-align: center;
......@@ -865,7 +880,7 @@
width: 90rpx;
height: 36rpx;
margin-right: 16rpx;
border-radius: 4px;
border-radius: 4rpx;
background: linear-gradient(180deg, #3F4357 0%, #252532 100%);
text-align: center;
......@@ -873,4 +888,8 @@
font-weight: 500;
line-height: 32rpx;
color: #E8D0AF;
}
.color-white {
color: #fff !important;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment