感恩活动开发

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/thanksgiving/ThanksGivingHandler.java

@@ -108,17 +108,17 @@ public class ThanksGivingHandler {
             rm.setMessage("电话号码错误!");
             return rm;
         }
-//
+
         member = memberService.getMemberByUserOpenId(member.getUserOpenid());
         if(member.getUserStatus() != 2){
-            return new ResultMsg(false, ResultMsg.ERROR, "未关注不能领取!",null);
+            return new ResultMsg(false, ResultMsg.ERROR, "请先关注“Watero水时代”公众号!",null);
         }
 
         ThanksGiving thanksGiving = new ThanksGiving();
         thanksGiving.setThanksGivingPhone(phone);
         List<ThanksGiving> thanksGivingList = thanksGivingService.getThanksGivingList(thanksGiving);
         if(thanksGivingList == null || thanksGivingList.size() < 1){
-            return new ResultMsg(false, ResultMsg.ERROR, "该电话号码不能领取!",null);
+            return new ResultMsg(false, ResultMsg.ERROR, "该电话号码无法领取优惠券!",null);
         }
 
         //获取验证码
@@ -151,7 +151,7 @@ public class ThanksGivingHandler {
         Member member =  WechatUtils.getUserBySession(request);
         member = memberService.getMemberByUserOpenId(member.getUserOpenid());
         if(member.getUserStatus() != 2){
-            return new ResultMsg(false, ResultMsg.ERROR, "未关注不能领取!",null);
+            return new ResultMsg(false, ResultMsg.ERROR, "请先关注“Watero水时代”公众号!",null);
         }
         //判断验证码
         //使用request对象的getSession()获取session，如果session不存在则创建一个
@@ -185,7 +185,7 @@ public class ThanksGivingHandler {
         thanksGiving.setThanksGivingPhone(phone);
         List<ThanksGiving> thanksGivingList = thanksGivingService.getThanksGivingList(thanksGiving);
         if(thanksGivingList == null){
-            return new ResultMsg(false, ResultMsg.ERROR, "该电话号码不能领取!",null);
+            return new ResultMsg(false, ResultMsg.ERROR, "该电话号码无法领取优惠券!",null);
         }
         thanksGiving = thanksGivingList.get(0);
         if(thanksGiving.getThanksGivingStatus() != 1 ){

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_list.html

@@ -57,7 +57,7 @@
 		<span class="iconfont icon-machine"></span>
 		<span class="mui-tab-label">水机</span>
 	</a>
-	<a class="mui-control-item">
+	<a class="mui-control-item" style="display: none">
 		<span class="iconfont icon-dingzhi"></span>
 		<span class="mui-tab-label">定制</span>
 	</a>