xt / xcx-book · Commits

Go to a project

Commit 39bc77367b4dc5e3a46a637178280479e8419d38

Authored by vking
1 parent 53daed8d
build: skipped

search

Inline Side-by-side
Showing 6 changed files with 29 additions and 10 deletions
@@ -32,6 +32,7 @@ Component({ @@ -32,6 +32,7 @@ Component({
32 type: String, 32 type: String,
33 value: '', 33 value: '',
34 }, 34 },
  35 + seeAll:String,//只看标识
35 }, 36 },
36 37
37 /** 38 /**
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </block> 14 </block>
15 </view> 15 </view>
16 <view class="price">¥ {{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}}
17 - <view class="opt flex-cc"> 17 + <view class="opt flex-cc" wx:if="{{!seeAll}}">
18 <block wx:if="{{item_clear_num==0}}"> 18 <block wx:if="{{item_clear_num==0}}">
19 <image 19 <image
20 class="avater" 20 class="avater"
1 <!--cookbook/index.wxml--> 1 <!--cookbook/index.wxml-->
2 -<nav>{{order.seller.sellername||'提前点菜'}}</nav> 2 +<nav>{{options.seeAll||order.seller.sellername||'提前点菜'}}</nav>
3 <loading wx:if="{{isloading}}">数据加载中</loading> 3 <loading wx:if="{{isloading}}">数据加载中</loading>
4 <view class="{{hasListModel?'page-list flex-ll-top':'page'}}" wx:if="{{!isloading}}"> 4 <view class="{{hasListModel?'page-list flex-ll-top':'page'}}" wx:if="{{!isloading}}">
5 <!--第四部分 原始菜无图或有图展示--> 5 <!--第四部分 原始菜无图或有图展示-->
6 <scroll-view 6 <scroll-view
7 scroll-y class = "partfour list-model" 7 scroll-y class = "partfour list-model"
8 - style = "height:{{kindHeight-55}}px;width:100%;z-index:{{scrollZindex}}; position: fixed;" 8 + style = "height:{{kindHeight-(options.seeAll?0:55)}}px;width:100%;z-index:{{scrollZindex}}; position: fixed;"
9 scroll-into-view = "{{toView}}" 9 scroll-into-view = "{{toView}}"
10 scroll-with-animation 10 scroll-with-animation
11 bindscroll="bindscroll" 11 bindscroll="bindscroll"
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <view class="list-model-column"> 19 <view class="list-model-column">
20 <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="itemIndex" > 20 <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="itemIndex" >
21 <view class="item"> 21 <view class="item">
22 - <foodCard item="{{item}}" 22 + <foodCard item="{{item}}" seeAll="{{options.seeAll}}"
23 sellerid="{{order.sellerid}}" orderid="{{order.id}}" 23 sellerid="{{order.sellerid}}" orderid="{{order.id}}"
24 identity="{{options.identity}}" 24 identity="{{options.identity}}"
25 bindfoodCardCallback="foodCardCallback" 25 bindfoodCardCallback="foodCardCallback"
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <view style="height: 110rpx;width: 100%;"></view> 32 <view style="height: 110rpx;width: 100%;"></view>
33 </view> 33 </view>
34 </scroll-view> 34 </scroll-view>
35 - <view class="white flex-lr bottom-view"> 35 + <view class="white flex-lr bottom-view" wx:if="{{!options.seeAll}}">
36 <button class="share flex-vc button-none" open-type="share"> 36 <button class="share flex-vc button-none" open-type="share">
37 <view class="flex-vc"> 37 <view class="flex-vc">
38 <view class="icon"> 38 <view class="icon">
@@ -149,9 +149,11 @@ @@ -149,9 +149,11 @@
149 149
150 <view class="black20line"></view> 150 <view class="black20line"></view>
151 <view class="block" wx:if="{{seller.dishes.length>0}}"> 151 <view class="block" wx:if="{{seller.dishes.length>0}}">
152 - <view class="header flex-ll">  
153 - <view class="line"></view>  
154 - <view class="name">推荐菜品</view> 152 + <view class="header flex-lr">
  153 + <view class="flex-ll">
  154 + <view class="line"></view>
  155 + <view class="name">推荐菜品</view>
  156 + </view>
155 </view> 157 </view>
156 <scroll-view wx:if="{{hasDishesImage}}" 158 <scroll-view wx:if="{{hasDishesImage}}"
157 scroll-x 159 scroll-x
@@ -177,6 +179,22 @@ @@ -177,6 +179,22 @@
177 </block> 179 </block>
178 </view> 180 </view>
179 </view> 181 </view>
  182 + <block wx:if="{{seller.dishes.length>0}}">
  183 + <view class="black20line"></view>
  184 + <navigator url="/pack-cookbook/pages/index?rid=18599&oid=273&identity=1&seeAll={{seller.sellername}}&sid={{seller.id}}" hover-class="navigator-hover">
  185 + <view class="view padding-tb-lg">
  186 + <view class="view flex justify-between align-center">
  187 + <view class="view txt-40-h text-bold">查看菜单</view>
  188 + <view class="view flex justify-end align-center">
  189 + <view style="font-size: 28rpx;margin-right: 20rpx;">所有菜品</view>
  190 + <view class="more"></view>
  191 + </view>
  192 + </view>
  193 + </view>
  194 + </navigator>
  195 + <view class="black20line"></view>
  196 + <view class="black20line"></view>
  197 + </block>
180 </view> 198 </view>
181 </view> 199 </view>
182 <view class="footer flex-lr"> 200 <view class="footer flex-lr">
1 /* pages/reserve/detail.wxss */ 1 /* pages/reserve/detail.wxss */
2 @import "./detail.skeleton.wxss"; 2 @import "./detail.skeleton.wxss";
  3 +@import "../../colorui/main.wxss";
3 .pages{ 4 .pages{
4 width: 100%; 5 width: 100%;
5 margin: 0 auto; 6 margin: 0 auto;
@@ -271,10 +271,9 @@ @@ -271,10 +271,9 @@
271 "scene": "1001" 271 "scene": "1001"
272 }, 272 },
273 { 273 {
274 - "id": 25,  
275 "name": "pack-cookbook/pages/index", 274 "name": "pack-cookbook/pages/index",
276 "pathName": "pack-cookbook/pages/index", 275 "pathName": "pack-cookbook/pages/index",
277 - "query": "rid=18599&oid=273&identity=1&sid=154", 276 + "query": "rid=18599&oid=273&identity=1&seeAll=陕西风味面馆&sid=1",
278 "scene": 1001 277 "scene": 1001
279 }, 278 },
280 { 279 {