From 434fc0f041ff2b11ddfe7d5854f93afc329e5f83 Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Thu, 25 Dec 2025 00:05:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env | 14 +++++++---- src/bundle/profile/profile.vue | 5 ++-- src/bundle/tea-room/detail.vue | 4 ++-- src/bundle/tea-room/room.vue | 2 +- src/components/reserve/RoomList.vue | 4 ++-- src/manifest.json | 2 +- src/pages.json | 1 - src/pages/city/city.vue | 27 ++++++++++++++++++---- src/pages/index/index.vue | 2 +- src/pages/login/login.vue | 4 ++-- src/pages/my/my.vue | 4 ++-- src/pages/reserve/reserve.vue | 8 +++++++ src/pages/webview/webview.vue | 36 +++++++++++++++++++++++++++++ 13 files changed, 89 insertions(+), 24 deletions(-) create mode 100644 src/pages/webview/webview.vue diff --git a/env/.env b/env/.env index b1f0ee4..625d61b 100644 --- a/env/.env +++ b/env/.env @@ -2,7 +2,7 @@ VITE_APP_TITLE = '茶址' VITE_APP_PORT = 9000 VITE_UNI_APPID = '__UNI__D1E5001' -VITE_WX_APPID = 'wx63e106209b842919' +VITE_WX_APPID = 'wx5b2c2c1cfc757c47' # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base VITE_APP_PUBLIC_BASE=/ @@ -10,17 +10,21 @@ VITE_APP_PUBLIC_BASE=/ # 登录页面 VITE_LOGIN_URL = '/pages/login/login' # 第一个请求地址 -VITE_SERVER_BASEURL = 'https://cz.stnav.com' +VITE_SERVER_BASEURL = 'https://76458.com' -VITE_UPLOAD_BASEURL = 'https://cz.stnav.com/upload' +VITE_UPLOAD_BASEURL = 'https://76458.com/upload' # h5是否需要配置代理 VITE_APP_PROXY=false VITE_APP_PROXY_PREFIX = '/api' # 第二个请求地址 (目前alova中可以使用) -VITE_SERVER_BASEURL = 'https://cz.stnav.com' +VITE_SERVER_BASEURL = 'https://76458.com' # 默认上海经纬度 VITE_DEFAULT_LONGITUDE = 121.4737 -VITE_DEFAULT_LATITUDE = 31.2304 \ No newline at end of file +VITE_DEFAULT_LATITUDE = 31.2304 + +# 上传图片请求地址 +VITE_UPLOAD_BASEURL = 'https://76458.com/storeapi/upload/image' +VITE_UPLOAD_IMAGE_URL = 'https://76458.com/' \ No newline at end of file diff --git a/src/bundle/profile/profile.vue b/src/bundle/profile/profile.vue index 87a21e7..8bfb710 100644 --- a/src/bundle/profile/profile.vue +++ b/src/bundle/profile/profile.vue @@ -135,7 +135,7 @@ // 上传文件 const fileList = ref([]) - const action = 'https://cz.stnav.com/api/upload/image' // 仅做测试使用，实际请换成真实上传接口 + const action = 'https://76458.com/api/upload/image' // 仅做测试使用，实际请换成真实上传接口 // 修改昵称 const showEditNicknamePopup = ref(false) // 是否显示退款详情弹出框 @@ -192,7 +192,8 @@ const response = JSON.parse(e.file.response) if (response.code) { const avatarUrl = response.data.url - await updateUserInfo({ field: 'avatar', value: avatarUrl }) + const url = avatarUrl.replace(import.meta.env.VITE_UPLOAD_IMAGE_URL, '') + await updateUserInfo({ field: 'avatar', value: url }) user.value.avatar = avatarUrl toast.info('头像上传成功') } else { diff --git a/src/bundle/tea-room/detail.vue b/src/bundle/tea-room/detail.vue index c89a490..b6f170a 100644 --- a/src/bundle/tea-room/detail.vue +++ b/src/bundle/tea-room/detail.vue @@ -90,10 +90,10 @@ {{ teaRoomPackage.introduce }} 已售 diff --git a/src/bundle/tea-room/room.vue b/src/bundle/tea-room/room.vue index 6b69407..7689616 100644 --- a/src/bundle/tea-room/room.vue +++ b/src/bundle/tea-room/room.vue @@ -89,7 +89,7 @@ - + 过期 diff --git a/src/components/reserve/RoomList.vue b/src/components/reserve/RoomList.vue index fbfdb14..7e5ab20 100644 --- a/src/components/reserve/RoomList.vue +++ b/src/components/reserve/RoomList.vue @@ -28,7 +28,7 @@ - 已售 {{ item.sold > 10 ? item.sold + '+' : item.sold }} + 已售 {{ item.sold > 10 ? '10+' : item.sold }} @@ -60,7 +60,7 @@ - 已售 {{ item.sold > 10 ? item.sold + '+' : item.sold }} + 已售 {{ item.sold > 10 ? '10+' : item.sold }} diff --git a/src/manifest.json b/src/manifest.json index fa783d9..2a94f2b 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -83,7 +83,7 @@ }, "quickapp": {}, "mp-weixin": { - "appid": "wx63e106209b842919", + "appid": "wx5b2c2c1cfc757c47", "setting": { "urlCheck": false, "es6": true, diff --git a/src/pages.json b/src/pages.json index 4517cf8..36c53c2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -172,7 +172,6 @@ { "path": "pages/webview/webview", "type": "page", - "needLogin": true, "layout": "tabbar", "style": { "navigationStyle": "custom" diff --git a/src/pages/city/city.vue b/src/pages/city/city.vue index a17e651..e8f24ac 100644 --- a/src/pages/city/city.vue +++ b/src/pages/city/city.vue @@ -20,7 +20,7 @@ 当前定位 - + {{ city || LOCATION_DEFAULT_CITY }} @@ -35,7 +35,7 @@ @click="City.handleChooseCity(item)" > - {{ item.name }} + {{ item.name }} @@ -45,7 +45,7 @@ diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue index 40417bd..39ba4da 100644 --- a/src/pages/my/my.vue +++ b/src/pages/my/my.vue @@ -193,7 +193,7 @@ --> - + diff --git a/src/pages/reserve/reserve.vue b/src/pages/reserve/reserve.vue index 997607e..a974c3d 100644 --- a/src/pages/reserve/reserve.vue +++ b/src/pages/reserve/reserve.vue @@ -92,8 +92,16 @@ }) onLoad(() => { + uni.$on('refreshOrderList', () => { + list.value = [] + getMescroll().resetUpScroll() + }) }) + onUnload(() => { + uni.$off('refreshOrderList') + }) + const Reserve = { // 上拉加载的回调: 其中num:当前页 从1开始, size:每页数据条数,默认10 upCallback: (mescroll) => { diff --git a/src/pages/webview/webview.vue b/src/pages/webview/webview.vue new file mode 100644 index 0000000..53100aa --- /dev/null +++ b/src/pages/webview/webview.vue @@ -0,0 +1,36 @@ + +{ + "layout": "tabbar", + "style": { + // 'custom' 表示开启自定义导航栏，默认 'default' + "navigationStyle": "custom" + } +} + + + + \ No newline at end of file