Merge branch 'master' into release

Application/Home/Controller/IndexController.class.php

@@ -90,7 +90,7 @@ class IndexController extends Controller
             ))->count();
 //            1牙膏
             if ($type == 1) {
-                if ($c >= 12) {
+                if ($c >= 2) {
                     continue;
                 }
             }

Public/static/js/index.js

@@ -96,7 +96,7 @@ $(document).ready(function () {
                                 $('.address').val(resp.data.address);
                             }
                             if(resp.data.info_type==2 || resp.data.info_type==1){
-                                type = 2
+                                type = 3
                                 $('#card').find('img').attr('src','Public/static/images/prize-map.jpg')
                                 // my_notify('你已中过奖');
                             }
@@ -125,6 +125,10 @@ $(document).ready(function () {
         }else if(type == 2){
             $('.m-prize').hide();
             $('.y-prize').show();
+
+        }else if(type == 3){
+            $('.m-prize').hide();
+            $('.y-prize').show();
             my_notify('你已中过奖');
         }else {
             $('.m-prize').hide();