xt / xcx-book · Commits

Go to a project

Commit 480a24b6d2b020b5df1facd9f39ca82b37ac9f92

Authored by wangfan
1 parent 8ea00fe6
build: skipped

v2 customer view

Inline Side-by-side
Showing 5 changed files with 17 additions and 33 deletions
@@ -14,6 +14,10 @@ Component({ @@ -14,6 +14,10 @@ Component({
14 this.init(); 14 this.init();
15 } 15 }
16 }, 16 },
  17 + hasMaster:{
  18 + type:Boolean,
  19 + value:false
  20 + }
17 }, 21 },
18 22
19 /** 23 /**
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 {{seller.map_address}} 30 {{seller.map_address}}
31 </view> 31 </view>
32 </view> 32 </view>
33 - <view class="seller master flex-lr"> 33 + <view class="seller master flex-lr" wx:if="{{hasMaster}}">
34 <view class="master-label"> 34 <view class="master-label">
35 预订人 35 预订人
36 </view> 36 </view>
@@ -11,9 +11,9 @@ @@ -11,9 +11,9 @@
11 </view> 11 </view>
12 --> 12 -->
13 <block wx:if="{{total==0}}"> 13 <block wx:if="{{total==0}}">
14 - <view wx:if="{{tabindex==tabFlag}}" class="flex-vc empry"> 14 + <view class="flex-vc empry">
15 <image src="http://qn.colorcun.com/custom/lite/image/empty-order.png"></image> 15 <image src="http://qn.colorcun.com/custom/lite/image/empty-order.png"></image>
16 - <view class="Medium">{{0==tabFlag?'暂无日程':'暂无订座'}}</view> 16 + <view class="Medium">暂无日程</view>
17 </view> 17 </view>
18 </block> 18 </block>
19 <block wx:else=""> 19 <block wx:else="">
@@ -23,7 +23,8 @@ @@ -23,7 +23,8 @@
23 <block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail"> 23 <block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail">
24 <navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}"> 24 <navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">
25 <view class="card"> 25 <view class="card">
26 - <card seller="{{detail.seller}}" detail="{{detail}}"></card> 26 + <card hasMaster
  27 + seller="{{detail.seller}}" detail="{{detail}}"></card>
27 </view> 28 </view>
28 </navigator> 29 </navigator>
29 </block> 30 </block>
@@ -36,7 +37,8 @@ @@ -36,7 +37,8 @@
36 <block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail"> 37 <block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail">
37 <navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}"> 38 <navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">
38 <view class="card"> 39 <view class="card">
39 - <card seller="{{detail.seller}}" detail="{{detail}}"></card> 40 + <card hasMaster
  41 + seller="{{detail.seller}}" detail="{{detail}}"></card>
40 </view> 42 </view>
41 </navigator> 43 </navigator>
42 </block> 44 </block>
@@ -49,7 +49,7 @@ Page({ @@ -49,7 +49,7 @@ Page({
49 }, 49 },
50 getListData(){ 50 getListData(){
51 App.Reserve.GetListFromScheAndRes({ 51 App.Reserve.GetListFromScheAndRes({
52 - flag:this.data.tabFlag, 52 + flag:1,
53 openid:getApp().openid, 53 openid:getApp().openid,
54 }).then(res => { 54 }).then(res => {
55 let data=this.formatList(res.data); 55 let data=this.formatList(res.data);
1 <!--pages/customer/list.wxml--> 1 <!--pages/customer/list.wxml-->
2 -<nav hasHome>订个座儿</nav> 2 +<nav hasHome>我的订单</nav>
3 <view class="page"> 3 <view class="page">
4 - <!--  
5 - <view class="tabs flex-cc">  
6 - <view class="item {{0==tabFlag?'active':''}}"  
7 - bindtap="switchTab" data-index="0">我的日程</view>  
8 - <view class="item" style="width: 246rpx;"></view>  
9 - <view class="item {{1==tabFlag?'active':''}}"  
10 - bindtap="switchTab" data-index="1">我的订座</view>  
11 - </view>  
12 - -->  
13 <block wx:if="{{total==0}}"> 4 <block wx:if="{{total==0}}">
14 - <view wx:if="{{tabindex==tabFlag}}" class="flex-vc empry"> 5 + <view class="flex-vc empry">
15 <image src="http://qn.colorcun.com/custom/lite/image/empty-order.png"></image> 6 <image src="http://qn.colorcun.com/custom/lite/image/empty-order.png"></image>
16 - <view class="Medium">{{0==tabFlag?'暂无日程':'暂无订座'}}</view> 7 + <view class="Medium">'暂无订座'</view>
17 </view> 8 </view>
18 </block> 9 </block>
19 <block wx:else=""> 10 <block wx:else="">
20 <block wx:for="{{success}}" wx:key="success.key" wx:for-item="part" wx:for-index="dateIndex"> 11 <block wx:for="{{success}}" wx:key="success.key" wx:for-item="part" wx:for-index="dateIndex">
21 <view class="list-content" wx:if="{{part.length>0}}"> 12 <view class="list-content" wx:if="{{part.length>0}}">
22 - <view class="cate-class" style="margin-bottom: 40rpx;margin-left: 44rpx;">{{dateIndex}}</view>  
23 <block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail"> 13 <block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail">
24 <navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}"> 14 <navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">
25 <view class="card"> 15 <view class="card">
26 - <card seller="{{detail.seller}}" detail="{{detail}}"></card>  
27 - </view>  
28 - </navigator>  
29 - </block>  
30 - </view>  
31 - </block>  
32 - <block wx:for="{{padding}}" wx:key="padding.key" wx:for-item="part" wx:for-index="dateIndex">  
33 - <view class="list-content" wx:if="{{part.length>0}}">  
34 - <view class="cate-class" style="margin-bottom: 26rpx;">待处理<text>({{part.length}}条)</text></view>  
35 - <view class="cate-class" style="margin-bottom: 40rpx;margin-top: 0;margin-left: 44rpx;">{{dateIndex}}</view>  
36 - <block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail">  
37 - <navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">  
38 - <view class="card">  
39 - <card seller="{{detail.seller}}" detail="{{detail}}"></card> 16 + <card
  17 + seller="{{detail.seller}}" detail="{{detail}}"></card>
40 </view> 18 </view>
41 </navigator> 19 </navigator>
42 </block> 20 </block>