From 0556e2bfdf6e9424ef6ef12abe08fc9d7b44cf1b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 08:54:05 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-xcx
---
pages/yuyue/order.wxml | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/pages/yuyue/order.wxml b/pages/yuyue/order.wxml
index 52cab3b..e01539b 100644
--- a/pages/yuyue/order.wxml
+++ b/pages/yuyue/order.wxml
@@ -2,33 +2,38 @@
<view class='tabs_box'>
- <view class="tabs_item {{currentIndex==0?'selected':''}}" bindtap='onTabsItemEvent' data-index="">
+ <view class="tabs_item {{currentIndex==0?'selected':''}}" bindtap='onTabsItemEvent' data-index="0">
全部
</view>
<view class="tabs_item {{currentIndex==1?'selected':''}}" bindtap='onTabsItemEvent' data-index="1">
- 待服务
+ 待确认
</view>
<view class="tabs_item {{currentIndex==2?'selected':''}}" bindtap='onTabsItemEvent' data-index="2">
- 已完成
+ 进行中
</view>
<view class="tabs_item {{currentIndex==3?'selected':''}}" bindtap='onTabsItemEvent' data-index="3">
+ 待评价
+ </view>
+ <view class="tabs_item {{currentIndex==4?'selected':''}}" bindtap='onTabsItemEvent' data-index="4">
+ 已评价
+ </view>
+ <view class="tabs_item {{currentIndex==5?'selected':''}}" bindtap='onTabsItemEvent' data-index="5">
已取消
</view>
-
</view>
<view class="order-container" wx:if="{{!orderShow}}">
<view class="order-list radius" wx:for="{{orderList}}" wx:key="ids" data-id="{{item.id}}" bindtap='intoDetail'>
<view class='order-top'>
- <text class='grey'>订单编号：{{item.orderNo}}</text>
- <text class='explain'>{{item.dicMap.status}}</text>
+ <text class='grey'>订单编号：{{item.serviceNo}}</text>
+ <text class='explain'>{{item.shopName}}</text>
</view>
<view class='order-middle'>
- <image src='{{item.shopProduct.imgMobile}}' class='order-image' mode="aspectFit"></image>
+ <image src='{{proj.imgMobile}}' class='order-image' mode="aspectFit"></image>
<view class='order-info'>
- <view class='name'>{{item.shopProduct.title}}</view>
- <view class='grey norms'>{{item.shopInfo.shopName}} </view>
+ <view wx:for="{{item.projs}}" wx:for-item="proj" class='name'>{{proj.projName}}</view>
+
<view class="goods-group">
<!-- <view class='price'>￥{{item.shopProduct.price}}</view>-->
</view>
@@ -37,12 +42,19 @@
<view class='order-bottom'>
- <text class='cancel-order' wx:if="{{item.status == 1}}" data-index="{{index}}" data-id="{{item.id}}" capture-catch:touchstart='cancelOrder'>取消订单</text>
+ <text class='cancel-order' wx:if="{{item.status == 9}}" data-index="{{index}}" data-id="{{item.id}}" capture-catch:touchstart='cancelOrder'>取消订单</text>
</view>
</view>
</view>
+ <!-- 没有更多数据 -->
+ <view class='text-center pd-10' wx:if="{{noMore}}">
+ <view>
+ <text class="color_gray font-12">没有更多了~</text>
+ </view>
+ </view>
+
</view>
--
Gitblit v1.9.1