fixed: vip套餐超过3个布局显示错误 && 手机号强制绑定

Qsnh · Mar 10, 2020 · 384e736 · 384e736
1 parent 7247434
commit 384e736
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/Http/Middleware/GlobalShareMiddleware.php b/app/Http/Middleware/GlobalShareMiddleware.php
@@ -94,7 +94,7 @@ public function handle($request, Closure $next)
 
         // 是否需要绑定手机号
         $bindMobileState = false;
-        if (Auth::check() && $this->businessState->isNeedBindMobile($user)) {
+        if (Auth::check() && (int)config('meedu.member.enabled_mobile_bind_alert') === 1 && $this->businessState->isNeedBindMobile($user)) {
             $bindMobileState = true;
         }
         View::share('bindMobileState', $bindMobileState);

diff --git a/public/frontend/css/frontend.css b/public/frontend/css/frontend.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
     "/frontend/js/frontend.js": "/frontend/js/frontend.js?id=f46fb0b79170b0467ac3",
-    "/frontend/css/frontend.css": "/frontend/css/frontend.css?id=e1d7daaefda51b535223",
+    "/frontend/css/frontend.css": "/frontend/css/frontend.css?id=c0c2c9574ea5ac1ffc93",
     "/h5/css/app.css": "/h5/css/app.css?id=f6eef83bda7dfebec1f9",
     "/h5/js/app.js": "/h5/js/app.js?id=f2ff2fe8da0a8a91a9f9"
 }
diff --git a/resources/assets/frontend/sass/app.scss b/resources/assets/frontend/sass/app.scss
@@ -2253,11 +2253,11 @@ footer.footer-box {
   float: left;
   margin-top: 100px;
   margin-bottom: 100px;
+  flex-flow: row wrap;
 
   .role-list-item {
     width: 320px;
     height: 380px;
-    float: left;
     text-align: center;
     padding-top: 40px;
     padding-bottom: 40px;