修改了添加质保卡信息

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/qrcode/MachineQrCodeHandler.java

@@ -282,13 +282,36 @@ public class MachineQrCodeHandler {
         //查询用户信息
         memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
         if (memberInfo != null && memberInfo.getUserStatus() == 2) {
-            request.getRequestDispatcher("/view/warranty_card.html").forward(request,res);
+            res.sendRedirect("/wateroPF/view/warranty_card.html?num=1");
         } else {
             request.getRequestDispatcher("/view/guanzhu.html").forward(request,res);
         }
     }
 
     /**
+     * 检查是否关注微信公众号
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/check_warranty")
+    public ResultMsg checkWarranty(HttpServletRequest request) throws Exception {
+        ResultMsg msg = new ResultMsg();
+        Member memberInfo = WechatUtils.getUserBySession(request);
+        //查询用户信息
+        memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
+        if (memberInfo != null && memberInfo.getUserStatus() == 2) {
+            msg.setData(true);
+        } else {
+            msg.setData(false);
+        }
+        msg.setStatus(true);
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        return msg;
+    }
+
+    /**
      * 获取ip地址
      * @param request
      * @return

wateroPF-wechat-web/src/main/webapp/view/add_machine.html

@@ -113,7 +113,9 @@
     var numberProvince = null;
     var numberCity = null;
     var numberDistrict = null;
+    var num = getParam("num");
     mui.ready(function(){
+        check_warranty();
         //选择示例
         var userPicker = new mui.PopPicker();
         userPicker.setData([{
@@ -156,6 +158,38 @@
         document.querySelector('.loading-bg').style.display='none';
     });
 
+    function check_warranty() {
+        if (num != 1) {
+            window.location.href = base_path + '/qrcode/_add_warranty';
+		}
+
+        /*$.ajax({
+            type: 'get',
+            url: base_path + '/qrcode/check_warranty',
+            dataType: 'json',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.status){
+                    if (!dt.data) {
+                        mui.openWindow({
+                            url: '/wateroPF/view/guanzhu.html'
+                        })
+					}
+                } else {
+                    mui.openWindow({
+                        url: '/wateroPF/view/guanzhu.html'
+                    })
+				}
+            },
+            error: function(xhr, type, errorThrown) {
+                mui.openWindow({
+                    url: '/wateroPF/view/guanzhu.html'
+                })
+                console.log("请检查网络或刷新页面重试！");
+            }
+        });*/
+	}
+
     wx.ready(function () {
         // 7.2 获取当前地理位置
         wx.getLocation({

wateroPF-wechat-web/src/main/webapp/view/warranty_card.html

@@ -67,6 +67,8 @@
 	<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
 	<script src="//s.iamberry.com/wateroPF/new/js/page/main.js?v=2016101701"></script>
 	<script type="text/javascript">
+        var num = getParam("num");
+
 	mui.ready(function(){
 
         mui.ajax(base_path + '/qrcode/select_warranty_card_list?dates=' + new Date().getTime(), {
@@ -127,7 +129,8 @@
 	}
 	//添加质保卡
     mui('body').on('tap', '.go_add_warranty_card', function() {
-        location.href='/wateroPF/view/add_machine.html';
+        alert(num);
+        location.href='/wateroPF/view/add_machine.html?num='+num;
 	});
 
     function dateFormat(now) {