diff --git a/package-lock.json b/package-lock.json index 403af71..a0df40e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@tarojs/runtime": "3.3.10", "@tarojs/taro": "3.3.10", "big.js": "^6.1.1", + "qs": "^6.10.3", "react": "^17.0.0", "react-dom": "^17.0.0" }, @@ -5896,6 +5897,18 @@ "node": ">= 0.8" } }, + "node_modules/body-parser/node_modules/qs": { + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", + "dev": true, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -6241,7 +6254,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.1", @@ -9074,6 +9086,18 @@ "node": ">= 0.10.0" } }, + "node_modules/express/node_modules/qs": { + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", + "dev": true, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/ext": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", @@ -9812,7 +9836,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true, "license": "MIT" }, "node_modules/functional-red-black-tree": { @@ -9846,7 +9869,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.1", @@ -10119,7 +10141,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.1" @@ -10165,7 +10186,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -13711,7 +13731,6 @@ "version": "1.12.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -15536,11 +15555,12 @@ } }, "node_modules/qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", - "dev": true, - "license": "BSD-3-Clause", + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "dependencies": { + "side-channel": "^1.0.4" + }, "engines": { "node": ">=0.6" }, @@ -17167,7 +17187,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.0", @@ -25055,6 +25074,14 @@ "qs": "6.9.7", "raw-body": "2.4.3", "type-is": "~1.6.18" + }, + "dependencies": { + "qs": { + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", + "dev": true + } } }, "bonjour": { @@ -25351,7 +25378,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -27448,6 +27474,14 @@ "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" + }, + "dependencies": { + "qs": { + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", + "dev": true + } } }, "ext": { @@ -27987,8 +28021,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "functional-red-black-tree": { "version": "1.0.1", @@ -28012,7 +28045,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -28212,7 +28244,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -28241,8 +28272,7 @@ "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" }, "has-tostringtag": { "version": "1.0.0", @@ -30797,8 +30827,7 @@ "object-inspect": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", - "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", - "dev": true + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" }, "object-is": { "version": "1.1.5", @@ -32147,10 +32176,12 @@ "dev": true }, "qs": { - "version": "6.9.7", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", - "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==", - "dev": true + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "requires": { + "side-channel": "^1.0.4" + } }, "query-string": { "version": "4.3.4", @@ -33326,7 +33357,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, "requires": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", diff --git a/package.json b/package.json index 54d82ed..9258dd5 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "@tarojs/runtime": "3.3.10", "@tarojs/taro": "3.3.10", "big.js": "^6.1.1", + "qs": "^6.10.3", "react": "^17.0.0", "react-dom": "^17.0.0" }, diff --git a/src/common/common.ts b/src/common/common.ts index e92f7c6..d0266a1 100644 --- a/src/common/common.ts +++ b/src/common/common.ts @@ -1,8 +1,25 @@ import Taro from "@tarojs/taro" +import Qs from 'qs' -export const goLink = (path?:string, params?:Object) => { - Taro.navigateTo({ - url: '/pages/search/index' - }) +/** + * 跳转 + * @param path + * @param params + * @param type false 跳转普通页面，true 跳转tabbar页面 + */ +export const goLink = (path = '', params = {}, type:false|true = false) => { + if(path) { + let params_str = Qs.stringify(params) + path = params_str?path+'?'+params_str:path + if(!type) { + Taro.navigateTo({ + url: path + }) + } else { + Taro.switchTab({ + url: path + }) + } + } } \ No newline at end of file diff --git a/src/components/product/index.tsx b/src/components/product/index.tsx index cf6421a..d7d6d3b 100644 --- a/src/components/product/index.tsx +++ b/src/components/product/index.tsx @@ -1,20 +1,17 @@ import { Image, View } from "@tarojs/components" import Taro from "@tarojs/taro" +import { goLink } from "@/common/common" import styles from './index.module.scss' type params = { desStatus?: true|false } export default ({desStatus = true}: params) => { - const goLink = () => { - Taro.navigateTo({ - url: '/pages/details/index?id=1' - }) - } + return ( {new Array(10).fill('').map(item => { - return goLink()}> + return goLink('/pages/details/index?id=1')}> 230色 diff --git a/src/pages/details/components/shopCart/index.module.scss b/src/pages/details/components/orderCount/index.module.scss similarity index 100% rename from src/pages/details/components/shopCart/index.module.scss rename to src/pages/details/components/orderCount/index.module.scss diff --git a/src/pages/details/components/shopCart/index.tsx b/src/pages/details/components/orderCount/index.tsx similarity index 100% rename from src/pages/details/components/shopCart/index.tsx rename to src/pages/details/components/orderCount/index.tsx diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 9f4cc32..985a864 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -6,6 +6,7 @@ import Product from '@/components/product' import MoveBtn from '@/components/moveBtn' import ShopCart from '@/components/shopCart' import styles from './index.module.scss' +import { goLink } from '@/common/common' import { useState } from 'react' import Taro from '@tarojs/taro' @@ -32,12 +33,6 @@ export default () => { const [showShopCart, setShowShopCart] = useState(false) - const goLink = () => { - Taro.navigateTo({ - url: '/pages/search/index' - }) - } - return ( setShowShopCart(!showShopCart)}> @@ -45,7 +40,7 @@ export default () => { 我的收藏 - goLink()}/> + goLink('/pages/search/index')}/> diff --git a/src/pages/search/index.tsx b/src/pages/search/index.tsx index bc14cd0..2c19f4b 100644 --- a/src/pages/search/index.tsx +++ b/src/pages/search/index.tsx @@ -1,6 +1,7 @@ import { View } from '@tarojs/components' import Search from '@/components/search' +import { goLink } from '@/common/common'; import classnames from "classnames"; import styles from './index.module.scss' @@ -8,7 +9,7 @@ export default () => { return ( - + goLink('/pages/searchList/index')}/> diff --git a/yarn.lock b/yarn.lock index 2348a98..ef6348d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8321,6 +8321,13 @@ "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" "version" "1.3.2" +"qs@^6.10.3": + "integrity" "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==" + "resolved" "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz" + "version" "6.10.3" + dependencies: + "side-channel" "^1.0.4" + "qs@~6.5.2": "integrity" "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" "resolved" "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"