xt / xcx-book · Commits

Go to a project

Commit c5ba3518a5498ff298bf3db8e81932d38ab91242

Authored by vking
1 parent fa527602
build: skipped

taocan

Inline Side-by-side
Showing 13 changed files with 225 additions and 11 deletions
... ... @@ -3796,6 +3796,61 @@ scroll-view.cu-steps .cu-item {
/* ==================
文本
==================== */
.txt-20-h{
font-size: 20rpx;
height: calc(20rpx * 1.4);
line-height: calc(20rpx * 1.4);
}
.txt-22-h{
font-size: 22rpx;
height: calc(22rpx * 1.4);
line-height: calc(22rpx * 1.4);
}
.txt-24-h{
font-size: 24rpx;
height: calc(24rpx * 1.4);
line-height: calc(24rpx * 1.4);
}
.txt-26-h{
font-size: 26rpx;
height: calc(26rpx * 1.4);
line-height: calc(26rpx * 1.4);
}
.txt-28-h{
font-size: 28rpx;
height: calc(28rpx * 1.4);
line-height: calc(28rpx * 1.4);
}
.txt-30-h{
font-size: 30rpx;
height: calc(30rpx * 1.4);
line-height: calc(30rpx * 1.4);
}
.txt-32-h{
font-size: 32rpx;
height: calc(32rpx * 1.4);
line-height: calc(32rpx * 1.4);
}
.txt-34-h{
font-size: 34rpx;
height: calc(34rpx * 1.4);
line-height: calc(34rpx * 1.4);
}
.txt-36-h{
font-size: 36rpx;
height: calc(36rpx * 1.4);
line-height: calc(36rpx * 1.4);
}
.txt-38-h{
font-size: 38rpx;
height: calc(38rpx * 1.4);
line-height: calc(38rpx * 1.4);
}
.txt-40-h{
font-size: 40rpx;
height: calc(40rpx * 1.4);
line-height: calc(40rpx * 1.4);
}
.text-xs {
font-size: 20rpx;
... ... @@ -3822,7 +3877,7 @@ scroll-view.cu-steps .cu-item {
}
.text-xxl {
font-size: 44rpx;
font-size: 40rpx;
}
.text-sl {
... ...
// components/2.0/taocan/card.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
... ...
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
... ...
<!--components/2.0/taocan/card.wxml-->
<view class="view flex margin-bottom-lg card">
<view class="view thumb"></view>
<view class="view margin-left">
<view class="view text-bold txt-36-h">111</view>
<view class="view bg-white flex text-gray txt-28-h" style="margin-bottom:6rpx;margin-top: 6rpx;">
<view class="view margin-right">123</view>
<view class="view margin-right">123</view>
<view class="view margin-right">123</view>
</view>
<view class="view flex align-end text-gray">
<view class="text-orange txt-28-h" style="margin-bottom: 4rpx;">¥</view>
<view class="text-orange txt-40-h margin-right-sm">123</view>
<view class="huaxian flex align-end">
<view class="txt-20-h" style="margin-bottom: 8rpx;">¥</view>
<view class="txt-28-h" style="margin-bottom: 4rpx;">123</view>
</view>
</view>
<view class="view flex text-orange align-end" style="margin-top: 2rpx;">
<view class="view tag" style="margin-bottom: 6rpx;"></view>
<view class="view margin-left-xs txt-24-h">8折</view>
</view>
</view>
<view class="button bg-blue-blue txt-28-h text-bold flex align-center justify-center">抢购</view>
</view>
... ...
/* components/2.0/taocan/card.wxss */
@import "../../../colorui/main.wxss";
.thumb{
width: 200rpx;
height: 200rpx;
background: #F6B3B3;
border-radius: 10rpx;
}
.tag{
width: 22rpx;
height: 22rpx;
background: #FF7A00;
}
.huaxian{
position: relative;
}
.huaxian:after{
position: absolute;
content: "";
width: 100%;
height: 2rpx;
background-color: #CCCCCC;
left:0rpx;
top:20rpx;
}
.card{
position: relative;
}
.button{
position: absolute;
right: 0;
bottom: 0;
width: 124rpx;
height: 56rpx;
border-radius: 28rpx;
}
\ No newline at end of file
... ...
// components/2.0/taocan/lists.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
rowLimit:3,
},
/**
* 组件的方法列表
*/
methods: {
more(){
this.setData({
rowLimit:this.data.rowLimit==3?9999:3,
})
},
}
})
... ...
{
"component": true,
"usingComponents": {
"card":"/components/2.0/taocan/card"
}
}
\ No newline at end of file
... ...
<!--components/2.0/taocan/lists.wxml-->
<view class="view padding-lg bg-white padding-bottom-sm">
<view class="view text-bold text-xxl margin-bottom">超值套餐</view>
<block wx:for="{{5}}" wx:key="lists">
<card detail="{{item}}" wx:if="{{index<rowLimit}}"></card>
</block>
</view>
<view class="view taocan-more {{rowLimit==9999?'opened':''}} solid-top flex align-center justify-center" wx:if="{{true}}" bindtap="more">
<view class="view txt-28-h margin-right-sm">{{rowLimit==9999?'收起':'展开更多'}}</view>
<view class="view icon"></view>
</view>
\ No newline at end of file
... ...
/* components/2.0/taocan/lists.wxss */
@import "../../../colorui/main.wxss";
.taocan-more{
height: 100rpx;
line-height: 100rpx;
}
.taocan-more .icon{
width: 22rpx;
height: 12rpx;
background-color: #8dc63f;
}
.taocan-more.opened .icon{
background-color: #3f8dc6;
}
\ No newline at end of file
... ...
... ... @@ -18,6 +18,7 @@
"activity-tips":"/components/activity/tips",
"section":"/components/reserve/section/section",
"select-room":"/components/reserve/select-room/select-room",
"service":"/components/tips/service"
"service":"/components/tips/service",
"taocan":"/components/2.0/taocan/lists"
}
}
\ No newline at end of file
... ...
... ... @@ -142,6 +142,12 @@
</scroll-view>
</view>
<view class="black20line"></view>
<view style="width: 110%;margin-left: -5%;">
<taocan sid="{{seller.id}}" ></taocan>
</view>
<view class="black20line"></view>
<view class="block" wx:if="{{seller.dishes.length>0}}">
<view class="header flex-ll">
<view class="line"></view>
... ...
... ... @@ -156,8 +156,8 @@
text-align: center;
}
.footer{
height: 100rpx;
line-height: 100rpx;
height: 116rpx;
line-height: 116rpx;
box-shadow: 0 0 8rpx 0 #E0E0E0;
position: fixed;
bottom: 0;
... ... @@ -204,13 +204,19 @@
width: 290rpx;
min-width: 290rpx;
height: 100%;
background:linear-gradient(360deg,rgba(249,142,71,1) 0%,rgba(240,85,34,1) 100%);
}
.footer .reserve .text{
font-size:36rpx;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(255,255,255,1);
width: 270rpx;
height: 84rpx;
background: linear-gradient(90deg, #3BBFF5 0%, #57A0FF 100%);
border-radius: 42rpx;
font-size: 36rpx;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #FFFFFF;
line-height: 84rpx;
margin-top: 16rpx;
}
.baos{
... ...
... ... @@ -604,10 +604,9 @@
"scene": null
},
{
"id": 71,
"name": "pages/reserve/detail",
"pathName": "pages/reserve/detail",
"query": "id=1&activeTab=reserve&_date=2020-02-16&_pnum=6",
"query": "id=1&_activeTab=reserve&_date=2020-02-16&_pnum=6",
"scene": null
},
{
... ...