diff --git a/src/assets/imgs/404.png b/src/assets/imgs/404.png new file mode 100644 index 000000000..f81f414f2 Binary files /dev/null and b/src/assets/imgs/404.png differ diff --git a/src/assets/imgs/500.png b/src/assets/imgs/500.png new file mode 100644 index 000000000..26535902f Binary files /dev/null and b/src/assets/imgs/500.png differ diff --git a/src/assets/imgs/cart_empty.png b/src/assets/imgs/cart_empty.png new file mode 100644 index 000000000..cd9b031c0 Binary files /dev/null and b/src/assets/imgs/cart_empty.png differ diff --git a/src/assets/imgs/plane.png b/src/assets/imgs/plane.png new file mode 100644 index 000000000..a0dac906b Binary files /dev/null and b/src/assets/imgs/plane.png differ diff --git a/src/pages/cart/index.js b/src/pages/cart/index.js index 09916557f..ee84e4928 100644 --- a/src/pages/cart/index.js +++ b/src/pages/cart/index.js @@ -1,7 +1,7 @@ import Taro, { Component } from '@tarojs/taro' import { View, Text, ScrollView } from '@tarojs/components' import { AtInputNumber, AtButton } from 'taro-ui' -import { GoodsItem, SpCheckbox, Address, Loading, Price } from '@/components' +import { GoodsItem, SpCheckbox, SpNote, Address, Loading, Price } from '@/components' import { log } from '@/utils' import api from '@/api' @@ -51,13 +51,19 @@ export default class CartIndex extends Component { } componentDidMount () { + } + + componentDidShow () { this.fetch() } async fetch () { const { cartlist } = await api.cart.get() - const list = resolveCartItems(cartlist) - const items = normalizeItems(list) + // const list = resolveCartItems(cartlist) + // const items = normalizeItems(list) + + const list = [] + const items = [] this.setState({ list, @@ -120,6 +126,7 @@ export default class CartIndex extends Component { }) } + // TODO: 对接api render () { const { list, selection, totalPrice, cartMode } = this.state @@ -127,9 +134,9 @@ export default class CartIndex extends Component { return } - // TODO: redux 计算 const totalSelection = selection.size const totalItems = totalSelection + const isEmpty = !list.length return ( @@ -137,12 +144,16 @@ export default class CartIndex extends Component { className='cart-list__wrap' scrollY > - - {cartMode === 'edit' ? '完成' : '编辑'} - + { + !isEmpty && ( + + {cartMode === 'edit' ? '完成' : '编辑'} + + ) + } { list.map(shopCart => @@ -187,10 +198,24 @@ export default class CartIndex extends Component { ) } + { + !list.length && ( + + 快去给我挑点宝贝吧~ + Taro.navigateTo({ url: '/pages/items/list' })} + >随便逛逛 + + ) + } - +