czg_team/cashier-web
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 合并冲突

Browse Source
This commit is contained in:
duan
2025-04-15 16:29:40 +08:00
parent 4f987ae3d2 2b8746abe4
commit 0a73635b78
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/online-shop/goods-group.vue
View File

@@ -267,7 +267,8 @@ async function addConfirm() {
}) })
obj.productIds = arr obj.productIds = arr
} }
if (obj.time.length) { console.log(obj, '商品分组的参数')
if (obj.time && obj.time.length) {
obj.saleStartTime = obj.time[0] obj.saleStartTime = obj.time[0]
obj.saleEndTime = obj.time[1] obj.saleEndTime = obj.time[1]
} }
@@ -278,6 +279,10 @@ async function addConfirm() {
myDialogRefAdd.value.close() myDialogRefAdd.value.close()
} }
} else { } else {
if (obj.useTime == 0) {
obj.saleStartTime = null
obj.saleEndTime = null
}
let res = await UserAPI.update(obj) let res = await UserAPI.update(obj)
if (res.code == 200) { if (res.code == 200) {
ElMessage.success("编辑成功"); ElMessage.success("编辑成功");

51
src/views/product/indexconfig/addgoods.vue
View File

@@ -4,14 +4,14 @@
<el-form-item label="商品名称" required> <el-form-item label="商品名称" required>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="name"> <el-form-item prop="name">
<el-input v-model="ruleForm.name" placeholder="请输入商品名称" :disabled="isSyncStatus()"/> <el-input v-model="ruleForm.name" placeholder="请输入商品名称" :disabled="isSyncStatus()" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form-item> </el-form-item>
<el-form-item label="商品介绍"> <el-form-item label="商品介绍">
<el-col :span="12"> <el-col :span="12">
<el-form-item> <el-form-item>
<el-input v-model="ruleForm.shortTitle" type="textarea" placeholder="请输入商品介绍" :disabled="isSyncStatus()"/> <el-input v-model="ruleForm.shortTitle" type="textarea" placeholder="请输入商品介绍" :disabled="isSyncStatus()" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form-item> </el-form-item>
@@ -65,9 +65,9 @@
<el-form-item label="套餐商品" v-if="ruleForm.type == 'package'"> <el-form-item label="套餐商品" v-if="ruleForm.type == 'package'">
<div style="display: block;width: 100%;"> <div style="display: block;width: 100%;">
<div class="head-container"> <div class="head-container">
<el-radio-group v-model="ruleForm.groupType" @change="typeChange" :disabled="isSyncStatus()"> <el-radio-group v-model="ruleForm.groupType" @change="typeChange">
<el-radio-button label="0">固定套餐</el-radio-button> <el-radio-button :label="0">固定套餐</el-radio-button>
<el-radio-button label="1">可选套餐</el-radio-button> <el-radio-button :label="1">可选套餐</el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
<div v-if="ruleForm.groupType == '0'"> <div v-if="ruleForm.groupType == '0'">
@@ -85,10 +85,10 @@
<el-button type="primary" @click="addgoods(-1)" :disabled="isSyncStatus()">添加商品</el-button> <el-button type="primary" @click="addgoods(-1)" :disabled="isSyncStatus()">添加商品</el-button>
</template> </template>
<template v-slot="scope"> <template v-slot="scope">
<el-button type="text" :disabled="scope.row.type != 'sku'&&isSyncStatus()" <el-button type="text" :disabled="scope.row.type != 'sku' && isSyncStatus()"
@click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button> @click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button>
<el-button type="text" <el-button type="text"
@click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)" >删除</el-button> @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -97,10 +97,10 @@
<div class="group_wrap" v-for="(item, index) in ruleForm.proGroupVo" :key="index"> <div class="group_wrap" v-for="(item, index) in ruleForm.proGroupVo" :key="index">
<el-form inline :model="item"> <el-form inline :model="item">
<el-form-item label="规格组名"> <el-form-item label="规格组名">
<el-input v-model="item.title" :disabled="isSyncStatus()"/> <el-input v-model="item.title" :disabled="isSyncStatus()" />
</el-form-item> </el-form-item>
<el-form-item :label="`本组菜品${item.goods.length}选`"> <el-form-item :label="`本组菜品${item.goods.length}选`">
<el-input v-model="item.number" :disabled="isSyncStatus()"/> <el-input v-model="item.number" :disabled="isSyncStatus()" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="ruleForm.proGroupVo.splice(index, 1)" :disabled="isSyncStatus()">删除</el-button> <el-button @click="ruleForm.proGroupVo.splice(index, 1)" :disabled="isSyncStatus()">删除</el-button>
@@ -113,7 +113,7 @@
<el-table-column label="价格" prop="price"></el-table-column> <el-table-column label="价格" prop="price"></el-table-column>
<el-table-column label="数量" prop="number"> <el-table-column label="数量" prop="number">
<template v-slot="scope"> <template v-slot="scope">
<el-input-number v-model="scope.row.number" :min="0" :disabled="isSyncStatus()"/> <el-input-number v-model="scope.row.number" :min="0" :disabled="isSyncStatus()" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150"> <el-table-column width="150">
@@ -121,10 +121,10 @@
<el-button type="primary" @click="addgoods(index);" :disabled="isSyncStatus()">添加商品</el-button> <el-button type="primary" @click="addgoods(index);" :disabled="isSyncStatus()">添加商品</el-button>
</template> </template>
<template v-slot="scope"> <template v-slot="scope">
<el-button type="text" :disabled="scope.row.type != 'sku'&&isSyncStatus()" <el-button type="text" :disabled="scope.row.type != 'sku' && isSyncStatus()"
@click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button> @click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button>
<el-button type="text" <el-button type="text" @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)"
@click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)" :disabled="isSyncStatus()">删除</el-button> :disabled="isSyncStatus()">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -135,7 +135,8 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="选择规格" v-if="ruleForm.type == 'sku'"> <el-form-item label="选择规格" v-if="ruleForm.type == 'sku'">
<el-select v-model="ruleForm.specId" placeholder="请选择规格" style="width: 500px" @change="selectSpecHandle" :disabled="isSyncStatus()"> <el-select v-model="ruleForm.specId" placeholder="请选择规格" style="width: 500px" @change="selectSpecHandle"
:disabled="isSyncStatus()">
<el-option :label="item.name" :value="item.id" v-for="item in datas.specificationsconfig" <el-option :label="item.name" :value="item.id" v-for="item in datas.specificationsconfig"
:key="item.id"></el-option> :key="item.id"></el-option>
</el-select> </el-select>
@@ -189,8 +190,7 @@
<el-form-item> <el-form-item>
<el-col :span="12"> <el-col :span="12">
<el-time-picker v-model="ruleForm.useTime" is-range range-separator="至" start-placeholder="开始时间" <el-time-picker v-model="ruleForm.useTime" is-range range-separator="至" start-placeholder="开始时间"
end-placeholder="结束时间" value-format="HH:mm:ss" end-placeholder="结束时间" value-format="HH:mm:ss" format="HH:mm:ss" />
format="HH:mm:ss" />
</el-col> </el-col>
</el-form-item> </el-form-item>
<el-form-item label="上架"> <el-form-item label="上架">
@@ -198,7 +198,7 @@
</el-form-item> </el-form-item>
<el-form-item label="库存开关"> <el-form-item label="库存开关">
<div style="display: block;"> <div style="display: block;">
<el-switch v-model="ruleForm.isStock" :active-value="1" :inactive-value="0" :disabled="isSyncStatus()"/> <el-switch v-model="ruleForm.isStock" :active-value="1" :inactive-value="0" :disabled="isSyncStatus()" />
<div style="color: #999;">注：关闭则不计算出入库数据</div> <div style="color: #999;">注：关闭则不计算出入库数据</div>
</div> </div>
</el-form-item> </el-form-item>
@@ -211,7 +211,8 @@
<el-form-item label="打包费" prop="delivery"> <el-form-item label="打包费" prop="delivery">
<div style="display: block;"> <div style="display: block;">
<el-input-number v-model="ruleForm.packFee" controls-position="right" :disabled="isSyncStatus()"></el-input-number> <el-input-number v-model="ruleForm.packFee" controls-position="right"
:disabled="isSyncStatus()"></el-input-number>
<div style="color: #999;">单份商品打包费。注：店铺开启外卖模式下该数据才生效</div> <div style="color: #999;">单份商品打包费。注：店铺开启外卖模式下该数据才生效</div>
</div> </div>
</el-form-item> </el-form-item>
@@ -493,7 +494,7 @@ function selectSkuHandle(item: any, index: number) {
// } // }
} }
function addimgEvent() { function addimgEvent() {
if( isSyncStatus() ){ if (isSyncStatus()) {
ElMessage.error('当前同步启用状态下不可修改') ElMessage.error('当前同步启用状态下不可修改')
return return
} }
@@ -526,7 +527,7 @@ function addgoods(index: number = -1) {
(shopListRef.value as any)?.opens() (shopListRef.value as any)?.opens()
} }
function deleteEvent(d: any) { function deleteEvent(d: any) {
if( isSyncStatus() ){ if (isSyncStatus()) {
ElMessage.error('当前同步启用状态下不可修改') ElMessage.error('当前同步启用状态下不可修改')
return return
} }
@@ -737,7 +738,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
if (!formEl) return if (!formEl) return
await formEl.validate(async (valid, fields) => { await formEl.validate(async (valid, fields) => {
if (valid) { if (valid) {
// 第一张图片作为封面图 // 第一张图片作为封面图
ruleForm.coverImg = ruleForm.images[0] ruleForm.coverImg = ruleForm.images[0]
// 规格id修改 // 规格id修改
@@ -751,7 +752,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
} }
// 修改时间 // 修改时间
console.log(ruleForm.useTime) console.log(ruleForm.useTime)
if( !ruleForm.useTime ){ if (!ruleForm.useTime) {
ElMessage.error('请选择定时上下架时间') ElMessage.error('请选择定时上下架时间')
return return
} }
@@ -769,7 +770,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
} else if (ruleForm.type == 'package') { } else if (ruleForm.type == 'package') {
// console.log(ruleForm, '套餐') // console.log(ruleForm, '套餐')
} }
// 标题和几选几是否填写 // 标题和几选几是否填写
if (ruleForm.type == "package") { if (ruleForm.type == "package") {
if (ruleForm.groupType == '1') { if (ruleForm.groupType == '1') {
@@ -789,6 +790,10 @@ const submitForm = async (formEl: FormInstance | undefined) => {
setTimeout(() => { setTimeout(() => {
ruleForm.days = ruleForm.days.split(',') ruleForm.days = ruleForm.days.split(',')
}, 200); }, 200);
if (ruleForm.type == 'weight') {
ruleForm.specId = ''
}
if (ruleForm.id) { if (ruleForm.id) {
let res = await UserAPI3.update(ruleForm) let res = await UserAPI3.update(ruleForm)
if (res.code == 200) { if (res.code == 200) {