xt / xcx-book · Commits

Go to a project

Commit cb09278f6669385aee1c48c4ffca6f84fa85b905

Authored by wangfan
1 parent 2d26deb5
build: skipped

快速预定

Inline Side-by-side
Showing 7 changed files with 54 additions and 8 deletions
@@ -9,8 +9,11 @@ @@ -9,8 +9,11 @@
9 </view> 9 </view>
10 <view class="cart-body"> 10 <view class="cart-body">
11 <view class="cart-item flex-lr" wx:for="{{order.cookbooklist}}" wx:key="item.key"> 11 <view class="cart-item flex-lr" wx:for="{{order.cookbooklist}}" wx:key="item.key">
12 - <view class="name">{{item.cookname}}</view>  
13 - <view class="price">￥{{item.price}}/份</view> 12 + <view class="flex-ll name">
  13 + <view class="name">{{item.cookname}}</view>
  14 + <view class="practice_name" wx:if="{{item.practice_name}}">{{item.practice_name}}</view>
  15 + </view>
  16 + <view class="price">￥{{item.price}}/{{item.spec_name||item.cookunit}}</view>
14 <view class="flex-lr opt"> 17 <view class="flex-lr opt">
15 <foodSpec item="{{item}}" type="-" id="foodSpecDel" 18 <foodSpec item="{{item}}" type="-" id="foodSpecDel"
16 sellerid="{{order.sellerid}}" orderid="{{order.id}}" identity="{{identity}}" 19 sellerid="{{order.sellerid}}" orderid="{{order.id}}" identity="{{identity}}"
@@ -37,6 +37,10 @@ @@ -37,6 +37,10 @@
37 overflow: hidden; 37 overflow: hidden;
38 white-space:nowrap; 38 white-space:nowrap;
39 } 39 }
  40 +.cart-item .name .name{
  41 + width: auto;
  42 + max-width: 80%;
  43 +}
40 .cart-item .price{ 44 .cart-item .price{
41 width: 32%; 45 width: 32%;
42 white-space:nowrap; 46 white-space:nowrap;
@@ -88,4 +92,13 @@ @@ -88,4 +92,13 @@
88 background-size: 100%; 92 background-size: 100%;
89 width: 40rpx; 93 width: 40rpx;
90 height: 40rpx; 94 height: 40rpx;
  95 +}
  96 +.practice_name{
  97 + border: 2rpx solid #C8B16D;
  98 + font-size: 24rpx;
  99 + height: 30rpx;
  100 + line-height: 30rpx;
  101 + color:#C8B16D;
  102 + padding: 0 6rpx;
  103 + margin-left: 18rpx;
91 } 104 }
@@ -11,8 +11,11 @@ @@ -11,8 +11,11 @@
11 <view class="icon"> 11 <view class="icon">
12 <image src="{{item.cookimg}}"></image> 12 <image src="{{item.cookimg}}"></image>
13 </view> 13 </view>
14 - <view class="name">{{item.cookname}}</view>  
15 - <view class="price">￥{{item.price}}/{{item.cookunit}}</view> 14 + <view class="flex-ll name">
  15 + <view class="name">{{item.cookname}}</view>
  16 + <view class="practice_name" wx:if="{{item.practice_name}}">{{item.practice_name}}</view>
  17 + </view>
  18 + <view class="price">￥{{item.price}}/{{item.spec_name||item.cookunit}}</view>
16 <view class="opt"> 19 <view class="opt">
17 {{item.num}} 20 {{item.num}}
18 </view> 21 </view>
@@ -108,6 +108,10 @@ page{ @@ -108,6 +108,10 @@ page{
108 overflow: hidden; 108 overflow: hidden;
109 white-space:nowrap; 109 white-space:nowrap;
110 } 110 }
  111 +.cart-item .name .name{
  112 + width: auto;
  113 + max-width: 80%;
  114 +}
111 .cart-item .price{ 115 .cart-item .price{
112 width: 32%; 116 width: 32%;
113 white-space:nowrap; 117 white-space:nowrap;
@@ -119,4 +123,13 @@ page{ @@ -119,4 +123,13 @@ page{
119 min-width: 80rpx; 123 min-width: 80rpx;
120 width: 80rpx; 124 width: 80rpx;
121 text-align: right; 125 text-align: right;
  126 +}
  127 +.practice_name{
  128 + border: 2rpx solid #C8B16D;
  129 + font-size: 24rpx;
  130 + height: 30rpx;
  131 + line-height: 30rpx;
  132 + color:#C8B16D;
  133 + padding: 0 6rpx;
  134 + margin-left: 18rpx;
122 } 135 }
@@ -28,8 +28,11 @@ @@ -28,8 +28,11 @@
28 <view class="icon"> 28 <view class="icon">
29 <image src="{{item.cookimage}}"></image> 29 <image src="{{item.cookimage}}"></image>
30 </view> 30 </view>
31 - <view class="name">{{item.cookname}}</view>  
32 - <view class="price">￥{{item.price}}/份</view> 31 + <view class="flex-ll name">
  32 + <view class="name">{{item.cookname}}</view>
  33 + <view class="practice_name" wx:if="{{item.practice_name}}">{{item.practice_name}}</view>
  34 + </view>
  35 + <view class="price">￥{{item.price}}/{{item.spec_name||item.cookunit}}</view>
33 <view class="opt"> 36 <view class="opt">
34 {{item.num}} 37 {{item.num}}
35 </view> 38 </view>
@@ -39,6 +39,10 @@ @@ -39,6 +39,10 @@
39 overflow: hidden; 39 overflow: hidden;
40 white-space:nowrap; 40 white-space:nowrap;
41 } 41 }
  42 +.cart-item .name .name{
  43 + width: auto;
  44 + max-width: 80%;
  45 +}
42 .cart-item .price{ 46 .cart-item .price{
43 width: 32%; 47 width: 32%;
44 white-space:nowrap; 48 white-space:nowrap;
@@ -149,4 +153,13 @@ @@ -149,4 +153,13 @@
149 line-height: 100rpx; 153 line-height: 100rpx;
150 color: #999999; 154 color: #999999;
151 font-size: 28rpx; 155 font-size: 28rpx;
  156 +}
  157 +.practice_name{
  158 + border: 2rpx solid #C8B16D;
  159 + font-size: 24rpx;
  160 + height: 30rpx;
  161 + line-height: 30rpx;
  162 + color:#C8B16D;
  163 + padding: 0 6rpx;
  164 + margin-left: 18rpx;
152 } 165 }
@@ -34,7 +34,6 @@ @@ -34,7 +34,6 @@
34 <view class="share-but Regular">发邀请函</view> 34 <view class="share-but Regular">发邀请函</view>
35 </userinfo-share> 35 </userinfo-share>
36 </view> 36 </view>
37 - <!--  
38 <view class="flex-lr share-view-cookbook" > 37 <view class="flex-lr share-view-cookbook" >
39 <userinfo 38 <userinfo
40 binduserinfo="userinfodemo" 39 binduserinfo="userinfodemo"
@@ -57,7 +56,6 @@ @@ -57,7 +56,6 @@
57 <view class="share-but Regular" wx:else="">提前点餐</view> 56 <view class="share-but Regular" wx:else="">提前点餐</view>
58 </userinfo> 57 </userinfo>
59 </view> 58 </view>
60 - -->  
61 </block> 59 </block>
62 60
63 <view style="height: 40rpx;"></view> 61 <view style="height: 40rpx;"></view>