xt / xcx-book · Commits

Go to a project

Commit c8bff393b2c71c40259e9860dc618b7d96337600

Authored by wangfan
1 parent 65f0bf75
build: skipped

预约安排

Inline Side-by-side
Showing 9 changed files with 67 additions and 57 deletions
... ... @@ -3,7 +3,6 @@
.nav-main{
position:fixed;
width: 100%;
z-index: 9999;
}
.nav{
font-size: 30rpx;
... ...
... ... @@ -3,12 +3,8 @@
<image mode="aspectFill" lazy-load="true" src="{{item.image}}"/>
</view>
<view class="content flex-tb">
<view class="name Semibold">
{{item.name}}
</view>
<view class="desc">
{{item.desc||''}}
</view>
<view class="name Semibold">{{item.name}}</view>
<view class="desc">{{item.desc||''}}</view>
<view class="label flex-ll">
<block wx:if="{{item.labelList}}">
<block wx:for="{{item.labelList}}" wx:for-item="son" wx:key="labelList-key">
... ... @@ -17,8 +13,7 @@
</block>
</block>
</view>
<view class="price">
¥ {{item.spec[0].price>0 ? item.spec[0].price : item.price}}
<view class="price">¥ {{item.spec[0].price>0 ? item.spec[0].price : item.price}}
<view class="opt flex-cc">
<block wx:if="{{item_clear_num==0}}">
<image
... ...
... ... @@ -4,11 +4,12 @@
<view hidden="{{hiddenFoodSpec}}" class="hiddenFoodSpec">
<view class="toast-mask flex-vc" bindtap="close">
<view class="toast-content" catchtap="catchtap">
<image class="toast-content-close" bindtap="close" src="http://qn.colorcun.com/custom/lite-yd-cook/image/close-cookbook.png" background-size="cover"></image>
<form bindsubmit="formSubmit">
<input value="{{cookbook_id}}" name="cookbookid" hidden="true"/>
<view class="toast-content-title">{{cookbook_name}}</view>
<block wx:if="{{kind.length>0}}">
<view class="toast-content-kind" style="margin-bottom:{{foodMenu.length==0 ? '80rpx' : '0rpx'}}">
<view class="toast-content-kind">
<view class="toast-kind-title">规格</view>
<view class="toast-kind-menu flex-ll">
<view class="toast-kind-single {{item.iskind==true?'kind-active':''}}" wx:for="{{kind}}" wx:key="kind-key" data-key="{{index}}" id="{{item.id}}" data-price="{{item.price}}" bindtap="kindSelect">{{item.title}}</view>
... ... @@ -18,7 +19,7 @@
</view>
</block>
<block wx:if="{{foodMenu.length>0}}">
<view class="toast-content-kind" style="margin-bottom:{{kind.length==0 ? '235rpx' : '40rpx'}};">
<view class="toast-content-kind">
<view class="toast-kind-title">做法</view>
<view class="toast-kind-menu flex-ll">
<view class="toast-kind-single {{item.iskind==true?'kind-active':''}}" wx:for="{{foodMenu}}" wx:key="foodmenu-key" data-key="{{index}}" id="{{item.id}}" data-price="{{item.price}}" bindtap='menuSelect'>{{item.title}}</view>
... ... @@ -32,20 +33,20 @@
</view>
</form>
</view>
<image class="toast-content-close" bindtap="close" src="http://qn.colorcun.com/custom/lite/image/close.png" background-size="cover"></image>
</view>
</view>
<view hidden="{{hiddenFoodSpecReduce}}" class="hiddenFoodSpec">
<view class="reduce-mask flex-vc" bindtap="close">
<view class="reduce-conent" catchtap="catchtap">
<image class="toast-content-close" bindtap="close" src="http://qn.colorcun.com/custom/lite-yd-cook/image/close-cookbook.png" background-size="cover"></image>
<view class="reduce-content-title">{{item.name}}</view>
<view class="reduce-content-list">
<view class='reduce-content-large' wx:for="{{selectKind}}" wx:key="selectKind-key" wx:for-item="kindItem">
<view class="reduce-list-title">{{kindItem.title?kindItem.title:''}}{{kindItem.title?':':''}}{{kindItem.ptitle?kindItem.ptitle:''}}</view>
<view class="reduce-list-title">{{kindItem.title?kindItem.title:''}}{{kindItem.title && kindItem.ptitle?'、':''}}{{kindItem.ptitle?kindItem.ptitle:''}}</view>
<view class="reduce-list-info flex-rr">
<image class="reduce-list-reduce reduce-list-first" data-index="{{index}}" data-cookbookid="{{kindItem.cookbookid}}" data-practiceid="{{kindItem.practiceid}}" data-specid="{{kindItem.specid}}" data-price="{{kindItem.price}}" bindtap="reduce" src="http://qn.colorcun.com/custom/lite/image/subtractCook.png" style="padding-right:18rpx;"></image>
<view class="reduce-list-first" data-index="{{index}}" data-cookbookid="{{kindItem.cookbookid}}" data-practiceid="{{kindItem.practiceid}}" data-specid="{{kindItem.specid}}" data-price="{{kindItem.price}}" bindtap="reduce" ></view>
<view class="reduce-list-reduce">{{kindItem.foodNum}}</view>
<image class="reduce-list-reduce reduce-list-last" data-index="{{index}}" data-cookbookid="{{kindItem.cookbookid}}" data-practiceid="{{kindItem.practiceid}}" data-specid="{{kindItem.specid}}" data-price="{{kindItem.price}}" bindtap='add' src="http://qn.colorcun.com/custom/lite/image/add.png"></image>
<view class="reduce-list-last" data-index="{{index}}" data-cookbookid="{{kindItem.cookbookid}}" data-practiceid="{{kindItem.practiceid}}" data-specid="{{kindItem.specid}}" data-price="{{kindItem.price}}" bindtap='add' ></view>
</view>
</view>
</view>
... ...
... ... @@ -30,7 +30,7 @@
height: auto;
padding:0 42rpx;
box-sizing: border-box;
padding-top: 20px;
margin-bottom: 34rpx;
}
.toast-kind-title{
width: 100%;
... ... @@ -42,7 +42,6 @@
width: 100%;
height: auto;
box-sizing: border-box;
padding-bottom:10px;
}
.toast-kind-menu:after{
width:0;
... ... @@ -69,7 +68,6 @@
height: 57px;
padding:15px 38rpx;
box-sizing: border-box;
margin-top: 22px;
background: #f2f2f2;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
... ... @@ -98,9 +96,10 @@
background: linear-gradient(to right, #ECDB99, #C8B16D);
}
.toast-content-close{
width: 60rpx;
height: 60rpx;
margin-top: 160rpx;
width: 30rpx;
height: 30rpx;
float: right;
margin: 10rpx;
}
/*删除规格遮罩*/
... ... @@ -145,39 +144,57 @@
}
.reduce-content-large{
width: 100%;
height: 25px;
height: 42rpx;
line-height: 42rpx;
padding-top: 50rpx;
}
.reduce-list-title{
float:left;
padding:0 26rpx;
height: 25px;
border:1rpx solid #ccc;
padding:0 10rpx;
height: 42rpx;
box-sizing: border-box;
color:#353535;
font-size:14px;
line-height: 25px;
color:#fefefe;
font-size:28rpx;
line-height: 42rpx;
text-align: center;
background: linear-gradient(to right, #C8B16D, #E6D9A6);
min-width: 100rpx;
}
.reduce-list-info{
height: 25px;
line-height: 25px;
}
.reduce-list-reduce{
padding:0 10rpx;
padding:0 20rpx;
font-size:32rpx;
line-height: 25px;
line-height: 42rpx;
text-align: center;
}
.reduce-list-first{
width:15px;
height:2px;
background:#fff;
width:36rpx;
height:36rpx;
border: 2rpx solid #262628;
border-radius: 50%;
overflow: hidden;
position: relative;
}
.reduce-list-first:after{
position: absolute;
content: '';
top: 0;
left: 0;
right: 0;
bottom: 0;
margin: auto;
width: 75%;
height: 4rpx;
background-color: #262628;
}
.reduce-list-last{
width:15px;
height:15px;
background:#fff;
width:40rpx;
height:40rpx;
background-image: url("http://qn.colorcun.com/custom/lite-yd-cook/image/add.png");
background-size: 100% 100%;
}
.reduce-close{
width: 60rpx;
... ...
... ... @@ -16,9 +16,7 @@
<view class="practice_name" wx:if="{{item.practice_name}}">{{item.practice_name}}</view>
</view>
<view class="price">￥{{item.price}}/{{item.spec_name||item.cookunit}}</view>
<view class="opt">
{{item.num}}
</view>
<view class="opt">{{item.num}}</view>
</view>
</view>
</view>
... ...
... ... @@ -107,7 +107,7 @@ page{
.cart-item{
height: 100rpx;
line-height: 100rpx;
font-size: 34rpx;
font-size: 30rpx;
}
.cart-item .name{
width: 60%;
... ... @@ -119,15 +119,16 @@ page{
max-width: 80%;
}
.cart-item .price{
width: 32%;
width: 200rpx;
min-width: 200rpx;
white-space:nowrap;
margin: 0 4%;
margin-left: 20rpx;
overflow: hidden;
}
.cart-item .opt{
font-size: 36rpx;
font-weight: bold;
min-width: 80rpx;
width: 80rpx;
font-size: 30rpx;
min-width: 50rpx;
width: 50rpx;
text-align: right;
}
.practice_name{
... ...
... ... @@ -43,7 +43,7 @@
</button>
<view class="cart flex-ll" bindtap="dispalyCart">
<view class="icon">
<image src="http://qn.colorcun.com/custom/lite-yd-cook/image/cart.png"/>
<image src="http://qn.colorcun.com/custom/lite-yd-cook/image/cart-black.png"/>
<view class="dot" wx:if="{{orderItemCount>0}}">{{orderItemCount}}</view>
</view>
<view class="text Semibold">￥{{order.price}}</view>
... ...
... ... @@ -33,9 +33,7 @@
<view class="practice_name" wx:if="{{item.practice_name}}">{{item.practice_name}}</view>
</view>
<view class="price">￥{{item.price}}/{{item.spec_name||item.cookunit}}</view>
<view class="opt">
{{item.num}}
</view>
<view class="opt">{{item.num}}</view>
</view>
</block>
</view>
... ...
... ... @@ -32,7 +32,7 @@
.cart-item{
height: 100rpx;
line-height: 100rpx;
font-size: 34rpx;
font-size: 30rpx;
}
.cart-item .name{
width: 60%;
... ... @@ -44,15 +44,16 @@
max-width: 80%;
}
.cart-item .price{
width: 32%;
width: 200rpx;
min-width: 200rpx;
white-space:nowrap;
margin: 0 4%;
margin-left: 20rpx;
overflow: hidden;
}
.cart-item .opt{
font-size: 36rpx;
font-weight: bold;
min-width: 80rpx;
width: 80rpx;
font-size: 30rpx;
min-width: 50rpx;
width: 50rpx;
text-align: right;
}
.total{
... ...