diff --git a/src/api/nxPawn.js b/src/api/nxPawn.js deleted file mode 100644 index 8cc5312..0000000 --- a/src/api/nxPawn.js +++ /dev/null @@ -1,27 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/nxPawn', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/nxPawn/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/nxPawn', - method: 'put', - data - }) -} - -export default { add, edit, del } diff --git a/src/components/pic-upload-two/index.vue b/src/components/pic-upload-two/index.vue index c054bee..f294cac 100644 --- a/src/components/pic-upload-two/index.vue +++ b/src/components/pic-upload-two/index.vue @@ -45,9 +45,9 @@ export default { }, // 限制图片上传大小 beforeAvatarUpload(file) { - const isLt2M = file.size / 1024 / 1024 < 4 + const isLt2M = file.size / 1024 / 1024 < 2 if (!isLt2M) { - this.$message.error('上传头像图片大小不能超过 4MB!') + this.$message.error('上传头像图片大小不能超过 2MB!') } return isLt2M } diff --git a/src/components/pic-upload/index.vue b/src/components/pic-upload/index.vue index ff8a704..dd9fd6f 100644 --- a/src/components/pic-upload/index.vue +++ b/src/components/pic-upload/index.vue @@ -45,9 +45,9 @@ export default { }, // 限制图片上传大小 beforeAvatarUpload(file) { - const isLt2M = file.size / 1024 / 1024 < 4 + const isLt2M = file.size / 1024 / 1024 < 2 if (!isLt2M) { - this.$message.error('上传头像图片大小不能超过 4MB!') + this.$message.error('上传头像图片大小不能超过 2MB!') } return isLt2M } diff --git a/src/mixins/crud.js b/src/mixins/crud.js index 1490a05..8ed7fe1 100644 --- a/src/mixins/crud.js +++ b/src/mixins/crud.js @@ -61,15 +61,9 @@ export default { this.loading = true // 请求数据 initData(this.url, this.getQueryParame()).then(data => { - // return ; - console.log(data) this.cateList = data.cateList - // this.total = data.total - // this.data = data.list this.total = data.totalElements this.data = data.content - - // console.log(this.cateList) // time 毫秒后显示表格 setTimeout(() => { this.loading = false @@ -182,7 +176,7 @@ export default { this.$refs[id].doClose() }) }, - afterDelMethod() { }, + afterDelMethod() {}, /** * 多选删除提示 */ @@ -221,7 +215,7 @@ export default { /** * 显示新增弹窗前可以调用该方法 */ - beforeShowAddForm() { }, + beforeShowAddForm() {}, /** * 显示新增弹窗 */ @@ -234,7 +228,7 @@ export default { /** * 显示编辑弹窗前可以调用该方法 */ - beforeShowEditForm(data) { }, + beforeShowEditForm(data) {}, /** * 显示编辑弹窗 */ @@ -265,11 +259,11 @@ export default { /** * 新增后可以调用该方法 */ - afterAddMethod() { }, + afterAddMethod() {}, /** * 新增失败后调用该方法 */ - afterAddErrorMethod() { }, + afterAddErrorMethod() {}, /** * 通用的编辑方法 */ @@ -287,7 +281,7 @@ export default { /** * 编辑后可以调用该方法 */ - afterEditMethod() { }, + afterEditMethod() {}, /** * 提交前可以调用该方法 */ diff --git a/src/settings.js b/src/settings.js index 976e58c..2cd68b8 100644 --- a/src/settings.js +++ b/src/settings.js @@ -2,11 +2,7 @@ module.exports = { /** * @description 网站标题 */ -<<<<<<< HEAD title: 'YSHOP-3.1', -======= - title: '农心商城', ->>>>>>> 88fdfe1ae8a01c7ce6c7907f9a20ebc751c8e4d1 /** * @description 是否显示 tagsView */ diff --git a/src/utils/request.js b/src/utils/request.js index e64e830..f997d12 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -8,7 +8,6 @@ import Config from '@/settings' // 创建axios实例 const service = axios.create({ baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/', // api 的 base_url - // baseURL: 'http://192.168.100.253:8001', timeout: Config.timeout // 请求超时时间 }) diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue index af2ed8e..951acc6 100644 --- a/src/views/generator/config.vue +++ b/src/views/generator/config.vue @@ -243,7 +243,6 @@ export default { }) getDicts().then(data => { this.dicts = data - }) }) }, @@ -257,7 +256,6 @@ export default { saveColumnConfig() { this.columnLoading = true save(this.data).then(res => { - console.log(res) this.notify('保存成功', 'success') this.columnLoading = false }).catch(err => { diff --git a/src/views/login.vue b/src/views/login.vue index f6030d7..66e6333 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -2,11 +2,7 @@

-<<<<<<< HEAD YSHOP后台管理系统-3.1 -======= - 农心商城后台管理系统v1.0 ->>>>>>> 88fdfe1ae8a01c7ce6c7907f9a20ebc751c8e4d1

diff --git a/src/views/pawn/index.vue b/src/views/pawn/index.vue deleted file mode 100644 index 79c1293..0000000 --- a/src/views/pawn/index.vue +++ /dev/null @@ -1,126 +0,0 @@ - - - - - diff --git a/src/views/shop/user/index.vue b/src/views/shop/user/index.vue index 6da1a90..f49707e 100644 --- a/src/views/shop/user/index.vue +++ b/src/views/shop/user/index.vue @@ -31,7 +31,7 @@ - + - - - - - - - - + + + + + + + + + + + + + + +