From 4049261e8c5b10b38049e419fbdb6fdb855220dd Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Wed, 11 Jun 2025 18:22:43 +0800 Subject: [PATCH] add api logic & login --- src/api/server.js | 12 +- src/pages.json | 19 ++ src/pages/index/index.vue | 16 +- src/static/images/tab/index_a.png | Bin 0 -> 1610 bytes src/static/images/tab/index_g.png | Bin 0 -> 1319 bytes src/static/images/tab/mine_a.png | Bin 0 -> 1675 bytes src/static/images/tab/mine_g.png | Bin 0 -> 1413 bytes src/static/images/tab/order_a.png | Bin 0 -> 831 bytes src/static/images/tab/order_g.png | Bin 0 -> 688 bytes src/subpackage/authorize/api/index.js | 3 +- src/subpackage/authorize/pages/index.vue | 129 +++++++++-- src/subpackage/groupon/components/site/footer.vue | 69 +++++- src/subpackage/groupon/components/site/table.vue | 61 +++-- .../groupon/js/site_select/autoSelect.js | 252 +++++++++++++++++++++ src/subpackage/groupon/js/site_select/handle.js | 0 src/subpackage/groupon/pages/site_select.vue | 50 +++- src/utils/polish.js | 16 +- 17 files changed, 568 insertions(+), 59 deletions(-) create mode 100644 src/static/images/tab/index_a.png create mode 100644 src/static/images/tab/index_g.png create mode 100644 src/static/images/tab/mine_a.png create mode 100644 src/static/images/tab/mine_g.png create mode 100644 src/static/images/tab/order_a.png create mode 100644 src/static/images/tab/order_g.png create mode 100644 src/subpackage/groupon/js/site_select/autoSelect.js create mode 100644 src/subpackage/groupon/js/site_select/handle.js diff --git a/src/api/server.js b/src/api/server.js index cc8f3ac..76f8fe1 100644 --- a/src/api/server.js +++ b/src/api/server.js @@ -19,7 +19,7 @@ const server = ajax.create({ server.interceptors.request.use( config => { let _token = uni.getStorageSync('token'); - if(_token)config.data.ustoken = _token; + if(_token)config.data.token = _token; loading.show(config.loading); return config; }, @@ -34,11 +34,12 @@ server.interceptors.response.use( response => { loading.hide(response.config.loading); if(response?.data?.code === 0)return formatResponse(response); - console.error(`get ${response?.config?.url} err -> `, response) + // console.error(`get ${response?.config?.url} err -> `, response) return errorHandle({ Catch: response?.config?.catch || false, content: response?.data?.message ?? '请求失败', data: response, + errorModal: response?.config?.errorModal, success: () => { // 登录超时 // if(response?.data?.error === '201')loginHandle(); @@ -54,12 +55,13 @@ server.interceptors.response.use( // 404 拦截 data 会存在错误信息 content: error?.data ?? error?.errMsg ?? '请求失败', data: error, + errorModal: error?.config?.errorModal, }) } ) function formatResponse(response){ - let _data = response?.data?.data || null; + let _data = response?.data ?? null; return _data; } @@ -69,9 +71,9 @@ function formatResponse(response){ * * 传值 config.catch 判断是否需要返回错误,如果是 true 返回错误信息,否则不返回。 */ -function errorHandle({ Catch = true, content = '', data = {}, success }) { +function errorHandle({ Catch = true, content = '', data = {}, success, errorModal = true }) { console.error(`get ${data?.config?.url} err -> `, data) - showModal({ + if(errorModal)showModal({ content: content || '请求失败', success: success }) diff --git a/src/pages.json b/src/pages.json index a30ccb1..b1bc744 100644 --- a/src/pages.json +++ b/src/pages.json @@ -81,6 +81,25 @@ ] } ], + "tabBar": { + "color": "#666666", + "selectedColor": "#009874", + "backgroundColor": "#FFFFFF", + "list": [ + { + "pagePath": "pages/index/index", + "text": "首页", + "iconPath": "static/images/tab/index_g.png", + "selectedIconPath": "static/images/tab/index_a.png" + }, + { + "pagePath": "pages/order/list", + "text": "订单", + "iconPath": "static/images/tab/order_g.png", + "selectedIconPath": "static/images/tab/order_a.png" + } + ] + }, "globalStyle": { "navigationBarTextStyle": "#FFFFFF", "navigationBarTitleText": "欧轩智能场馆", diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 758f02b..9ae87af 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -2,17 +2,23 @@ import { onLoad } from '@dcloudio/uni-app'; import { deepClone } from "@/utils"; import { accAdd } from "@/utils/calculation"; +import { routeTo } from "@/utils/polish"; import { stadiumFind } from "@/api"; onLoad(() => { console.log('deepClone', deepClone({ a: 1, b: { c: 2 } })); console.log('accAdd', accAdd(0.1, 0.2)); - stadiumFind({ data: { brand_id: 63 }, loading: '加载...' }) - .then(res=>{ - console.log('stadiumFind', res); - }) + // stadiumFind({ data: { brand_id: 63 }, loading: '加载...' }) + // .then(res=>{ + // console.log('stadiumFind', res); + // }) }); + +function verifyBtn(){ + routeTo(`/subpackage/groupon/pages/list`); +} +