From 7421443be8dfd8b55e53a44dc448ebc3d93cfa56 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Tue, 22 Jun 2021 10:29:50 +0800 Subject: [PATCH] =?UTF-8?q?chore(=E4=BF=A1=E6=81=AF=E9=85=8D=E7=BD=AE):=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AEeslint=E7=AD=89=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintcache | 2 +- .eslintrc.js | 2 +- .gitignore | 1 + CHANGELOG.md | 8 +++++++- src/main.js | 4 ++++ src/utils/request.js | 46 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 src/utils/request.js diff --git a/.eslintcache b/.eslintcache index 9e4d0d0..1d7e704 100644 --- a/.eslintcache +++ b/.eslintcache @@ -1 +1 @@ -[{"/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/commitlint.config.js":"1","/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/src/main.js":"2","/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/src/registerServiceWorker.js":"3","/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/tailwind.config.js":"4","/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/vue.config.js":"5"},{"size":85,"mtime":1623918227177,"results":"6","hashOfConfig":"7"},{"size":222,"mtime":1623973598320,"results":"8","hashOfConfig":"7"},{"size":882,"mtime":1623918165160,"results":"9","hashOfConfig":"7"},{"size":160,"mtime":1623973181665},{"size":398,"mtime":1623918227183,"results":"10","hashOfConfig":"7"},{"filePath":"11","messages":"12","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"ssjk3q",{"filePath":"13","messages":"14","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"15","messages":"16","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"17","messages":"18","errorCount":2,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/commitlint.config.js",[],"/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/src/main.js",[],"/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/src/registerServiceWorker.js",[],"/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/vue.config.js",["19","20"],{"ruleId":"21","severity":2,"message":"22","line":1,"column":7,"nodeType":"23","endLine":1,"endColumn":11},{"ruleId":"21","severity":2,"message":"24","line":2,"column":7,"nodeType":"23","endLine":2,"endColumn":24},"no-unused-vars","'path' is assigned a value but never used.","Identifier","'CopyWebpackPlugin' is assigned a value but never used."] \ No newline at end of file +[{"/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/commitlint.config.js":"1","/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/src/main.js":"2","/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/src/registerServiceWorker.js":"3","/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/tailwind.config.js":"4"},{"size":85,"mtime":1623976024000,"results":"5","hashOfConfig":"6"},{"size":222,"mtime":1623976024081,"results":"7","hashOfConfig":"6"},{"size":882,"mtime":1623976024087,"results":"8","hashOfConfig":"6"},{"size":160,"mtime":1623976024089},{"filePath":"9","messages":"10","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"14qqz39",{"filePath":"11","messages":"12","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"13","messages":"14","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/commitlint.config.js",[],"/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/src/main.js",[],"/mnt/c/Users/Administrator/Documents/coding/ccsens/tall-mui-cli/src/registerServiceWorker.js",[]] \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js index e2224b1..6f481d2 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -9,7 +9,7 @@ module.exports = { 'vue/html-self-closing': 'off', 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'no-param-reassign': ['error', { props: true, ignorePropertyModificationsFor: ['state'] }], + 'no-param-reassign': 'off', 'max-len': ['error', { code: 140, tabWidth: 2 }], 'object-curly-newline': ['error', { multiline: true }], 'arrow-parens': ['error', 'as-needed'], diff --git a/.gitignore b/.gitignore index 2561bb4..e42ee69 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ yarn-error.log* *.njsproj *.sln *.sw* +.eslintcache diff --git a/CHANGELOG.md b/CHANGELOG.md index 388a941..99ea622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -# 0.1.0 (2021-06-18) +# 0.1.0 (2021-06-22) + +### 🔨 代码重构 +范围|描述|commitId +--|--|-- + template | eslint prettier sass uview tailwindcss | [9c966a1](https://gitee.com/mongos/uni-cli-template/commits/9c966a1) + 范围|描述|commitId --|--|-- diff --git a/src/main.js b/src/main.js index 0999170..253e42a 100644 --- a/src/main.js +++ b/src/main.js @@ -8,4 +8,8 @@ Vue.config.productionTip = false; App.mpType = 'app'; const app = new Vue({ ...App }); + +import request from '@/utils/request.js'; +Vue.use(request, app); + app.$mount(); diff --git a/src/utils/request.js b/src/utils/request.js new file mode 100644 index 0000000..d4492af --- /dev/null +++ b/src/utils/request.js @@ -0,0 +1,46 @@ +const install = (Vue, vm) => { + Vue.prototype.$u.http.setConfig({ + baseUrl: '', + showLoading: true, // 是否显示请求中的loading + loadingText: '玩命加载中...', + loadingTime: 800, + loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透 + // 配置请求头信息 + header: { 'content-type': 'application/json;charset=UTF-8' }, + }); + + // 请求拦截部分，如配置，每次请求前都会执行 + Vue.prototype.$u.http.interceptor.request = config => { + // TODO: 如果在白名单里 则不需要加token + + if (vm.$store.state.user.token) { + config.header.Authorization = `Bearer ${vm.$store.state.user.token}`; + } + + return config; + }; + + // 响应拦截，如配置，每次请求结束都会执行本方法 + Vue.prototype.$u.http.interceptor.response = res => { + if (res.code == 200) { + // res为服务端返回值，可能有code，result等字段 + // 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到 + // 如果配置了originalData为true，请留意这里的返回值 + return res.result; + } else if (res.code == 401) { + // 假设201为token失效，这里跳转登录 + vm.$u.toast('验证失败，请重新登录'); + setTimeout(() => { + // 此为uView的方法，详见路由相关文档 + vm.$u.route('/pages/user/login'); + }, 1500); + return false; + } else { + // 如果返回false，则会调用Promise的reject回调， + // 并将进入this.$u.post(url).then().catch(res=>{})的catch回调中，res为服务端的返回值 + return false; + } + }; +}; + +export default { install };