diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0d1d9dd2806f11fe562d3d2016527008b1b98740..0708d4c8c376ac8cbf73461c3e49358dcbbd5fc4 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,6 +7,7 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="bhs-system" />
         <module name="bhs-user" />
         <module name="dm-system" />
         <module name="bhs-order" />
@@ -17,6 +18,7 @@
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="bhs" target="8" />
+      <module name="bhs-cart" target="8" />
       <module name="bhs-auth" target="8" />
       <module name="bhs-gatway" target="8" />
       <module name="bhs-order" target="8" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b94feb7b48d049b0323a603bdca32ba06adee4ce..c8565b5c7c3ee338a38c23ffad561052705106a8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -15,6 +15,7 @@
     </option>
     <option name="ignoredFiles">
       <set>
+        <option value="$PROJECT_DIR$/bhs/bhs-cart/pom.xml" />
         <option value="$PROJECT_DIR$/dm/item/pom.xml" />
       </set>
     </option>
diff --git a/bhs/bhs-system/src/main/java/com/bhs/controller/ProductController.java b/bhs/bhs-system/src/main/java/com/bhs/controller/ProductController.java
index c829ea69b37cea156ee9c69a00a1949d4df1911f..aedd1cd3ac073fc8b9ea93b5a003b8a4d4e06623 100644
--- a/bhs/bhs-system/src/main/java/com/bhs/controller/ProductController.java
+++ b/bhs/bhs-system/src/main/java/com/bhs/controller/ProductController.java
@@ -1,6 +1,7 @@
 package com.bhs.controller;
 
 import com.bhs.pojo.Item;
+import com.bhs.pojo.MainMenu;
 import com.bhs.service.Product.ProductService;
 import com.bhs.vo.ResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,9 +15,46 @@ import java.util.List;
 public class ProductController {
     @Autowired
     private ProductService productService;
+    //商品详情
     @PostMapping("/getDetails/{id}")
     public ResponseData getDetails(@PathVariable("id") Integer id){
         Item productDetails=productService.getDetails(id);
         return ResponseData.success(productDetails);
     }
+    //商品列表
+    @PostMapping("/getGoodsList")
+    public ResponseData getGoodsList(){
+        List<MainMenu> goodsList=productService.getGoodsList();
+        return ResponseData.success(goodsList);
+    }
+    @PostMapping("/getGoodsList1")
+    public ResponseData getGoodsList1(){
+        List<Item> items1=productService.getGoodsList1();
+        return ResponseData.success(items1);
+    }
+    @PostMapping("/getGoodsList2")
+    public ResponseData getGoodsList2(){
+        List<Item> items2=productService.getGoodsList2();
+        return ResponseData.success(items2);
+    }
+    @PostMapping("/getGoodsList3")
+    public ResponseData getGoodsList3(){
+        List<Item> items3=productService.getGoodsList3();
+        return ResponseData.success(items3);
+    }
+    @PostMapping("/getGoodsList4")
+    public ResponseData getGoodsList4(){
+        List<Item> items4=productService.getGoodsList4();
+        return ResponseData.success(items4);
+    }
+    @PostMapping("/getGoodsList5")
+    public ResponseData getGoodsList5(){
+        List<Item> items5=productService.getGoodsList5();
+        return ResponseData.success(items5);
+    }
+    @PostMapping("/getGoodsList6")
+    public ResponseData getGoodsList6(){
+        List<Item> items6=productService.getGoodsList6();
+        return ResponseData.success(items6);
+    }
 }
diff --git a/bhs/bhs-system/src/main/java/com/bhs/mappers/Product/ProductMapper.java b/bhs/bhs-system/src/main/java/com/bhs/mappers/Product/ProductMapper.java
index a529856305d6df70a7e5285a7b476234299d4f07..bb4ed0cd4344ef4e97f85394c6ad646616ad4164 100644
--- a/bhs/bhs-system/src/main/java/com/bhs/mappers/Product/ProductMapper.java
+++ b/bhs/bhs-system/src/main/java/com/bhs/mappers/Product/ProductMapper.java
@@ -10,4 +10,28 @@ public interface ProductMapper {
             "FROM item " +
             "WHERE id=#{id}")
     Item getDetails(Integer id);
+    @Select("SELECT id,menu_id,name,price,img_path,created,updated,status,top_menu_id,repertory,advantage " +
+            "FROM item " +
+            "WHERE main_menu_id=1")
+    List<Item> getGoodsList1();
+    @Select("SELECT id,menu_id,name,price,img_path,created,updated,status,top_menu_id,repertory,advantage " +
+            "FROM item " +
+            "WHERE main_menu_id=2")
+    List<Item> getGoodsList2();
+    @Select("SELECT id,menu_id,name,price,img_path,created,updated,status,top_menu_id,repertory,advantage " +
+            "FROM item " +
+            "WHERE main_menu_id=3")
+    List<Item> getGoodsList3();
+    @Select("SELECT id,menu_id,name,price,img_path,created,updated,status,top_menu_id,repertory,advantage " +
+            "FROM item " +
+            "WHERE main_menu_id=4")
+    List<Item> getGoodsList4();
+    @Select("SELECT id,menu_id,name,price,img_path,created,updated,status,top_menu_id,repertory,advantage " +
+            "FROM item " +
+            "WHERE main_menu_id=5")
+    List<Item> getGoodsList5();
+    @Select("SELECT id,menu_id,name,price,img_path,created,updated,status,top_menu_id,repertory,advantage " +
+            "FROM item " +
+            "WHERE main_menu_id in (6,7)")
+    List<Item> getGoodsList6();
 }
diff --git a/bhs/bhs-system/src/main/java/com/bhs/pojo/ShoppingCart.java b/bhs/bhs-system/src/main/java/com/bhs/pojo/ShoppingCart.java
new file mode 100644
index 0000000000000000000000000000000000000000..eddd883fa1d94cdbe7787207e8f820273010e57e
--- /dev/null
+++ b/bhs/bhs-system/src/main/java/com/bhs/pojo/ShoppingCart.java
@@ -0,0 +1,14 @@
+package com.bhs.pojo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class ShoppingCart extends basePojo{
+    private static final long serialVersionUID = 7291723109947907696L;
+    private Integer id;
+    private Integer userId;
+    private Integer itemId;
+    private Integer quantity;
+}
diff --git a/bhs/bhs-system/src/main/java/com/bhs/service/Product/ProductService.java b/bhs/bhs-system/src/main/java/com/bhs/service/Product/ProductService.java
index 988186539a30299df6900dd3fcb3d28d73bae95c..da3b783530c631c4f061fd9fe81441d00bf9f08c 100644
--- a/bhs/bhs-system/src/main/java/com/bhs/service/Product/ProductService.java
+++ b/bhs/bhs-system/src/main/java/com/bhs/service/Product/ProductService.java
@@ -1,11 +1,21 @@
 package com.bhs.service.Product;
 
 import com.bhs.pojo.Item;
+import com.bhs.pojo.MainMenu;
 
 import java.util.List;
 
 public interface ProductService {
-
+//商品详情页
     Item getDetails(Integer productID);
+//商品列表页
+    List<MainMenu> getGoodsList();
+    List<Item> getGoodsList1();
+    List<Item> getGoodsList2();
+    List<Item> getGoodsList3();
+    List<Item> getGoodsList4();
+    List<Item> getGoodsList5();
+    List<Item> getGoodsList6();
+
 
 }
diff --git a/bhs/bhs-system/src/main/java/com/bhs/service/Product/impl/ProductServiceImpl.java b/bhs/bhs-system/src/main/java/com/bhs/service/Product/impl/ProductServiceImpl.java
index 5881bd2a7a71dfc666536372fc19cd18a30baad2..57ef46078a1807c345fabc108fb46e14e8f750dd 100644
--- a/bhs/bhs-system/src/main/java/com/bhs/service/Product/impl/ProductServiceImpl.java
+++ b/bhs/bhs-system/src/main/java/com/bhs/service/Product/impl/ProductServiceImpl.java
@@ -1,15 +1,23 @@
 package com.bhs.service.Product.impl;
 
 import com.bhs.mappers.Product.ProductMapper;
+import com.bhs.mappers.menu.LeftMenuMapper;
 import com.bhs.pojo.Item;
+import com.bhs.pojo.MainMenu;
 import com.bhs.service.Product.ProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.sound.midi.Soundbank;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class ProductServiceImpl implements ProductService {
+    @Autowired
+    private LeftMenuMapper leftMenuMapper;
     @Autowired
     private ProductMapper productMapper;
 
@@ -18,5 +26,82 @@ public class ProductServiceImpl implements ProductService {
         return productMapper.getDetails(id);
     }
 
+    @Override
+    public List<MainMenu> getGoodsList() {
+        //获取MainMenu表数据并用List保存，这个里面没children
+        List<MainMenu> mainMenus=leftMenuMapper.getMainMenu();
+        //这个是新建的传回前端的，有children
+        List<MainMenu> mainMenuLists=new ArrayList<>();
+        //Item表k是表中mainMenuId，v是表数据
+        Map<Integer,List<Item>> maps=getGoodsMap();
+        System.out.println();
+        //把MainMenu表中的数据便利出来，这个里面的children没有
+        for (MainMenu items:mainMenus){
+            //获取MainMenu表id
+            Integer mainMenuId=items.getId();
+            //根据mainMenuId获取Item表并存入List中
+            List<Item> items1=maps.get(mainMenuId);
+            //如果为空则说明mainMenuId对应的类型没有则直接结束
+            if(items1==null){
+                continue;
+            }
+            //把上面获取的Item数据写入MainMenu的children里
+            items.setChildren(items1);
+            mainMenuLists.add(items);
+        }
+        return mainMenuLists;
+    }
+
+    @Override
+    public List<Item> getGoodsList1() {
+        return productMapper.getGoodsList1();
+    }
+
+    @Override
+    public List<Item> getGoodsList2() {
+        return productMapper.getGoodsList2();
+    }
+
+    @Override
+    public List<Item> getGoodsList3() {
+        return productMapper.getGoodsList3();
+    }
+
+    @Override
+    public List<Item> getGoodsList4() {
+        return productMapper.getGoodsList4();
+    }
+
+    @Override
+    public List<Item> getGoodsList5() {
+        return productMapper.getGoodsList5();
+    }
+
+    @Override
+    public List<Item> getGoodsList6() {
+        return productMapper.getGoodsList6();
+    }
+
+    public Map<Integer,List<Item>> getGoodsMap(){
+        HashMap<Integer, List<Item>> maps = new HashMap<>();
+        //获取Item表
+        List<Item> itemList = leftMenuMapper.getMainItem();
+        //把Item表遍历出来
+        for (Item item : itemList){
+            //获取item表的mainMenuId
+            Integer key = item.getMainMenuId();
+            //把Item表和Item表中的mainMenuId作为一对<k,v>传入maps中
+            if (maps.containsKey(key)){
+                //如果K存在，则只改变V，增加到list中
+                List<Item> list = maps.get(key);
+                list.add(item);
+                continue;
+            }
+            List<Item> list = new ArrayList<>();
+            list.add(item);
+            maps.put(key, list);
+        }
+        return maps;
+    }
 
 }
diff --git a/bhs/bhs-system/target/classes/com/bhs/controller/ProductController.class b/bhs/bhs-system/target/classes/com/bhs/controller/ProductController.class
index 1a19dc95cc3c9d85e0917ba0e96eab86ac296bd5..0ba7f037199918dc86e7151ee07cae4674aefc7e 100644
Binary files a/bhs/bhs-system/target/classes/com/bhs/controller/ProductController.class and b/bhs/bhs-system/target/classes/com/bhs/controller/ProductController.class differ
diff --git a/bhs/bhs-system/target/classes/com/bhs/mappers/Product/ProductMapper.class b/bhs/bhs-system/target/classes/com/bhs/mappers/Product/ProductMapper.class
index fd766d23e509a7fb29e86ed05eadee94544fda61..850b6107b52c571a9268364713dd415e393f6687 100644
Binary files a/bhs/bhs-system/target/classes/com/bhs/mappers/Product/ProductMapper.class and b/bhs/bhs-system/target/classes/com/bhs/mappers/Product/ProductMapper.class differ
diff --git a/bhs/bhs-system/target/classes/com/bhs/service/Product/ProductService.class b/bhs/bhs-system/target/classes/com/bhs/service/Product/ProductService.class
index 9a423ef2a423e3e33bb09c3d54cf91cae2982afc..61394c9123683d02e4cf3170a0c22c71a99aefdc 100644
Binary files a/bhs/bhs-system/target/classes/com/bhs/service/Product/ProductService.class and b/bhs/bhs-system/target/classes/com/bhs/service/Product/ProductService.class differ
diff --git a/bhs/bhs-system/target/classes/com/bhs/service/Product/impl/ProductServiceImpl.class b/bhs/bhs-system/target/classes/com/bhs/service/Product/impl/ProductServiceImpl.class
index 1d30099cb1276fb4eb1e68ef98f53185b7e26249..50267fdd19c7422d3c419592e5fe9d99d0b6c27f 100644
Binary files a/bhs/bhs-system/target/classes/com/bhs/service/Product/impl/ProductServiceImpl.class and b/bhs/bhs-system/target/classes/com/bhs/service/Product/impl/ProductServiceImpl.class differ
diff --git a/bhs/bhs.iml b/bhs/bhs.iml
index c432f6ee9084517aa6c5efd43c36176bae0b45cb..7c3ac58227952b322c0a035eb154c03d40c06368 100644
--- a/bhs/bhs.iml
+++ b/bhs/bhs.iml
@@ -4,6 +4,7 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/bhs-cart" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/bhs/pom.xml b/bhs/pom.xml
index 537d6cb6216e37a212c44f58c0001fa1174e4bd6..ab9cbae72e6d70cd38997391c19fbe7d7ad86fbd 100644
--- a/bhs/pom.xml
+++ b/bhs/pom.xml
@@ -12,6 +12,7 @@
         <module>bhs-system</module>
         <module>bhs-user</module>
         <module>bhs-gatway</module>
+        <module>bhs-cart</module>
     </modules>
     <!-- 依赖声明 -->
     <dependencyManagement>
diff --git a/vue-store/src/components/Phone.vue b/vue-store/src/components/Phone.vue
index a2a1f5c2715c11f07a7ce26315ffd4f6c04a9040..a59c65a4057e24e3d1e51231a44eab7c3d97c465 100644
--- a/vue-store/src/components/Phone.vue
+++ b/vue-store/src/components/Phone.vue
@@ -38,41 +38,40 @@ export default {
 
 <style>
 .mainItemUl{
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
 }
 .mainItem:hover {
-    box-shadow: 0 12px 8px rgba(191, 191, 191, .2);
-    transform: translateY(-5px);
+/* 	box-shadow: 0 12px 8px rgba(191, 191, 191, .2);
+	transform: translateY(-5px); */
 }
 .mainItemImg{
     width: 100px;
     height: 150px;
 }
 .mainItem{
-    
-    width: 200px;
-    margin: 10px;
-    padding: 20px 10px;
-    text-align: center;
-    background-color:whitesmoke
+	width: 200px;
+	margin: 10px;
+	padding: 20px 10px;
+	text-align: center;
+	background-color:whitesmoke
 }
 .mainItemMenu{
     margin: 20px 0;
 }
 .phone{
-    /* 弹性布局设置 */
+/*    弹性布局设置*/
     display: flex;
     /* 按垂直方向排列 */
     flex-direction: column;
     justify-content: flex-start;
     /* 可多行排列 */
     flex-wrap: wrap;
-    margin: 0,20px;
+    margin: 0,20px; 
 }
 .phone1{
-    float: right;
+   float: right;
     font-size:20px;
     font-weight:700
 }
diff --git a/vue-store/src/components/top/TopHeader.vue b/vue-store/src/components/top/TopHeader.vue
index 0d93d9fe1af83cd713e501dec66e5c432b7b4438..f7d8c13237a43dcf650a14477b361c8535e6ec95 100644
--- a/vue-store/src/components/top/TopHeader.vue
+++ b/vue-store/src/components/top/TopHeader.vue
@@ -12,13 +12,6 @@
     </el-menu-item>
     
       <el-menu-item v-if="isHome" style="width: 120px"></el-menu-item>
-      <el-submenu index="2-4" style="width: 120px" v-else>
-        <template slot="title">全部商品分类</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-menu-item class="topMenu" v-for="item in topList" :key="item.id">
         <span @mouseenter="setTopListOn" @mouseover="getTopListItem(item.id)">
             {{item.name}}
diff --git a/vue-store/src/views/Details.vue b/vue-store/src/views/Details.vue
index 6af76860d2e168c29cbecec0350d32aa03eed740..0d4859326c1c48f3888f1bebeee0d92ca80ea184 100644
--- a/vue-store/src/views/Details.vue
+++ b/vue-store/src/views/Details.vue
@@ -35,7 +35,7 @@
       <!-- 左侧商品轮播图 -->
      <div class="block">
         <div height="560px" >
-            <img style="height:560px;width: 560px;" :src="$target + getDetails.imgPath"/>
+            <img style="height:500px;width: 560px;" :src="$target + getDetails.imgPath"/>
         </div>
       </div>
       <!-- 左侧商品轮播图END -->
@@ -127,7 +127,39 @@ export default {
         .then((res) => {
           this.getDetails = res.data.data;
         });
-    }
+	},
+	methods:{
+		addShoppingCart() {
+		this.$axios
+			.post("/api/menu/product/addShoppingCart", {
+				user_id: this.$store.getters.getUser.user_id,
+				product_id: this.productID
+			})
+			.then(res => {
+				switch (res.data.code) {
+				case "001":
+					// 新加入购物车成功
+					this.unshiftShoppingCart(res.data.shoppingCartData[0]);
+					this.notifySucceed(res.data.msg);
+					break;
+				case "002":
+				// 该商品已经在购物车，数量+1
+				this.addShoppingCartNum(this.productID);
+				this.notifySucceed(res.data.msg);
+				break;
+				case "003":
+				// 商品数量达到限购数量
+				this.dis = true;
+				this.notifyError(res.data.msg);
+				break;
+				default:
+				this.notifyError(res.data.msg);
+				}
+			})
+			.catch(err => {
+				return Promise.reject(err);
+			});
+		},
 	}
 	
   // data() {
@@ -177,42 +209,42 @@ export default {
   //       });
   //   },
     // 加入购物车
-    // addShoppingCart() {
-    //   // 判断是否登录,没有登录则显示登录组件
-    //   if (!this.$store.getters.getUser) {
-    //     this.$store.dispatch("setShowLogin", true);
-    //     return;
-    //   }
-    //   this.$axios
-    //     .post("/api/user/shoppingCart/addShoppingCart", {
-    //       user_id: this.$store.getters.getUser.user_id,
-    //       product_id: this.productID
-    //     })
-    //     .then(res => {
-    //       switch (res.data.code) {
-    //         case "001":
-    //           // 新加入购物车成功
-    //           this.unshiftShoppingCart(res.data.shoppingCartData[0]);
-    //           this.notifySucceed(res.data.msg);
-    //           break;
-    //         case "002":
-    //           // 该商品已经在购物车，数量+1
-    //           this.addShoppingCartNum(this.productID);
-    //           this.notifySucceed(res.data.msg);
-    //           break;
-    //         case "003":
-    //           // 商品数量达到限购数量
-    //           this.dis = true;
-    //           this.notifyError(res.data.msg);
-    //           break;
-    //         default:
-    //           this.notifyError(res.data.msg);
-    //       }
-    //     })
-    //     .catch(err => {
-    //       return Promise.reject(err);
-    //     });
-    // },
+	// addShoppingCart() {
+ //      // 判断是否登录,没有登录则显示登录组件
+	// 	if (!this.$store.getters.getUser) {
+	// 	this.$store.dispatch("setShowLogin", true);
+	// 	return;
+ //      }
+ //      this.$axios
+ //        .post("/api/user/shoppingCart/addShoppingCart", {
+ //          user_id: this.$store.getters.getUser.user_id,
+ //          product_id: this.productID
+ //        })
+ //        .then(res => {
+ //          switch (res.data.code) {
+ //            case "001":
+ //              // 新加入购物车成功
+ //              this.unshiftShoppingCart(res.data.shoppingCartData[0]);
+ //              this.notifySucceed(res.data.msg);
+ //              break;
+ //            case "002":
+ //              // 该商品已经在购物车，数量+1
+ //              this.addShoppingCartNum(this.productID);
+ //              this.notifySucceed(res.data.msg);
+ //              break;
+ //            case "003":
+ //              // 商品数量达到限购数量
+ //              this.dis = true;
+ //              this.notifyError(res.data.msg);
+ //              break;
+ //            default:
+ //              this.notifyError(res.data.msg);
+ //          }
+ //        })
+ //        .catch(err => {
+ //          return Promise.reject(err);
+ //        });
+ //    },
     // addCollect() {
     //   // 判断是否登录,没有登录则显示登录组件
     //   if (!this.$store.getters.getUser) {
diff --git a/vue-store/src/views/Goods.vue b/vue-store/src/views/Goods.vue
index df8fc5bf960e51712260ace532ef97be46b9039f..94c6b004e1521fcf5d63fb31402e98356ea0164a 100644
--- a/vue-store/src/views/Goods.vue
+++ b/vue-store/src/views/Goods.vue
@@ -6,277 +6,304 @@
  * @LastEditTime: 2020-03-08 12:11:13
  -->
 <template>
-  <div class="goods" id="goods" name="goods">
-    <!-- 面包屑 -->
-    <div class="breadcrumb">
-      <el-breadcrumb separator-class="el-icon-arrow-right">
-        <el-breadcrumb-item to="/">首页</el-breadcrumb-item>
-        <el-breadcrumb-item>全部商品</el-breadcrumb-item>
-        <el-breadcrumb-item v-if="search">搜索</el-breadcrumb-item>
-        <el-breadcrumb-item v-else>分类</el-breadcrumb-item>
-        <el-breadcrumb-item v-if="search">{{search}}</el-breadcrumb-item>
-      </el-breadcrumb>
-    </div>
-    <!-- 面包屑END -->
-
-    <!-- 分类标签 -->
-    <div class="nav">
-      <div class="product-nav">
-        <div class="title">分类</div>
-        <el-tabs v-model="activeName" type="card">
-          <el-tab-pane
-            v-for="item in categoryList"
-            :key="item.category_id"
-            :label="item.category_name"
-            :name="''+item.category_id"
-          />
-        </el-tabs>
-      </div>
-    </div>
-    <!-- 分类标签END -->
-
-    <!-- 主要内容区 -->
-    <div class="main">
-      <div class="list">
-        <MyList :list="product" v-if="product.length>0"></MyList>
-        <div v-else class="none-product">抱歉没有找到相关的商品，请看看其他的商品</div>
-      </div>
-      <!-- 分页 -->
-      <div class="pagination">
-        <el-pagination
-          background
-          layout="prev, pager, next"
-          :page-size="pageSize"
-          :total="total"
-          @current-change="currentChange"
-        ></el-pagination>
-      </div>
-      <!-- 分页END -->
-    </div>
-    <!-- 主要内容区END -->
-  </div>
+	<div>
+		<top-bar></top-bar>
+		<top-header></top-header>
+		<div class="good">
+			<!--首页-->
+			<el-breadcrumb separator="/">
+				<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+			</el-breadcrumb>
+			<!--首页END-->
+			
+			<div class="bbb">
+				<span style="font-size:20px;font-weight:700">
+					飞行器<i :class="wireframe1" @click="show1"></i>
+				</span>
+					<div v-for="items in goodsList1" :key="items.id" v-show="a1">
+						<ul class="bbb">
+							<li :key="items.id">
+								<router-link :to="{path:'/goods/details',query:{id:items.id}}">
+								<img class="mainItemImg" :src="$target + items.imgPath">
+								<span style="font:200;margin: 1px;height: 40px;"><br/>{{items.name}}</span>
+								<span style="font:200;font-size:14px;height: 40px;color:rgb(99, 96, 96)"><br/>{{items.advantage}}</span>
+								<div style="font:200;color:red;height: 40px;margin-botton:5px"><br/>{{items.price}}</div>
+								</router-link>
+							</li>
+						</ul>
+					</div>
+			</div>
+			<div class="bbb">
+				<span style="font-size:20px;font-weight:700">
+					舰船舰艇<i :class="wireframe2" @click="show2"></i>
+				</span>
+					<div v-for="items in goodsList2" :key="items.id" v-show="a2">
+						<ul class="bbb">
+							<li :key="items.id">
+								<router-link :to="{path:'/goods/details',query:{id:items.id}}">
+								<img class="mainItemImg" :src="$target + items.imgPath">
+								<span style="font:200;margin: 1px;height: 40px;"><br/>{{items.name}}</span>
+								<span style="font:200;font-size:14px;height: 40px;color:rgb(99, 96, 96)"><br/>{{items.advantage}}</span>
+								<div style="font:200;color:red;height: 40px;margin-botton:5px"><br/>{{items.price}}</div>
+								</router-link>
+							</li>
+						</ul>
+					</div>
+			</div>
+			<div class="bbb">
+				<span style="font-siz:20px;font-weight:700">坦克装甲车辆<i :class="wireframe3" @click="show3"></i></span>
+					<div v-for="items in goodsList3" :key="items.id" v-show="a3">
+						<ul class="bbb">
+							<li :key="items.id">
+								<router-link :to="{path:'/goods/details',query:{id:items.id}}">
+								<img class="mainItemImg" :src="$target + items.imgPath">
+								<span style="font:200;margin: 1px;height: 40px;"><br/>{{items.name}}</span>
+								<span style="font:200;font-size:14px;height: 40px;color:rgb(99, 96, 96)"><br/>{{items.advantage}}</span>
+								<div style="font:200;color:red;height: 40px;margin-botton:5px"><br/>{{items.price}}</div>
+								</router-link>
+							</li>
+						</ul>
+					</div>
+			</div>
+			<div class="bbb">
+				<span style="font-size:20px;font-weight:700">火炮导弹<i :class="wireframe4" @click="show4"></i></span>
+					<div v-for="items in goodsList4" :key="items.id" v-show="a4">
+						<ul class="bbb">
+							<li :key="items.id">
+								<router-link :to="{path:'/goods/details',query:{id:items.id}}">
+								<img class="mainItemImg" :src="$target + items.imgPath">
+								<span style="font:200;margin: 1px;height: 40px;"><br/>{{items.name}}</span>
+								<span style="font:200;font-size:14px;height: 40px;color:rgb(99, 96, 96)"><br/>{{items.advantage}}</span>
+								<div style="font:200;color:red;height: 40px;margin-botton:5px"><br/>{{items.price}}</div>
+								</router-link>
+							</li>
+						</ul>
+					</div>
+			</div>
+			<div class="bbb">
+				<span style="font-size:20px;font-weight:700">爆炸物<i :class="wireframe5" @click="show5"></i></span>
+					<div v-for="items in goodsList5" :key="items.id" v-show="a5">
+						<ul class="bbb">
+							<li :key="items.id">
+								<router-link :to="{path:'/goods/details',query:{id:items.id}}">
+								<img class="mainItemImg" :src="$target + items.imgPath">
+								<span style="font:200;margin: 1px;height: 40px;"><br/>{{items.name}}</span>
+								<span style="font:200;font-size:14px;height: 40px;color:rgb(99, 96, 96)"><br/>{{items.advantage}}</span>
+								<div style="font:200;color:red;height: 40px;margin-botton:5px"><br/>{{items.price}}</div>
+								</router-link>
+							</li>
+						</ul>
+					</div>
+			</div>
+			<div class="bbb">
+				<span style="font-size:20px;font-weight:700">
+					机械与单兵<i :class="wireframe6" @click="show6"></i>
+				</span>
+					<div v-for="items in goodsList6" :key="items.id" v-show="a6">
+						<ul class="bbb">
+							<li :key="items.id">
+								<router-link :to="{path:'/goods/details',query:{id:items.id}}">
+								<img class="mainItemImg" :src="$target + items.imgPath">
+								<span style="font:200;margin: 1px;height: 40px;"><br/>{{items.name}}</span>
+								<span style="font:200;font-size:14px;height: 40px;color:rgb(99, 96, 96)"><br/>{{items.advantage}}</span>
+								<div style="font:200;color:red;height: 40px;margin-botton:5px"><br/>{{items.price}}</div>
+								</router-link>
+							</li>
+						</ul>
+					</div>
+			</div>
+		</div>
+		<bottom-bar></bottom-bar>
+	</div>
 </template>
 <script>
+import BottomBar from '../components/bottom/BottomBar.vue';
+import TopBar from '../components/top/TopBar.vue';
+import TopHeader from '../components/top/TopHeader.vue';
 export default {
-  data() {
-    return {
-      categoryList: "", //分类列表
-      categoryID: [], // 分类id
-      product: "", // 商品列表
-      productList: "",
-      total: 0, // 商品总量
-      pageSize: 15, // 每页显示的商品数量
-      currentPage: 1, //当前页码
-      activeName: "-1", // 分类列表当前选中的id
-      search: "" // 搜索条件
-    };
-  },
-  created() {
-    // 获取分类列表
-    this.getCategory();
-  },
-  activated() {
-    this.activeName = "-1"; // 初始化分类列表当前选中的id为-1
-    this.total = 0; // 初始化商品总量为0
-    this.currentPage = 1; //初始化当前页码为1
-    // 如果路由没有传递参数，默认为显示全部商品
-    if (Object.keys(this.$route.query).length == 0) {
-      this.categoryID = [];
-      this.activeName = "0";
-      return;
-    }
-    // 如果路由传递了categoryID，则显示对应的分类商品
-    if (this.$route.query.categoryID != undefined) {
-      this.categoryID = this.$route.query.categoryID;
-      if (this.categoryID.length == 1) {
-        this.activeName = "" + this.categoryID[0];
-      }
-      return;
-    }
-    // 如果路由传递了search，则为搜索，显示对应的分类商品
-    if (this.$route.query.search != undefined) {
-      this.search = this.$route.query.search;
-    }
-  },
-  watch: {
-    // 监听点击了哪个分类标签，通过修改分类id，响应相应的商品
-    activeName: function(val) {
-      if (val == 0) {
-        this.categoryID = [];
-      }
-      if (val > 0) {
-        this.categoryID = [Number(val)];
-      }
-      // 初始化商品总量和当前页码
-      this.total = 0;
-      this.currentPage = 1;
-      // 更新地址栏链接，方便刷新页面可以回到原来的页面
-      this.$router.push({
-        path: "/goods",
-        query: { categoryID: this.categoryID }
-      });
-    },
-    // 监听搜索条件，响应相应的商品
-    search: function(val) {
-      if (val != "") {
-        this.getProductBySearch(val);
-      }
-    },
-    // 监听分类id，响应相应的商品
-    categoryID: function() {
-      this.getData();
-      this.search = "";
-    },
-    // 监听路由变化，更新路由传递了搜索条件
-    $route: function(val) {
-      if (val.path == "/goods") {
-        if (val.query.search != undefined) {
-          this.activeName = "-1";
-          this.currentPage = 1;
-          this.total = 0;
-          this.search = val.query.search;
-        }
-      }
-    }
-  },
-  methods: {
-    // 返回顶部
-    backtop() {
-      const timer = setInterval(function() {
-        const top = document.documentElement.scrollTop || document.body.scrollTop;
-        const speed = Math.floor(-top / 5);
-        document.documentElement.scrollTop = document.body.scrollTop =
-          top + speed;
-
-        if (top === 0) {
-          clearInterval(timer);
-        }
-      }, 20);
-    },
-    // 页码变化调用currentChange方法
-    currentChange(currentPage) {
-      this.currentPage = currentPage;
-      if (this.search != "") {
-        this.getProductBySearch();
-      } else {
-        this.getData();
-      }
-      this.backtop();
-    },
-    // 向后端请求分类列表数据
-    getCategory() {
-      this.$axios
-        .post("/api/product/getCategory", {})
-        .then(res => {
-          const val = {
-            category_id: 0,
-            category_name: "全部"
-          };
-          const cate = res.data.category;
-          cate.unshift(val);
-          this.categoryList = cate;
-        })
-        .catch(err => {
-          return Promise.reject(err);
-        });
-    },
-    // 向后端请求全部商品或分类商品数据
-    getData() {
-      // 如果分类列表为空则请求全部商品数据，否则请求分类商品数据
-      const api =
-        this.categoryID.length == 0
-          ? "/api/product/getAllProduct"
-          : "/api/product/getProductByCategory";
-      this.$axios
-        .post(api, {
-          categoryID: this.categoryID,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize
-        })
-        .then(res => {
-          this.product = res.data.Product;
-          this.total = res.data.total;
-        })
-        .catch(err => {
-          return Promise.reject(err);
-        });
-    },
-    // 通过搜索条件向后端请求商品数据
-    getProductBySearch() {
-      this.$axios
-        .post("/api/product/getProductBySearch", {
-          search: this.search,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize
-        })
-        .then(res => {
-          this.product = res.data.Product;
-          this.total = res.data.total;
-        })
-        .catch(err => {
-          return Promise.reject(err);
-        });
-    }
-  }
-};
+	components: { TopHeader, BottomBar,TopBar,},
+	name:"goods",
+	data(){
+		return{
+			goodsList:'',
+			goodsList1:'',
+			goodsList2:'',
+			goodsList3:'',
+			goodsList4:'',
+			goodsList5:'',
+			goodsList6:'',
+			a1:false,
+			a2:false,
+			a3:false,
+			a4:false,
+			a5:false,
+			a6:false,
+			isGoodsList1:false,
+			isGoodsList2:false,
+			isGoodsList3:false,
+			isGoodsList4:false,
+			isGoodsList5:false,
+			isGoodsList6:false,
+			wireframe1:'el-icon-caret-bottom',
+			wireframe2:'el-icon-caret-bottom',
+			wireframe3:'el-icon-caret-bottom',
+			wireframe4:'el-icon-caret-bottom',
+			wireframe5:'el-icon-caret-bottom',
+			wireframe6:'el-icon-caret-bottom',
+		};
+	},
+	created() {
+		this.$axios.post("/api/menu/product/getGoodsList")
+			.then((res)=>{
+				this.goodsList=res.data.data;
+			})
+		
+	},
+	methods:{
+		handleChange(val) {
+				console.log(val);
+		},
+		show1(){
+			if(this.isGoodsList1===false){
+			this.isGoodsList1 =!this.isGoodsList1
+			this.wireframe1='el-icon-caret-top'
+			this.a1=!this.a1
+			this.$axios.post("/api/menu/product/getGoodsList1")
+				.then((res)=>{
+					this.goodsList1=res.data.data;
+				})
+			}else{
+				this.isGoodsList1 =!this.isGoodsList1
+				this.wireframe1='el-icon-caret-bottom'
+				this.a1=false
+			}
+		},	
+		show2(){
+			if(this.isGoodsList2===false){
+			this.isGoodsList2 =!this.isGoodsList2
+			this.wireframe2='el-icon-caret-top'
+			this.a2=!this.a2
+			this.$axios.post("/api/menu/product/getGoodsList2")
+				.then((res)=>{
+					this.goodsList2=res.data.data;
+				})
+			}else{
+				this.isGoodsList2 =!this.isGoodsList2
+				this.wireframe2='el-icon-caret-bottom'
+				this.a2=false
+			}	
+		},
+		show3(){
+			if(this.isGoodsList3===false){
+			this.isGoodsList3 =!this.isGoodsList3
+			this.wireframe3='el-icon-caret-top'
+			this.a3=!this.a3
+			this.$axios.post("/api/menu/product/getGoodsList3")
+				.then((res)=>{
+					this.goodsList3=res.data.data;
+				})
+			}else{
+				this.isGoodsList3 =!this.isGoodsList3
+				this.wireframe3='el-icon-caret-bottom'
+				this.a3=false
+			}	
+		},
+		show4(){
+			if(this.isGoodsList4===false){
+			this.isGoodsList4 =!this.isGoodsList4
+			this.wireframe4='el-icon-caret-top'
+			this.a4=!this.a4
+			this.$axios.post("/api/menu/product/getGoodsList4")
+				.then((res)=>{
+					this.goodsList4=res.data.data;
+				})
+			}else{
+				this.isGoodsList4=!this.isGoodsList4
+				this.wireframe4='el-icon-caret-bottom'
+				this.a4=false
+			}	
+		},
+		show5(){
+			if(this.isGoodsList5===false){
+			this.isGoodsList5 =!this.isGoodsList5
+			this.wireframe5='el-icon-caret-top'
+			this.a5=!this.a5
+			this.$axios.post("/api/menu/product/getGoodsList5")
+				.then((res)=>{
+					this.goodsList5=res.data.data;
+				})
+			}else{
+				this.isGoodsList5=!this.isGoodsList5
+				this.wireframe5='el-icon-caret-bottom'
+				this.a5=false
+			}	
+		},
+		show6(){
+			if(this.isGoodsList6===false){
+			this.isGoodsList6 =!this.isGoodsList6
+			this.wireframe='el-icon-caret-top'
+			this.a6=!this.a6
+			this.$axios.post("/api/menu/product/getGoodsList6")
+				.then((res)=>{
+					this.goodsList6=res.data.data;
+				})
+			}else{
+				this.isGoodsList6 =!this.isGoodsList6
+				this.wireframe6='el-icon-caret-bottom'
+				this.a6=false
+			}
+		}
+	},
+}
 </script>
 
 <style scoped>
-.goods {
-  background-color: #f5f5f5;
+.good{
+	margin-top: 45px;
+	margin-left: 150px;
+	margin-right: 150px;
 }
-/* 面包屑CSS */
-.el-tabs--card .el-tabs__header {
-  border-bottom: none;
+.mainItemUl{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
 }
-.goods .breadcrumb {
-  height: 50px;
-  background-color: white;
+.mainItem:hover {
+    box-shadow: 0 12px 8px rgba(191, 191, 191, .2);
+    transform: translateY(-5px);
 }
-.goods .breadcrumb .el-breadcrumb {
-  width: 1225px;
-  line-height: 30px;
-  font-size: 16px;
-  margin: 0 auto;
+.mainItemImg{
+    width: 100px;
+    height: 150px;
 }
-/* 面包屑CSS END */
-
-/* 分类标签CSS */
-.goods .nav {
-  background-color: white;
-}
-.goods .nav .product-nav {
-  width: 1225px;
-  height: 40px;
-  line-height: 40px;
-  margin: 0 auto;
+.mainItem{
+    width: 200px;
+    margin: 10px;
+    padding: 20px 10px;
+    text-align: center;
+    background-color:whitesmoke;
 }
-.nav .product-nav .title {
-  width: 50px;
-  font-size: 16px;
-  font-weight: 700;
-  float: left;
-}
-/* 分类标签CSS END */
-
-/* 主要内容区CSS */
-.goods .main {
-  margin: 0 auto;
-  max-width: 1225px;
+.mainItemMenu{
+    margin: 20px 0;
 }
-.goods .main .list {
-  min-height: 650px;
-  padding-top: 14.5px;
-  margin-left: -13.7px;
-  overflow: auto;
+.phone{
+    /* 弹性布局设置 */
+    display: flex;
+    /* 按垂直方向排列 */
+    flex-direction: column;
+    justify-content: flex-start;
+    /* 可多行排列 */
+    flex-wrap: wrap;
+    margin: 0,20px;
 }
-.goods .main .pagination {
-  height: 50px;
-  text-align: center;
+.phone1{
+    float: right;
+    font-size:20px;
+    font-weight:700
 }
-.goods .main .none-product {
-  color: #333;
-  margin-left: 13.7px;
+.bbb{
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
 }
-/* 主要内容区CSS END */
 </style>
\ No newline at end of file
diff --git a/vue-store/src/views/ShoppingCart.vue b/vue-store/src/views/ShoppingCart.vue
index 7765a22316d4b37f0aa84774fc34ca7ada5cc11d..1404df303e61d191ffa47ca22394364df5179a6e 100644
--- a/vue-store/src/views/ShoppingCart.vue
+++ b/vue-store/src/views/ShoppingCart.vue
@@ -1,11 +1,4 @@
-<!--
- * @Description: 我的购物车页面组件
- * @Author: hai-27
- * @Date: 2020-02-20 01:55:47
- * @LastEditors: hai-27
- * @LastEditTime: 2020-02-27 13:36:42
- -->
-
+<!--* @Description: 我的购物车页面组件-->
 <template>
   <div class="shoppingCart">
     <!-- 购物车头部 -->
@@ -21,19 +14,19 @@
     <!-- 购物车头部END -->
 
     <!-- 购物车主要内容区 -->
-    <div class="content" v-if="getShoppingCart.length>0">
-      <ul>
+<!--   <div class="content" v-if="getShoppingCart.length>0"> -->
+<div class="content"><ul>
         <!-- 购物车表头 -->
         <li class="header">
-          <div class="pro-check">
-            <el-checkbox v-model="isAllCheck">全选</el-checkbox>
-          </div>
-          <div class="pro-img"></div>
-          <div class="pro-name">商品名称</div>
-          <div class="pro-price">单价</div>
-          <div class="pro-num">数量</div>
-          <div class="pro-total">小计</div>
-          <div class="pro-action">操作</div>
+			<div class="pro-check">
+			<el-checkbox v-model="isAllCheck">全选</el-checkbox>
+			</div>
+			<div class="pro-img"></div>
+			<div class="pro-name">商品名称</div>
+			<div class="pro-price">单价</div>
+			<div class="pro-num">数量</div>
+			<div class="pro-total">小计</div>
+			<div class="pro-action">操作</div>
         </li>
         <!-- 购物车表头END -->
 
@@ -78,10 +71,10 @@
           </div>
         </li>
         <!-- 购物车列表END -->
-      </ul>
+	</ul></div>
       <div style="height:20px;background-color: #f5f5f5"></div>
       <!-- 购物车底部导航条 -->
-      <div class="cart-bar">
+     <div class="cart-bar">
         <div class="cart-bar-left">
           <span>
             <router-link to="/goods">继续购物</router-link>
@@ -104,108 +97,111 @@
         </div>
       </div>
       <!-- 购物车底部导航条END -->
-    </div>
+    <!-- </div> -->
     <!-- 购物车主要内容区END -->
 
     <!-- 购物车为空的时候显示的内容 -->
-    <div v-else class="cart-empty">
-      <div class="empty">
-        <h2>您的购物车还是空的！</h2>
-        <p>快去购物吧！</p>
-      </div>
-    </div>
+	<!-- <div v-else class="cart-empty"> -->
+	<div class="cart-empty">
+		<div class="empty">
+			<h2>您的购物车还是空的！</h2>
+			<p>快去购物吧！</p>
+		</div>
+	</div>
     <!-- 购物车为空的时候显示的内容END -->
   </div>
 </template>
 <script>
-import { mapActions } from "vuex";
-import { mapGetters } from "vuex";
 
 export default {
-  data() {
-    return {};
-  },
-  methods: {
-    ...mapActions(["updateShoppingCart", "deleteShoppingCart", "checkAll"]),
-    // 修改商品数量的时候调用该函数
-    handleChange(currentValue, key, productID) {
-      // 当修改数量时，默认勾选
-      this.updateShoppingCart({ key: key, prop: "check", val: true });
-      // 向后端发起更新购物车的数据库信息请求
-      this.$axios
-        .post("/api/user/shoppingCart/updateShoppingCart", {
-          user_id: this.$store.getters.getUser.user_id,
-          product_id: productID,
-          num: currentValue
-        })
-        .then(res => {
-          switch (res.data.code) {
-            case "001":
-              // “001”代表更新成功
-              // 更新vuex状态
-              this.updateShoppingCart({
-                key: key,
-                prop: "num",
-                val: currentValue
-              });
-              // 提示更新成功信息
-              this.notifySucceed(res.data.msg);
-              break;
-            default:
-              // 提示更新失败信息
-              this.notifyError(res.data.msg);
-          }
-        })
-        .catch(err => {
-          return Promise.reject(err);
-        });
-    },
-    checkChange(val, key) {
-      // 更新vuex中购物车商品是否勾选的状态
-      this.updateShoppingCart({ key: key, prop: "check", val: val });
-    },
-    // 向后端发起删除购物车的数据库信息请求
-    deleteItem(e, id, productID) {
-      this.$axios
-        .post("/api/user/shoppingCart/deleteShoppingCart", {
-          user_id: this.$store.getters.getUser.user_id,
-          product_id: productID
-        })
-        .then(res => {
-          switch (res.data.code) {
-            case "001":
-              // “001” 删除成功
-              // 更新vuex状态
-              this.deleteShoppingCart(id);
-              // 提示删除成功信息
-              this.notifySucceed(res.data.msg);
-              break;
-            default:
-              // 提示删除失败信息
-              this.notifyError(res.data.msg);
-          }
-        })
-        .catch(err => {
-          return Promise.reject(err);
-        });
-    }
-  },
-  computed: {
-    ...mapGetters([
-      "getShoppingCart",
-      "getCheckNum",
-      "getTotalPrice",
-      "getNum"
-    ]),
-    isAllCheck: {
-      get() {
-        return this.$store.getters.getIsAllCheck;
-      },
-      set(val) {
-        this.checkAll(val);
-      }
-    }
-  }
+	data() {
+		return {
+			shoppingCart:''
+		};
+	},
+	created() {
+		this.$axios
+		.post('/api/menu/product/getshoppingCart/${this.$route.query.userid}')
+		.then((res) => {
+		this.shoppingCart = res.data.data;
+		})}
+		
+	// }
+
+  // methods: {
+  //   // 修改商品数量的时候调用该函数
+  //   handleChange(currentValue, key, productID) {
+  //     // 当修改数量时，默认勾选
+  //     this.updateShoppingCart({ key: key, prop: "check", val: true });
+  //     // 向后端发起更新购物车的数据库信息请求
+  //     this.$axios
+  //       .post("/api/user/shoppingCart/updateShoppingCart", {
+  //         user_id: this.$store.getters.getUser.user_id,
+  //         product_id: productID,
+  //         num: currentValue
+  //       })
+  //       .then(res => {
+  //         switch (res.data.code) {
+  //           case "001":
+  //             // “001”代表更新成功
+  //             // 更新vuex状态
+  //             this.updateShoppingCart({
+  //               key: key,
+  //               prop: "num",
+  //               val: currentValue
+  //             });
+  //             // 提示更新成功信息
+  //             this.notifySucceed(res.data.msg);
+  //             break;
+  //           default:
+  //             // 提示更新失败信息
+  //             this.notifyError(res.data.msg);
+  //         }
+  //       })
+  //       .catch(err => {
+  //         return Promise.reject(err);
+  //       });
+  //   },
+  //   checkChange(val, key) {
+  //     // 更新vuex中购物车商品是否勾选的状态
+  //     this.updateShoppingCart({ key: key, prop: "check", val: val });
+  //   },
+  //   // 向后端发起删除购物车的数据库信息请求
+  //   deleteItem(e, id, productID) {
+  //     this.$axios
+  //       .post("/api/user/shoppingCart/deleteShoppingCart", {
+  //         user_id: this.$store.getters.getUser.user_id,
+  //         product_id: productID
+  //       })
+  //       .then(res => {
+  //         switch (res.data.code) {
+  //           case "001":
+  //             // “001” 删除成功
+  //             // 更新vuex状态
+  //             this.deleteShoppingCart(id);
+  //             // 提示删除成功信息
+  //             this.notifySucceed(res.data.msg);
+  //             break;
+  //           default:
+  //             // 提示删除失败信息
+  //             this.notifyError(res.data.msg);
+  //         }
+  //       })
+  //       .catch(err => {
+  //         return Promise.reject(err);
+  //       });
+  //   }
+  // },
+  // computed: {
+  //   isAllCheck: {
+  //     get() {
+  //       return this.$store.getters.getIsAllCheck;
+  //     },
+  //     set(val) {
+  //       this.checkAll(val);
+  //     }
+  //   }
+  // }
 };
 </script>
 <style scoped>
@@ -325,13 +321,15 @@ export default {
 
 /* 购物车底部导航条CSS */
 .shoppingCart .cart-bar {
-  width: 1225px;
-  height: 50px;
-  line-height: 50px;
-  background-color: #fff;
+	/* margin-left: 24px; */
+	margin-left: 147px;
+	width: 1225px;
+	height: 50px;
+	line-height: 50px;
+	background-color: #fff;
 }
 .shoppingCart .cart-bar .cart-bar-left {
-  float: left;
+	float: left;
 }
 .shoppingCart .cart-bar .cart-bar-left a {
   line-height: 50px;