Skip to content

严立 / mini-shimao

Go to a project
Commit d8e1c6c4 by 严立
Options

LL - 代码合并

parents a4da6070 774387e6
Inline Side-by-side
Showing with 40 additions and 65 deletions
pages/commodity/project/project.wxml
<navigation class="navigation" titleText="所有项目服务" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation> <navigation class="navigation" titleText="所有门票服务" scrollStyle="{{navigationStyle}}" scrollHeight="{{navigationScroll}}"></navigation>
<view class="container"> <view class="container">
<view class="banner"> <view class="banner">
......
pages/commodity/project/project.wxss
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
.shop-item { .shop-item {
width: 670rpx; width: 670rpx;
margin: 48rpx 40rpx 0 40rpx; margin: 48rpx 40rpx 0 40rpx;
padding: 32rpx; padding: 32rpx 32rpx 14rpx 32rpx;
border-radius: 4rpx; border-radius: 4rpx;
background: #FFFFFF; background: #FFFFFF;
} }
...@@ -59,9 +59,9 @@ ...@@ -59,9 +59,9 @@
/* 商品信息样式 */ /* 商品信息样式 */
.commodity-item { .commodity-item {
height: 214rpx; padding-bottom: 50rpx;
margin-top: 50rpx; margin-top: 50rpx;
border-bottom: 1px #E2E7EF solid; border-bottom: 1rpx #E2E7EF solid;
} }
.commodity-item:last-child { .commodity-item:last-child {
......
pages/commodity/shopping-cart/shopping-cart.wxss
...@@ -322,9 +322,10 @@ ...@@ -322,9 +322,10 @@
.empty-title { .empty-title {
margin-top: 64rpx; margin-top: 64rpx;
color: #959DA9;
font-size: 38rpx; font-size: 38rpx;
font-weight: 800;
line-height: 52rpx; line-height: 52rpx;
color: #959DA9;
} }
.empty-btn { .empty-btn {
......
pages/mine/appointment/appointment.wxss
...@@ -76,8 +76,7 @@ ...@@ -76,8 +76,7 @@
.myAppointment-item{ .myAppointment-item{
width: 670rpx; width: 670rpx;
height: 360rpx; height: 360rpx;
margin: auto; margin: 50rpx auto;
margin-bottom: 50rpx;
background-color: rgb(220, 214, 220); background-color: rgb(220, 214, 220);
border-radius: 4rpx; border-radius: 4rpx;
position: relative; position: relative;
......
pages/play/activity/activity.wxml
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</view> </view>
</block> </block>
<block wx:if="{{other.length > 0}}"> <block wx:if="{{selectedOther.length > 0}}">
<view class="title row"> <view class="title row">
<image src="./image/title-2.png"></image> <image src="./image/title-2.png"></image>
</view> </view>
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
<view class="route-list row con-b"> <view class="route-list row con-b">
<!-- 左侧列表 --> <!-- 左侧列表 -->
<view class="route-list-left"> <view class="route-list-left">
<block wx:for="{{other}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{selectedOther}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="route-item" wx:if="{{index % 2 === 0}}" data-id="{{item.id}}" bindtap="onActivityDetail"> <view class="route-item" wx:if="{{index % 2 === 0}}" data-id="{{item.id}}" data-index="{{index}}" bindtap="onActivityDetail">
<view class="row con-c align-c"> <view class="row con-c align-c">
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
</view> </view>
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
<!-- 右侧列表 --> <!-- 右侧列表 -->
<view class="route-list-right"> <view class="route-list-right">
<block wx:for="{{touristRouteList}}" wx:for-index="index" wx:for-item="item" wx:key="index"> <block wx:for="{{selectedOther}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="route-item" wx:if="{{index % 2 === 1}}" data-item="{{item}}" bindtap="onTouristRouteDetail"> <view class="route-item" wx:if="{{index % 2 === 1}}" data-id="{{item.id}}" data-index="{{index}}" bindtap="onActivityDetail">
<view class="row con-c align-c"> <view class="row con-c align-c">
<image src="{{item.cover}}" mode="aspectFill"></image> <image src="{{item.cover}}" mode="aspectFill"></image>
</view> </view>
......
pages/play/activity/activity.wxss
...@@ -207,7 +207,9 @@ ...@@ -207,7 +207,9 @@
/* 往期活动 */ /* 往期活动 */
.route-list { .route-list {
width: 750rpx;
margin-top: 48rpx; margin-top: 48rpx;
padding: 0 40rpx;
} }
.route-list-left, .route-list-left,
......
pages/play/home/home.wxss
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
.health-button { .health-button {
position: absolute; position: absolute;
top: 320rpx; top: 340rpx;
left: 40rpx; left: 40rpx;
width: 296rpx; width: 296rpx;
height: 376rpx; height: 376rpx;
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
.food-button { .food-button {
position: absolute; position: absolute;
top: 350rpx; top: 360rpx;
right: 40rpx; right: 40rpx;
width: 276rpx; width: 276rpx;
height: 376rpx; height: 376rpx;
...@@ -75,19 +75,19 @@ ...@@ -75,19 +75,19 @@
.leisure-button { .leisure-button {
position: absolute; position: absolute;
top: 788rpx; top: 796rpx;
left: 40rpx; left: 40rpx;
width: 304rpx; width: 304rpx;
height: 308rpx; height: 350rpx;
background: transparent; background: transparent;
} }
.hotel-button { .hotel-button {
position: absolute; position: absolute;
top: 820rpx; top: 794rpx;
right: 40rpx; right: 40rpx;
width: 296rpx; width: 296rpx;
height: 328rpx; height: 360rpx;
background: transparent; background: transparent;
} }
......
pages/play/service-detail/service-detail.js
...@@ -127,7 +127,7 @@ Page({ ...@@ -127,7 +127,7 @@ Page({
case 5: case 5:
this.queryActivity() this.queryActivity()
this.setData({ this.setData({
commodityTitle: '拾光花坊', commodityTitle: '能量补给站',
winCommodityMenu: true winCommodityMenu: true
}) })
break break
......
pages/play/service-detail/service-detail.wxml
...@@ -166,19 +166,12 @@ ...@@ -166,19 +166,12 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 能量补给站 -->
<view class="commodity-menu col" wx:if="{{winCommodityMenu}}" bindtap="onBuySnacks" data-id="{{5}}"> <view class="commodity-menu col" wx:if="{{winCommodityMenu}}">
<image class="commodity-menu-bg" src="{{resourcesBase + 'play/service/service-flower.png'}}"></image> <view class="commodity-menu-title row con-b align-e">
<view> <text>{{commodityTitle}}</text>
<image class="commodity-menu-icon" src="{{imageBase + 'icon/food.png'}}"></image>
</view>
<view>
<text>能量补给站</text>
</view>
<view class="row align-c">
<text>饮品预订</text>
<image src="{{imageBase + 'more-w.png'}}"></image>
</view> </view>
<image src="{{resourcesBase + 'play/service/service-flower.png'}}" bindtap="onBuySnacks" data-id="{{5}}"></image>
</view> </view>
<!-- 简介，评价 --> <!-- 简介，评价 -->
......
pages/play/service-detail/service-detail.wxss
...@@ -342,12 +342,18 @@ ...@@ -342,12 +342,18 @@
font-weight: 400; font-weight: 400;
line-height: 44rpx; line-height: 44rpx;
color: #15191F; color: #15191F;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.movie-card-item-title text:nth-child(1) { .movie-card-item-title text:nth-child(1) {
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
line-height: 37rpx; line-height: 37rpx;
color: #fff; color: #fff;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.commodity-card-item-title text:nth-child(2) { .commodity-card-item-title text:nth-child(2) {
...@@ -390,47 +396,21 @@ ...@@ -390,47 +396,21 @@
/* 能量补给跳转 */ /* 能量补给跳转 */
.commodity-menu { .commodity-menu {
position: relative;
width: 750rpx; width: 750rpx;
height: 256rpx;
margin-top: 80rpx;
padding: 0 40rpx; padding: 0 40rpx;
margin-top: 80rpx;
border-radius: 4rpx; border-radius: 4rpx;
overflow: hidden;
}
.commodity-menu-bg {
position: absolute;
z-index: -1;
width: 670rpx;
height: 256rpx;
background: #999999;
} }
.commodity-menu-icon { .commodity-menu-title text:nth-child(1) {
margin: 48rpx 0 0 54rpx; font-size: 40rpx;
width: 56rpx; font-weight: 800;
height: 56rpx;
}
.commodity-menu view:nth-child(3) {
margin: 16rpx 0 0 50rpx;
font-size: 30rpx;
color: #FFFFFF;
line-height: 42rpx;
} }
.commodity-menu view:nth-child(4) { .commodity-menu image{
margin: 8rpx 0 0 50rpx; width: 670rpx;
font-size: 26rpx; height: 256rpx;
color: #FFFFFF; margin-top: 48rpx;
line-height: 40rpx;
}
.commodity-menu view:nth-child(4) image {
margin-left: 16rpx;
width: 32rpx;
height: 32rpx;
} }
......
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