Browse Source

fix: 解决冲突

pull/40/head
aBin 4 years ago
parent
commit
d2a545ee2f
  1. 1
      .env
  2. 1
      .env.development
  3. 1
      .env.production
  4. 1
      CHANGELOG.md
  5. 2
      src/App.vue
  6. 2
      src/components/Calendar/Calendar.vue
  7. 14
      src/config/domains.js
  8. 2
      vue.config.js

1
.env

@ -1 +0,0 @@
VUE_APP_DOMAIN=qcp

1
.env.development

@ -2,4 +2,3 @@ VUE_APP_NODE_ENV=development
VUE_APP_BASE_URL=https://test.tall.wiki
VUE_APP_API_URL=https://test.tall.wiki/gateway
VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
VUE_APP_PUBLIC_PATH=/tall3/v3.0.0/static/

1
.env.production

@ -2,4 +2,3 @@ VUE_APP_NODE_ENV=production
VUE_APP_BASE_URL=https://www.tall.wiki
VUE_APP_API_URL=https://www.tall.wiki/gateway
VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws
VUE_APP_PUBLIC_PATH=/tall3/v3.0.0/static/

1
CHANGELOG.md

@ -79,6 +79,7 @@
- | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/a54c601)
- | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/aa4981c)
- | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/92b3254)
- | 定期任务未加载时,显示空的时间轴并能上下滑动 | [ce38093](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ce38093)
- | 平车演示临时去掉项目快捷方式的toast提示 | [e0b2c23](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e0b2c23)
- | 手动展开日常任务 | [0a4a622](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0a4a622)
- | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f2f06c5)

2
src/App.vue

@ -3,7 +3,7 @@ import { mapActions, mapState } from 'vuex';
export default {
async onLaunch(options) {
console.log('App Launch', options);
options.query.url && (this.$t.domain = options.query.url);
if (!this.token) {
// tokenuserIdtoken
// token userId

2
src/components/Calendar/Calendar.vue

@ -132,7 +132,6 @@ export default {
}
});
this.days = days;
console.log(days);
},
},
@ -278,7 +277,6 @@ export default {
}
});
this.days = days;
console.log(days);
// ,
let obj = {
start: '',

14
src/config/domains.js

@ -1,14 +0,0 @@
const domain = process.env.VUE_APP_DOMAIN;
const domains = {
default: {
path: '/defaultwbs',
description: '默认最小项目',
},
qcp: {
path: '/qcp/v3.0',
description: '平车项目',
},
};
export default domains[domain].path;

2
vue.config.js

@ -2,13 +2,11 @@ const path = require('path');
// const CopyWebpackPlugin = require('copy-webpack-plugin'); // 最新版本copy-webpack-plugin插件暂不兼容,推荐v5.0.0
const CompressionWebpackPlugin = require('compression-webpack-plugin');
const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg|ttf|woff|woff2)(\?.*)?$/i;
const publicPath = process.env.VUE_APP_PUBLIC_PATH;
const isPro = process.env.NODE_ENV === 'production';
module.exports = {
lintOnSave: process.env.NODE_ENV !== 'production',
productionSourceMap: false,
publicPath: isPro ? publicPath : '/',
devServer: {
// open: true,
// host: '127.0.0.1',

Loading…
Cancel
Save