From 3c97c32e9e7f3219a95d6e9377de519b40c01624 Mon Sep 17 00:00:00 2001
From: JianWeie <jianweie@live.com>
Date: Wed, 28 Sep 2022 15:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=9D=9E=E3=80=90=E4=BB=BF=E7=82=B9=E9=A4=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E3=80=91=E6=A0=8F=E7=9B=AE=E6=A0=B7=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E5=87=BA=E7=8E=B0=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/pages/category/index/index.vue   | 19 +++++++++--------
 .../pages/template/diancan/list/list.vue      | 21 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue
index 7db94816..e1f545ee 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue
@@ -92,6 +92,15 @@
                         </view>
                     </scroll-view>
                 </view>
+                <!-- 购物车栏 begin -->
+                <view class="cart-box">
+                    <view class="mark">
+                        <image src="https://files.cdn.coreshop.cn/static/template/diancan/images/cart.png" class="cart-img"></image>
+                        <view class="tag">{{cartNums}}</view>
+                    </view>
+                    <view class="price">￥{{cartMoney}}</view>
+                    <button type="primary" class="pay-btn" @tap="redirectCart" :disabled="cartNums<=0">去结算</button>
+                </view>
                 <!-- 购物车栏 end -->
             </view>
 
@@ -106,15 +115,7 @@
                                      @add-cart="addCart"
                                      @buy-now="buyNow"></vk-data-goods-sku-popup>
         </view>
-        <!-- 购物车栏 begin -->
-        <view class="cart-box">
-            <view class="mark">
-                <image src="https://files.cdn.coreshop.cn/static/template/diancan/images/cart.png" class="cart-img"></image>
-                <view class="tag">{{cartNums}}</view>
-            </view>
-            <view class="price">￥{{cartMoney}}</view>
-            <button type="primary" class="pay-btn" @tap="redirectCart" :disabled="cartNums<=0">去结算</button>
-        </view>
+        
         <!-- 登录提示 -->
         <coreshop-login-modal></coreshop-login-modal>
     </view>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.vue
index d40acd7b..353088be 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/template/diancan/list/list.vue
@@ -78,7 +78,16 @@
                     </view>
 
                 </scroll-view>
-                <!-- goods list end -->
+                <!-- 购物车栏 begin -->
+                <view class="cart-box">
+                    <view class="mark">
+                        <image src="https://files.cdn.coreshop.cn/static/template/diancan/images/cart.png" class="cart-img"></image>
+                        <view class="tag">{{cartNums}}</view>
+                    </view>
+                    <view class="price">￥{{cartMoney}}</view>
+                    <button type="primary" class="pay-btn" @tap="redirectCart" :disabled="cartNums<=0">去结算</button>
+                </view>
+                <!-- 购物车栏 end -->
             </view>
 
         </view>
@@ -94,16 +103,6 @@
                                  @add-cart="addCart"
                                  @buy-now="buyNow"></vk-data-goods-sku-popup>
 
-        <!-- 购物车栏 begin -->
-        <view class="cart-box">
-            <view class="mark">
-                <image src="https://files.cdn.coreshop.cn/static/template/diancan/images/cart.png" class="cart-img"></image>
-                <view class="tag">{{cartNums}}</view>
-            </view>
-            <view class="price">￥{{cartMoney}}</view>
-            <button type="primary" class="pay-btn" @tap="redirectCart" :disabled="cartNums<=0">去结算</button>
-        </view>
-        <!-- 购物车栏 end -->
         <!-- 登录提示 -->
         <coreshop-login-modal></coreshop-login-modal>
     </view>