From 17f862be2a2f1a83f9bb93f339da495f7ca63921 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:31:27 +0800
Subject: [PATCH 01/10] https://guangdagit.com/beike/beikeshop/issues/78

---
 .../views/pages/products/form/form.blade.php  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php
index d4545843..6709fabd 100644
--- a/resources/beike/admin/views/pages/products/form/form.blade.php
+++ b/resources/beike/admin/views/pages/products/form/form.blade.php
@@ -152,13 +152,13 @@
                           <th v-for="(variant, index) in form.variables" :key="'pv-header-' + index">
                             @{{ variant.name[current_language_code] || 'No name' }}
                           </th>
-                          <th width="106px">image</th>
-                          <th>model</th>
+                          <th width="106px">图片</th>
+                          <th>型号</th>
                           <th>sku</th>
-                          <th>price</th>
-                          <th>orgin price</th>
-                          <th>cost price</th>
-                          <th>quantity</th>
+                          <th>价格</th>
+                          <th>原价</th>
+                          <th>成本价</th>
+                          <th>数量</th>
                         </thead>
                         <tbody>
                           <tr v-for="(sku, skuIndex) in form.skus" :key="skuIndex">
@@ -207,12 +207,12 @@
 
               <template v-if="!editing.isVariable">
                 <input type="hidden" value="{{ old('skus.0.image', $product->skus[0]->image ?? '') }}" name="skus[0][image]">
-                <x-admin-form-input name="skus[0][model]" title="model" :value="old('skus.0.model', $product->skus[0]->model ?? '')" />
+                <x-admin-form-input name="skus[0][model]" title="型号" :value="old('skus.0.model', $product->skus[0]->model ?? '')" />
                 <x-admin-form-input name="skus[0][sku]" title="sku" :value="old('skus.0.sku', $product->skus[0]->sku ?? '')" />
-                <x-admin-form-input name="skus[0][price]" title="price" :value="old('skus.0.price', $product->skus[0]->price ?? '')" />
-                <x-admin-form-input name="skus[0][origin_price]" title="origin_price" :value="old('skus.0.origin_price', $product->skus[0]->origin_price ?? '')" />
-                <x-admin-form-input name="skus[0][cost_price]" title="cost_price" :value="old('skus.0.cost_price', $product->skus[0]->cost_price ?? '')" />
-                <x-admin-form-input name="skus[0][quantity]" title="quantity" :value="old('skus.0.quantity', $product->skus[0]->quantity ?? '')" />
+                <x-admin-form-input name="skus[0][price]" title="价格" :value="old('skus.0.price', $product->skus[0]->price ?? '')" />
+                <x-admin-form-input name="skus[0][origin_price]" title="原价" :value="old('skus.0.origin_price', $product->skus[0]->origin_price ?? '')" />
+                <x-admin-form-input name="skus[0][cost_price]" title="成本价" :value="old('skus.0.cost_price', $product->skus[0]->cost_price ?? '')" />
+                <x-admin-form-input name="skus[0][quantity]" title="数量" :value="old('skus.0.quantity', $product->skus[0]->quantity ?? '')" />
                 <input type="hidden" name="skus[0][variants]" placeholder="variants" value="">
                 <input type="hidden" name="skus[0][position]" placeholder="position" value="0">
                 <input type="hidden" name="skus[0][is_default]" placeholder="is_default" value="1">

From 1eba785fac990c6841987fd97e9dda0d377d1dbf Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:34:24 +0800
Subject: [PATCH 02/10] https://guangdagit.com/beike/beikeshop/issues/116

---
 themes/default/account/rmas/form.blade.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/themes/default/account/rmas/form.blade.php b/themes/default/account/rmas/form.blade.php
index 54dd8392..8f6a2579 100644
--- a/themes/default/account/rmas/form.blade.php
+++ b/themes/default/account/rmas/form.blade.php
@@ -74,11 +74,15 @@
 
                 <div class="col-sm-6 mb-4">
                   <label class="form-label">退换原因</label>
-                  <select class="form-select" name="rma_reason_id">
+                  <select class="form-select {{ $errors->has('rma_reason_id') ? 'is-invalid' : '' }}" name="rma_reason_id">
                     @foreach ($reasons as $item)
                       <option value="{{ $item['id'] }}" {{ $item['id'] == old('opened', '') ? 'selected': '' }}>{{ $item['name'] }}</option>
                     @endforeach
                   </select>
+
+                  @if ($errors->has('rma_reason_id'))
+                    <span class="invalid-feedback" role="alert">{{ $errors->first('rma_reason_id') }}</span>
+                  @endif
                 </div>
 
                 <div class="col-12 "></div>

From 827272dbb2308b3a92c283ce4d5687b313561b61 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:42:48 +0800
Subject: [PATCH 03/10] https://guangdagit.com/beike/beikeshop/issues/115

---
 beike/Admin/Http/Resources/CustomerResource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beike/Admin/Http/Resources/CustomerResource.php b/beike/Admin/Http/Resources/CustomerResource.php
index 6cc1ddbe..479a7bf1 100644
--- a/beike/Admin/Http/Resources/CustomerResource.php
+++ b/beike/Admin/Http/Resources/CustomerResource.php
@@ -18,7 +18,7 @@ class CustomerResource extends JsonResource
             'id' => $this->id,
             'name' => $this->name,
             'email' => $this->email,
-            'status' => $this->status ? '启用' : '禁用',
+            'status' => $this->status,
             'avatar' => image_resize($this->avatar),
             'from' => $this->from,
             'customer_group_name' => $this->customerGroup->description->name ?? '',

From 0c6bc6c220717fa3974d51da10e8f91e7a1a75e5 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:49:21 +0800
Subject: [PATCH 04/10] =?UTF-8?q?pages=20=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/views/pages/pages/index.blade.php   | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/resources/beike/admin/views/pages/pages/index.blade.php b/resources/beike/admin/views/pages/pages/index.blade.php
index 09aa3b18..bc04361e 100644
--- a/resources/beike/admin/views/pages/pages/index.blade.php
+++ b/resources/beike/admin/views/pages/pages/index.blade.php
@@ -29,11 +29,11 @@
             <td>{{ $page['updated_at'] }}</td>
             <td class="text-end">
               <a href="{{ admin_route('pages.edit', [$page['id']]) }}" class="btn btn-outline-secondary btn-sm">编辑</a>
-              <form action="{{ admin_route('pages.destroy', [$page['id']]) }}" method="post" class="d-inline-block">
+              {{-- <form action="{{ admin_route('pages.destroy', [$page['id']]) }}" method="post" class="d-inline-block">
                 {{ method_field('delete') }}
                 {{ csrf_field() }}
-                <button class="btn btn-outline-danger btn-sm">删除</button>
-              </form>
+              </form> --}}
+              <button class="btn btn-outline-danger btn-sm delete-btn" data-id="{{ $page['id'] }}">删除</button>
             </td>
           </tr>
           @endforeach
@@ -45,3 +45,24 @@
     </div>
   </div>
 @endsection
+
+@push('footer')
+  <script>
+    $('.delete-btn').click(function(event) {
+      const id = $(this).data('id');
+      const self = $(this);
+
+      layer.confirm('确定要删除角色吗？', {
+        title: "提示",
+        btn: ['取消', '确定'],
+        area: ['400px'],
+        btn2: () => {
+        $http.delete(`pages/${id}`).then((res) => {
+            layer.msg(res.message);
+            window.location.reload();
+          })
+        }
+      })
+    });
+  </script>
+@endpush

From e7734e02d1a9a07c103a2028b4af946fdfc0a32a Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 18 Aug 2022 16:51:08 +0800
Subject: [PATCH 05/10] fixed account orders filter by status

---
 beike/Repositories/OrderRepo.php                        | 6 ++++++
 beike/Shop/Http/Controllers/Account/OrderController.php | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php
index 066cfb88..60bc1916 100644
--- a/beike/Repositories/OrderRepo.php
+++ b/beike/Repositories/OrderRepo.php
@@ -93,6 +93,12 @@ class OrderRepo
             $builder->where('created_at', '<', $end);
         }
 
+        $status = $filters['status'] ?? '';
+        if ($status) {
+            $builder->where('status', $status);
+        }
+
+
         return $builder;
     }
 
diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php
index 3969c274..5451b4b5 100644
--- a/beike/Shop/Http/Controllers/Account/OrderController.php
+++ b/beike/Shop/Http/Controllers/Account/OrderController.php
@@ -30,7 +30,11 @@ class OrderController extends Controller
      */
     public function index(Request $request): View
     {
-        $orders = OrderRepo::getListByCustomer(current_customer());
+        $filters = [
+            'customer' => current_customer(),
+            'status' => $request->get('status')
+        ];
+        $orders = OrderRepo::filterOrders($filters);
         $data = [
             'orders' => OrderList::collection($orders),
         ];

From 20ddc211474aa2b70ae52d21b55578994259a89a Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:53:57 +0800
Subject: [PATCH 06/10] =?UTF-8?q?pages=20=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/beike/admin/views/pages/pages/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/beike/admin/views/pages/pages/index.blade.php b/resources/beike/admin/views/pages/pages/index.blade.php
index bc04361e..76e32a0a 100644
--- a/resources/beike/admin/views/pages/pages/index.blade.php
+++ b/resources/beike/admin/views/pages/pages/index.blade.php
@@ -33,7 +33,7 @@
                 {{ method_field('delete') }}
                 {{ csrf_field() }}
               </form> --}}
-              <button class="btn btn-outline-danger btn-sm delete-btn" data-id="{{ $page['id'] }}">删除</button>
+              <button class="btn btn-outline-danger btn-sm delete-btn" type='button' data-id="{{ $page['id'] }}">删除</button>
             </td>
           </tr>
           @endforeach

From f475313e2790e2ee5e785a28fc94e15740798918 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 18 Aug 2022 16:57:22 +0800
Subject: [PATCH 07/10] ajax delete page

---
 beike/Admin/Http/Controllers/PagesController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/beike/Admin/Http/Controllers/PagesController.php b/beike/Admin/Http/Controllers/PagesController.php
index cac1b7f5..1d912589 100644
--- a/beike/Admin/Http/Controllers/PagesController.php
+++ b/beike/Admin/Http/Controllers/PagesController.php
@@ -97,12 +97,12 @@ class PagesController
      *
      * @param Request $request
      * @param int $pageId
-     * @return RedirectResponse
+     * @return array
      */
-    public function destroy(Request $request, int $pageId)
+    public function destroy(Request $request, int $pageId): array
     {
         PageRepo::deleteById($pageId);
-        return redirect()->to(admin_route('pages.index'));
+        return json_success(trans('common.deleted_success'));
     }
 
 

From 6d2c7de17e8a14283e4ec3d96cd5da152f0ba87e Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 18 Aug 2022 17:01:55 +0800
Subject: [PATCH 08/10] use PRC as default timezone
 https://guangdagit.com/beike/beikeshop/issues/99

---
 .env.example   | 3 ++-
 config/app.php | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index 731bbe0a..3f90b95a 100644
--- a/.env.example
+++ b/.env.example
@@ -3,6 +3,7 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
+APP_TIMEZONE=RPC
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
@@ -54,4 +55,4 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 # 前端热更新, PROXY: vhost or path, HOST: 多设备实时
 MIX_PROXY=beikeshop.test
-MIX_HOST=192.168.0.122
\ No newline at end of file
+MIX_HOST=192.168.0.122
diff --git a/config/app.php b/config/app.php
index 517967c8..c7c8618b 100644
--- a/config/app.php
+++ b/config/app.php
@@ -39,7 +39,7 @@ return [
     |
     */
 
-    'debug' => (bool) env('APP_DEBUG', false),
+    'debug' => (bool)env('APP_DEBUG', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -67,7 +67,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => env('APP_TIMEZONE', 'UTC'),
 
     /*
     |--------------------------------------------------------------------------

From 519193fef92af19c12268059ad19d1c175e9a8c0 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 17:03:25 +0800
Subject: [PATCH 09/10] https://guangdagit.com/beike/beikeshop/issues/113

---
 .../beike/admin/views/pages/customers/form.blade.php   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php
index 4e946271..282140d6 100644
--- a/resources/beike/admin/views/pages/customers/form.blade.php
+++ b/resources/beike/admin/views/pages/customers/form.blade.php
@@ -101,8 +101,8 @@
               </el-form-item>
             </div>
             <div class="col-4">
-              <el-form-item prop="city_id">
-                <el-input v-model="dialogAddress.form.city_id" placeholder="输入 city"></el-input>
+              <el-form-item prop="city">
+                <el-input v-model="dialogAddress.form.city" placeholder="输入城市"></el-input>
               </el-form-item>
             </div>
           </div>
@@ -158,7 +158,7 @@
             country_id: @json((int)system_setting('base.country_id')),
             zipcode: '',
             zone_id: '',
-            city_id: '',
+            city: '',
             address_1: '',
             address_2: '',
           }
@@ -193,9 +193,9 @@
             message: '请选择省份',
             trigger: 'blur'
           }, ],
-          city_id: [{
+          city: [{
             required: true,
-            message: '请填写 city',
+            message: '请填写城市',
             trigger: 'blur'
           }, ],
         }

From 13582f25596b39ac7d930e7298c2eca3b27e36ee Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 17:05:23 +0800
Subject: [PATCH 10/10] https://guangdagit.com/beike/beikeshop/issues/97

---
 themes/default/account/login.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/default/account/login.blade.php b/themes/default/account/login.blade.php
index 0f1c4652..b5d2f436 100644
--- a/themes/default/account/login.blade.php
+++ b/themes/default/account/login.blade.php
@@ -24,9 +24,9 @@
             </div>
             <div class="card-body">
               <p class="lead">{{ __('shop/login.already') }}</p>
-              <p class="text-muted">Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis
+              {{-- <p class="text-muted">Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis
                 egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit
-                amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p>
+                amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo.</p> --}}
               <hr>
 
               <el-form-item label="{{ __('shop/login.email') }}" prop="email">
@@ -53,10 +53,10 @@
           </div>
           <div class="card-body">
             <p class="lead">{{ __('shop/login.not_already') }}</p>
-            <p class="text-muted">With registration with us new world of fashion, fantastic discounts and much more opens to
+            {{-- <p class="text-muted">With registration with us new world of fashion, fantastic discounts and much more opens to
               you! The whole process will not take you more than a minute!</p>
             <p class="text-muted">If you have any questions, please feel free to <a href="/contact">contact us</a>, our
-              customer service center is working for you 24/7.</p>
+              customer service center is working for you 24/7.</p> --}}
               <hr>
 
               <el-form ref="registerForm" :model="registerForm" :rules="registeRules">