yanghao
/
yunshengtai-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug秒杀拼团修改报错

master
xuwenbo 4 years ago
parent
b53ed0fe4b
commit
bc4abafd55
2 changed files with 178 additions and 206 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 207
      src/views/activity/combination/form.vue
  2. 177
      src/views/activity/seckill/form.vue

207
src/views/activity/combination/form.vue
Unescape View File

@ -187,91 +187,91 @@
</el-col>
</el-row>
<el-row>
<el-col v-bind="grid">
<el-form-item label="虚拟：">
<el-input-number :min="0" v-model="formValidate.sales" placeholder="请输入销量" :disabled="true"/>
</el-form-item>
</el-col>
<el-col v-bind="grid">
<el-form-item label="排序：">
<el-input-number :min="0" v-model="formValidate.sort" placeholder="请输入排序" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="佣金设置：">
<el-radio-group v-model="formValidate.is_sub" :disabled="true" >
<el-radio :label="1" class="radio">单独设置</el-radio>
<el-radio :label="0">默认设置</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="formValidate.is_sub === 1">
<!--单规格返佣-->
<el-form-item label="" v-if="formValidate.spec_type === 0">
<el-table :data="oneFormValidate" border>
<el-table-column prop="imageArr" label="图片" align="center">
<template slot-scope="scope">
<el-image :src="scope.row.pic" fit="contain">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</template>
</el-table-column>
<el-table-column prop="price" label="售价" align="center" />
<el-table-column prop="cost" label="成本价" align="center" />
<el-table-column prop="ot_price" label="原价" align="center" />
<el-table-column prop="stock" label="库存" align="center" />
<el-table-column prop="pink_price" label="拼团价" align="center" />
<el-table-column prop="pink_stock" label="拼团库存" align="center" />
<el-table-column prop="bar_code" label="商品编号" align="center" />
<el-table-column prop="weight" label="重量（KG）" align="center" />
<el-table-column prop="volume" label="体积(m³" align="center" />
<el-table-column prop="volume" label="一级返佣" align="center">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.brokerage" :disabled="true"/>
</template>
</el-table-column>
<el-table-column prop="volume" label="二级返佣" align="center">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.brokerage_two" :disabled="true"/>
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="" v-if="formValidate.spec_type === 1 && manyFormValidate.length">
<el-table :data="manyFormValidate" border>
<el-table-column prop="imageArr" label="图片" align="center">
<template slot-scope="scope">
<el-image :src="scope.row.pic" fit="contain">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</template>
</el-table-column>
<el-table-column prop="price" label="售价" align="center" />
<el-table-column prop="cost" label="成本价" align="center" />
<el-table-column prop="ot_price" label="原价" align="center" />
<el-table-column prop="stock" label="库存" align="center" />
<el-table-column prop="pink_price" label="拼团价" align="center" />
<el-table-column prop="pink_stock" label="拼团库存" align="center" />
<el-table-column prop="bar_code" label="商品编号" align="center" />
<el-table-column prop="weight" label="重量（KG）" align="center" />
<el-table-column prop="volume" label="体积(m³" align="center" />
<el-table-column prop="volume" label="一级返佣" align="center">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.brokerage":disabled="true"/>
</template>
</el-table-column>
<el-table-column prop="volume" label="二级返佣" align="center">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.brokerage_two":disabled="true"/>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
<!-- <el-col v-bind="grid">-->
<!-- <el-form-item label="虚拟：">-->
<!-- <el-input-number :min="0" v-model="formValidate.sales" placeholder="请输入销量" :disabled="true"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col v-bind="grid">-->
<!-- <el-form-item label="排序：">-->
<!-- <el-input-number :min="0" v-model="formValidate.sort" placeholder="请输入排序" :disabled="true"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="佣金设置：">-->
<!-- <el-radio-group v-model="formValidate.is_sub" :disabled="true" >-->
<!-- <el-radio :label="1" class="radio">单独设置</el-radio>-->
<!-- <el-radio :label="0">默认设置</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24" v-if="formValidate.is_sub === 1">-->
<!-- &lt;!&ndash;单规格返佣&ndash;&gt;-->
<!-- <el-form-item label="" v-if="formValidate.spec_type === 0">-->
<!-- <el-table :data="oneFormValidate" border>-->
<!-- <el-table-column prop="imageArr" label="图片" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-image :src="scope.row.pic" fit="contain">-->
<!-- <div slot="error" class="image-slot">-->
<!-- <i class="el-icon-picture-outline"></i>-->
<!-- </div>-->
<!-- </el-image>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="price" label="售价" align="center" />-->
<!-- <el-table-column prop="cost" label="成本价" align="center" />-->
<!-- <el-table-column prop="ot_price" label="原价" align="center" />-->
<!-- <el-table-column prop="stock" label="库存" align="center" />-->
<!-- <el-table-column prop="pink_price" label="拼团价" align="center" />-->
<!-- <el-table-column prop="pink_stock" label="拼团库存" align="center" />-->
<!-- <el-table-column prop="bar_code" label="商品编号" align="center" />-->
<!-- <el-table-column prop="weight" label="重量（KG）" align="center" />-->
<!-- <el-table-column prop="volume" label="体积(m³" align="center" />-->
<!-- <el-table-column prop="volume" label="一级返佣" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input type="text" v-model="scope.row.brokerage" :disabled="true"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="volume" label="二级返佣" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input type="text" v-model="scope.row.brokerage_two" :disabled="true"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="" v-if="formValidate.spec_type === 1 && manyFormValidate.length">-->
<!-- <el-table :data="manyFormValidate" border>-->
<!-- <el-table-column prop="imageArr" label="图片" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-image :src="scope.row.pic" fit="contain">-->
<!-- <div slot="error" class="image-slot">-->
<!-- <i class="el-icon-picture-outline"></i>-->
<!-- </div>-->
<!-- </el-image>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="price" label="售价" align="center" />-->
<!-- <el-table-column prop="cost" label="成本价" align="center" />-->
<!-- <el-table-column prop="ot_price" label="原价" align="center" />-->
<!-- <el-table-column prop="stock" label="库存" align="center" />-->
<!-- <el-table-column prop="pink_price" label="拼团价" align="center" />-->
<!-- <el-table-column prop="pink_stock" label="拼团库存" align="center" />-->
<!-- <el-table-column prop="bar_code" label="商品编号" align="center" />-->
<!-- <el-table-column prop="weight" label="重量（KG）" align="center" />-->
<!-- <el-table-column prop="volume" label="体积(m³" align="center" />-->
<!-- <el-table-column prop="volume" label="一级返佣" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input type="text" v-model="scope.row.brokerage":disabled="true"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="volume" label="二级返佣" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input type="text" v-model="scope.row.brokerage_two":disabled="true"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-form-item>
<el-button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</el-button>
@ -420,26 +420,7 @@ export default {
}
},
formValidate: {
// imageArr:[],
// sliderImageArr: [],
// store_name: '',
// cate_id: '',
// keyword: '',
// unit_name: '',
// store_info: '',
// image: '',
slider_image: [],
// description: '',
// ficti: 0,
// give_integral: 0,
// sort: 0,
// is_show: 1,
// is_hot: 0,
// is_benefit: 0,
// is_best: 0,
// is_new: 0,
// is_good: 0,
// is_postage: 0,
is_sub: 0,
id: 0,
combinationId: 0,
@ -582,7 +563,6 @@ export default {
},
'form1.good': {
handler(val,oldVal){
this.formValidate = val.cform
this.getInfoChooseGood (val.cform.id)
},
deep:true//对象内部的属性监听，也叫深度监听
@ -640,10 +620,10 @@ export default {
this.oneFormBatch[0].pic = this.formValidate.image;
}
}).catch(res => {
// this.$message({
// message:res.msg,
// type: 'error'
// });
this.$message({
message:res.msg,
type: 'error'
});
})
},
// 取消
@ -709,7 +689,6 @@ export default {
let that = this;
getInfo(id).then(async res => {
let data = res.productInfo;
console.log('data:'+data)
if(data){
let cate_id = parseInt(data.cate_id) || 0;
that.attrs = data.items || [];
@ -841,10 +820,10 @@ export default {
this.$router.push({ path: '/activity/combination' });
}, 500);
}).catch(res => {
// this.$message({
// message:res.message,
// type: 'error'
// });
this.$message({
message:res.message,
type: 'error'
});
})
} else {
if(!this.formValidate.store_name || !this.formValidate.cate_id || !this.formValidate.keyword

177
src/views/activity/seckill/form.vue
Unescape View File

@ -193,91 +193,91 @@
</el-col>
</el-row>
<el-row>
<el-col v-bind="grid">
<el-form-item label="虚拟：">
<el-input-number :min="0" v-model="formValidate.sales" placeholder="请输入销量" :disabled="true"/>
</el-form-item>
</el-col>
<el-col v-bind="grid">
<el-form-item label="排序：">
<el-input-number :min="0" v-model="formValidate.sort" placeholder="请输入排序" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="佣金设置：">
<el-radio-group v-model="formValidate.is_sub" :disabled="true" >
<el-radio :label="1" class="radio">单独设置</el-radio>
<el-radio :label="0">默认设置</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="formValidate.is_sub === 1">
<!--单规格返佣-->
<el-form-item label="" v-if="formValidate.spec_type === 0">
<el-table :data="oneFormValidate" border>
<el-table-column prop="imageArr" label="图片" align="center">
<template slot-scope="scope">
<el-image :src="scope.row.pic" fit="contain">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</template>
</el-table-column>
<el-table-column prop="price" label="售价" align="center" />
<el-table-column prop="cost" label="成本价" align="center" />
<el-table-column prop="ot_price" label="原价" align="center" />
<el-table-column prop="stock" label="库存" align="center" />
<el-table-column prop="pink_price" label="秒杀价" align="center" />
<el-table-column prop="pink_stock" label="秒杀库存" align="center" />
<el-table-column prop="bar_code" label="商品编号" align="center" />
<el-table-column prop="weight" label="重量（KG）" align="center" />
<el-table-column prop="volume" label="体积(m³" align="center" />
<el-table-column prop="volume" label="一级返佣" align="center">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.brokerage" :disabled="true"/>
</template>
</el-table-column>
<el-table-column prop="volume" label="二级返佣" align="center">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.brokerage_two" :disabled="true"/>
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="" v-if="formValidate.spec_type === 1 && manyFormValidate.length">
<el-table :data="manyFormValidate" border>
<el-table-column prop="imageArr" label="图片" align="center">
<template slot-scope="scope">
<el-image :src="scope.row.pic" fit="contain">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</template>
</el-table-column>
<el-table-column prop="price" label="售价" align="center" />
<el-table-column prop="cost" label="成本价" align="center" />
<el-table-column prop="ot_price" label="原价" align="center" />
<el-table-column prop="stock" label="库存" align="center" />
<el-table-column prop="seckill_price" label="秒杀价" align="center" />
<el-table-column prop="seckill_stock" label="秒杀库存" align="center" />
<el-table-column prop="bar_code" label="商品编号" align="center" />
<el-table-column prop="weight" label="重量（KG）" align="center" />
<el-table-column prop="volume" label="体积(m³" align="center" />
<el-table-column prop="volume" label="一级返佣" align="center">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.brokerage":disabled="true"/>
</template>
</el-table-column>
<el-table-column prop="volume" label="二级返佣" align="center">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.brokerage_two":disabled="true"/>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
<!-- <el-col v-bind="grid">-->
<!-- <el-form-item label="虚拟：">-->
<!-- <el-input-number :min="0" v-model="formValidate.sales" placeholder="请输入销量" :disabled="true"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col v-bind="grid">-->
<!-- <el-form-item label="排序：">-->
<!-- <el-input-number :min="0" v-model="formValidate.sort" placeholder="请输入排序" :disabled="true"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="佣金设置：">-->
<!-- <el-radio-group v-model="formValidate.is_sub" :disabled="true" >-->
<!-- <el-radio :label="1" class="radio">单独设置</el-radio>-->
<!-- <el-radio :label="0">默认设置</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24" v-if="formValidate.is_sub === 1">-->
<!-- &lt;!&ndash;单规格返佣&ndash;&gt;-->
<!-- <el-form-item label="" v-if="formValidate.spec_type === 0">-->
<!-- <el-table :data="oneFormValidate" border>-->
<!-- <el-table-column prop="imageArr" label="图片" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-image :src="scope.row.pic" fit="contain">-->
<!-- <div slot="error" class="image-slot">-->
<!-- <i class="el-icon-picture-outline"></i>-->
<!-- </div>-->
<!-- </el-image>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="price" label="售价" align="center" />-->
<!-- <el-table-column prop="cost" label="成本价" align="center" />-->
<!-- <el-table-column prop="ot_price" label="原价" align="center" />-->
<!-- <el-table-column prop="stock" label="库存" align="center" />-->
<!-- <el-table-column prop="pink_price" label="秒杀价" align="center" />-->
<!-- <el-table-column prop="pink_stock" label="秒杀库存" align="center" />-->
<!-- <el-table-column prop="bar_code" label="商品编号" align="center" />-->
<!-- <el-table-column prop="weight" label="重量（KG）" align="center" />-->
<!-- <el-table-column prop="volume" label="体积(m³" align="center" />-->
<!-- <el-table-column prop="volume" label="一级返佣" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input type="text" v-model="scope.row.brokerage" :disabled="true"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="volume" label="二级返佣" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input type="text" v-model="scope.row.brokerage_two" :disabled="true"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="" v-if="formValidate.spec_type === 1 && manyFormValidate.length">-->
<!-- <el-table :data="manyFormValidate" border>-->
<!-- <el-table-column prop="imageArr" label="图片" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-image :src="scope.row.pic" fit="contain">-->
<!-- <div slot="error" class="image-slot">-->
<!-- <i class="el-icon-picture-outline"></i>-->
<!-- </div>-->
<!-- </el-image>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="price" label="售价" align="center" />-->
<!-- <el-table-column prop="cost" label="成本价" align="center" />-->
<!-- <el-table-column prop="ot_price" label="原价" align="center" />-->
<!-- <el-table-column prop="stock" label="库存" align="center" />-->
<!-- <el-table-column prop="seckill_price" label="秒杀价" align="center" />-->
<!-- <el-table-column prop="seckill_stock" label="秒杀库存" align="center" />-->
<!-- <el-table-column prop="bar_code" label="商品编号" align="center" />-->
<!-- <el-table-column prop="weight" label="重量（KG）" align="center" />-->
<!-- <el-table-column prop="volume" label="体积(m³" align="center" />-->
<!-- <el-table-column prop="volume" label="一级返佣" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input type="text" v-model="scope.row.brokerage":disabled="true"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="volume" label="二级返佣" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input type="text" v-model="scope.row.brokerage_two":disabled="true"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-form-item>
<el-button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</el-button>
@ -550,11 +550,6 @@ export default {
}
},
watch: {
// 'formValidate.imageArr': function(val) {
// if (val) {
// this.formValidate.image = val.join(',')
// }
// },
'formValidate.slider_image': function(val) {
if (val) {
@ -570,9 +565,7 @@ export default {
},
mounted () {
this.getInfo(),
console.log('9999'),
initData('api/yxSystemGroupData',{ groupName: 'yshop_seckill_time' }).then(res => {
//console.log(res.content)
this.myTimes = res.content
})
},

Write Preview
Loading…
Cancel
Save