diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index 9c22274..c32fd33 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -10,7 +10,7 @@
-
+
diff --git a/packageB/pages/user/user_coupon/c_filter.wxs b/packageB/pages/user/user_coupon/c_filter.wxs
index 7112486..1de6386 100644
--- a/packageB/pages/user/user_coupon/c_filter.wxs
+++ b/packageB/pages/user/user_coupon/c_filter.wxs
@@ -12,23 +12,38 @@ var filters = {
setcolor:function(ind){
if(ind==0) return "red";
if(ind==1) return "green";
- if(ind==2) return "blue";
+ 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==13) return "red";
+
if(ind==14) return "red";
+ if(ind==20) return "green";
+
+ if(ind==21) return "green";
+ if(ind==22) return "blue";
+
+ if(ind==24) return "red";
+ if(ind==25) return "blue";
return "";
},
setbgcolor: function (ind) {
- if (ind == 0) return "#ffa1b9";
- if (ind == 1) return "#59e1d2";
- 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";
+ if (ind == 0) return "#ffa1b9";//红
+ if (ind == 1) return "#59e1d2";//绿
+ if (ind == 2) return "#a3bcff";//蓝
+ if (ind == 11) return "#59e1d2";//绿
+ if (ind == 12) return "#a3bcff";//蓝
+
+ if (ind==13) return "#ffa1b9";//红
+
+ if (ind==14) return "#ffa1b9";//红
+ if (ind == 20) return "#59e1d2";//绿色
+ if (ind==21) return "#59e1d2";
+ if (ind==22) return "#a3bcff";
+
+ if (ind==24) return "#ffa1b9";//红
+ if (ind==25) return "#a3bcff";
return "";
},
@@ -38,10 +53,14 @@ var filters = {
if (ind == 1) return "品牌";
if (ind == 2) return "品类";
if (ind == 11) return "用途";
- if (ind == 12) return "分类1";
+ if (ind == 12) return "分类一";
if (ind == 13) return "自定义";
- if (ind == 14) return "分类2";
- if (ind == 20) return "指定单品";
+ if (ind == 14) return "分类二";
+ if (ind == 20) return "单品";
+ if (ind == 21) return "卡项类别";
+ if (ind == 22) return "自选项目";
+ if (ind == 24) return "全部卡项";
+ if (ind == 25) return "卡项";
return "";
},
get_type_card:function(ind){
@@ -49,10 +68,14 @@ var filters = {
if (ind == 1) return "指定品牌";
if (ind == 2) return "指定品类";
if (ind == 11) return "指定用途";
- if (ind == 12) return "指定分类1";
- if (ind == 14) return "指定分类2";
+ if (ind == 12) return "指定分类一";
+ if (ind == 14) return "指定分类二";
if (ind == 13) return "自定义";
if (ind == 20) return "指定单品";
+ if (ind == 21) return "卡项类别";
+ if (ind == 22) return "自选项目";
+ if (ind == 24) return "全部卡项";
+ if (ind == 25) return "卡项";
return "";
},
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index db3772f..8340691 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -8,7 +8,7 @@
-
+
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
index 5405cf3..5cc0131 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxml
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -7,7 +7,7 @@
-
+