diff --git a/.env.production b/.env.production index d3ac6de..411a001 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,4 @@ ENV = 'production' VUE_APP_BASE_API = '/prod-api' # VUE_APP_DOMAIN_PREFIX = 'https://ceresdev.zkthink.com/businessapi' -VUE_APP_DOMAIN_PREFIX = 'http://14.22.116.132:81/ceres-business-api' +VUE_APP_DOMAIN_PREFIX = 'https://wechat.hnthee.com/ceres-business-api' diff --git a/public/cereshop.ico b/public/cereshop.ico index 5a160d7..6c8cf22 100644 Binary files a/public/cereshop.ico and b/public/cereshop.ico differ diff --git a/src/assets/images/chengjiaojine.png b/src/assets/images/chengjiaojine.png new file mode 100644 index 0000000..ee5cb43 Binary files /dev/null and b/src/assets/images/chengjiaojine.png differ diff --git a/src/assets/images/login_account.png b/src/assets/images/login_account.png new file mode 100644 index 0000000..fb1baf6 Binary files /dev/null and b/src/assets/images/login_account.png differ diff --git a/src/assets/images/login_bg.png b/src/assets/images/login_bg.png new file mode 100644 index 0000000..acd5a52 Binary files /dev/null and b/src/assets/images/login_bg.png differ diff --git a/src/assets/images/login_center_bg.png b/src/assets/images/login_center_bg.png new file mode 100644 index 0000000..baf2210 Binary files /dev/null and b/src/assets/images/login_center_bg.png differ diff --git a/src/assets/images/login_code.png b/src/assets/images/login_code.png new file mode 100644 index 0000000..71e41f2 Binary files /dev/null and b/src/assets/images/login_code.png differ diff --git a/src/assets/images/login_logo.png b/src/assets/images/login_logo.png new file mode 100644 index 0000000..70ee3e2 Binary files /dev/null and b/src/assets/images/login_logo.png differ diff --git a/src/assets/images/login_password.png b/src/assets/images/login_password.png new file mode 100644 index 0000000..f68e3f8 Binary files /dev/null and b/src/assets/images/login_password.png differ diff --git a/src/assets/images/login_phone.png b/src/assets/images/login_phone.png new file mode 100644 index 0000000..06b242e Binary files /dev/null and b/src/assets/images/login_phone.png differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index cb49768..2f36674 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/assets/images/refund_order.png b/src/assets/images/refund_order.png new file mode 100644 index 0000000..ba60f53 Binary files /dev/null and b/src/assets/images/refund_order.png differ diff --git a/src/assets/images/un_submit_order.png b/src/assets/images/un_submit_order.png new file mode 100644 index 0000000..35d59e2 Binary files /dev/null and b/src/assets/images/un_submit_order.png differ diff --git a/src/assets/images/visit_number.png b/src/assets/images/visit_number.png new file mode 100644 index 0000000..54aed8b Binary files /dev/null and b/src/assets/images/visit_number.png differ diff --git a/src/assets/images/white_logo.png b/src/assets/images/white_logo.png new file mode 100644 index 0000000..ea22860 Binary files /dev/null and b/src/assets/images/white_logo.png differ diff --git a/src/components/Tinymce/components/EditorImage.vue b/src/components/Tinymce/components/EditorImage.vue index 5f5c836..82bb482 100644 --- a/src/components/Tinymce/components/EditorImage.vue +++ b/src/components/Tinymce/components/EditorImage.vue @@ -128,9 +128,10 @@ export default { hasSuccess: false, uid: file.uid, width: this.width, - height: this.height + height: this.height, } } + img.setAttribute resolve(true) }) } diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index c3fafee..730935e 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -11,7 +11,7 @@

{{ title }}

- +

{{ title }}

 @@ -29,7 +29,7 @@ export default { }, data() { return { - title: 'cereShop商家端' + title: 'Thee商家端' } } } @@ -50,7 +50,7 @@ export default { width: 100%; height: 50px; line-height: 50px; - background: #2b2f3a; + background: #ffffff; text-align: center; overflow: hidden; @@ -59,14 +59,14 @@ export default { width: 100%; & .sidebar-logo { - width: 32px; - height: 32px; + width: 159px; + height: 30px; vertical-align: middle; margin-right: 12px; } & .sidebar-title { - display: inline-block; + display: none; margin: 0; color: #fff; font-weight: 600; diff --git a/src/settings.js b/src/settings.js index 8996917..9ecea93 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: 'cereShop商家端', + title: 'Thee商家端', /** * @type {boolean} true | false diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index b9d7f01..f4edc58 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -76,6 +76,7 @@ background-color: $menuHover !important; } } + .is-active>.el-submenu__title { color: $subMenuActiveText !important; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index be55772..53ee24d 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,13 +1,13 @@ // sidebar -$menuText:#bfcbd9; -$menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 +$menuText:#404F64; +$menuActiveText:#183ECD; +$subMenuActiveText:#183ECD; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; -$menuHover:#263445; +$menuBg:#ffffff; +$menuHover:#DFECFF; -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#ffffff; +$subMenuHover:#DFECFF; $sideBarWidth: 210px; diff --git a/src/views/commodity/commodityList/commodityGroup.vue b/src/views/commodity/commodityList/commodityGroup.vue index 28e7338..9441ce2 100644 --- a/src/views/commodity/commodityList/commodityGroup.vue +++ b/src/views/commodity/commodityList/commodityGroup.vue @@ -468,23 +468,23 @@ export default { }) return false } - if (self.selectGroup === '1') { - if (self.groupData.ids.length === 0) { - self.$message({ - message: '请选择手动添加分组商品', - type: 'warning' - }) - return false - } - } - if (self.selectGroup === '2') { - if (self.groupData.conditions.length === 0) { - self.$message({ - message: '请添加智能筛选条件', - type: 'warning' - }) - } - } + // if (self.selectGroup === '1') { + // if (self.groupData.ids.length === 0) { + // self.$message({ + // message: '请选择手动添加分组商品', + // type: 'warning' + // }) + // return false + // } + // } + // if (self.selectGroup === '2') { + // if (self.groupData.conditions.length === 0) { + // self.$message({ + // message: '请添加智能筛选条件', + // type: 'warning' + // }) + // } + // } if (self.selectGroup === '1') { self.groupData.conditions = [] self.groupData.condition = null diff --git a/src/views/commodity/commoditySystem/addCommodity.vue b/src/views/commodity/commoditySystem/addCommodity.vue index 6dee971..6a95b2d 100644 --- a/src/views/commodity/commoditySystem/addCommodity.vue +++ b/src/views/commodity/commoditySystem/addCommodity.vue @@ -28,7 +28,7 @@
- + diff --git a/src/views/commodity/commoditySystem/index.vue b/src/views/commodity/commoditySystem/index.vue index 008152f..343f9d0 100644 --- a/src/views/commodity/commoditySystem/index.vue +++ b/src/views/commodity/commoditySystem/index.vue @@ -221,8 +221,10 @@ import { setProductMember, clearProductMember, productExport, - getBrandList + getBrandList, + getGroupSelect } from '@/api/commodity' +import { storehouseGetAll } from '@/api/shopSys' export default { components: { CommAdd @@ -301,7 +303,11 @@ export default { }, btnClick(id) { if (id.permissionName === '批量导入') { - this.sends() + this.checkGroupAndStoreHouse().then(result=>{ + if(result){ + this.sends() + } + }); } else if (id.permissionName === '新增商品') { this.add() } @@ -333,13 +339,44 @@ export default { }, // 新增商品 add() { - this.showTinymce = true - if (this.commId) { - this.$refs.child.reset() + let that = this; + //判断是否已经创建了仓库、分组 + this.checkGroupAndStoreHouse().then(result=>{ + if(result){ + that.showTinymce = true + if (that.commId) { + that.$refs.child.reset() + } + that.commidyVisible = true + that.commId = 0 + // that.$router.push({ name: 'addCommodity', params: { id: '1' }}) + } + }); + + }, + async checkGroupAndStoreHouse(){ + const storehouseRes = await storehouseGetAll({ page: 1, pageSize: 10 + }) + let storehouseList = storehouseRes.data.list + + if(storehouseList == null || storehouseList.length <= 0){ + this.$message({ + type: 'warning', + message: '请先添加仓库信息' + }) + return false; } - this.commidyVisible = true - this.commId = 0 - // this.$router.push({ name: 'addCommodity', params: { id: '1' }}) + const groupRes = await getGroupSelect({ + }) + let groupList = groupRes.data + if(groupList == null || groupList.length <= 0){ + this.$message({ + type: 'warning', + message: '请先添加商品分组信息' + }) + return false; + } + return true; }, // 导出商品 async productDataExport() { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 63e7ef5..538961a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -2,16 +2,17 @@