diff --git a/.gitignore b/.gitignore index c9dcfdf..d3ac682 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ selenium-debug.log package-lock.json yarn.lock +/.history +/.github \ No newline at end of file diff --git a/.history/.env_20240110150811.development b/.history/.env_20240110150811.development deleted file mode 100644 index b2563a2..0000000 --- a/.history/.env_20240110150811.development +++ /dev/null @@ -1,19 +0,0 @@ -# just a flag -ENV = 'development' - -# base api -# VUE_APP_BASE_API = 'http://192.168.31.106:8324' -VUE_APP_BASE_API = 'https://mer1.crmeb.net' - -# socket 连接地址 -VUE_APP_WS_URL = 'ws://192.168.31.106:8324' -# VUE_APP_WS_URL = 'ws://mer1.crmeb.net' - -# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, -# to control whether the babel-plugin-dynamic-import-node plugin is enabled. -# It only does one thing by converting all import() to require(). -# This configuration can significantly increase the speed of hot updates, -# when you have a large number of pages. -# Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js - -VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.history/.env_20240325145243.development b/.history/.env_20240325145243.development deleted file mode 100644 index d0dceee..0000000 --- a/.history/.env_20240325145243.development +++ /dev/null @@ -1,19 +0,0 @@ -# just a flag -ENV = 'development' - -# base api -# VUE_APP_BASE_API = 'http://192.168.31.106:8324' -VUE_APP_BASE_API = 'http://many.shop.lo' - -# socket 连接地址 -VUE_APP_WS_URL = 'ws://many.shop.lo' -# VUE_APP_WS_URL = 'ws://mer1.crmeb.net' - -# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, -# to control whether the babel-plugin-dynamic-import-node plugin is enabled. -# It only does one thing by converting all import() to require(). -# This configuration can significantly increase the speed of hot updates, -# when you have a large number of pages. -# Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js - -VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.history/.gitignore_20240322155514 b/.history/.gitignore_20240322155514 deleted file mode 100644 index 101c0f2..0000000 --- a/.history/.gitignore_20240322155514 +++ /dev/null @@ -1,23 +0,0 @@ -.DS_Store -node_modules/ -dist/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* -**/*.log -.env.development -tests/**/coverage/ -tests/e2e/reports -selenium-debug.log - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.local - -package-lock.json -yarn.lock diff --git a/.history/.gitignore_20240325145153 b/.history/.gitignore_20240325145153 deleted file mode 100644 index c9dcfdf..0000000 --- a/.history/.gitignore_20240325145153 +++ /dev/null @@ -1,22 +0,0 @@ -.DS_Store -node_modules/ -dist/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* -**/*.log -tests/**/coverage/ -tests/e2e/reports -selenium-debug.log - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.local - -package-lock.json -yarn.lock diff --git a/.history/mock/index_20240322155514.js b/.history/mock/index_20240322155514.js deleted file mode 100644 index 38cedf3..0000000 --- a/.history/mock/index_20240322155514.js +++ /dev/null @@ -1,65 +0,0 @@ -// +---------------------------------------------------------------------- -// | CRMEB [ CRMEB赋能开发者,助力企业发展 ] -// +---------------------------------------------------------------------- -// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved. -// +---------------------------------------------------------------------- -// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权 -// +---------------------------------------------------------------------- -// | Author: CRMEB Team -// +---------------------------------------------------------------------- -import Mock from 'mockjs' -import { param2Obj } from '../src/utils' -import user from './user' -import role from './role' -import article from './article' -import search from './remote-search' - -const mocks = [ - ...user, - ...role, - ...article, - ...search -] - -// for front mock -// please use it cautiously, it will redefine XMLHttpRequest, -// which will cause many of your third-party libraries to be invalidated(like progress event). -export function mockXHR() { - // mock patch - // https://github.com/nuysoft/Mock/issues/300 - Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send - Mock.XHR.prototype.send = function() { - if (this.custom.xhr) { - this.custom.xhr.withCredentials = this.withCredentials || false - - if (this.responseType) { - this.custom.xhr.responseType = this.responseType - } - } - this.proxy_send(...arguments) - } - - function XHR2ExpressReqWrap(respond) { - return function(options) { - let result = null - if (respond instanceof Function) { - const { body, type, url } = options - // https://expressjs.com/en/4x/api.html#req - result = respond({ - method: type, - body: JSON.parse(body), - query: param2Obj(url) - }) - } else { - result = respond - } - return Mock.mock(result) - } - } - - for (const i of mocks) { - Mock.mock(new RegExp(i.url), i.type || 'get', XHR2ExpressReqWrap(i.response)) - } -} - -export default mocks diff --git a/.history/mock/index_20240324094414.js b/.history/mock/index_20240324094414.js deleted file mode 100644 index e69de29..0000000 diff --git a/.history/mock/index_20240324094442.js b/.history/mock/index_20240324094442.js deleted file mode 100644 index 38cedf3..0000000 --- a/.history/mock/index_20240324094442.js +++ /dev/null @@ -1,65 +0,0 @@ -// +---------------------------------------------------------------------- -// | CRMEB [ CRMEB赋能开发者,助力企业发展 ] -// +---------------------------------------------------------------------- -// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved. -// +---------------------------------------------------------------------- -// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权 -// +---------------------------------------------------------------------- -// | Author: CRMEB Team -// +---------------------------------------------------------------------- -import Mock from 'mockjs' -import { param2Obj } from '../src/utils' -import user from './user' -import role from './role' -import article from './article' -import search from './remote-search' - -const mocks = [ - ...user, - ...role, - ...article, - ...search -] - -// for front mock -// please use it cautiously, it will redefine XMLHttpRequest, -// which will cause many of your third-party libraries to be invalidated(like progress event). -export function mockXHR() { - // mock patch - // https://github.com/nuysoft/Mock/issues/300 - Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send - Mock.XHR.prototype.send = function() { - if (this.custom.xhr) { - this.custom.xhr.withCredentials = this.withCredentials || false - - if (this.responseType) { - this.custom.xhr.responseType = this.responseType - } - } - this.proxy_send(...arguments) - } - - function XHR2ExpressReqWrap(respond) { - return function(options) { - let result = null - if (respond instanceof Function) { - const { body, type, url } = options - // https://expressjs.com/en/4x/api.html#req - result = respond({ - method: type, - body: JSON.parse(body), - query: param2Obj(url) - }) - } else { - result = respond - } - return Mock.mock(result) - } - } - - for (const i of mocks) { - Mock.mock(new RegExp(i.url), i.type || 'get', XHR2ExpressReqWrap(i.response)) - } -} - -export default mocks diff --git a/.history/src/views/order/orderRefund/index_20240322155514.vue b/.history/src/views/order/orderRefund/index_20240322155514.vue deleted file mode 100644 index f1182d0..0000000 --- a/.history/src/views/order/orderRefund/index_20240322155514.vue +++ /dev/null @@ -1,670 +0,0 @@ - - - - - diff --git a/.history/src/views/order/orderRefund/index_20240329103706.vue b/.history/src/views/order/orderRefund/index_20240329103706.vue deleted file mode 100644 index 1395eac..0000000 --- a/.history/src/views/order/orderRefund/index_20240329103706.vue +++ /dev/null @@ -1,671 +0,0 @@ - - - - - diff --git a/.history/src/views/system/service/index_20240322155514.vue b/.history/src/views/system/service/index_20240322155514.vue deleted file mode 100644 index a4f9156..0000000 --- a/.history/src/views/system/service/index_20240322155514.vue +++ /dev/null @@ -1,358 +0,0 @@ - - - - - diff --git a/.history/src/views/system/service/index_20240328125054.vue b/.history/src/views/system/service/index_20240328125054.vue deleted file mode 100644 index 8bab182..0000000 --- a/.history/src/views/system/service/index_20240328125054.vue +++ /dev/null @@ -1,359 +0,0 @@ - - - - -