xt / xcx-book · Commits

Go to a project

Commit b7216f7074c1911fcdd179ffc9d21a20e68d1708

Authored by wangfan
1 parent 84c3c253
build: skipped

seller nav

Inline Side-by-side
Showing 13 changed files with 41 additions and 21 deletions
@@ -29,11 +29,12 @@ Component({ @@ -29,11 +29,12 @@ Component({
29 let disBack = false; 29 let disBack = false;
30 let disHome = false; 30 let disHome = false;
31 let pages = getCurrentPages(); 31 let pages = getCurrentPages();
32 - console.log('pages.length',pages.length); 32 + console.log('pages.length',pages[0]);
33 if (pages.length > 1) { 33 if (pages.length > 1) {
34 disBack = true; 34 disBack = true;
35 } else { 35 } else {
36 - if (getApp().shareTicket && this.data.hasHome) { 36 + //if (getApp().shareTicket && this.data.hasHome) {
  37 + if (this.data.hasHome && pages[0].route!="pages/customer/list") {
37 disHome = true; 38 disHome = true;
38 } 39 }
39 } 40 }
1 <!--components/nav/nav.wxml--> 1 <!--components/nav/nav.wxml-->
2 -<view class="nav" style="padding-top: {{statusBarHeight*2}}rpx;background-color: {{backgroundColor}};color:{{color}};">  
3 - <view class="flex-lr part">  
4 - <view class="opt flex-ll">  
5 - <view class="back flex-vc" bindtap="back" wx:if="{{disBack}}">  
6 - <image class="back-image" src="http://qn.colorcun.com/custom/lite-yd/image/back.png"></image> 2 +<view class="nav-main" style="background-color: {{backgroundColor}};color:{{color}};">
  3 + <view class="nav" style="padding-top: {{statusBarHeight*2}}rpx;">
  4 + <view class="flex-lr part">
  5 + <view class="opt flex-ll">
  6 + <view class="back flex-vc" bindtap="back" wx:if="{{disBack}}">
  7 + <image class="back-image" src="http://qn.colorcun.com/custom/lite-yd/image/back.png"></image>
  8 + </view>
  9 + <view class="home flex-vc" bindtap="home" wx:if="{{disHome}}">
  10 + <image class="home-image" src="http://qn.colorcun.com/custom/lite-yd/image/home.svg"></image>
  11 + </view>
7 </view> 12 </view>
8 - <view class="home flex-vc" bindtap="home" wx:if="{{disHome}}">  
9 - <image class="home-image" src="http://qn.colorcun.com/custom/lite-yd/image/home.svg"></image> 13 + <view class="title" bindtap="home">
  14 + <slot></slot>
  15 + </view>
  16 + <view class="opt">
  17 + <view></view>
10 </view> 18 </view>
11 </view> 19 </view>
12 - <view class="title" bindtap="home">  
13 - <slot></slot>  
14 - </view>  
15 - <view class="opt">  
16 - <view></view>  
17 - </view>  
18 - </view>  
19 20
  21 + </view>
20 </view> 22 </view>
  23 +<view class="nav-main-space" style="height: {{statusBarHeight*2+68}}rpx;"></view>
1 /* components/nav/nav.wxss */ 1 /* components/nav/nav.wxss */
2 @import "../../app.wxss"; 2 @import "../../app.wxss";
  3 +.nav-main{
  4 + position:fixed;
  5 + width: 100%;
  6 + z-index: 9999;
  7 +}
3 .nav{ 8 .nav{
4 font-size: 30rpx; 9 font-size: 30rpx;
5 font-weight: bold; 10 font-weight: bold;
@@ -10,6 +15,7 @@ @@ -10,6 +15,7 @@
10 height: 68rpx; 15 height: 68rpx;
11 margin-top: 10rpx; 16 margin-top: 10rpx;
12 text-align: center; 17 text-align: center;
  18 +
13 } 19 }
14 .nav .part .title{ 20 .nav .part .title{
15 width: 100%; 21 width: 100%;
@@ -3,7 +3,8 @@ @@ -3,7 +3,8 @@
3 "navigationBarBackgroundColor": "#fff", 3 "navigationBarBackgroundColor": "#fff",
4 "navigationBarTextStyle":"black", 4 "navigationBarTextStyle":"black",
5 "usingComponents": { 5 "usingComponents": {
6 - "timeDuration":"/components/book/time/time" 6 + "timeDuration":"/components/book/time/time",
  7 + "nav":"/components/nav/nav"
7 } 8 }
8 9
9 } 10 }
  1 +<nav>点餐商户端</nav>
1 <!--日期--> 2 <!--日期-->
2 <view style="padding-bottom:160rpx;"> 3 <view style="padding-bottom:160rpx;">
3 <view class="select-date flex-lr smooth"> 4 <view class="select-date flex-lr smooth">
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "navigationBarTextStyle":"black", 4 "navigationBarTextStyle":"black",
5 "usingComponents": { 5 "usingComponents": {
6 "selectPeople":"/components/book/people/people", 6 "selectPeople":"/components/book/people/people",
7 - "orderDesk":"/components/book/desk/desk" 7 + "orderDesk":"/components/book/desk/desk",
  8 + "nav":"/components/nav/nav"
8 } 9 }
9 } 10 }
  1 +<nav>点餐商户端</nav>
1 <view class="other-info flex-lr"> 2 <view class="other-info flex-lr">
2 <view class="selected-time flex-lr"> 3 <view class="selected-time flex-lr">
3 <view style="padding:30rpx 40rpx;" bindtap="backtime"> 4 <view style="padding:30rpx 40rpx;" bindtap="backtime">
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "navigationBarTextStyle":"black", 4 "navigationBarTextStyle":"black",
5 "usingComponents": { 5 "usingComponents": {
6 "noticeCall":"/components/book/notice/notice", 6 "noticeCall":"/components/book/notice/notice",
7 - "step":"/components/book/step/step" 7 + "step":"/components/book/step/step",
  8 + "nav":"/components/nav/nav"
8 } 9 }
9 } 10 }
  1 +<nav>点餐商户端</nav>
1 <step step="2"></step> 2 <step step="2"></step>
2 <!--商家信息--> 3 <!--商家信息-->
3 <view class="flex-lr seller-info"> 4 <view class="flex-lr seller-info">
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 "usingComponents": { 5 "usingComponents": {
6 "nothingBook":"/components/book/nothing/nothing", 6 "nothingBook":"/components/book/nothing/nothing",
7 "bookList":"/components/book/list/list", 7 "bookList":"/components/book/list/list",
8 - "actButton":"/components/book/action/action" 8 + "actButton":"/components/book/action/action",
  9 + "nav":"/components/nav/nav"
9 } 10 }
10 } 11 }
  1 +<nav>点餐商户端</nav>
1 <block wx:if="{{isloading==true}}"> 2 <block wx:if="{{isloading==true}}">
2 <block wx:if="{{!bookList}}"> 3 <block wx:if="{{!bookList}}">
3 <nothingBook></nothingBook> 4 <nothingBook></nothingBook>
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "navigationBarTextStyle":"black", 4 "navigationBarTextStyle":"black",
5 "usingComponents": { 5 "usingComponents": {
6 "selectPeople":"/components/book/people/people", 6 "selectPeople":"/components/book/people/people",
7 - "step":"/components/book/step/step" 7 + "step":"/components/book/step/step",
  8 + "nav":"/components/nav/nav"
8 } 9 }
9 } 10 }
  1 +<nav>点餐商户端</nav>
1 <step step="1"></step> 2 <step step="1"></step>
2 <view class="other-info flex-lr"> 3 <view class="other-info flex-lr">
3 <view class="selected-time flex-vc" bindtap="changetime"> 4 <view class="selected-time flex-vc" bindtap="changetime">