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;
                 }
             }