From 8340fc781e6cfa5959f8484ce81a201cf9bcfed3 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 29 Aug 2022 16:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=8A=A0=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=9A?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=99=BB=E5=BD=95=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/build/beike/shop/default/js/app.js | 15 +++++++++++++
 resources/beike/shop/default/js/common.js | 13 +++++++++++
 resources/beike/shop/default/js/header.js |  2 ++
 themes/default/account/login.blade.php    | 27 +++++++++++++++--------
 themes/default/layout/master.blade.php    |  8 +++++--
 5 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js
index 51182491..47f0553c 100644
--- a/public/build/beike/shop/default/js/app.js
+++ b/public/build/beike/shop/default/js/app.js
@@ -2124,6 +2124,20 @@ __webpack_require__.r(__webpack_exports__);
         quantity = _ref$quantity === void 0 ? 1 : _ref$quantity,
         _ref$isBuyNow = _ref.isBuyNow,
         isBuyNow = _ref$isBuyNow === void 0 ? false : _ref$isBuyNow;
+
+    if (!isLogin) {
+      layer.open({
+        type: 2,
+        title: '',
+        shadeClose: true,
+        shade: 0.8,
+        area: ['900px', '600px'],
+        content: 'login?iframe=true' //iframe的url
+
+      });
+      return;
+    }
+
     var $btn = $(event);
     var btnHtml = $btn.html();
     var loadHtml = '<span class="spinner-border spinner-border-sm"></span>';
@@ -2233,6 +2247,7 @@ __webpack_require__.r(__webpack_exports__);
 // offcanvas-search-top
 $(function () {
   var myOffcanvas = document.getElementById('offcanvas-search-top');
+  if (!myOffcanvas) return;
   myOffcanvas.addEventListener('shown.bs.offcanvas', function () {
     $('#offcanvas-search-top input').focus();
     $('#offcanvas-search-top input').keydown(function (e) {
diff --git a/resources/beike/shop/default/js/common.js b/resources/beike/shop/default/js/common.js
index b8830a62..50217974 100644
--- a/resources/beike/shop/default/js/common.js
+++ b/resources/beike/shop/default/js/common.js
@@ -24,6 +24,19 @@ export default {
    * @return {*}  返回Promise
    */
   addCart({sku_id, quantity = 1, isBuyNow = false}, event) {
+    if (!isLogin) {
+      layer.open({
+        type: 2,
+        title: '',
+        shadeClose: true,
+        shade: 0.8,
+        area: ['900px', '600px'],
+        content: 'login?iframe=true' //iframe的url
+      });
+
+      return;
+    }
+
     const $btn = $(event);
     const btnHtml = $btn.html();
     const loadHtml = '<span class="spinner-border spinner-border-sm"></span>';
diff --git a/resources/beike/shop/default/js/header.js b/resources/beike/shop/default/js/header.js
index 1b2e83c6..a72b7f6a 100644
--- a/resources/beike/shop/default/js/header.js
+++ b/resources/beike/shop/default/js/header.js
@@ -1,6 +1,8 @@
 // offcanvas-search-top
 $(function() {
   var myOffcanvas = document.getElementById('offcanvas-search-top')
+  if (!myOffcanvas) return;
+
   myOffcanvas.addEventListener('shown.bs.offcanvas', function () {
     $('#offcanvas-search-top input').focus();
     $('#offcanvas-search-top input').keydown(function (e) {
diff --git a/themes/default/account/login.blade.php b/themes/default/account/login.blade.php
index b5d2f436..5042b996 100644
--- a/themes/default/account/login.blade.php
+++ b/themes/default/account/login.blade.php
@@ -10,13 +10,14 @@
 
 
 @section('content')
-  <div class="container" id="page-login" v-cloak>
+  <div class="{{ request('iframe') ? 'container-fluid mt-5' : 'container' }}" id="page-login" v-cloak>
+    @if (!request('iframe'))
+      <x-shop-breadcrumb type="static" value="login.index" />
+      <div class="hero-content pb-5 text-center"><h1 class="hero-heading">{{ __('shop/login.index') }}</h1></div>
+    @endif
 
-    <x-shop-breadcrumb type="static" value="login.index" />
-
-    <div class="hero-content pb-5 text-center"><h1 class="hero-heading">{{ __('shop/login.index') }}</h1></div>
-    <div class="justify-content-center row mb-5">
-      <div class="col-lg-5">
+    <div class="justify-content-center row {{ !request('iframe') ? 'mb-5' : '' }}">
+      <div class="col-lg-{{ request('iframe') ? '6' : '5' }} col-md-6 col-sm-12">
         <div class="card">
           <el-form ref="loginForm" :model="loginForm" :rules="loginRules">
             <div class="login-item-header card-header">
@@ -46,7 +47,7 @@
           </el-form>
         </div>
       </div>
-      <div class="col-lg-5">
+      <div class="col-lg-{{ request('iframe') ? '6' : '5' }} col-md-6 col-sm-12">
         <div class="card">
           <div class="login-item-header card-header">
             <h6 class="text-uppercase mb-0">{{ __('shop/login.new') }}</h6>
@@ -164,8 +165,16 @@
             }
 
             $http.post(url, _data).then((res) => {
-              this.$message.success(res.message);
-              location = "{{ shop_route('account.index') }}"
+              layer.msg(res.message)
+              @if (!request('iframe'))
+                location = "{{ shop_route('account.index') }}"
+              @else
+                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+                setTimeout(() => {
+                  parent.layer.close(index); //再执行关闭
+                  parent.window.location.reload()
+                }, 400);
+              @endif
             })
           });
         }
diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php
index 157945a1..f5c868a1 100644
--- a/themes/default/layout/master.blade.php
+++ b/themes/default/layout/master.blade.php
@@ -19,11 +19,15 @@
   @stack('header')
 </head>
 <body class="@yield('body-class')">
-  @include('layout.header')
+  @if (!request('iframe'))
+    @include('layout.header')
+  @endif
 
   @yield('content')
 
-  @include('layout.footer')
+  @if (!request('iframe'))
+    @include('layout.footer')
+  @endif
 
   <script>
     const isLogin = @json(current_customer());