From 108e32293cbfca10b6695bc46b3d4cee20a06394 Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Thu, 27 Jan 2022 17:24:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E9=A1=B5=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 - CHANGELOG.md | 1 + hooks/user/userMixin.js | 5 ++--- pages.json | 9 +++++++++ pages/index/index.vue | 4 ++-- pages/user/login.vue | 4 ++-- pages/workbench/workbench.vue | 14 ++++++++++++++ store/user/actions.js | 8 ++++---- 8 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 pages/workbench/workbench.vue diff --git a/App.vue b/App.vue index fb34cb7..664440b 100644 --- a/App.vue +++ b/App.vue @@ -30,7 +30,6 @@ export default { // 判断是否第一次打开App // let firstOpenApp = uni.$storage.getStorageSync('firstOpenApp'); // this.$store.commit('setFirstOpenApp'); - this.getGuide(0); this.getGuide(1); // #endif diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bf7577..8814290 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,7 @@ --|--|-- - | 插件接口修改 | [53c6b90](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/53c6b90) - | 查询插件 | [542d714](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/542d714) + - | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5) 交付物 | 修复检查人选择组件之间相互影响的bug | [435c0bd](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/435c0bd) 交付物 | 重构交付物审核部分,修复审核bug | [5fd8889](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5fd8889) - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) diff --git a/hooks/user/userMixin.js b/hooks/user/userMixin.js index 16f1ffe..864da24 100644 --- a/hooks/user/userMixin.js +++ b/hooks/user/userMixin.js @@ -121,11 +121,10 @@ export default function userMixin() { verificationCodeValue: form.verificationCodeValue, }; const data = await store.dispatch('user/sendCode', params); - // console.log('11111', data); - // if (data) { + if (data) { getCodeInterval(); dataObj.showPaste = true; - // } + } } catch (err) { dataObj.showPaste = false; throw err; diff --git a/pages.json b/pages.json index ee8fd00..eedaf89 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,6 @@ { "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages + // #ifdef APP-PLUS { "path": "pages/guide/adv", "style": { @@ -14,6 +15,7 @@ "navigationStyle": "custom" } }, + // #endif { "path": "pages/index/index", "style": { @@ -21,6 +23,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/workbench/workbench", + "style": { + "navigationBarText": "TALL", + "navigationStyle": "custom" + } + }, { "path": "pages/business/business", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 8fae8f9..b8c0513 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -40,8 +40,8 @@ const store = useStore(); const token = computed(() => store.state.user.token); const uTips = ref(null); - const firstOpenApp = computed(() => store.state.firstOpenApp); - const isOpenApp = computed(() => store.state.isOpenApp); // 是否打开APP + // const firstOpenApp = computed(() => store.state.firstOpenApp); + // const isOpenApp = computed(() => store.state.isOpenApp); // 是否打开APP const data = reactive({ calendar: null, diff --git a/pages/user/login.vue b/pages/user/login.vue index 42943ea..fa5866a 100644 --- a/pages/user/login.vue +++ b/pages/user/login.vue @@ -35,12 +35,12 @@ 用户名登录 --> - + diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue new file mode 100644 index 0000000..17643ce --- /dev/null +++ b/pages/workbench/workbench.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/store/user/actions.js b/store/user/actions.js index dce0ce9..250706d 100644 --- a/store/user/actions.js +++ b/store/user/actions.js @@ -27,11 +27,11 @@ const actions = { async sendCode({ commit }, params) { try { const res = await uni.$u.api.getSmsCode(params); - // if (res) { + if (res) { uni.$ui.showToast('验证码发送成功'); - // } else { - // uni.$ui.showToast('验证码发送失败'); - // } + } else { + uni.$ui.showToast('验证码发送失败'); + } return res; } catch (error) { uni.$ui.showToast(error.msg || '验证码发送失败');