diff --git a/.drone.yml b/.drone.yml index 3d2c558..51fe1c1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,36 +17,36 @@ volumes: path: /var/lib/data steps: - - name: restore-cache - image: drillster/drone-volume-cache - volumes: - - name: cache - path: /cache - settings: - restore: true - mount: - - ./node_modules + # - name: restore-cache + # image: drillster/drone-volume-cache + # volumes: + # - name: cache + # path: /cache + # settings: + # restore: true + # mount: + # - ./node_modules - name: build image: node:latest pull: if-not-exists # default always - volumes: - - name: cache - path: /root/.m2 + # volumes: + # - name: cache + # path: /root/.m2 commands: - npm config set registry http://registry.npm.taobao.org - npm i - - npm run build:dev + - npm run test - - name: rebuild-cache - image: drillster/drone-volume-cache - volumes: - - name: cache - path: /cache - settings: - rebuild: true - mount: - - ./node_modules + # - name: rebuild-cache + # image: drillster/drone-volume-cache + # volumes: + # - name: cache + # path: /cache + # settings: + # rebuild: true + # mount: + # - ./node_modules - name: deploy-scp image: appleboy/drone-scp @@ -61,7 +61,7 @@ steps: key_path: /root/.ssh/id_rsa rm: true # true则会删除目标目录重建 target: /home/tall/v4.0.0 - source: dist/**/* + source: dist/* strip_components: 1 # 去除的目录层数,如果没有该选项,则拷贝过去是 target/xxx.jar,1代表去除target # - name: run-ssh @@ -124,7 +124,7 @@ steps: - success trigger: - branch: develop + branch: feat # - name: notify-dingtalk # image: lddsb/drone-dingtalk-message # environment: diff --git a/App.vue b/App.vue index a526b47..0368041 100644 --- a/App.vue +++ b/App.vue @@ -43,19 +43,18 @@ export default { if (token && tokenIsAvailable) { // 1.1 store里有token 且没过期直接:使用store的token return token; - } else { - // 2. 根据userId获取token - if (userId) { - try { - const { token } = await this.$store.dispatch('user/getTokenByUserId', userId); - return token; - } catch (error) { - console.error('error: ', error); - return null; - } - } else { + } + // 2. 根据userId获取token + if (userId) { + try { + const { token } = await this.$store.dispatch('user/getTokenByUserId', userId); + return token; + } catch (error) { + console.error('error: ', error); return null; } + } else { + return null; } }, @@ -166,4 +165,5 @@ export default { page { height: 100%; } + diff --git a/CHANGELOG.md b/CHANGELOG.md index c913aa4..720d2ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) + - | 手机号登录 | [a198527](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a198527) - | 手机号登录 | [8f455da](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f455da) - | 手机号登录 | [565585b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/565585b) - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) diff --git a/README.md b/README.md new file mode 100644 index 0000000..cb2986f --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# 时物链条 + +[![Build Status](http://101.201.226.163:3001/api/badges/TALL/TALL-MUI-4/status.svg)](http://101.201.226.163:3001/TALL/TALL-MUI-4) diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss index f851f5a..038cb4a 100644 --- a/common/styles/theme/default.scss +++ b/common/styles/theme/default.scss @@ -1,7 +1,7 @@ // 默认主题文件 .theme-default { background-color: #007aff; - color: #fff; + // color: #fff; .u-card { font-size: 24px !important; color: #0f0; @@ -13,4 +13,7 @@ color: #fff !important; } } + button{ + border: none!important; + } } diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue index d740eca..c343551 100644 --- a/components/Plugin/Plugin.vue +++ b/components/Plugin/Plugin.vue @@ -1,6 +1,6 @@