diff --git a/canvas-container/assets/font_icon/iconfont.json b/canvas-container/assets/font_icon/iconfont.json index bd266cc..5352d51 100644 --- a/canvas-container/assets/font_icon/iconfont.json +++ b/canvas-container/assets/font_icon/iconfont.json @@ -1,6 +1,6 @@ { "id": "2224733", - "name": "cereshop", + "name": "Thee", "font_family": "iconfont", "css_prefix_text": "icon-", "description": "", diff --git a/src/api/commodity.js b/src/api/commodity.js index 5b06f98..ebc8821 100644 --- a/src/api/commodity.js +++ b/src/api/commodity.js @@ -28,6 +28,14 @@ export function getClassifyGetAll(data) { }) } +export function getClassifyGetList(data) { + return request({ + url: '/product/getList', + method: 'post', + data + }) +} + // 修改商品查询 export function getClassifyGetById(data) { return request({ diff --git a/src/api/shopSys.js b/src/api/shopSys.js index f37ad27..db99173 100644 --- a/src/api/shopSys.js +++ b/src/api/shopSys.js @@ -19,6 +19,16 @@ export function shopSysUpdate(data) { }) } +// 支付认证 +export function registerByXs(data) { + return request({ + url: '/shop/registerByXs', + method: 'post', + data + }) +} + + //* ******************** 物流方案 ********************* // 物流方案查询 export function logisticsGetAll(data) { @@ -68,6 +78,15 @@ export function logisticsDelete(data) { //* ******************** 仓库 ********************* // 仓库查询 +export function storehouseGetList(data) { + return request({ + url: '/storehouse/getList', + method: 'post', + data + }) +} + + export function storehouseGetAll(data) { return request({ url: '/storehouse/getAll', diff --git a/src/api/stockNote.js b/src/api/stockNote.js new file mode 100644 index 0000000..9e60ae4 --- /dev/null +++ b/src/api/stockNote.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +//* ******************** 出入库记录 ********************* +// 出入库记录查询 +export function stocknoteGetAll(data) { + return request({ + url: '/stocknote/getAll', + method: 'post', + data + }) +} + +// 出入库记录详情 +export function stocknoteGetById(data) { + return request({ + url: '/stocknote/getById', + method: 'post', + data + }) +} + +// 添加出入库记录 +export function stocknoteAdd(data) { + return request({ + url: '/stocknote/save', + method: 'post', + data + }) +} + +// 修改出入库记录 +export function stocknoteUpdate(data) { + return request({ + url: '/stocknote/update', + method: 'post', + data + }) +} + +// 删除仓库 +export function stocknoteDelete(data) { + return request({ + url: '/stocknote/delete', + method: 'post', + data + }) +} + diff --git a/src/styles/elDialog.scss b/src/styles/elDialog.scss index efda26b..c87a2db 100644 --- a/src/styles/elDialog.scss +++ b/src/styles/elDialog.scss @@ -10,6 +10,10 @@ color: #FFFFFF; } +.el-dialog__headerbtn .el-dialog__close { + color: #FFFFFF; +} + .fenye { padding-top: 20px; } diff --git a/src/views/active/index.vue b/src/views/active/index.vue index ae2c7f5..61d0b9f 100644 --- a/src/views/active/index.vue +++ b/src/views/active/index.vue @@ -40,7 +40,7 @@ 查询 - 重置 + 重置
diff --git a/src/views/commodity/commodityList/commodityGroup.vue b/src/views/commodity/commodityList/commodityGroup.vue index 9441ce2..83b859b 100644 --- a/src/views/commodity/commodityList/commodityGroup.vue +++ b/src/views/commodity/commodityList/commodityGroup.vue @@ -105,7 +105,7 @@ 查询 - 重置 + 重置
diff --git a/src/views/commodity/commoditySystem/addComponent.vue b/src/views/commodity/commoditySystem/addComponent.vue index 9af3033..b01e4fb 100644 --- a/src/views/commodity/commoditySystem/addComponent.vue +++ b/src/views/commodity/commoditySystem/addComponent.vue @@ -86,7 +86,7 @@ @@ -219,7 +219,7 @@ @@ -697,12 +697,12 @@ export default { } .sku-attr-list { .el-input { - width: 180px; + width: 100px; } } .single-style { .el-input { - max-width: 180px; + max-width: 100px; } } .add-attr-btn { diff --git a/src/views/commodity/commoditySystem/index.vue b/src/views/commodity/commoditySystem/index.vue index 694eb8a..c2b693c 100644 --- a/src/views/commodity/commoditySystem/index.vue +++ b/src/views/commodity/commoditySystem/index.vue @@ -31,7 +31,7 @@ 查询 - 重置 + 重置 新增商品 批量导入 导出商品 diff --git a/src/views/customer/operate/index.vue b/src/views/customer/operate/index.vue index 328dfdd..4a38bf3 100644 --- a/src/views/customer/operate/index.vue +++ b/src/views/customer/operate/index.vue @@ -34,9 +34,9 @@ 查询 - 重置 - 新增 - 删除 + 重置 + 新增 + 删除 diff --git a/src/views/distributor/achievement/humens.vue b/src/views/distributor/achievement/humens.vue index 8076da4..55e7cb9 100644 --- a/src/views/distributor/achievement/humens.vue +++ b/src/views/distributor/achievement/humens.vue @@ -23,7 +23,7 @@ 查询 - 重置 + 重置 diff --git a/src/views/distributor/achievement/order.vue b/src/views/distributor/achievement/order.vue index 584341d..4927c63 100644 --- a/src/views/distributor/achievement/order.vue +++ b/src/views/distributor/achievement/order.vue @@ -33,7 +33,7 @@ 查询 - 重置 + 重置 @@ -62,7 +62,7 @@
- 标记为已结算 + 标记为已结算
查询 - 重置 + 重置
diff --git a/src/views/distributor/personnel/list.vue b/src/views/distributor/personnel/list.vue index 72fc2a0..66cf1d8 100644 --- a/src/views/distributor/personnel/list.vue +++ b/src/views/distributor/personnel/list.vue @@ -33,7 +33,7 @@ 查询 - 重置 + 重置 添加分销员 diff --git a/src/views/distributor/personnel/msg.vue b/src/views/distributor/personnel/msg.vue index 6248ad4..39ed750 100644 --- a/src/views/distributor/personnel/msg.vue +++ b/src/views/distributor/personnel/msg.vue @@ -31,7 +31,7 @@ 查询 - 重置 + 重置 diff --git a/src/views/distributor/personnel/sys.vue b/src/views/distributor/personnel/sys.vue index dcc32ee..abd6c6f 100644 --- a/src/views/distributor/personnel/sys.vue +++ b/src/views/distributor/personnel/sys.vue @@ -27,7 +27,7 @@ - 取消 + 取消 保存 diff --git a/src/views/finance/list/index.vue b/src/views/finance/list/index.vue index 9c2e8f5..bae9424 100644 --- a/src/views/finance/list/index.vue +++ b/src/views/finance/list/index.vue @@ -49,6 +49,7 @@ + diff --git a/src/views/marketing/channelCoupons/index.vue b/src/views/marketing/channelCoupons/index.vue index 9c09e1f..e567188 100644 --- a/src/views/marketing/channelCoupons/index.vue +++ b/src/views/marketing/channelCoupons/index.vue @@ -10,7 +10,7 @@ 查询 - 重置 + 重置 diff --git a/src/views/shop/material/index.vue b/src/views/shop/material/index.vue index 8f779bf..9e265a7 100644 --- a/src/views/shop/material/index.vue +++ b/src/views/shop/material/index.vue @@ -33,7 +33,7 @@
-
+
链接 - 标签 + 标签 删除
@@ -177,13 +177,13 @@ export default { addtips: {}, tipsName: '', tipsList: '', - findIndex: 0, + findIndex: 0, //当前选择的标签 tipsShow: false, isVisible: false, tipsDio: false, typeList: '.jpg,.jpeg,.png,.gif,.JPG,.JPEG,.PBG,.GIF,.mp4,.MP4', attachment: this.initAttachment(), - currentIndex: '', + currentIndex: '', //上传素材选择的标签 sizeForm: {}, dataObj: { folderId: 1 @@ -192,9 +192,12 @@ export default { tagId: '', id: 0 }, - currentIndexs: '', + currentIndexs: '',//更新弹框选择的标签序号 + lableList: [], tipsImgLsit: [], + currentLabelIndex: 0, + imageUrl: '', fileLength: 0, disabled: false, @@ -217,7 +220,7 @@ export default { } }, mounted() { - this.getAllTips() + this.getAllTips(true) }, methods: { btnClick(id) { @@ -232,30 +235,22 @@ export default { console.log(tab, 'tab') console.log(event, 'event') this.activeName = tab.name - const res = await tipsGetAll({ - labelType: tab.name - }) - this.tipsList = res.data - if(this.tipsList && this.tipsList.length > 0){ - this.getTips(0, this.tipsList[0]) - } - - console.log(res) + this.getAllTips(true) }, // 查询标签 - async getAllTips() { + async getAllTips(init) { const res = await tipsGetAll({ labelType: this.activeName }) this.tipsList = res.data console.log(res) - if(this.tipsList && this.tipsList.length > 0){ + if(init && this.tipsList && this.tipsList.length > 0){ this.getTips(0, this.tipsList[0]) } }, // 点击标签 async getTips(index, arr) { - console.log(index) + console.log("getTips index:"+index) this.findIndex = index this.tipsName = arr.labelName this.tipsShow = true @@ -278,7 +273,7 @@ export default { } }, // 编辑 - edit(row) { + edit() { this.tipsName = this.tipsList[this.findIndex].labelName this.addtips = { title: '编辑标签', @@ -318,22 +313,23 @@ export default { }) }, // 标签 - changeTips(labelId) { + changeTips(labelIndex) { + this.currentLabelIndex = labelIndex; this.tipsDio = true }, async tipsDioEn() { console.log(this.lableList, this.currentIndexs) const res = await updateSource({ labelId: this.tipsList[this.currentIndexs].labelId, - image: this.lableList[0].image + image: this.lableList[this.currentLabelIndex].image }) if (res.code === '') { this.$message.success('修改成功') - this.getAllTips() this.tipsDio = false + //更新当前列表 this.getTips(this.findIndex, { labelName: this.tipsName, - labelId: this.tipsList[this.currentIndexs].labelId + labelId: this.tipsList[this.findIndex].labelId }) } }, diff --git a/src/views/stock/stocknote/Edit.vue b/src/views/stock/stocknote/Edit.vue new file mode 100644 index 0000000..335a758 --- /dev/null +++ b/src/views/stock/stocknote/Edit.vue @@ -0,0 +1,335 @@ + + + diff --git a/src/views/stock/stocknote/index.vue b/src/views/stock/stocknote/index.vue new file mode 100644 index 0000000..7961332 --- /dev/null +++ b/src/views/stock/stocknote/index.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/src/views/system/shopSys/index.vue b/src/views/system/shopSys/index.vue index b6b1fa1..47d998c 100644 --- a/src/views/system/shopSys/index.vue +++ b/src/views/system/shopSys/index.vue @@ -78,7 +78,26 @@
店铺认证
- 支付信息已认证 {{storeDetails.xsPayId}} + + + + + + + + + + +
支付信息认证 @@ -123,13 +142,27 @@