taocan

vking
1 parent d0f060a4
Showing 7 changed files with 35 additions and 18 deletions
components/2.0/taocan/subject.js
components/2.0/taocan/subject.wxml
components/2.0/taocan/subject.wxss
pages/me/list.js
pages/me/list.json
pages/me/list.wxml
pages/taocan/order.wxml
--- a/components/2.0/taocan/subject.js
View file @6bd4c3b
+++ b/components/2.0/taocan/subject.js
View file @6bd4c3b
@@ -5,6 +5,7 @@ Component({
    */
   properties: {
     order:Object,
+    hasTopStatus:Boolean,
   },
   /**
--- a/components/2.0/taocan/subject.wxml
View file @6bd4c3b
+++ b/components/2.0/taocan/subject.wxml
View file @6bd4c3b
 <!--components/2.0/taocan/subject.wxml-->
-<view class="view card padding-lg padding-top">
+<view class="view card padding-lr-lg padding-tb">
     <view class="header view flex align-center">
         <view class="view avatar margin-right-sm" style="background-image: url('{{order.seller.oooo}}')"></view>
         <view class="flex-treble">
             <view class="txt-32-h text-cut" style="margin-bottom: 2rpx;">123</view>
             <view class="txt-24-h text-gray text-cut">地址</view>
         </view>
-        <view class="phone view"></view>
+        <view class="view txt-28-h text-blue" wx:if="{{hasTopStatus}}">以哈哈</view>
+        <view class="phone view" wx:else=""></view>
     </view>
     <view class="view flex solid-bottom" style="padding-bottom: 36rpx;padding-top: 36rpx;">
         <view class="thumb margin-right-lg"></view>
--- a/components/2.0/taocan/subject.wxss
View file @6bd4c3b
+++ b/components/2.0/taocan/subject.wxss
View file @6bd4c3b
@@ -27,4 +27,7 @@
     height: 30rpx;
     background: #F5F5F5!important;
     text-align: center;
+}
+.status{
+
 }
--- a/pages/me/list.js
View file @6bd4c3b
+++ b/pages/me/list.js
View file @6bd4c3b
@@ -5,6 +5,7 @@ import RS from '../../utils/reserveStatus'
 import PubSub from '../../utils/PubSub'
 const {regeneratorRuntime} = global
+const defTabType=5
 Page({
   /**
@@ -16,11 +17,11 @@ Page({
       [],[],[],[]
     ],
     total: 0,
-    tabType:1,
+    tabType:defTabType,
     hasMore:true,
     rsl:[],//推荐商家
   },
-  tabType:1,
+  tabType:defTabType,
   offset:0,
   limit:10,
   hasMore:true,
@@ -95,6 +96,9 @@ Page({
       if(this.hasMore){
         this.offset+=this.limit
       }
+      if(tabType>4){
+        data=[{},{},{}]
+      }
       this.setData({
         [`list[`+tabType+`]`]: this.data.list[tabType].concat(data),
         hasMore:this.hasMore
--- a/pages/me/list.json
View file @6bd4c3b
+++ b/pages/me/list.json
View file @6bd4c3b
@@ -10,6 +10,7 @@
     "getpos":"/components/userinfo/getpos",
     "as-phone":"/components/actionSheet/phone",
     "card-bak":"/components/seller-card/seller-card",
-    "card":"/components/2.0/reserve/card"
+    "card":"/components/2.0/reserve/card",
+    "subject":"/components/2.0/taocan/subject"
   }
 }
--- a/pages/me/list.wxml
View file @6bd4c3b
+++ b/pages/me/list.wxml
View file @6bd4c3b
@@ -5,17 +5,17 @@
         <view class="view item {{tabType>4?'active':''}}" data-type="5" bindtap="switchType">我的套餐</view>
     </view>
 </nav>
-<view class="view tabs flex padding-lg padding-top-xs justify-between" wx:if="{{tabType<5}}">
+<view class="view tabs flex padding-lr-lg padding-top-xs justify-between padding-bottom-sm margin-bottom-sm" wx:if="{{tabType<5}}">
     <view class="view item {{tabType==1?'active':''}}" data-type="1" bindtap="switchType">等待确认</view>
     <view class="view item {{tabType==2?'active':''}}" data-type="2" bindtap="switchType">预订成功</view>
     <view class="view item {{tabType==3?'active':''}}" data-type="3" bindtap="switchType">历史订单</view>
     <view class="view item {{tabType==4?'active':''}}" data-type="4" bindtap="switchType">无效预订</view>
 </view>
-<view class="view tabs flex padding-lg padding-top-xs justify-between" wx:else="">
-    <view class="view item {{tabType==5?'active':''}}" data-type="5" bindtap="switchType">全部套餐</view>
-    <view class="view item {{tabType==6?'active':''}}" data-type="6" bindtap="switchType">待使用</view>
-    <view class="view item {{tabType==7?'active':''}}" data-type="7" bindtap="switchType">已使用</view>
-    <view class="view item {{tabType==8?'active':''}}" data-type="8" bindtap="switchType">已退款</view>
+<view class="view tabs flex padding-lr-lg padding-top-xs justify-between padding-bottom-sm margin-bottom-sm" wx:else="">
+    <view class="view item {{tabType==5?'active':''}}" data-type="5" bindtap="switchType">待使用</view>
+    <view class="view item {{tabType==6?'active':''}}" data-type="6" bindtap="switchType">已使用</view>
+    <view class="view item {{tabType==7?'active':''}}" data-type="7" bindtap="switchType">已过期</view>
+    <view class="view item {{tabType==8?'active':''}}" data-type="8" bindtap="switchType">退款</view>
 </view>
 <view class="view pages">
     <block wx:if="{{list[tabType].length==0}}">
@@ -34,13 +34,18 @@
                     seller="{{detail.seller}}" detail="{{detail}}"></card>
             </navigator>
         </block>
-        <block wx:else="">
+        <view class="view padding-lr" wx:else="">
             <navigator wx:for="{{list[tabType]}}" wx:key="success.key"
                        wx:for-item="order" wx:for-index="dateIndex"
+                       class="margin-bottom-lg"
                        url="/pages/taocan/order?id={{order.id}}">
-                <tcard order="{{order}}"></tcard>
+                <subject order="{{order}}" hasTopStatus>
+                    <view class="view flex justify-end margin-top">
+                        <view class="solid txt-26-h text-blue">到店使用</view>
+                    </view>
+                </subject>
             </navigator>
-        </block>
+        </view>
         <view class="view" style="height: 192rpx;"></view>
     </block>
 </view>
--- a/pages/taocan/order.wxml
View file @6bd4c3b
+++ b/pages/taocan/order.wxml
View file @6bd4c3b
@@ -10,10 +10,12 @@
             <image src="{{false?'':'http://nosqn.colorcun.com/taocan/1%20%2813%29.png'}}" mode="heightFix" style="height: 340rpx;"></image>
         </view>
     </subject>
-    <view class="view card flex margin-tb-sm padding-lg justify-between">
-        <view class="view text-bold txt-32-h">您还可以预订包间</view>
-        <view class="view bg-blue-blue round" style="padding: 8rpx 20rpx;">订包间</view>
-    </view>
+    <navigator url="/pages/reserve/detail?id={{order.seller.id}}&activeTab=reserve">
+        <view class="view card flex margin-tb-sm padding-lg justify-between">
+            <view class="view text-bold txt-32-h">您还可以预订包间</view>
+            <view class="view bg-blue-blue round" style="padding: 8rpx 20rpx;">订包间</view>
+        </view>
+    </navigator>
     <view class="view card">
         <view class="txt-30-h padding solid-bottom text-bold">使用须知</view>
         <view class="view padding block">