taocan

@@ -21,6 +21,15 @@ Component({
    * 组件的方法列表
    */
   methods: {
-
+    clickSeller(){
+      if(this.data.hasTopStatus) return;
+      let seller_tel=this.data.order_info.seller_tel||this.data.order_info.phone
+      if(typeof seller_tel=='string'){
+        seller_tel=seller_tel.split(',')
+      }
+      this.selectComponent('#as').show({
+        seller_tel:seller_tel,
+      });
+    },
   }
 })

 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "as-phone":"/components/2.0/dialog/phone"
+  }
 }
\ No newline at end of file

 <!--components/2.0/taocan/subject.wxml-->
 <wxs src="../../../utils/util.wxs" module="util" />
 <view class="view card padding-lr-lg padding-tb">
-    <view class="header view flex align-center">
+    <view class="header view flex align-center" bindtap="clickSeller">
         <view class="view avatar margin-right-sm" style="background-image: url('{{order_info.seller_image}}?imageView2/2/w/320')"></view>
         <view class="flex-treble">
             <view class="txt-32-h text-cut" style="margin-bottom: 2rpx;">{{order_info.sellername}}</view>
@@ -33,4 +33,5 @@
     </view>
     <slot></slot>
 </view>
+<as-phone id="as"></as-phone>
 

@@ -81,12 +81,26 @@ Page({
   onUnload: function () {
 
   },
+  getLisType(){
+    if(this.tabType<5) return {type:this.tabType}
+    //2=交易成功(待使用) 3=已使用 5=已退款 6=已过期
+    return {status:{5:2,6:3,7:6,8:5}[this.tabType]}
+  },
+  getOffset(){
+    if(this.tabType<5) return this.offset
+    let page=Math.ceil(this.offset/this.limit)
+    return page<1?1:page
+  },
   getListData() {
     let tabType=this.tabType
-    App.Customer.GetMyOrder({
-      type: tabType,
+    let lisFun=App.Customer.GetMyOrder
+    if(tabType>4){
+      lisFun=App.Foodset.GetUserFoodOrders
+    }
+    lisFun({
+      ...this.getLisType(),//tabType,
       openid: getApp().openid,
-      offset:this.offset,
+      offset:this.getOffset(),
       limit:this.limit,
     }).then(res => {
       let resData=res.data||[]

@@ -507,6 +507,10 @@ export default {
   'App.PayOnline.JsApiPay':{
     openid:'openid',
   },
+  //获取用户已购买的套餐信息
+  'App.Foodset.GetUserFoodOrders':{
+    openid:'openid',
+  },
 
   //根据账单ID获取账单详情
   'App.Foodset.GetFoodOrdersDetail':null,