From 1490230466477092a4ee1ca9ea10b365f4c70ff4 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 24 Feb 2025 15:51:37 +0800 Subject: [PATCH 1/4] env --- .env | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 1b2aa12..fdcdde2 100644 --- a/.env +++ b/.env @@ -17,11 +17,11 @@ VITE_PWD_ENC_KEY='pigxpigxpigxpigx' VITE_OAUTH2_APP_CLIENT='mini:mini' # 图片访问基础地址 -#VITE_IMAGE_BASE_PATH = http://localhost:9999 +VITE_IMAGE_BASE_PATH = http://localhost:9999 # VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://192.168.101.37:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = https://123.156.230.15:8089/api # 线上 -VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上 +#VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上 # VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 @@ -33,8 +33,8 @@ VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上 # VITE_APP_DEV_SERVICE = http://192.168.101.37:9999 # 邓-本地 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上 -VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上 -# VITE_APP_DEV_SERVICE = http://localhost:9999 +#VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上 +VITE_APP_DEV_SERVICE = http://localhost:9999 # ******************** end 开发环境 end ******************** # ******************** start 生产环境 start **************** From 0ca4a55fc92ff155907a9811c2fe0f5711ec90dc Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 21 Mar 2025 15:22:49 +0800 Subject: [PATCH 2/4] env --- .env | 18 +++++++++--------- package.json | 2 +- src/pages.json | 26 +++++++++++++------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.env b/.env index b22752f..e41bf99 100644 --- a/.env +++ b/.env @@ -17,23 +17,23 @@ VITE_PWD_ENC_KEY='pigxpigxpigxpigx' VITE_OAUTH2_APP_CLIENT='mini:mini' # 图片访问基础地址 -#VITE_IMAGE_BASE_PATH = http://localhost:9999 +VITE_IMAGE_BASE_PATH = http://localhost:9999 # VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://192.168.101.37:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = https://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上 # VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 -VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 +#VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 # ******************** start 开发环境 start ******************** -VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 -# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api +; VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 +VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # VITE_APP_DEV_SERVICE = http://192.168.101.50:9999 # 邓-本地 -# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 +; VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上 # VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上 -# VITE_APP_DEV_SERVICE = http://localhost:9999 +; VITE_APP_DEV_SERVICE = http://localhost:9999 # ******************** end 开发环境 end ******************** # ******************** start 生产环境 start **************** @@ -41,8 +41,8 @@ VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 #VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api # VITE_APP_PROD_SERVICE = http://220.191.229.171:8090/api -VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 +#VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 # ******************** end 生产环境 end ******************** -# VITE_DEV_ENV = dev -VITE_DEV_ENV = prod \ No newline at end of file +VITE_DEV_ENV = dev +#VITE_DEV_ENV = prod diff --git a/package.json b/package.json index 1d34db9..d41bb0c 100644 --- a/package.json +++ b/package.json @@ -87,4 +87,4 @@ "vite": "5.2.8", "vue-tsc": "^1.0.24" } -} \ No newline at end of file +} diff --git a/src/pages.json b/src/pages.json index 45db073..d610224 100644 --- a/src/pages.json +++ b/src/pages.json @@ -16,13 +16,13 @@ "disableScroll": true } }, - // { - // "path": "pages/tabbar/shop", - // "style": { - // "navigationBarTitleText": "超市", - // "disableScroll": true - // } - // }, + { + "path": "pages/tabbar/shop", + "style": { + "navigationBarTitleText": "超市", + "disableScroll": true + } + }, { "path": "pages/tabbar/order", "style": { @@ -273,12 +273,12 @@ "iconPath": "static/tabbar/home.png", "selectedIconPath": "static/tabbar/home-select.png" }, - // { - // "pagePath": "pages/tabbar/shop", - // "text": "超市", - // "iconPath": "static/tabbar/shop.png", - // "selectedIconPath": "static/tabbar/shop-select.png" - // }, + { + "pagePath": "pages/tabbar/shop", + "text": "超市", + "iconPath": "static/tabbar/shop.png", + "selectedIconPath": "static/tabbar/shop-select.png" + }, { "pagePath": "pages/tabbar/order", "text": "订单", From 6f70afa8433b3b04f453c6d4863bcb5fb7eac0f5 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 25 Mar 2025 13:43:45 +0800 Subject: [PATCH 3/4] env --- .env | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.env b/.env index b162418..600c665 100644 --- a/.env +++ b/.env @@ -21,14 +21,14 @@ VITE_OAUTH2_APP_CLIENT='mini:mini' # VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = https://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上 -# VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 + VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 -VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 +#VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 # ******************** start 开发环境 start ******************** # VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 -# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api -VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地 + VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api +#VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上 # VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上 @@ -38,10 +38,9 @@ VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地 # ******************** start 生产环境 start **************** #VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api #VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api -# VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api + VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api # VITE_APP_PROD_SERVICE = http://220.191.229.171:8090/api -VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 +#VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 # ******************** end 生产环境 end ******************** - -# VITE_DEV_ENV = dev -# VITE_DEV_ENV = prod \ No newline at end of file +VITE_DEV_ENV = dev +# VITE_DEV_ENV = prod From ec1b9b5a0b484f2ba7cbb522aea347a965e981a2 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 26 Mar 2025 11:10:38 +0800 Subject: [PATCH 4/4] env --- .env | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.env b/.env index bc55261..258cc9e 100644 --- a/.env +++ b/.env @@ -21,12 +21,12 @@ VITE_OAUTH2_APP_CLIENT='mini:mini' # VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = https://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上 -# VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 +VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 -VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 +#VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 # ******************** start 开发环境 start ******************** -VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 +#VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api # VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 @@ -38,10 +38,10 @@ VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 # ******************** start 生产环境 start **************** #VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api #VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api -# VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api +VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api # VITE_APP_PROD_SERVICE = http://220.191.229.171:8090/api -VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 +#VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 # ******************** end 生产环境 end ******************** # VITE_DEV_ENV = dev -# VITE_DEV_ENV = prod \ No newline at end of file + VITE_DEV_ENV = prod