Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页

package.json

@@ -39,7 +39,7 @@
   "dependencies": {
     "@babel/runtime": "^7.7.7",
     "@tarojs/components": "3.5.4",
-		"@tarojs/plugin-framework-react": "3.5.4",
+    "@tarojs/plugin-framework-react": "^3.4.12",
     "@tarojs/react": "3.5.4",
     "@tarojs/runtime": "3.5.4",
     "@tarojs/taro": "3.5.4",
@@ -58,6 +58,7 @@
     "@babel/core": "^7.8.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
     "@tarojs/plugin-mini-ci": "^3.5.1",
+    "@tarojs/plugin-platform-weapp": "^3.5.4",
     "@tarojs/plugin-react-devtools": "^3.4.13",
     "@tarojs/webpack5-runner": "^3.5.4",
     "@types/qs": "^6.9.7",
@@ -65,7 +66,7 @@
     "@types/webpack-env": "^1.13.6",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
-		"babel-preset-taro": "3.5.4",
+    "babel-preset-taro": "3.3.10",
     "cross-env": "^7.0.3",
     "eslint": "^6.8.0",
     "eslint-config-taro": "3.5.4",

src/pages/user/index.tsx

@@ -1,10 +1,30 @@
 import { isEmptyObject } from '@/common/common'
-import { View } from '@tarojs/components'
+import { Button, View } from '@tarojs/components'
+import { FC, memo, useState } from 'react'
 import styles from './index.module.scss'
+const SonComp: FC = memo(() => {
+  return <View className=''>我改变了吗{new Date().getTime()}</View>
+})
+
 // 我的
 const User = () => {
   const obj = {}
   console.log(isEmptyObject(obj))
-  return <View className={styles['main']}>sdfasdfasdf</View>
+  const [count, setCount] = useState(0)
+  const handleCount = () => {
+    setCount((prev) => {
+      return prev + 1
+    })
+  }
+  return (
+    <>
+      <View className={styles['main']}>
+        sdfasdfasdf {count}
+        <Button onClick={handleCount}>+1</Button>
+        <SonComp />
+      </View>
+    </>
+  )
 }
+
 export default User