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 @@ @@ -3,7 +3,6 @@
3 .nav-main{ 3 .nav-main{
4 position:fixed; 4 position:fixed;
5 width: 100%; 5 width: 100%;
6 - z-index: 9999;  
7 } 6 }
8 .nav{ 7 .nav{
9 font-size: 30rpx; 8 font-size: 30rpx;
@@ -3,12 +3,8 @@ @@ -3,12 +3,8 @@
3 <image mode="aspectFill" lazy-load="true" src="{{item.image}}"/> 3 <image mode="aspectFill" lazy-load="true" src="{{item.image}}"/>
4 </view> 4 </view>
5 <view class="content flex-tb"> 5 <view class="content flex-tb">
6 - <view class="name Semibold">  
7 - {{item.name}}  
8 - </view>  
9 - <view class="desc">  
10 - {{item.desc||''}}  
11 - </view> 6 + <view class="name Semibold">{{item.name}}</view>
  7 + <view class="desc">{{item.desc||''}}</view>
12 <view class="label flex-ll"> 8 <view class="label flex-ll">
13 <block wx:if="{{item.labelList}}"> 9 <block wx:if="{{item.labelList}}">
14 <block wx:for="{{item.labelList}}" wx:for-item="son" wx:key="labelList-key"> 10 <block wx:for="{{item.labelList}}" wx:for-item="son" wx:key="labelList-key">
@@ -17,8 +13,7 @@ @@ -17,8 +13,7 @@
17 </block> 13 </block>
18 </block> 14 </block>
19 </view> 15 </view>
20 - <view class="price">  
21 - ¥ {{item.spec[0].price>0 ? item.spec[0].price : item.price}} 16 + <view class="price">¥ {{item.spec[0].price>0 ? item.spec[0].price : item.price}}
22 <view class="opt flex-cc"> 17 <view class="opt flex-cc">
23 <block wx:if="{{item_clear_num==0}}"> 18 <block wx:if="{{item_clear_num==0}}">
24 <image 19 <image
@@ -4,11 +4,12 @@ @@ -4,11 +4,12 @@
4 <view hidden="{{hiddenFoodSpec}}" class="hiddenFoodSpec"> 4 <view hidden="{{hiddenFoodSpec}}" class="hiddenFoodSpec">
5 <view class="toast-mask flex-vc" bindtap="close"> 5 <view class="toast-mask flex-vc" bindtap="close">
6 <view class="toast-content" catchtap="catchtap"> 6 <view class="toast-content" catchtap="catchtap">
  7 + <image class="toast-content-close" bindtap="close" src="http://qn.colorcun.com/custom/lite-yd-cook/image/close-cookbook.png" background-size="cover"></image>
7 <form bindsubmit="formSubmit"> 8 <form bindsubmit="formSubmit">
8 <input value="{{cookbook_id}}" name="cookbookid" hidden="true"/> 9 <input value="{{cookbook_id}}" name="cookbookid" hidden="true"/>
9 <view class="toast-content-title">{{cookbook_name}}</view> 10 <view class="toast-content-title">{{cookbook_name}}</view>
10 <block wx:if="{{kind.length>0}}"> 11 <block wx:if="{{kind.length>0}}">
11 - <view class="toast-content-kind" style="margin-bottom:{{foodMenu.length==0 ? '80rpx' : '0rpx'}}"> 12 + <view class="toast-content-kind">
12 <view class="toast-kind-title">规格</view> 13 <view class="toast-kind-title">规格</view>
13 <view class="toast-kind-menu flex-ll"> 14 <view class="toast-kind-menu flex-ll">
14 <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> 15 <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 @@ @@ -18,7 +19,7 @@
18 </view> 19 </view>
19 </block> 20 </block>
20 <block wx:if="{{foodMenu.length>0}}"> 21 <block wx:if="{{foodMenu.length>0}}">
21 - <view class="toast-content-kind" style="margin-bottom:{{kind.length==0 ? '235rpx' : '40rpx'}};"> 22 + <view class="toast-content-kind">
22 <view class="toast-kind-title">做法</view> 23 <view class="toast-kind-title">做法</view>
23 <view class="toast-kind-menu flex-ll"> 24 <view class="toast-kind-menu flex-ll">
24 <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> 25 <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 @@ @@ -32,20 +33,20 @@
32 </view> 33 </view>
33 </form> 34 </form>
34 </view> 35 </view>
35 - <image class="toast-content-close" bindtap="close" src="http://qn.colorcun.com/custom/lite/image/close.png" background-size="cover"></image>  
36 </view> 36 </view>
37 </view> 37 </view>
38 <view hidden="{{hiddenFoodSpecReduce}}" class="hiddenFoodSpec"> 38 <view hidden="{{hiddenFoodSpecReduce}}" class="hiddenFoodSpec">
39 <view class="reduce-mask flex-vc" bindtap="close"> 39 <view class="reduce-mask flex-vc" bindtap="close">
40 <view class="reduce-conent" catchtap="catchtap"> 40 <view class="reduce-conent" catchtap="catchtap">
  41 + <image class="toast-content-close" bindtap="close" src="http://qn.colorcun.com/custom/lite-yd-cook/image/close-cookbook.png" background-size="cover"></image>
41 <view class="reduce-content-title">{{item.name}}</view> 42 <view class="reduce-content-title">{{item.name}}</view>
42 <view class="reduce-content-list"> 43 <view class="reduce-content-list">
43 <view class='reduce-content-large' wx:for="{{selectKind}}" wx:key="selectKind-key" wx:for-item="kindItem"> 44 <view class='reduce-content-large' wx:for="{{selectKind}}" wx:key="selectKind-key" wx:for-item="kindItem">
44 - <view class="reduce-list-title">{{kindItem.title?kindItem.title:''}}{{kindItem.title?':':''}}{{kindItem.ptitle?kindItem.ptitle:''}}</view> 45 + <view class="reduce-list-title">{{kindItem.title?kindItem.title:''}}{{kindItem.title && kindItem.ptitle?'、':''}}{{kindItem.ptitle?kindItem.ptitle:''}}</view>
45 <view class="reduce-list-info flex-rr"> 46 <view class="reduce-list-info flex-rr">
46 - <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> 47 + <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>
47 <view class="reduce-list-reduce">{{kindItem.foodNum}}</view> 48 <view class="reduce-list-reduce">{{kindItem.foodNum}}</view>
48 - <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> 49 + <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>
49 </view> 50 </view>
50 </view> 51 </view>
51 </view> 52 </view>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 height: auto; 30 height: auto;
31 padding:0 42rpx; 31 padding:0 42rpx;
32 box-sizing: border-box; 32 box-sizing: border-box;
33 - padding-top: 20px; 33 + margin-bottom: 34rpx;
34 } 34 }
35 .toast-kind-title{ 35 .toast-kind-title{
36 width: 100%; 36 width: 100%;
@@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
42 width: 100%; 42 width: 100%;
43 height: auto; 43 height: auto;
44 box-sizing: border-box; 44 box-sizing: border-box;
45 - padding-bottom:10px;  
46 } 45 }
47 .toast-kind-menu:after{ 46 .toast-kind-menu:after{
48 width:0; 47 width:0;
@@ -69,7 +68,6 @@ @@ -69,7 +68,6 @@
69 height: 57px; 68 height: 57px;
70 padding:15px 38rpx; 69 padding:15px 38rpx;
71 box-sizing: border-box; 70 box-sizing: border-box;
72 - margin-top: 22px;  
73 background: #f2f2f2; 71 background: #f2f2f2;
74 border-bottom-left-radius: 6px; 72 border-bottom-left-radius: 6px;
75 border-bottom-right-radius: 6px; 73 border-bottom-right-radius: 6px;
@@ -98,9 +96,10 @@ @@ -98,9 +96,10 @@
98 background: linear-gradient(to right, #ECDB99, #C8B16D); 96 background: linear-gradient(to right, #ECDB99, #C8B16D);
99 } 97 }
100 .toast-content-close{ 98 .toast-content-close{
101 - width: 60rpx;  
102 - height: 60rpx;  
103 - margin-top: 160rpx; 99 + width: 30rpx;
  100 + height: 30rpx;
  101 + float: right;
  102 + margin: 10rpx;
104 } 103 }
105 104
106 /*删除规格遮罩*/ 105 /*删除规格遮罩*/
@@ -145,39 +144,57 @@ @@ -145,39 +144,57 @@
145 } 144 }
146 .reduce-content-large{ 145 .reduce-content-large{
147 width: 100%; 146 width: 100%;
148 - height: 25px; 147 + height: 42rpx;
  148 + line-height: 42rpx;
149 padding-top: 50rpx; 149 padding-top: 50rpx;
150 } 150 }
151 .reduce-list-title{ 151 .reduce-list-title{
152 float:left; 152 float:left;
153 - padding:0 26rpx;  
154 - height: 25px;  
155 - border:1rpx solid #ccc; 153 + padding:0 10rpx;
  154 + height: 42rpx;
156 box-sizing: border-box; 155 box-sizing: border-box;
157 - color:#353535;  
158 - font-size:14px;  
159 - line-height: 25px; 156 + color:#fefefe;
  157 + font-size:28rpx;
  158 + line-height: 42rpx;
160 text-align: center; 159 text-align: center;
  160 + background: linear-gradient(to right, #C8B16D, #E6D9A6);
  161 + min-width: 100rpx;
161 } 162 }
162 .reduce-list-info{ 163 .reduce-list-info{
163 height: 25px; 164 height: 25px;
164 line-height: 25px; 165 line-height: 25px;
165 } 166 }
166 .reduce-list-reduce{ 167 .reduce-list-reduce{
167 - padding:0 10rpx; 168 + padding:0 20rpx;
168 font-size:32rpx; 169 font-size:32rpx;
169 - line-height: 25px; 170 + line-height: 42rpx;
170 text-align: center; 171 text-align: center;
171 } 172 }
172 .reduce-list-first{ 173 .reduce-list-first{
173 - width:15px;  
174 - height:2px;  
175 - background:#fff; 174 + width:36rpx;
  175 + height:36rpx;
  176 + border: 2rpx solid #262628;
  177 + border-radius: 50%;
  178 + overflow: hidden;
  179 + position: relative;
  180 +}
  181 +.reduce-list-first:after{
  182 + position: absolute;
  183 + content: '';
  184 + top: 0;
  185 + left: 0;
  186 + right: 0;
  187 + bottom: 0;
  188 + margin: auto;
  189 + width: 75%;
  190 + height: 4rpx;
  191 + background-color: #262628;
176 } 192 }
177 .reduce-list-last{ 193 .reduce-list-last{
178 - width:15px;  
179 - height:15px;  
180 - background:#fff; 194 + width:40rpx;
  195 + height:40rpx;
  196 + background-image: url("http://qn.colorcun.com/custom/lite-yd-cook/image/add.png");
  197 + background-size: 100% 100%;
181 } 198 }
182 .reduce-close{ 199 .reduce-close{
183 width: 60rpx; 200 width: 60rpx;
@@ -16,9 +16,7 @@ @@ -16,9 +16,7 @@
16 <view class="practice_name" wx:if="{{item.practice_name}}">{{item.practice_name}}</view> 16 <view class="practice_name" wx:if="{{item.practice_name}}">{{item.practice_name}}</view>
17 </view> 17 </view>
18 <view class="price">￥{{item.price}}/{{item.spec_name||item.cookunit}}</view> 18 <view class="price">￥{{item.price}}/{{item.spec_name||item.cookunit}}</view>
19 - <view class="opt">  
20 - {{item.num}}  
21 - </view> 19 + <view class="opt">{{item.num}}</view>
22 </view> 20 </view>
23 </view> 21 </view>
24 </view> 22 </view>
@@ -107,7 +107,7 @@ page{ @@ -107,7 +107,7 @@ page{
107 .cart-item{ 107 .cart-item{
108 height: 100rpx; 108 height: 100rpx;
109 line-height: 100rpx; 109 line-height: 100rpx;
110 - font-size: 34rpx; 110 + font-size: 30rpx;
111 } 111 }
112 .cart-item .name{ 112 .cart-item .name{
113 width: 60%; 113 width: 60%;
@@ -119,15 +119,16 @@ page{ @@ -119,15 +119,16 @@ page{
119 max-width: 80%; 119 max-width: 80%;
120 } 120 }
121 .cart-item .price{ 121 .cart-item .price{
122 - width: 32%; 122 + width: 200rpx;
  123 + min-width: 200rpx;
123 white-space:nowrap; 124 white-space:nowrap;
124 - margin: 0 4%; 125 + margin-left: 20rpx;
  126 + overflow: hidden;
125 } 127 }
126 .cart-item .opt{ 128 .cart-item .opt{
127 - font-size: 36rpx;  
128 - font-weight: bold;  
129 - min-width: 80rpx;  
130 - width: 80rpx; 129 + font-size: 30rpx;
  130 + min-width: 50rpx;
  131 + width: 50rpx;
131 text-align: right; 132 text-align: right;
132 } 133 }
133 .practice_name{ 134 .practice_name{
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 </button> 43 </button>
44 <view class="cart flex-ll" bindtap="dispalyCart"> 44 <view class="cart flex-ll" bindtap="dispalyCart">
45 <view class="icon"> 45 <view class="icon">
46 - <image src="http://qn.colorcun.com/custom/lite-yd-cook/image/cart.png"/> 46 + <image src="http://qn.colorcun.com/custom/lite-yd-cook/image/cart-black.png"/>
47 <view class="dot" wx:if="{{orderItemCount>0}}">{{orderItemCount}}</view> 47 <view class="dot" wx:if="{{orderItemCount>0}}">{{orderItemCount}}</view>
48 </view> 48 </view>
49 <view class="text Semibold">￥{{order.price}}</view> 49 <view class="text Semibold">￥{{order.price}}</view>
@@ -33,9 +33,7 @@ @@ -33,9 +33,7 @@
33 <view class="practice_name" wx:if="{{item.practice_name}}">{{item.practice_name}}</view> 33 <view class="practice_name" wx:if="{{item.practice_name}}">{{item.practice_name}}</view>
34 </view> 34 </view>
35 <view class="price">￥{{item.price}}/{{item.spec_name||item.cookunit}}</view> 35 <view class="price">￥{{item.price}}/{{item.spec_name||item.cookunit}}</view>
36 - <view class="opt">  
37 - {{item.num}}  
38 - </view> 36 + <view class="opt">{{item.num}}</view>
39 </view> 37 </view>
40 </block> 38 </block>
41 </view> 39 </view>
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 .cart-item{ 32 .cart-item{
33 height: 100rpx; 33 height: 100rpx;
34 line-height: 100rpx; 34 line-height: 100rpx;
35 - font-size: 34rpx; 35 + font-size: 30rpx;
36 } 36 }
37 .cart-item .name{ 37 .cart-item .name{
38 width: 60%; 38 width: 60%;
@@ -44,15 +44,16 @@ @@ -44,15 +44,16 @@
44 max-width: 80%; 44 max-width: 80%;
45 } 45 }
46 .cart-item .price{ 46 .cart-item .price{
47 - width: 32%; 47 + width: 200rpx;
  48 + min-width: 200rpx;
48 white-space:nowrap; 49 white-space:nowrap;
49 - margin: 0 4%; 50 + margin-left: 20rpx;
  51 + overflow: hidden;
50 } 52 }
51 .cart-item .opt{ 53 .cart-item .opt{
52 - font-size: 36rpx;  
53 - font-weight: bold;  
54 - min-width: 80rpx;  
55 - width: 80rpx; 54 + font-size: 30rpx;
  55 + min-width: 50rpx;
  56 + width: 50rpx;
56 text-align: right; 57 text-align: right;
57 } 58 }
58 .total{ 59 .total{