diff --git a/commons/utils/dict.js b/commons/utils/dict.js index db30a84..23eed10 100644 --- a/commons/utils/dict.js +++ b/commons/utils/dict.js @@ -67,6 +67,16 @@ export default { { label: '订单消费出库', type: 'order-out' }, { label: '损耗出库', type: 'damage-out' }, ], + invoicingType: [ + { label: '全部', type: '' }, + { label: '手动入库', type: 'manual-in' }, + { label: '手动出库', type: 'manual-out' }, + { label: '盘盈入库', type: 'win-in' }, + { label: '盘亏出库', type: 'loss-out' }, + { label: '订单退款入库', type: 'other-out' }, + { label: '订单消费出库', type: 'order-out' }, + { label: '损耗出库', type: 'damage-out' }, + ], getDiceName(val,key){ let item = this[key].find(v => v.type == val) return item ? item.label : '' diff --git a/http/api/product.js b/http/api/product.js index d7efd3c..b7d9f55 100644 --- a/http/api/product.js +++ b/http/api/product.js @@ -320,6 +320,20 @@ export function updateProdGroup(data, urlType = 'product') { }) } +/** + * 商品分组简单修改 + * @returns + */ +export function editProdGroup(data, urlType = 'product') { + return request({ + url: `${urlType}/admin/prod/group/update`, + method: "PUT", + data: { + ...data + } + }) +} + /** * 商品分组删除 * @returns diff --git a/pageGoodsGroup/edit-group/edit-group.vue b/pageGoodsGroup/edit-group/edit-group.vue index 98180d2..713994f 100644 --- a/pageGoodsGroup/edit-group/edit-group.vue +++ b/pageGoodsGroup/edit-group/edit-group.vue @@ -53,10 +53,19 @@ - + + + + + + + + - + @@ -87,22 +96,29 @@ }) // 构造分类的基础数据 - const categoryBasicData = { + const category = reactive({ id: '', name: '', status: 1, - sort: 0, + sort: 1, useTime: 0, saleEndTime:'', saleStartTime:'', - } - - // 分类列表 - const category = reactive({ - ...categoryBasicData, + sortMode: '0', childrenList: [] }) + const pageData = reactive({ + sortType: [ + {label: '默认', value: '0'}, + {label: '价格从高到低', value: '1'}, + {label: '价格从低到高', value: '2'}, + {label: '销量由高到低', value: '3'}, + {label: '销量由低到高', value: '4'}, + ], + }) + + // 表单样式 const placeholderStyle = ref('font-size:28rpx;') //表单边框 @@ -168,6 +184,9 @@ time.val='' time.show=false } + function groupChange (n) { + console.log('groupChange ', n); + }; function returnValidateResult(obj) { @@ -212,7 +231,7 @@ if (result.length) { return uni.$utils.showToast(result[0].errMeessage) } - + console.log(category) if (option.type === 'edit') { const res = await updateProdGroup({ ...category, diff --git a/pageGoodsGroup/index/components/edit-sort.vue b/pageGoodsGroup/index/components/edit-sort.vue index 2822628..56a6fee 100644 --- a/pageGoodsGroup/index/components/edit-sort.vue +++ b/pageGoodsGroup/index/components/edit-sort.vue @@ -7,6 +7,15 @@ + + 排序方式: + + + + + 修改排序: @@ -49,7 +58,15 @@ } } }) - + const pageData = reactive({ + sortType: [ + {label: '默认', value: '0'}, + {label: '价格从高到低', value: '1'}, + {label: '价格从低到高', value: '2'}, + {label: '销量由高到低', value: '3'}, + {label: '销量由低到高', value: '4'}, + ], + }) const data = ref(props.item) const emits = defineEmits(['update:show', 'save']) diff --git a/pageGoodsGroup/index/index.vue b/pageGoodsGroup/index/index.vue index 458f90d..f047bdd 100644 --- a/pageGoodsGroup/index/index.vue +++ b/pageGoodsGroup/index/index.vue @@ -39,14 +39,13 @@ import editSort from './components/edit-sort.vue'; import editName from './components/edit-name.vue'; import editTime from './components/edit-time.vue'; - import { getProdGroupPage, addProdGroup, updateProdGroup, delProdGroup } from '@/http/api/product.js' + import { getProdGroupPage, addProdGroup, updateProdGroup, delProdGroup,editProdGroup } from '@/http/api/product.js' const pageData = reactive({ showGoodsDetail: false, query: { page: 1, size: 10, - orderBy: 'create_time desc', }, totalElements: 0, list: [], @@ -165,12 +164,14 @@ * @param {Object} e */ async function updataGroup(e) { - const res = await updateProdGroup(e) + console.log(e) + const res = await editProdGroup(e) popup.sort.show = false; popup.name.show = false; popup.time.show = false; pageData.list[popup.selIndex] = e uni.$utils.showToast('更新成功') + getList() } /** @@ -178,11 +179,11 @@ * @param {Object} data */ async function isSHowChange(data) { - const res = await updateProdGroup({ + const res = await editProdGroup({ ...data }) - uni.$utils.showToast('修改成功') - // init() + uni.$utils.showToast('更新成功') + }