Commit d3541411e352068e832299badca5710ecde2a0f4
1 parent
bfa390d1
3.0权益领取券
Showing
3 changed files
with
38 additions
and
17 deletions
packageB/pages/user/user_coupon/c_filter.wxs
| @@ -14,7 +14,10 @@ var filters = { | @@ -14,7 +14,10 @@ var filters = { | ||
| 14 | if(ind==1) return "green"; | 14 | if(ind==1) return "green"; |
| 15 | if(ind==2) return "blue"; | 15 | if(ind==2) return "blue"; |
| 16 | if(ind==11) return "green"; | 16 | if(ind==11) return "green"; |
| 17 | + if(ind==13) return "red"; | ||
| 17 | if(ind==12) return "blue"; | 18 | if(ind==12) return "blue"; |
| 19 | + if(ind==20) return "green"; | ||
| 20 | + if(ind==14) return "red"; | ||
| 18 | return ""; | 21 | return ""; |
| 19 | }, | 22 | }, |
| 20 | setbgcolor: function (ind) { | 23 | setbgcolor: function (ind) { |
| @@ -23,25 +26,37 @@ var filters = { | @@ -23,25 +26,37 @@ var filters = { | ||
| 23 | if (ind == 2) return "#a3bcff"; | 26 | if (ind == 2) return "#a3bcff"; |
| 24 | if (ind == 11) return "#59e1d2"; | 27 | if (ind == 11) return "#59e1d2"; |
| 25 | if (ind == 12) return "#a3bcff"; | 28 | if (ind == 12) return "#a3bcff"; |
| 29 | + if (ind == 20) return "#6d87cd"; | ||
| 30 | + if (ind==13) return "#ffa1b9"; | ||
| 31 | + if (ind==14) return "#59e1d2"; | ||
| 26 | return ""; | 32 | return ""; |
| 27 | }, | 33 | }, |
| 28 | - | ||
| 29 | - get_type:function(ind){ | ||
| 30 | - if (ind == 0) return "全场通用"; | ||
| 31 | - if (ind == 1) return "品牌"; | ||
| 32 | - if (ind == 2) return "品类"; | ||
| 33 | - if (ind == 11) return "用途"; | ||
| 34 | - if (ind == 12) return "分类1"; | ||
| 35 | - return ""; | ||
| 36 | - }, | ||
| 37 | - get_type_card:function(ind){ | ||
| 38 | - if (ind == 0) return "全场通用"; | ||
| 39 | - if (ind == 1) return "指定品牌"; | ||
| 40 | - if (ind == 2) return "指定品类"; | ||
| 41 | - if (ind == 11) return "指定用途"; | ||
| 42 | - if (ind == 12) return "指定分类1"; | ||
| 43 | - return ""; | ||
| 44 | - }, | 34 | + |
| 35 | + | ||
| 36 | + get_type:function(ind){ | ||
| 37 | + if (ind == 0 || ind == null) return "全场通用"; | ||
| 38 | + if (ind == 1) return "品牌"; | ||
| 39 | + if (ind == 2) return "品类"; | ||
| 40 | + if (ind == 11) return "用途"; | ||
| 41 | + if (ind == 12) return "分类1"; | ||
| 42 | + if (ind == 13) return "自定义"; | ||
| 43 | + if (ind == 14) return "分类2"; | ||
| 44 | + if (ind == 20) return "指定单品"; | ||
| 45 | + return ""; | ||
| 46 | + }, | ||
| 47 | + get_type_card:function(ind){ | ||
| 48 | + if (ind == 0 || ind == null) return "全场通用"; | ||
| 49 | + if (ind == 1) return "指定品牌"; | ||
| 50 | + if (ind == 2) return "指定品类"; | ||
| 51 | + if (ind == 11) return "指定用途"; | ||
| 52 | + if (ind == 12) return "指定分类1"; | ||
| 53 | + if (ind == 14) return "指定分类2"; | ||
| 54 | + if (ind == 13) return "自定义"; | ||
| 55 | + if (ind == 20) return "指定单品"; | ||
| 56 | + return ""; | ||
| 57 | + }, | ||
| 58 | + | ||
| 59 | + | ||
| 45 | format_huiche:function (text) { | 60 | format_huiche:function (text) { |
| 46 | if (!text) { | 61 | if (!text) { |
| 47 | return ""; | 62 | return ""; |
packageB/pages/user/user_coupon/user_coupon.js
| @@ -93,6 +93,8 @@ Page({ | @@ -93,6 +93,8 @@ Page({ | ||
| 93 | obj[text] = Obtain; | 93 | obj[text] = Obtain; |
| 94 | th.setData(obj); | 94 | th.setData(obj); |
| 95 | getApp().my_warnning("您已成功领取该券",1,th); | 95 | getApp().my_warnning("您已成功领取该券",1,th); |
| 96 | + }else{ | ||
| 97 | + getApp().my_warnning(e.data.msg,0,th); | ||
| 96 | } | 98 | } |
| 97 | } | 99 | } |
| 98 | }) | 100 | }) |
packageE/pages/cart/cart2/c_filter.wxs
| @@ -18,6 +18,7 @@ var filters = { | @@ -18,6 +18,7 @@ var filters = { | ||
| 18 | if(ind==13) return "red"; | 18 | if(ind==13) return "red"; |
| 19 | if(ind==12) return "blue"; | 19 | if(ind==12) return "blue"; |
| 20 | if(ind==20) return "green"; | 20 | if(ind==20) return "green"; |
| 21 | + if(ind==14) return "red"; | ||
| 21 | return ""; | 22 | return ""; |
| 22 | }, | 23 | }, |
| 23 | setbgcolor: function (ind) { | 24 | setbgcolor: function (ind) { |
| @@ -27,6 +28,7 @@ var filters = { | @@ -27,6 +28,7 @@ var filters = { | ||
| 27 | if (ind == 11) return "#59e1d2"; | 28 | if (ind == 11) return "#59e1d2"; |
| 28 | if (ind == 12) return "#a3bcff"; | 29 | if (ind == 12) return "#a3bcff"; |
| 29 | if (ind == 20) return "#6d87cd"; | 30 | if (ind == 20) return "#6d87cd"; |
| 31 | + if (ind==13) return "#ffa1b9"; | ||
| 30 | return ""; | 32 | return ""; |
| 31 | }, | 33 | }, |
| 32 | 34 | ||
| @@ -36,6 +38,8 @@ var filters = { | @@ -36,6 +38,8 @@ var filters = { | ||
| 36 | if (ind == 2) return "品类"; | 38 | if (ind == 2) return "品类"; |
| 37 | if (ind == 11) return "用途"; | 39 | if (ind == 11) return "用途"; |
| 38 | if (ind == 12) return "分类1"; | 40 | if (ind == 12) return "分类1"; |
| 41 | + if (ind == 13) return "自定义"; | ||
| 42 | + if (ind == 14) return "分类2"; | ||
| 39 | if (ind == 20) return "指定单品"; | 43 | if (ind == 20) return "指定单品"; |
| 40 | return ""; | 44 | return ""; |
| 41 | }, | 45 | }, |