diff --git a/pages.json b/pages.json index c43a692..12f408c 100644 --- a/pages.json +++ b/pages.json @@ -75,7 +75,8 @@ "path" : "generate-record/generate-record", "style" : { - "navigationBarTitleText" : "图纸生成记录" + "navigationBarTitleText" : "图纸生成记录", + "enablePullDownRefresh":true } }, { @@ -119,18 +120,18 @@ "pagePath": "pages/index/index", "iconPath": "static/tabbar/index.png", "selectedIconPath": "static/tabbar/index_HL.png", - "text": "首页" + "text": "图纸" }, { "pagePath": "pages/order/order", - "iconPath": "static/tabbar/appointment.png", - "selectedIconPath": "static/tabbar/appointment_HL.png", + "iconPath": "static/tabbar/order.png", + "selectedIconPath": "static/tabbar/order_HL.png", "text": "订单" }, { "pagePath": "pages/consumption/consumption", - "iconPath": "static/tabbar/appointment.png", - "selectedIconPath": "static/tabbar/appointment_HL.png", + "iconPath": "static/tabbar/xiaofei.png", + "selectedIconPath": "static/tabbar/xiaofei_HL.png", "text": "消费" }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index 1050be1..ff4e25d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,85 +1,60 @@ \ No newline at end of file diff --git a/pages/login/login.vue b/pages/login/login.vue index e59d6ee..9ae5fd2 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -4,714 +4,682 @@ \ No newline at end of file diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 35c8408..632e2f4 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -16,14 +16,14 @@ > --> - 张三 + {{userStore.userInfo.username}} - 用户ID: U12345678 + 用户ID: {{userStore.userInfo.id}} 会员等级: 年会员 (有效期至: 2026-05-15) diff --git a/pagesA/edit-profile/edit-profile.vue b/pagesA/edit-profile/edit-profile.vue index e961943..9ee3044 100644 --- a/pagesA/edit-profile/edit-profile.vue +++ b/pagesA/edit-profile/edit-profile.vue @@ -79,7 +79,7 @@ @click="logout" :loading="logoutLoading" > - 退出登陆 + 退出登录 diff --git a/pagesA/generate-record/generate-record.vue b/pagesA/generate-record/generate-record.vue index 1fc5ba5..938aa04 100644 --- a/pagesA/generate-record/generate-record.vue +++ b/pagesA/generate-record/generate-record.vue @@ -1,351 +1,278 @@ \ No newline at end of file diff --git a/static/tabbar/index.png b/static/tabbar/index.png index 9628d7c..5ee5657 100644 Binary files a/static/tabbar/index.png and b/static/tabbar/index.png differ diff --git a/static/tabbar/index_HL.png b/static/tabbar/index_HL.png index 720fd2c..6354ee4 100644 Binary files a/static/tabbar/index_HL.png and b/static/tabbar/index_HL.png differ diff --git a/static/tabbar/order.png b/static/tabbar/order.png new file mode 100644 index 0000000..0b38286 Binary files /dev/null and b/static/tabbar/order.png differ diff --git a/static/tabbar/order_HL.png b/static/tabbar/order_HL.png new file mode 100644 index 0000000..a65273d Binary files /dev/null and b/static/tabbar/order_HL.png differ diff --git a/static/tabbar/xiaofei.png b/static/tabbar/xiaofei.png new file mode 100644 index 0000000..3fe1ed4 Binary files /dev/null and b/static/tabbar/xiaofei.png differ diff --git a/static/tabbar/xiaofei_HL.png b/static/tabbar/xiaofei_HL.png new file mode 100644 index 0000000..84d9933 Binary files /dev/null and b/static/tabbar/xiaofei_HL.png differ diff --git a/utils/request.js b/utils/request.js index 976cb79..6f9ed61 100644 --- a/utils/request.js +++ b/utils/request.js @@ -124,7 +124,10 @@ $uv.http.interceptors.request.use( } const method = config.url - config.url = 'https://lift-dev.ruixininfo.com/jsonrpc' + config.url = 'https://lift-drawing.ruixininfo.com/jsonrpc' + // #ifdef H5 + config.url = '/jsonrpc' + // #endif // config.url = useUserStore().adressIp + '/jsonrpc' const params = config.data config.data = { diff --git a/vite.config.js b/vite.config.js index 04856fe..66c83f5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -26,11 +26,10 @@ export default defineConfig(({ mode }) => { server: { port: Number.parseInt(env.VITE_APP_PORT, 10), proxy: { - [env.VITE_APP_PROXY_PREFIX]: { + ['/jsonrpc']: { changeOrigin: true, - target: env.VITE_APP_BASE_URL, - rewrite: (path) => - path.replace(new RegExp("^" + env.VITE_APP_PROXY_PREFIX), ""), + target: 'https://lift-drawing-h5.ruixininfo.com', + // target: 'https://lift-drawing.ruixininfo.com', }, }, },