diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 05050b3..ff806b1 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -239,7 +239,7 @@ Page({ } } } else { - getApp().my_warnning("系统繁忙,请稍后再试", 0, th); + getApp().my_warnning(res.data.msg, 0, th); return false; } } @@ -293,7 +293,7 @@ Page({ isStart:isStart, }) } else { - getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2); + getApp().my_warnning(res.data.msg, 0, _this2); return false; } } @@ -337,7 +337,6 @@ Page({ }, "put" - ) }, diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml index de8a720..92065b4 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.wxml +++ b/pages/giftpack/giftpacklist/giftpacklist.wxml @@ -100,29 +100,39 @@ - - - - - 立即购买 - - - - - 立即兑换 - - - - - 立即购买 - - - - - 立即兑换 - - - + + + + + + 立即购买 + + + + + 立即兑换 + + + + + 立即购买 + + + + + 立即兑换 + + + + + + + + 活动还未开始 + + + + diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxss b/pages/giftpack/giftpacklist/giftpacklist.wxss index 26e7cbb..958233b 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.wxss +++ b/pages/giftpack/giftpacklist/giftpacklist.wxss @@ -245,5 +245,5 @@ page.data-v-3a5b7e36 { background-color: rgb(153,153,153); } -.foot_button_left.data-v-3a5b7e36.gray{ background-color: #aaa; } -.foot_button_right.data-v-3a5b7e36.gray{ background-color: #aaa;} +.foot_button_intalge.data-v-3a5b7e36.gray{ background-color: #aaa; } +