合并到dev

yvan.ni
1 parent 1a212bb1
Showing 1 changed file with 3 additions and 2 deletions
pages/user/order_list/order_list.js
@@ -3065,7 +3065,7 @@ Page({
     if (e) {
       currentIndex = e.target.dataset.index;
     } else {
-      currentIndex = this.data.currentIndex
+      currentIndex = this.data.tabIndex
     };
     // let || this.data.tabIndex;
@@ -3076,7 +3076,7 @@ Page({
       user_id: oo.user_id,
     };
     this.setData({
-      tabIndex: this.data.tabIndex || 0,
+      tabIndex: currentIndex,
       is_no_data2: 0,
       is_no_more2: 0,
       cardList: [],
@@ -3157,6 +3157,7 @@ Page({
     var pt_act=null;  //-- 拼团活动的优化 --
     for (const it of list) {
+      
       //秒杀
       if ([1,2].includes(it.prom_type)) {
         let act_details = null;