goods

xianxianzhuyi · Jul 12, 2017 · 2894933 · 2894933
1 parent 2559703
commit 2894933
Show file tree

Hide file tree

Showing 22 changed files with 559 additions and 338 deletions.
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -26,7 +26,8 @@ module.exports = {
       '/page': resolve('src/page'),
       '/common': resolve('src/common'),
       '/assets': resolve('src/assets'),
-      '/api': resolve('src/api')
+      '/api': resolve('src/api'),
+      '/utils': resolve('src/utils')
     }
   },
   module: {

diff --git a/index.html b/index.html
@@ -3,6 +3,9 @@
   <head>
     <meta charset="utf-8">
     <title>电子商城</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta name="wap-font-scale" content="no">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
   </head>
   <body>
     <div id="app"></div>

diff --git a/src/api/goods.js b/src/api/goods.js
@@ -3,3 +3,7 @@ import http from './public'
 export const getComputer = (params) => {
   return http.fetchGet('/goods/computer', params)
 }
+// 未登录获取购物车
+export const getCartList = (params) => {
+  return http.fetchPost('/users/cartList', params)
+}
diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
@@ -40,3 +40,17 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+// 删除按钮
+.del-btn {
+  display: block;
+  cursor: pointer;
+  width: 20px;
+  height: 20px;
+  background: url(/static/images/[email protected]) -50px -60px no-repeat;
+  background-size: 240px 107px;
+  text-indent: -9999em;
+  &:hover {
+    background-position: -75px -60px;
+  }
+}
diff --git a/src/assets/style/mixin.scss b/src/assets/style/mixin.scss
@@ -4,7 +4,7 @@
   justify-content: center;
 }
 
-@mixin wh($w,$h) {
+@mixin wh($w,$h:$w) {
   width: $w;
   height: $h;
 }