Skip to content

严立 / mini-shimao

Go to a project
Commit f0ae8fd9 by 严立
Options

Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao

parents 188cc4dc 8b5e0a9f
Inline Side-by-side
Showing with 82 additions and 37 deletions
pages/commodity/home/home.wxss
......@@ -211,6 +211,7 @@ swiper {
font-size: 34rpx;
font-weight: 300;
line-height: 64rpx;
letter-spacing: 4rpx;
color: #15191F;
}
......@@ -225,9 +226,9 @@ swiper {
.shop-banner > button {
position: absolute;
top: 330rpx;
width: 204rpx;
height: 120rpx;
top: 0rpx;
width: 750rpx;
height: 500rpx;
background: rgba(0, 0, 0, 0);
font-size: 26rpx;
......@@ -282,6 +283,7 @@ swiper {
font-size: 34rpx;
font-weight: 300;
line-height: 64rpx;
letter-spacing: 4rpx;
color: #15191F;
}
......@@ -321,6 +323,7 @@ swiper {
font-size: 34rpx;
font-weight: 300;
line-height: 64rpx;
letter-spacing: 4rpx;
color: #15191F;
}
......
pages/commodity/menu-food/menu-food.wxml
......@@ -108,10 +108,10 @@
</view>
<!-- 商品详情弹窗 -->
<l-popup show="{{winCommodityDetail}}" content-align="center" locked="{{true}}">
<l-popup l-class="popup-mask" show="{{winCommodityDetail}}" content-align="center" locked="{{true}}">
<view class="popup-wrap">
<view id="banner" class="banner">
<swiper autoplay circular class="banner-swiper" interval="5000" duration="500">
<swiper autoplay circular indicator-dots indicator-active-color="#fff" indicator-color="rgba(255, 255, 255, .4)" class="banner-swiper" interval="5000" duration="500">
<block wx:for="{{commodityDetail.banner}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="banner-swiper-item">
<image class="banner-swiper-image" src="{{item}}"></image>
......
pages/commodity/menu-food/menu-food.wxss
......@@ -210,6 +210,20 @@ page {
text-decoration: line-through;
}
.wx-swiper-dots{
position:relative;
left: 0;
right: 0;
}
.wx-swiper-dots.wx-swiper-dots-horizontal{
margin-bottom: 32rpx;
}
.popup-mask {
z-index: 11111 !important;
background: rgba(0, 0, 0, 0.65);
}
.popup-wrap {
width: 606rpx;
margin-top: 100rpx;
......
pages/commodity/project-detail/project-detail.js
......@@ -22,7 +22,7 @@ Page({
color: '#000000',
background: 'rgba(255, 255, 255, 1)'
},
scroll: '600rpx',
scroll: '200rpx',
},
navigationScroll: 0,
......
pages/commodity/project/project.wxss
......@@ -52,6 +52,11 @@
margin-right: 20rpx;
}
.shop-name text {
font-size: 34rpx;
font-weight: 600;
}
/* 商品信息样式 */
.commodity-item {
height: 214rpx;
......@@ -78,7 +83,7 @@
.commodity-describe text:nth-child(1) {
height: 42rpx;
font-size: 30rpx;
font-weight: 500;
font-weight: 600;
line-height: 42rpx;
color: #15191F;
......
pages/commodity/shopping-cart/shopping-cart.wxss
......@@ -27,7 +27,7 @@
font-size: 30rpx;
font-weight: 500;
line-height: 42rpx;
color: #586A46;
color: #656E7B;
}
.l-content {
color: #959da9 !important;
......@@ -333,6 +333,7 @@
margin-top: 68rpx;
color: #fff;
font-size: 30rpx;
font-weight: 600;
line-height: 96rpx;
text-align: center;
background: #86C5E1;
......
pages/mine/home/home.wxml
......@@ -90,7 +90,7 @@
<view class="order-activity-title row align-c">
<text>我的订单</text>
</view>
<view class="row align-c" bindtap="onOrder">
<view class="order-activity-all row align-c" bindtap="onOrder">
<text>查看全部</text>
<image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
......@@ -222,7 +222,7 @@
<view class="order-activity-title row align-c">
<text>我的预约</text>
</view>
<view class="row align-c" bindtap="onAppointment">
<view class="order-activity-all row align-c" bindtap="onAppointment">
<text>查看全部</text>
<image class="all-order-icon" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view>
......@@ -258,7 +258,7 @@
</view>
</view>
<!-- 预约卡片 -->
<view class="appintment">
<view class="appointment">
<!-- 主题活动 -->
<view class="appointment-wrapper" wx:for="{{activityList}}" wx:key="*this" data-item="{{item}}"
bindtap="onOrderDetail">
......
pages/mine/home/home.wxss
......@@ -410,8 +410,14 @@
font-weight: 600;
}
.order-activity-all text {
font-size: 26rpx;
color: #15191F;
}
.order-activity-icon-list {
margin-top: 56rpx;
padding-bottom: 12rpx;
}
.order-activity-icon-wrapper {
......@@ -593,10 +599,6 @@
background-color: #ccc;
}
.appointment {
margin-top: 16rpx;
}
.appointment-wrapper {
position: relative;
width: 606rpx;
......
pages/play/home/home.wxss
......@@ -211,9 +211,10 @@
.movie-btn {
width: 152rpx;
height: 56rpx;
margin-top: 42rpx;
margin-top: 45rpx;
color: #fff;
font-size: 26rpx;
font-weight: 600;
text-align: center;
line-height: 56rpx;
background: #86c5e1;
......
pages/play/movie/movie.wxml
......@@ -88,7 +88,7 @@
</block>
</view>
<view wx:else>
<block wx:for="{{movieAll}}" wx:for-index="key" wx:for-item="movieList" wx:key="key" wx:if="{{movieAll.moviewWeek.list.length > 0 || movieAll.movieNextWeek.list.length > 0}}">
<block wx:for="{{movieAll}}" wx:for-index="key" wx:for-item="movieList" wx:key="key" wx:if="{{movieAll.movieWeek.list.length > 0 || movieAll.movieNextWeek.list.length > 0}}">
<view class="movie-week row align-c con-c" wx:if="{{movieList.list.length > 0}}">
<view class="line"></view>
<view class="movie-week-title">
......@@ -152,7 +152,7 @@
</view>
</block>
</block>
<block wx:if="{{movieAll.moviewWeek.list.length === 0 && movieAll.movieNextWeek.list.length === 0}}">
<block wx:if="{{movieAll.movieWeek.list.length === 0 && movieAll.movieNextWeek.list.length === 0}}">
<view class="show-end col align-c">
<image src="/image/no-movie.png"></image>
<text>观影已结束，请期待后续排片</text>
......
pages/play/service-detail/service-detail.wxml
......@@ -314,19 +314,35 @@
<image src="{{imageBase + 'icon/location-3.png'}}" bind:tap="onLocation"></image>
</view>
<!-- 分享弹出图片 -->
<l-popup show="{{showPopup}}" animation="{{false}}">
<view class="popupImage">
<view class="container-share row con-c align-c" hidden="{{!showPopup}}">
<view class="col con-c">
<view class="share-content">
<image src="{{shareImage}}"></image>
</view>
<view class="row con-b">
<view class="cancel" bindtap="onCancel">
<text>取消</text>
<view class="share-operation row con-b align-c">
<button bindtap="onCancel">取消</button>
<button bindtap="onDownload">下载图片</button>
</view>
<view class="download" bindtap="onDownload">
<text>下载图片</text>
</view>
</view>
</l-popup>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastSuccess}}"
image="../../../image/icon/success-3.png"
title="图片已保存"
duration="3000"
></l-toast>
<!-- 下载图片反馈 -->
<l-toast
l-class="toast"
l-image-class="toast-icon"
show="{{winToastFail}}"
image="../../../image/icon/war-3.png"
title="图片保存失败"
duration="3000"
></l-toast>
<!-- 开放时间信息 -->
<view class="commodity-other movie-border row align-c">
<image src="./image/time.png"></image>
......
pages/play/service-detail/service-detail.wxss
......@@ -178,18 +178,16 @@
}
.commodity-other {
padding: 50rpx 40rpx;
border-bottom: 1px #E2E7EF solid;
margin: 0 40rpx;
padding: 50rpx 0;
border-bottom: 1rpx #E2E7EF solid;
font-size: 30rpx;
font-weight: 400;
line-height: 44rpx;
}
.food-border {
border-bottom: none;
}
.movie-border {
border-bottom: 1px #3A3A40 solid !important;
border-bottom: 1rpx #3A3A40 solid !important;
}
.commodity-other image {
......@@ -237,6 +235,11 @@
color: #959DA9;
}
.movie-card-title text:nth-child(2) {
font-size: 26rpx;
color: #959DA9;
}
.commodity-card-list {
width: 710rpx;
margin: 50rpx 0 0 40rpx;
......
pages/play/service/service.wxml
......@@ -26,7 +26,7 @@
<text>{{tabDetail[0].shop[0].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[0].shop[0].appId}}" data-type="{{tabDetail[0].shop[0].shopType}}" bindtap="onShopDetail">
<text>立即购票</text>
<text>查看详情</text>
</view>
</view>
</view>
......@@ -68,7 +68,7 @@
<text>{{tabDetail[1].shop[0].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[1].shop[0].appId}}" data-type="{{tabDetail[1].shop[0].shopType}}" bindtap="onShopDetail">
<text>立即购票</text>
<text>查看详情</text>
</view>
</view>
</view>
......@@ -89,7 +89,7 @@
<text>{{tabDetail[2].shop[0].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[2].shop[0].appId}}" data-type="{{tabDetail[2].shop[0].shopType}}" bindtap="onShopDetail">
<text>立即预订</text>
<text>查看详情</text>
</view>
</view>
</view>
......@@ -110,7 +110,7 @@
<text>{{tabDetail[2].shop[1].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[2].shop[1].appId}}" data-type="{{tabDetail[2].shop[1].shopType}}" bindtap="onShopDetail">
<text>立即预订</text>
<text>查看详情</text>
</view>
</view>
</view>
......@@ -131,7 +131,7 @@
<text>{{tabDetail[3].shop[0].time}}</text>
</view>
<view class="shop-btn" data-id="{{tabDetail[3].shop[0].appId}}" data-type="{{tabDetail[3].shop[0].shopType}}" bindtap="onShopDetail">
<text>立即购票</text>
<text>查看详情</text>
</view>
</view>
</view>
......
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