Commit 40d4f29897a3e4990f52e031c14e33f130992dc1
1 parent
af05b82d
待支付的重新支付的优化
Showing
3 changed files
with
21 additions
and
17 deletions
pages/cart/cart/g_filter.wxs
| @@ -41,7 +41,7 @@ var g_filters = { | @@ -41,7 +41,7 @@ var g_filters = { | ||
| 41 | map_str:function (content){ | 41 | map_str:function (content){ |
| 42 | var string=''; | 42 | var string=''; |
| 43 | if(content.is_money==1) string+='免'+content.money+'元|'; | 43 | if(content.is_money==1) string+='免'+content.money+'元|'; |
| 44 | - if(content.is_sale==1) string+="打"+item.content.sale+"折|"; | 44 | + if(content.is_sale==1) string+="打"+content.sale+"折|"; |
| 45 | if(content.is_past==1) string+= "包邮|"; | 45 | if(content.is_past==1) string+= "包邮|"; |
| 46 | if(content.is_coupon==1) string+="送优惠券|"; | 46 | if(content.is_coupon==1) string+="送优惠券|"; |
| 47 | if(content.is_int==1) string+="送积分|"; | 47 | if(content.is_int==1) string+="送积分|"; |
pages/user/order_detail/order_detail.js
| @@ -1066,14 +1066,16 @@ Page({ | @@ -1066,14 +1066,16 @@ Page({ | ||
| 1066 | if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过 | 1066 | if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过 |
| 1067 | } | 1067 | } |
| 1068 | }else{ | 1068 | }else{ |
| 1069 | - switch (gg.discount_field){ | ||
| 1070 | - case 1: | ||
| 1071 | - if (good.goods_price != gg.shop_price) isok = 0; | ||
| 1072 | - break; | ||
| 1073 | - case 2: | ||
| 1074 | - if (good.goods_price != gg.market_price) isok = 0; | ||
| 1075 | - break; | ||
| 1076 | - } | 1069 | + if(good.prom_type==3){ |
| 1070 | + switch (gg.discount_field){ | ||
| 1071 | + case 1: | ||
| 1072 | + if (good.goods_price != gg.shop_price) isok = 0; | ||
| 1073 | + break; | ||
| 1074 | + case 2: | ||
| 1075 | + if (good.goods_price != gg.market_price) isok = 0; | ||
| 1076 | + break; | ||
| 1077 | + } | ||
| 1078 | + } | ||
| 1077 | } | 1079 | } |
| 1078 | 1080 | ||
| 1079 | var is_h = 0; | 1081 | var is_h = 0; |
pages/user/order_list/order_list.js
| @@ -1123,7 +1123,6 @@ Page({ | @@ -1123,7 +1123,6 @@ Page({ | ||
| 1123 | if(prom_pc){ | 1123 | if(prom_pc){ |
| 1124 | gg.discount_field=prom_pc.discount_field; | 1124 | gg.discount_field=prom_pc.discount_field; |
| 1125 | } | 1125 | } |
| 1126 | - | ||
| 1127 | } | 1126 | } |
| 1128 | 1127 | ||
| 1129 | 1128 | ||
| @@ -1360,14 +1359,17 @@ Page({ | @@ -1360,14 +1359,17 @@ Page({ | ||
| 1360 | if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过 | 1359 | if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过 |
| 1361 | } | 1360 | } |
| 1362 | }else{ | 1361 | }else{ |
| 1363 | - switch (gg.discount_field){ | ||
| 1364 | - case 1: | ||
| 1365 | - if (good.goods_price != gg.shop_price) isok = 0; | 1362 | + |
| 1363 | + if(good.prom_type==3){ | ||
| 1364 | + switch (gg.discount_field){ | ||
| 1365 | + case 1: | ||
| 1366 | + if (good.goods_price != gg.shop_price) isok = 0; | ||
| 1367 | + break; | ||
| 1368 | + case 2: | ||
| 1369 | + if (good.goods_price != gg.market_price) isok = 0; | ||
| 1366 | break; | 1370 | break; |
| 1367 | - case 2: | ||
| 1368 | - if (good.goods_price != gg.market_price) isok = 0; | ||
| 1369 | - break; | ||
| 1370 | - } | 1371 | + } |
| 1372 | + } | ||
| 1371 | } | 1373 | } |
| 1372 | 1374 | ||
| 1373 | 1375 |