diff --git a/.env.development b/.env.development
index 1cb4a82..6acd4cf 100644
--- a/.env.development
+++ b/.env.development
@@ -18,7 +18,7 @@ TARO_APP_FISH_GAME='https://jdt-test-fish.wanzhuanyongcheng.cn/?uid='
TARO_APP_HALL_API='https://game.wanzhuanyongcheng.cn'
# 游戏大厅
-TARO_APP_HOME= 'https://test.wanzhuanyongcheng.cn/app/game'
+TARO_APP_HOME='https://test.wanzhuanyongcheng.cn/app/game'
# 游戏ws链接
TARO_APP_WS='wss://game.wanzhuanyongcheng.cn/dice/home'
diff --git a/.env.production b/.env.production
index d66bd9f..3290875 100644
--- a/.env.production
+++ b/.env.production
@@ -13,4 +13,4 @@ TARO_APP_GAME='https://jdt-prod-tz.wanzhuanyongcheng.cn/pages/index/index?uid='
TARO_APP_FISH_GAME='https://jdt-prod-fish.wanzhuanyongcheng.cn/?uid='
# 游戏大厅
-TARO_APP_HOME= 'https://www.wanzhuanyongcheng.cn/app/game'
\ No newline at end of file
+TARO_APP_HOME='https://www.wanzhuanyongcheng.cn/app/game'
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 8f3f3b4..edc2ef8 100644
--- a/.env.test
+++ b/.env.test
@@ -17,7 +17,7 @@ TARO_APP_FISH_GAME='https://jdt-test-fish.wanzhuanyongcheng.cn/?uid='
TARO_APP_HALL_API='https://game.wanzhuanyongcheng.cn'
# 游戏大厅
-TARO_APP_HOME= 'https://test.wanzhuanyongcheng.cn/app/game'
+TARO_APP_HOME='https://test.wanzhuanyongcheng.cn/app/game'
# 游戏ws链接
TARO_APP_WS='wss://game.wanzhuanyongcheng.cn/dice/home'
diff --git a/babel.config.js b/babel.config.js
index 552eb39..eb83259 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,4 +1,3 @@
-// babel-preset-taro 更多选项和默认值：
// https://github.com/NervJS/taro/blob/next/packages/babel-preset-taro/README.md
module.exports = {
presets: [
diff --git a/package.json b/package.json
index 8d5c444..aea2258 100644
--- a/package.json
+++ b/package.json
@@ -1,126 +1,126 @@
{
- "name": "jdt-user",
- "version": "4.0.11",
- "private": true,
- "description": "",
- "templateInfo": {
- "name": "jdt-user",
- "typescript": true,
- "css": "sass"
- },
- "taroConfig": {
- "version": "4.0.11"
- },
- "scripts": {
- "build:weapp": "taro build --type weapp",
- "build:test": "taro build --type weapp --mode test",
- "build:swan": "taro build --type swan",
- "build:alipay": "taro build --type alipay",
- "build:tt": "taro build --type tt",
- "build:h5": "taro build --type h5",
- "build:rn": "taro build --type rn",
- "build:qq": "taro build --type qq",
- "build:jd": "taro build --type jd",
- "build:quickapp": "taro build --type quickapp",
- "dev:weapp": "taro build --type weapp --watch",
- "dev:weapp:prview": "taro build --type weapp --watch --mode production",
- "dev:swan": "npm run build:swan -- --watch",
- "dev:alipay": "npm run build:alipay -- --watch",
- "dev:tt": "npm run build:tt -- --watch",
- "dev:h5": "npm run build:h5 -- --watch",
- "dev:rn": "npm run build:rn -- --watch",
- "dev:qq": "npm run build:qq -- --watch",
- "dev:jd": "npm run build:jd -- --watch",
- "dev:quickapp": "npm run build:quickapp -- --watch",
- "lint": "eslint --ext .ts,.vue .",
- "lint:fix": "eslint --fix --ext .ts,.vue .",
- "lint:staged": "lint-staged",
- "prepare": "husky install",
- "cz": "cz",
- "lf": "npx prettier --write",
- "postinstall": "weapp-tw patch",
- "build:weapp:prod:upload": "taro build --type weapp --upload --robot=1 --desc='正式环境'",
- "build:weapp:test:upload": "taro build --type weapp --upload --robot=2 --desc='测试环境' --mode test"
- },
- "browserslist": [
- "last 3 versions",
- "Android >= 4.1",
- "ios >= 8"
- ],
- "author": "",
- "lint-staged": {
- "*.{ts,vue}": [
- "eslint --ext .ts,.vue .",
- "npx prettier --write --end-of-line lf ."
- ]
- },
- "config": {
- "commitizen": {
- "path": "node_modules/cz-customizable"
- }
- },
- "dependencies": {
- "@babel/runtime": "^7.26.7",
- "@nutui/icons-vue-taro": "^0.0.9",
- "@nutui/nutui-taro": "^4.3.13",
- "@qiun/vue-ucharts": "2.5.0-20230101",
- "@tarojs/components": "3.6.35",
- "@tarojs/helper": "3.6.35",
- "@tarojs/plugin-framework-vue3": "3.6.35",
- "@tarojs/plugin-html": "3.6.35",
- "@tarojs/plugin-platform-alipay": "3.6.35",
- "@tarojs/plugin-platform-h5": "3.6.35",
- "@tarojs/plugin-platform-jd": "3.6.35",
- "@tarojs/plugin-platform-qq": "3.6.35",
- "@tarojs/plugin-platform-swan": "3.6.35",
- "@tarojs/plugin-platform-tt": "3.6.35",
- "@tarojs/plugin-platform-weapp": "3.6.35",
- "@tarojs/runtime": "3.6.35",
- "@tarojs/shared": "3.6.35",
- "@tarojs/taro": "3.6.35",
- "dayjs": "^1.11.13",
- "pinia": "^2.3.1",
- "uqrcodejs": "^4.0.7",
- "vue": "^3.5.13"
- },
- "devDependencies": {
- "@babel/core": "^7.26.8",
- "@commitlint/cli": "^18.6.1",
- "@commitlint/config-conventional": "^18.6.3",
- "@tarojs/cli": "3.6.35",
- "@tarojs/plugin-mini-ci": "3.6.35",
- "@tarojs/taro-loader": "3.6.35",
- "@tarojs/webpack5-runner": "3.6.35",
- "@types/node": "^18.19.75",
- "@types/webpack-env": "^1.18.8",
- "@typescript-eslint/eslint-plugin": "^6.21.0",
- "@typescript-eslint/parser": "^6.21.0",
- "@unocss/webpack": "^0.60.4",
- "@vue/babel-plugin-jsx": "^1.2.5",
- "@vue/compiler-sfc": "^3.5.13",
- "autoprefixer": "^10.4.20",
- "babel-preset-taro": "3.6.35",
- "commitizen": "^4.3.1",
- "css-loader": "3.4.2",
- "cz-customizable": "^7.4.0",
- "eslint": "^8.57.1",
- "eslint-config-taro": "3.6.35",
- "eslint-plugin-vue": "^9.32.0",
- "husky": "^8.0.3",
- "lint-staged": "^15.4.3",
- "miniprogram-ci": "^2.0.10",
- "postcss": "8.4.29",
- "postcss-rem-to-responsive-pixel": "^6.0.2",
- "prettier": "^3.5.3",
- "style-loader": "1.3.0",
- "stylelint": "9.3.0",
- "tailwindcss": "^3.4.17",
- "ts-node": "^10.9.2",
- "typescript": "^5.8.2",
- "unplugin-vue-components": "^28.4.1",
- "vue-loader": "^17.4.2",
- "weapp-tailwindcss": "^3.7.0",
- "webpack": "^5.97.1",
- "yargs": "^17.7.2"
- }
+ "name": "jdt-user",
+ "version": "4.0.11",
+ "private": true,
+ "description": "",
+ "templateInfo": {
+ "name": "jdt-user",
+ "typescript": true,
+ "css": "sass"
+ },
+ "taroConfig": {
+ "version": "4.0.11"
+ },
+ "scripts": {
+ "build:weapp": "taro build --type weapp",
+ "build:test": "taro build --type weapp --mode test",
+ "build:swan": "taro build --type swan",
+ "build:alipay": "taro build --type alipay",
+ "build:tt": "taro build --type tt",
+ "build:h5": "taro build --type h5",
+ "build:rn": "taro build --type rn",
+ "build:qq": "taro build --type qq",
+ "build:jd": "taro build --type jd",
+ "build:quickapp": "taro build --type quickapp",
+ "dev:weapp": "taro build --type weapp --watch",
+ "dev:weapp:prview": "taro build --type weapp --watch --mode production",
+ "dev:swan": "npm run build:swan -- --watch",
+ "dev:alipay": "npm run build:alipay -- --watch",
+ "dev:tt": "npm run build:tt -- --watch",
+ "dev:h5": "npm run build:h5 -- --watch",
+ "dev:rn": "npm run build:rn -- --watch",
+ "dev:qq": "npm run build:qq -- --watch",
+ "dev:jd": "npm run build:jd -- --watch",
+ "dev:quickapp": "npm run build:quickapp -- --watch",
+ "lint": "eslint --ext .ts,.vue .",
+ "lint:fix": "eslint --fix --ext .ts,.vue .",
+ "lint:staged": "lint-staged",
+ "prepare": "husky install",
+ "cz": "cz",
+ "lf": "npx prettier --write",
+ "postinstall": "weapp-tw patch",
+ "build:weapp:prod:upload": "taro build --type weapp --upload --robot=1 --desc='正式环境'",
+ "build:weapp:test:upload": "taro build --type weapp --upload --robot=2 --desc='测试环境' --mode test"
+ },
+ "browserslist": [
+ "last 3 versions",
+ "Android >= 4.1",
+ "ios >= 8"
+ ],
+ "author": "",
+ "lint-staged": {
+ "*.{ts,vue}": [
+ "eslint --ext .ts,.vue .",
+ "npx prettier --write --end-of-line lf ."
+ ]
+ },
+ "config": {
+ "commitizen": {
+ "path": "node_modules/cz-customizable"
+ }
+ },
+ "dependencies": {
+ "@babel/runtime": "^7.28.4",
+ "@nutui/icons-vue-taro": "^0.0.9",
+ "@nutui/nutui-taro": "^4.3.14",
+ "@qiun/vue-ucharts": "2.5.0-20230101",
+ "@tarojs/components": "4.1.6",
+ "@tarojs/helper": "4.1.6",
+ "@tarojs/plugin-framework-vue3": "4.1.6",
+ "@tarojs/plugin-html": "4.1.6",
+ "@tarojs/plugin-platform-alipay": "4.1.6",
+ "@tarojs/plugin-platform-h5": "4.1.6",
+ "@tarojs/plugin-platform-jd": "4.1.6",
+ "@tarojs/plugin-platform-qq": "4.1.6",
+ "@tarojs/plugin-platform-swan": "4.1.6",
+ "@tarojs/plugin-platform-tt": "4.1.6",
+ "@tarojs/plugin-platform-weapp": "4.1.6",
+ "@tarojs/runtime": "4.1.6",
+ "@tarojs/shared": "4.1.6",
+ "@tarojs/taro": "4.1.6",
+ "dayjs": "^1.11.18",
+ "pinia": "^2.3.1",
+ "uqrcodejs": "^4.0.7",
+ "vue": "^3.5.21"
+ },
+ "devDependencies": {
+ "@babel/core": "^7.28.4",
+ "@commitlint/cli": "^18.6.1",
+ "@commitlint/config-conventional": "^18.6.3",
+ "@tarojs/cli": "4.1.6",
+ "@tarojs/plugin-mini-ci": "4.1.6",
+ "@tarojs/taro-loader": "4.1.6",
+ "@tarojs/webpack5-runner": "4.1.6",
+ "@types/node": "^18.19.124",
+ "@types/webpack-env": "^1.18.8",
+ "@typescript-eslint/eslint-plugin": "^6.21.0",
+ "@typescript-eslint/parser": "^6.21.0",
+ "@unocss/webpack": "^0.60.4",
+ "@vue/babel-plugin-jsx": "^1.5.0",
+ "@vue/compiler-sfc": "^3.5.21",
+ "autoprefixer": "^10.4.21",
+ "babel-preset-taro": "4.1.6",
+ "commitizen": "^4.3.1",
+ "css-loader": "3.4.2",
+ "cz-customizable": "^7.5.1",
+ "eslint": "^8.57.1",
+ "eslint-config-taro": "4.1.6",
+ "eslint-plugin-vue": "^9.33.0",
+ "husky": "^8.0.3",
+ "lint-staged": "^15.5.2",
+ "miniprogram-ci": "^2.1.26",
+ "postcss": "8.4.29",
+ "postcss-rem-to-responsive-pixel": "^6.1.0",
+ "prettier": "^3.6.2",
+ "style-loader": "1.3.0",
+ "stylelint": "9.3.0",
+ "tailwindcss": "^3.4.17",
+ "ts-node": "^10.9.2",
+ "typescript": "^5.9.2",
+ "unplugin-vue-components": "^28.8.0",
+ "vue-loader": "^17.4.2",
+ "weapp-tailwindcss": "^3.7.0",
+ "webpack": "^5.101.3",
+ "yargs": "^17.7.2"
+ }
}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a586cd8..0fa8810 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,6 +2,7 @@ onlyBuiltDependencies:
- '@parcel/watcher'
- '@swc/core'
- '@tarojs/binding'
+ - '@tarojs/cli'
- core-js
- core-js-pure
- esbuild
diff --git a/src/components/StoreList.vue b/src/components/StoreList.vue
index c6780a6..6bfb790 100644
--- a/src/components/StoreList.vue
+++ b/src/components/StoreList.vue
@@ -15,6 +15,7 @@
}}
销量：10000
@@ -51,9 +52,10 @@ const getList = async () => {
};
const goDetail = item => {
+ console.log(item);
Taro.setStorageSync('mer_info', item);
Taro.navigateTo({
- url: `/pages/mer/mer_detail/index`,
+ url: `/pages/mer/mer_detail/index?bid=${item.bid}`,
});
};
diff --git a/src/pages/hotGoods/index/index.vue b/src/pages/hotGoods/index/index.vue
index 0860233..88c21fb 100644
--- a/src/pages/hotGoods/index/index.vue
+++ b/src/pages/hotGoods/index/index.vue
@@ -129,7 +129,7 @@ const get_mer_list = async () => {
const toMerDetails = (item: any) => {
Taro.setStorageSync('mer_info', item);
Taro.navigateTo({
- url: `/pages/mer/mer_detail/index`,
+ url: `/pages/mer/mer_detail/index?bid=${item.bid}`,
});
};