From 67be2fd9fa9774c4fb6b42a51a77c39edce558f8 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Fri, 19 Aug 2022 18:21:43 +0800
Subject: [PATCH] wip

---
 public/build/beike/shop/default/js/app.js     |  1 +
 .../admin/views/pages/pages/index.blade.php   | 35 +++++++++++--------
 resources/beike/shop/default/js/product.js    |  2 ++
 themes/default/cart/cart.blade.php            | 13 ++++---
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/public/build/beike/shop/default/js/app.js b/public/build/beike/shop/default/js/app.js
index f7e59dd6..ca4ca0fa 100644
--- a/public/build/beike/shop/default/js/app.js
+++ b/public/build/beike/shop/default/js/app.js
@@ -2254,6 +2254,7 @@ $(function () {
 
 $(document).on('click', '.quantity-wrap .right i', function (event) {
   event.stopPropagation();
+  event.preventDefault();
   var input = $(this).parent().siblings('input');
 
   if ($(this).hasClass('bi-chevron-up')) {
diff --git a/resources/beike/admin/views/pages/pages/index.blade.php b/resources/beike/admin/views/pages/pages/index.blade.php
index 12cd31ea..c293bb5e 100644
--- a/resources/beike/admin/views/pages/pages/index.blade.php
+++ b/resources/beike/admin/views/pages/pages/index.blade.php
@@ -4,7 +4,11 @@
 
 @section('content')
 
-    @dump($errors)
+  {{-- @dump($errors) --}}
+
+  {{-- @if (session('success'))
+    <x-admin-alert type="success" msg="{{ session('success') }}" class="mt-4" />
+  @endif --}}
 
   <div class="card">
     <div class="card-body h-min-600">
@@ -24,21 +28,24 @@
         </thead>
         <tbody>
           @foreach ($pages_format as $page)
-          <tr>
-            <td>{{ $page['id'] }}</td>
-            <td><div title="{{ $page['title'] ?? '' }}">{{ $page['title_format'] ?? '' }}</div></td>
-            <td>{{ $page['active'] }}</td>
-            <td>{{ $page['created_at'] }}</td>
-            <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">
+            <tr>
+              <td>{{ $page['id'] }}</td>
+              <td>
+                <div title="{{ $page['title'] ?? '' }}">{{ $page['title_format'] ?? '' }}</div>
+              </td>
+              <td>{{ $page['active'] }}</td>
+              <td>{{ $page['created_at'] }}</td>
+              <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">
                 {{ method_field('delete') }}
                 {{ csrf_field() }}
               </form> --}}
-              <button class="btn btn-outline-danger btn-sm delete-btn" type='button' data-id="{{ $page['id'] }}">删除</button>
-            </td>
-          </tr>
+                <button class="btn btn-outline-danger btn-sm delete-btn" type='button'
+                  data-id="{{ $page['id'] }}">删除</button>
+              </td>
+            </tr>
           @endforeach
         </tbody>
       </table>
@@ -60,7 +67,7 @@
         btn: ['取消', '确定'],
         area: ['400px'],
         btn2: () => {
-        $http.delete(`pages/${id}`).then((res) => {
+          $http.delete(`pages/${id}`).then((res) => {
             layer.msg(res.message);
             window.location.reload();
           })
diff --git a/resources/beike/shop/default/js/product.js b/resources/beike/shop/default/js/product.js
index 1238d09a..7dee0cd7 100644
--- a/resources/beike/shop/default/js/product.js
+++ b/resources/beike/shop/default/js/product.js
@@ -1,5 +1,7 @@
 $(document).on('click', '.quantity-wrap .right i', function(event) {
   event.stopPropagation();
+  event.preventDefault();
+
   let input = $(this).parent().siblings('input')
 
   if ($(this).hasClass('bi-chevron-up')) {
diff --git a/themes/default/cart/cart.blade.php b/themes/default/cart/cart.blade.php
index ce31642f..7bad5144 100644
--- a/themes/default/cart/cart.blade.php
+++ b/themes/default/cart/cart.blade.php
@@ -17,7 +17,7 @@
       <div class="col-12 col-md-9">@include('shared.steps', ['steps' => 1])</div>
     </div>
 
-      @dump($errors)
+      {{-- @dump($errors) --}}
 
     <div class="row mt-5" v-if="products.length">
       <div class="col-12 col-md-9">
@@ -38,11 +38,10 @@
               </tr>
             </thead>
             <tbody>
-              <tr v-for="product, index in products" :key="index" @click="checkedCartTr(index)"
-                :class="product.selected ? 'active' : ''">
+              <tr v-for="product, index in products" :key="index" :class="product.selected ? 'active' : ''">
                 <td>
                   <div class="d-flex align-items-center p-image">
-                    <input class="form-check-input" type="checkbox" v-model="product.selected">
+                    <input class="form-check-input" type="checkbox" @change="checkedCartTr(index)" v-model="product.selected">
                     <img :src="product.image" class="img-fluid">
                   </div>
                 </td>
@@ -144,7 +143,7 @@
 
         quantityChange(quantity, cart_id) {
           const self = this;
-          $http.put(`/carts/${cart_id}`, {quantity: quantity}).then((res) => {
+          $http.put(`/carts/${cart_id}`, {quantity: quantity}, {hload: true}).then((res) => {
             this.setUpdateData(res);
           })
         },
@@ -158,7 +157,7 @@
         },
 
         checkedCartTr(index) {
-          this.products[index].selected = !this.products[index].selected;
+          // this.products[index].selected = !this.products[index].selected;
           this.selectedBtnSelected();
         },
 
@@ -166,7 +165,7 @@
           const self = this;
           const cart_ids = this.products.filter(e => e.selected).map(x => x.cart_id)
 
-          $http.post(`/carts/select`, {cart_ids: cart_ids}).then((res) => {
+          $http.post(`/carts/select`, {cart_ids: cart_ids}, {hload: true}).then((res) => {
             this.setUpdateData(res);
           })
         },