Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
严立
/
mini-shimao
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8b5e0a9f
authored
Sep 25, 2020
by
wjw
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
ww-ui修改
parent
9e6ed057
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
17 deletions
pages/commodity/menu-food/menu-food.wxml
pages/commodity/menu-food/menu-food.wxss
pages/commodity/project-detail/project-detail.js
pages/commodity/project/project.wxss
pages/commodity/shopping-cart/shopping-cart.wxss
pages/mine/home/home.wxml
pages/mine/home/home.wxss
pages/play/service/service.wxml
pages/commodity/menu-food/menu-food.wxml
View file @
8b5e0a9f
...
...
@@ -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
View file @
8b5e0a9f
...
...
@@ -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
View file @
8b5e0a9f
...
...
@@ -22,7 +22,7 @@ Page({
color
:
'#000000'
,
background
:
'rgba(255, 255, 255, 1)'
},
scroll
:
'
6
00rpx'
,
scroll
:
'
2
00rpx'
,
},
navigationScroll
:
0
,
...
...
pages/commodity/project/project.wxss
View file @
8b5e0a9f
...
...
@@ -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:
5
00;
font-weight:
6
00;
line-height: 42rpx;
color: #15191F;
...
...
pages/commodity/shopping-cart/shopping-cart.wxss
View file @
8b5e0a9f
...
...
@@ -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
View file @
8b5e0a9f
...
...
@@ -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="app
o
intment">
<!-- 主题活动 -->
<view class="appointment-wrapper" wx:for="{{activityList}}" wx:key="*this" data-item="{{item}}"
bindtap="onOrderDetail">
...
...
pages/mine/home/home.wxss
View file @
8b5e0a9f
...
...
@@ -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/service/service.wxml
View file @
8b5e0a9f
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment