diff --git a/src/api/_service.js b/src/api/_service.js index 47e34359..b7f6a7af 100644 --- a/src/api/_service.js +++ b/src/api/_service.js @@ -1,7 +1,7 @@ import { Message } from 'element-ui' import axios from 'axios' import Adapter from 'axios-mock-adapter' -import { get, isEmpty } from 'lodash' +import { get, isEmpty, merge } from 'lodash' import qs from 'qs' import util from '@/libs/util' import store from '@/store' @@ -132,7 +132,7 @@ function createRequest (service) { baseURL: process.env.VUE_APP_API, data: {} } - const option = Object.assign(configDefault, config) + const option = merge(configDefault, config) // 处理 get 请求的参数 // 请根据实际需要修改 if (!isEmpty(option.params)) { diff --git a/src/components/d2-container/components/mixins/bs.js b/src/components/d2-container/components/mixins/bs.js index bece609b..e659da3f 100644 --- a/src/components/d2-container/components/mixins/bs.js +++ b/src/components/d2-container/components/mixins/bs.js @@ -1,4 +1,6 @@ +import { merge } from 'lodash' import BScroll from 'better-scroll' + export default { props: { // 滚动优化的选项 @@ -22,7 +24,7 @@ export default { methods: { scrollInit () { // 初始化 bs - this.BS = new BScroll(this.$refs.wrapper, Object.assign({ + this.BS = new BScroll(this.$refs.wrapper, merge({ mouseWheel: true, click: true, scrollbar: { diff --git a/src/components/d2-mde/index.vue b/src/components/d2-mde/index.vue index 13781f83..0fc80e80 100644 --- a/src/components/d2-mde/index.vue +++ b/src/components/d2-mde/index.vue @@ -3,8 +3,10 @@