Merge branch 'master' of http://192.168.136.45:3000/SERVER/langer

# Conflicts:
#	web/ansjer_answer/lottery/index.html

web/ansjer_answer/chapter.html

@@ -531,7 +531,7 @@
 	});
 </script>
 
-<!--<script type="text/javascript">
+<script type="text/javascript">
     var ua = navigator.userAgent.toLowerCase();
     var isWeixin = ua.indexOf('micromessenger') != -1;
 //  var isAndroid = ua.indexOf('android') != -1;
@@ -540,6 +540,6 @@
         document.head.innerHTML = '<title>抱歉，出错了</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0"><link rel="stylesheet" type="text/css" href="weua.css">';
         document.body.innerHTML = '<div class="weui_msg"><div class="weui_icon_area"><i class="weui_icon_info weui_icon_msg"></i></div><div class="weui_text_area"><h4 class="weui_msg_title">请在微信客户端打开链接</h4></div></div>';
     }
-</script>-->
+</script>
 </body>
 </html>

web/ansjer_answer/lottery/index.html

@@ -218,9 +218,7 @@
                             $("#rec_addr").val(addrJson['rec_addr'])
                         }
                     } else {
-                    	console.log(data['msg'])
-                    }
-                }
+                        alert(data['msg'])                    }                }
             );
         } else {
             //没有token唤醒登录界面
@@ -344,6 +342,7 @@
                         console.log('很遗憾没有中奖');
                     }
                     doDrawRollAction(status);
+                    draw_status = status
                 } else if(data['code']==309) {
                     alert('请绑定手机再来抽奖吧！');
                 } else{
@@ -419,7 +418,6 @@
             callback: function () {
                 //alert("￥" + txt);
                 alert(txt)
-                DetailsTab();
                 bRotate = !bRotate;
             }
         })
@@ -554,7 +552,6 @@
                 break;
         }
     }
-    
 </script>
 <script type="text/javascript">
     var ua = navigator.userAgent.toLowerCase();