待支付的重新支付的优化

yvan.ni
1 parent af05b82d
Showing 3 changed files with 21 additions and 17 deletions
pages/cart/cart/g_filter.wxs
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -41,7 +41,7 @@ var g_filters = {
 	map_str:function (content){
 		var string='';
 		if(content.is_money==1) string+='免'+content.money+'元|';
-		if(content.is_sale==1) string+="打"+item.content.sale+"折|";
+		if(content.is_sale==1) string+="打"+content.sale+"折|";
 		if(content.is_past==1) string+= "包邮|";
 		if(content.is_coupon==1) string+="送优惠券|";
 		if(content.is_int==1) string+="送积分|";
@@ -1066,14 +1066,16 @@ Page({
                             if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过
                         }
                     }else{
-                        switch (gg.discount_field){
-                            case 1:
-                                if (good.goods_price != gg.shop_price) isok = 0;
-                                break;
-                            case 2:
-                                if (good.goods_price != gg.market_price) isok = 0;
-                                break;
-                        }
+                        if(good.prom_type==3){
+                            switch (gg.discount_field){
+                                case 1:
+                                    if (good.goods_price != gg.shop_price) isok = 0;
+                                    break;
+                                case 2:
+                                    if (good.goods_price != gg.market_price) isok = 0;
+                                    break;
+                            }
+                       }
                     }
  
                     var is_h = 0;
@@ -1123,7 +1123,6 @@ Page({
           if(prom_pc){
              gg.discount_field=prom_pc.discount_field;
           }
-
         }
  
  
@@ -1360,14 +1359,17 @@ Page({
                 if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过
               }
           }else{
-             switch (gg.discount_field){
-               case 1:
-                  if (good.goods_price != gg.shop_price) isok = 0;
+
+            if(good.prom_type==3){
+              switch (gg.discount_field){
+                case 1:
+                    if (good.goods_price != gg.shop_price) isok = 0;
+                    break;
+                case 2:
+                  if (good.goods_price != gg.market_price) isok = 0;
                   break;
-               case 2:
-                 if (good.goods_price != gg.market_price) isok = 0;
-                 break;
-             }
+              }
+            }
           }