diff --git a/App.vue b/App.vue index ad6a2b1..8533888 100644 --- a/App.vue +++ b/App.vue @@ -18,7 +18,28 @@ page{ font-size: 26rpx; - background-color: #eee; + background-color: #f6f6f6; } + .fiexd-btn-box { + position: fixed; + bottom: 0; + left: 0; + height: 120rpx; + height: calc(constant(safe-area-inset-bottom) + 120rpx); + /* 适用于iOS设备 */ + height: calc(env(safe-area-inset-bottom) + 120rpx); + /* 适用于Android设备 */ + width: 100%; + box-sizing: border-box; + background-color: #fff; + padding: 20rpx; + padding-bottom: calc(constant(safe-area-inset-bottom) + 20rpx); + /* 适用于iOS设备 */ + padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx); + /* 适用于Android设备 */ + display: flex; + justify-content: space-between; + align-items: center; + } diff --git a/api/cart.js b/api/cart.js new file mode 100644 index 0000000..61c81a5 --- /dev/null +++ b/api/cart.js @@ -0,0 +1,21 @@ +import request from '@/utils/request'; + +//添加购物车数量 +export const cartCreateApi = (data)=>{ + return request.post('/order/cart/create', data); +} + +//购物车-调整数量 +export const cartChangeApi = (data)=>{ + return request.post('/order/cart/change', data); +} + +//购物车-清空 +export const cartDeleteApi = (data)=>{ + return request.post('/order/cart/delete', data); +} + +//购物车-零售列表 +export const cartListApi = (data)=>{ + return request.get('/order/RetailOrder/checkOrder', data); +} \ No newline at end of file diff --git a/api/good.js b/api/good.js index 504e0fb..84f653b 100644 --- a/api/good.js +++ b/api/good.js @@ -1,5 +1,9 @@ import request from '@/utils/request'; export const goodListApi = (data)=>{ - return request.get('/good/list', data); + return request.get('/goods/goods/lists', data); +} + +export const goodClassListApi = (data)=>{ + return request.get('/goods/goodsclass/lists', data); } \ No newline at end of file diff --git a/api/user.js b/api/user.js new file mode 100644 index 0000000..4e54b11 --- /dev/null +++ b/api/user.js @@ -0,0 +1,32 @@ +import request from '@/utils/request'; + +// 密码登录 +export const userLoginApi = (data)=>{ + return request.post('/login/account', data); +} + + +// 添加地址 +export const addressCreateApi = (data)=>{ + return request.post('/user/address/create', data); +} + +// 修改地址 +export const addressEditApi = (data)=>{ + return request.post('/user/address/edit', data); +} + +// 删除地址 +export const addressDeleteApi = (data)=>{ + return request.post('/user/address/delete', data); +} + +// 地址列表 +export const addressListsApi = (data)=>{ + return request.post('/user/address/lists', data); +} + +// 地址详情 +export const addressDetailApi = (data)=>{ + return request.post('/user/address/detail', data); +} \ No newline at end of file diff --git a/components/addressPopup.vue b/components/addressPopup.vue index 8e231f7..7ece4c2 100644 --- a/components/addressPopup.vue +++ b/components/addressPopup.vue @@ -94,7 +94,7 @@ align-items: center; justify-content: space-between; padding-bottom: 20rpx; - border-bottom: 1rpx solid #eee; + border-bottom: 1rpx solid #f6f6f6; margin-bottom: 20rpx; &:last-child { diff --git a/components/modal.vue b/components/modal.vue index 231c7d3..e39a18f 100644 --- a/components/modal.vue +++ b/components/modal.vue @@ -1,9 +1,9 @@