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({
type: String,
value: '',
},
seeAll:String,//只看标识
},
/**
... ...
... ... @@ -14,7 +14,7 @@
</block>
</view>
<view class="price">¥ {{item.spec[0].price>0 ? item.spec[0].price : item.price}}
<view class="opt flex-cc">
<view class="opt flex-cc" wx:if="{{!seeAll}}">
<block wx:if="{{item_clear_num==0}}">
<image
class="avater"
... ...
<!--cookbook/index.wxml-->
<nav>{{order.seller.sellername||'提前点菜'}}</nav>
<nav>{{options.seeAll||order.seller.sellername||'提前点菜'}}</nav>
<loading wx:if="{{isloading}}">数据加载中</loading>
<view class="{{hasListModel?'page-list flex-ll-top':'page'}}" wx:if="{{!isloading}}">
<!--第四部分 原始菜无图或有图展示-->
<scroll-view
scroll-y class = "partfour list-model"
style = "height:{{kindHeight-55}}px;width:100%;z-index:{{scrollZindex}}; position: fixed;"
style = "height:{{kindHeight-(options.seeAll?0:55)}}px;width:100%;z-index:{{scrollZindex}}; position: fixed;"
scroll-into-view = "{{toView}}"
scroll-with-animation
bindscroll="bindscroll"
... ... @@ -19,7 +19,7 @@
<view class="list-model-column">
<block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="itemIndex" >
<view class="item">
<foodCard item="{{item}}"
<foodCard item="{{item}}" seeAll="{{options.seeAll}}"
sellerid="{{order.sellerid}}" orderid="{{order.id}}"
identity="{{options.identity}}"
bindfoodCardCallback="foodCardCallback"
... ... @@ -32,7 +32,7 @@
<view style="height: 110rpx;width: 100%;"></view>
</view>
</scroll-view>
<view class="white flex-lr bottom-view">
<view class="white flex-lr bottom-view" wx:if="{{!options.seeAll}}">
<button class="share flex-vc button-none" open-type="share">
<view class="flex-vc">
<view class="icon">
... ...
... ... @@ -149,9 +149,11 @@
<view class="black20line"></view>
<view class="block" wx:if="{{seller.dishes.length>0}}">
<view class="header flex-ll">
<view class="line"></view>
<view class="name">推荐菜品</view>
<view class="header flex-lr">
<view class="flex-ll">
<view class="line"></view>
<view class="name">推荐菜品</view>
</view>
</view>
<scroll-view wx:if="{{hasDishesImage}}"
scroll-x
... ... @@ -177,6 +179,22 @@
</block>
</view>
</view>
<block wx:if="{{seller.dishes.length>0}}">
<view class="black20line"></view>
<navigator url="/pack-cookbook/pages/index?rid=18599&oid=273&identity=1&seeAll={{seller.sellername}}&sid={{seller.id}}" hover-class="navigator-hover">
<view class="view padding-tb-lg">
<view class="view flex justify-between align-center">
<view class="view txt-40-h text-bold">查看菜单</view>
<view class="view flex justify-end align-center">
<view style="font-size: 28rpx;margin-right: 20rpx;">所有菜品</view>
<view class="more"></view>
</view>
</view>
</view>
</navigator>
<view class="black20line"></view>
<view class="black20line"></view>
</block>
</view>
</view>
<view class="footer flex-lr">
... ...
/* pages/reserve/detail.wxss */
@import "./detail.skeleton.wxss";
@import "../../colorui/main.wxss";
.pages{
width: 100%;
margin: 0 auto;
... ...
... ... @@ -271,10 +271,9 @@
"scene": "1001"
},
{
"id": 25,
"name": "pack-cookbook/pages/index",
"pathName": "pack-cookbook/pages/index",
"query": "rid=18599&oid=273&identity=1&sid=154",
"query": "rid=18599&oid=273&identity=1&seeAll=陕西风味面馆&sid=1",
"scene": 1001
},
{
... ...