master #1

Open
gxwebsoft wants to merge 108 commits from developer/template-10584:master into master
Showing only changes of commit 00d3ffaeee - Show all commits

View File

@@ -10,7 +10,7 @@ import {
Divider, Divider,
ConfigProvider ConfigProvider
} from '@nutui/nutui-react-taro'; } from '@nutui/nutui-react-taro';
import {ArrowLeft, Del} from '@nutui/icons-react-taro'; import {Del} from '@nutui/icons-react-taro';
import {View} from '@tarojs/components'; import {View} from '@tarojs/components';
import {CartItem, useCart} from "@/hooks/useCart"; import {CartItem, useCart} from "@/hooks/useCart";
import './cart.scss'; import './cart.scss';
@@ -175,7 +175,6 @@ function Cart() {
<NavBar <NavBar
fixed={true} fixed={true}
style={{marginTop: `${statusBarHeight}px`}} style={{marginTop: `${statusBarHeight}px`}}
left={<ArrowLeft onClick={() => Taro.navigateBack()}/>}
right={ right={
cartItems.length > 0 && ( cartItems.length > 0 && (
<Button <Button
@@ -231,7 +230,6 @@ function Cart() {
<NavBar <NavBar
fixed={true} fixed={true}
style={{marginTop: `${statusBarHeight}px`}} style={{marginTop: `${statusBarHeight}px`}}
left={<ArrowLeft onClick={() => Taro.navigateBack()}/>}
right={ right={
cartItems.length > 0 && ( cartItems.length > 0 && (
<Button <Button