From e51c44e71f4bce94a5274fbd2fa4d483596752ed Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Tue, 9 Apr 2024 17:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout-shop/index.vue           | 25 ++++++++----------
 src/views/shopCart/detail/index.vue | 41 +++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/layout-shop/index.vue b/src/layout-shop/index.vue
index 4739abf..86bad6e 100644
--- a/src/layout-shop/index.vue
+++ b/src/layout-shop/index.vue
@@ -2,25 +2,22 @@
   <el-container>
     <el-header>
       <el-menu
-        default-active="1"
+        default-active="2"
         class="el-menu-demo"
         mode="horizontal"
         background-color="#545c64"
         text-color="#fff"
         active-text-color="#ffd04b">
-        <el-menu-item index="1">处理中心</el-menu-item>
-        <el-submenu index="2">
-          <template slot="title">我的工作台</template>
-          <el-menu-item index="2-1">选项1</el-menu-item>
-          <el-menu-item index="2-2">选项2</el-menu-item>
-          <el-menu-item index="2-3">选项3</el-menu-item>
-          <el-submenu index="2-4">
-            <template slot="title">选项4</template>
-            <el-menu-item index="2-4-1">选项1</el-menu-item>
-            <el-menu-item index="2-4-2">选项2</el-menu-item>
-            <el-menu-item index="2-4-3">选项3</el-menu-item>
-          </el-submenu>
-        </el-submenu>
+        <el-menu-item index="1">
+          <router-link :to="'/index'" class="link-type">
+            <span>返回首页</span>
+          </router-link>
+        </el-menu-item>
+        <el-menu-item index="2">
+          <router-link :to="'/cart/detail'" class="link-type">
+            <span>我的购物车</span>
+          </router-link>
+        </el-menu-item>
         <el-menu-item index="3" disabled>消息中心</el-menu-item>
         <el-menu-item index="4"><a href="https://www.ele.me" target="_blank">订单管理</a></el-menu-item>
       </el-menu>
diff --git a/src/views/shopCart/detail/index.vue b/src/views/shopCart/detail/index.vue
index a97f3b9..fb1a2d4 100644
--- a/src/views/shopCart/detail/index.vue
+++ b/src/views/shopCart/detail/index.vue
@@ -82,9 +82,12 @@
         <el-row>
           <el-col :span="6">
             <el-checkbox v-model="isAllCheck" @change="changeIsAllCheck">全选</el-checkbox>
-            <el-button type="text" style="margin-left: 10px">删除选中商品</el-button>
+            <el-button type="text" style="margin-left: 10px" @click="removeCartProject(undefined)">删除选中商品</el-button>
           </el-col>
-          <el-col :span="14">
+          <el-col v-if="statisticsCart == null" :span="16">
+            <span style="font-size: 24px; font-weight: bolder;">购物车内无购物商品，请先去加入购物车</span>
+          </el-col>
+          <el-col v-if="statisticsCart != null" :span="14">
             <div>
               <span>共 <span style="color: red">{{ statisticsCart.total }}</span> 件商品，已选择 <span
                 style="color:red;">{{ statisticsCart.selectTotal }}</span> 件</span>
@@ -94,7 +97,7 @@
               <span>应付总额：<span style="color:red; font-size: 24px;">¥{{ statisticsCart.actualTotal }}</span></span>
             </div>
           </el-col>
-          <el-col :span="4">
+          <el-col v-if="statisticsCart != null" :span="4">
             <el-button style="float: right;" type="success">下单</el-button>
           </el-col>
         </el-row>
@@ -137,12 +140,26 @@ export default {
   },
   methods: {
     removeCartProject(row){
-      let removeCartProjectParam = {
-        "projectId": row.projectId,
-        "projectSku": row.projectSku,
-        "cartInfoId": row.cartInfoId
-      };
-      let removeCartProjectParams = [removeCartProjectParam];
+
+      let removeCartProjectParams = [];
+      if (row){
+        removeCartProjectParams.push({
+          "projectId": row.projectId,
+          "projectSku": row.projectSku,
+          "cartInfoId": row.cartInfoId
+        });
+      }else {
+        debugger
+        if (this.cartProjectSelected.length === 0){
+          this.$message.warning("请先选择购物车内商品")
+          return;
+        }
+        this.cartProjectSelected.forEach(cartInfoIsSelect => removeCartProjectParams.push({
+          "projectId": cartInfoIsSelect.projectId,
+          "projectSku": cartInfoIsSelect.projectSku,
+          "cartInfoId": cartInfoIsSelect.cartInfoId
+        }))
+      }
       removeCartInfo(removeCartProjectParams).then(response => {
         this.init();
       })
@@ -164,8 +181,10 @@ export default {
       this.cartProjectList = [];
       this.cartProjectSelected = []
       getDetailInfo().then(response => {
-        this.statisticsCart = response.data.statisticsCart;
-        this.cartProjectList = response.data.cartSkuList;
+        const {data} = response;
+
+        this.statisticsCart = data == null ? null : data.statisticsCart;
+        this.cartProjectList = data == null ? [] : data.cartSkuList;
         this.loading = true;
         setTimeout(this.initCartSelected, 200);
       })