Merge branch 'dev' into devbra

src/route/CopyrightGgoods/CopyrightGgoods.tsx

@@ -112,6 +112,7 @@ export default function CopyrightGgoods() {
     // console.log('呵呵', goodsFlag);
     // console.log('嘻嘻', state.goodsFlag);
     // return
+    setData([])
     try {
       setLoading(true)
       const res: any = await buyGoodsList({
@@ -436,7 +437,7 @@ export default function CopyrightGgoods() {
           <Pagination
             showSizeChanger={false}
             current={page} total={total} defaultPageSize={20} onChange={(page) => {
-              console.log(page)
+              // console.log(page)
               setPage(page)
             }} />
         </div>

src/route/ProductRelease/ProductRelease.tsx

@@ -253,6 +253,7 @@ export default function ProductRelease() {
   const [selectTypeArray, setSelectTypeArray] = useState<any>([]) // 选择的软著类型
 
   const getGoodsDate = async (page: number) => {
+    setData([])
     try {
       setLoading(true)
       const res: any = await getGoodsList({

src/route/TrademarkMall/TrademarkMall.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+// import React from 'react'
 import nothingImg from '../../static/appimgs/nothing.png'
 export default function TrademarkMall() {
   const height = window.innerHeight - 180;

src/route/TrademarkMall/components/EditFive/EditFive.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+// import React from 'react'
 import { Button } from 'antd'
 export default function editFive(props: any) {
   const height = window.innerHeight - 350;

src/route/TrademarkMall/components/EditFour/EditFour.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+// import React from 'react'
 import { Button } from 'antd'
 export default function editFour(props: any) {
   const height = window.innerHeight - 350;

src/route/TrademarkMall/components/EditSix/EditSix.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+// import React from 'react'
 import { Button } from 'antd'
 export default function editSix(props: any) {
   const height = window.innerHeight - 350;

src/route/TrademarkMall/components/EditThree/EditThree.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+// import React from 'react'
 import { Button } from 'antd'
 export default function editThree(props: any) {
   const height = window.innerHeight - 350;

src/route/TrademarkMall/components/EditTwo/EditTwo.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+// import React from 'react'
 import { Button } from 'antd'
 export default function editTwo(props: any) {
   const height = window.innerHeight - 350;

src/route/TradingGoods/TradingGoods.tsx

@@ -172,6 +172,7 @@ export default function TradingGoods() {
   const [buyInfoModal, setBuyInfoModal] = useState(false) // 填写购买人信息弹窗
 
   const getDataList = async (page: number) => {
+    setData([])
     try {
       setLoading(true)
       const res: any = await getBuyOrderList({

src/route/TransactionOrder/TransactionOrder.tsx

@@ -62,6 +62,7 @@ export default function TransactionOrder() {
 
   const [data, setData] = useState<DataType[]>([]); // 表格数据
   const getDataList = async (page: number) => {
+    setData([])
     try {
       setLoading(true)
       const res: any = await getSellOrderList({