diff --git a/packageB/pages/user/user_coupon/c_filter.wxs b/packageB/pages/user/user_coupon/c_filter.wxs index b1d896d..7112486 100644 --- a/packageB/pages/user/user_coupon/c_filter.wxs +++ b/packageB/pages/user/user_coupon/c_filter.wxs @@ -14,7 +14,10 @@ var filters = { if(ind==1) return "green"; if(ind==2) return "blue"; if(ind==11) return "green"; + if(ind==13) return "red"; if(ind==12) return "blue"; + if(ind==20) return "green"; + if(ind==14) return "red"; return ""; }, setbgcolor: function (ind) { @@ -23,25 +26,37 @@ var filters = { if (ind == 2) return "#a3bcff"; if (ind == 11) return "#59e1d2"; if (ind == 12) return "#a3bcff"; + if (ind == 20) return "#6d87cd"; + if (ind==13) return "#ffa1b9"; + if (ind==14) return "#59e1d2"; return ""; }, - - get_type:function(ind){ - if (ind == 0) return "全场通用"; - if (ind == 1) return "品牌"; - if (ind == 2) return "品类"; - if (ind == 11) return "用途"; - if (ind == 12) return "分类1"; - return ""; - }, - get_type_card:function(ind){ - if (ind == 0) return "全场通用"; - if (ind == 1) return "指定品牌"; - if (ind == 2) return "指定品类"; - if (ind == 11) return "指定用途"; - if (ind == 12) return "指定分类1"; - return ""; - }, + + + get_type:function(ind){ + if (ind == 0 || ind == null) return "全场通用"; + if (ind == 1) return "品牌"; + if (ind == 2) return "品类"; + if (ind == 11) return "用途"; + if (ind == 12) return "分类1"; + if (ind == 13) return "自定义"; + if (ind == 14) return "分类2"; + if (ind == 20) return "指定单品"; + return ""; + }, + get_type_card:function(ind){ + if (ind == 0 || ind == null) return "全场通用"; + if (ind == 1) return "指定品牌"; + if (ind == 2) return "指定品类"; + if (ind == 11) return "指定用途"; + if (ind == 12) return "指定分类1"; + if (ind == 14) return "指定分类2"; + if (ind == 13) return "自定义"; + if (ind == 20) return "指定单品"; + return ""; + }, + + format_huiche:function (text) { if (!text) { return ""; diff --git a/packageB/pages/user/user_coupon/user_coupon.js b/packageB/pages/user/user_coupon/user_coupon.js index fa5d7a4..2344df9 100644 --- a/packageB/pages/user/user_coupon/user_coupon.js +++ b/packageB/pages/user/user_coupon/user_coupon.js @@ -93,6 +93,8 @@ Page({ obj[text] = Obtain; th.setData(obj); getApp().my_warnning("您已成功领取该券",1,th); + }else{ + getApp().my_warnning(e.data.msg,0,th); } } }) diff --git a/packageE/pages/cart/cart2/c_filter.wxs b/packageE/pages/cart/cart2/c_filter.wxs index 630d400..06abcf8 100644 --- a/packageE/pages/cart/cart2/c_filter.wxs +++ b/packageE/pages/cart/cart2/c_filter.wxs @@ -18,6 +18,7 @@ var filters = { if(ind==13) return "red"; if(ind==12) return "blue"; if(ind==20) return "green"; + if(ind==14) return "red"; return ""; }, setbgcolor: function (ind) { @@ -27,6 +28,7 @@ var filters = { if (ind == 11) return "#59e1d2"; if (ind == 12) return "#a3bcff"; if (ind == 20) return "#6d87cd"; + if (ind==13) return "#ffa1b9"; return ""; }, @@ -36,6 +38,8 @@ var filters = { if (ind == 2) return "品类"; if (ind == 11) return "用途"; if (ind == 12) return "分类1"; + if (ind == 13) return "自定义"; + if (ind == 14) return "分类2"; if (ind == 20) return "指定单品"; return ""; },