From 75917e50ed6b06eeb74f86d86ba0e902525efa95 Mon Sep 17 00:00:00 2001 From: song Date: Wed, 25 May 2022 16:01:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 6 +- CHANGELOG.md | 1 + src/apis/tall.js | 61 +------- .../StatisticsCards/StatisticsCards.vue | 4 +- src/components/Upload/Upload.vue | 134 +++++++++++------- src/pages/detail-webview/detail-webview.vue | 5 + src/pages/task-page/task-page.vue | 1 - 8 files changed, 100 insertions(+), 114 deletions(-) diff --git a/.env.development b/.env.development index 8674ebc..4ba6364 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ VUE_APP_NODE_ENV=development VUE_APP_BASE_URL=https://test.tall.wiki -VUE_APP_API_URL=https://test.tall.wiki/gateway-1 +VUE_APP_API_URL=https://test.tall.wiki/gateway VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws VUE_APP_PROJECT_PATH=https://test.tall.wiki/carBasicTall VUE_APP_QUESTION_PATH=https://test.tall.wiki/carbasics diff --git a/.env.production b/.env.production index 3ca0e06..c289fb7 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ VUE_APP_NODE_ENV=production VUE_APP_BASE_URL=https://test.tall.wiki -VUE_APP_API_URL=https://test.tall.wiki/gateway-1 +VUE_APP_API_URL=https://test.tall.wiki/gateway VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws -VUE_APP_PROJECT_PATH=https://test.tall.wiki/carBasicTall-1 -VUE_APP_QUESTION_PATH=https://test.tall.wiki/carbasics-1 +VUE_APP_PROJECT_PATH=https://test.tall.wiki/carBasicTall +VUE_APP_QUESTION_PATH=https://test.tall.wiki/carbasics VUE_APP_VERSION=v3.1.0 VUE_APP_PUBLIC_PATH=/carBasicCalendar/ diff --git a/CHANGELOG.md b/CHANGELOG.md index ea72a80..ac4bba9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ 范围|描述|commitId --|--|-- - | 提测试版本 | [b31ecd7](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/b31ecd7) + - | 修改bug | [0854a84](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/0854a84) - | bug修复 | [63940a6](https://101.201.226.163:50022/ZhangBin/Typhoneye/commits/63940a6) diff --git a/src/apis/tall.js b/src/apis/tall.js index 8681a17..bfef7c4 100644 --- a/src/apis/tall.js +++ b/src/apis/tall.js @@ -19,66 +19,14 @@ export const login = { }, }; -// 获取手机号 -export const bindPhone = { - async index(params) { - try { - /* #endif */ - const data = await uni.$u.http.post(`${tall}/users/bindingNoCode`, params); - return data; - } catch (error) { - throw new Error(error); - } - }, -}; - -// 绑定手机号(合并或者替换) -export const bindNowPhone = { - async index(params) { - try { - /* #endif */ - const data = await uni.$u.http.post(`${tall}/users/merge`, params); - return data; - } catch (error) { - throw new Error(error); - } - }, -}; - -// 查询首页按钮的名称及跳转 -export const getQueryButton = { - async index(params) { - try { - /* #endif */ - const data = await uni.$u.http.post(`${carbasics}/questionnaire/queryButton`, params); - return data; - } catch (error) { - return null; - } - }, -}; - -// 查询当前用户是否展示宣传页 -export const queryIsShow = { - async index(params) { - try { - /* #endif */ - const data = await uni.$u.http.post(`${carbasics}/questionnaire/queryIsShow`, params); - return data; - } catch (error) { - throw new Error(error); - } - }, -}; - const install = (Vue, vm) => { vm.$u.api = { ...vm.$u.api } || {}; // 登录 vm.$u.api.signin = params => login.index(params); // 绑定手机号无需验证码 - vm.$u.api.bindPhone = params => bindPhone.index(params); + vm.$u.api.bindPhone = params => vm.$u.http.post(`${tall}/users/bindingNoCode`, params); // 手机号已被注册,是否合并 - vm.$u.api.bindNowPhone = params => bindNowPhone.index(params); + vm.$u.api.bindNowPhone = params => vm.$u.http.post(`${tall}/users/merge`, params); // 获取图片验证码 vm.$u.api.getImageCode = () => vm.$u.get(`${tall}/users/code`); // 获取短信验证码 @@ -89,13 +37,12 @@ const install = (Vue, vm) => { vm.$u.api.phoneBind = (phone, smsCode) => vm.$u.http.post(`${tall}/users/binding`, { phone, smsCode }); // 修改用户信息 vm.$u.api.updateUserInfo = params => vm.$u.http.post(`${tall}/users/userInfo`, params); - // 获取项目列表 vm.$u.api.getProjects = (startTime, endTime) => vm.$u.post(`${tall}/project/query`, { startTime, endTime }); // 查询首页的按钮展示及跳转 - vm.$u.api.getQueryButton = params => getQueryButton.index(params); + vm.$u.api.getQueryButton = params => vm.$u.post(`${carbasics}/questionnaire/queryButton`, params); // 查询当前用户是否展示宣传页按钮 - vm.$u.api.queryIsShow = params => queryIsShow.index(params); + vm.$u.api.queryIsShow = params => vm.$u.post(`${carbasics}/questionnaire/queryIsShow`, params); // 查询日历是否有小红点 vm.$u.api.findRedPoint = (startTime, endTime) => vm.$u.post(`${tall}/project/day`, { startTime, endTime }); // 设置项目顺序 diff --git a/src/components/StatisticsCards/StatisticsCards.vue b/src/components/StatisticsCards/StatisticsCards.vue index 193dd43..ff50193 100644 --- a/src/components/StatisticsCards/StatisticsCards.vue +++ b/src/components/StatisticsCards/StatisticsCards.vue @@ -22,9 +22,9 @@ - 高危 + 高危 中危 - 低危 + 低危 {{ list.name }} {{ list.phone }} diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue index 12fc363..9694027 100644 --- a/src/components/Upload/Upload.vue +++ b/src/components/Upload/Upload.vue @@ -1,60 +1,71 @@