|
|
@@ -36,7 +36,7 @@
|
|
|
<span v-if="props.row.productAttribute == 0">虚拟</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" min-width="80px" label="积分" prop="integral">
|
|
|
+ <el-table-column align="center" min-width="80px" label="积分" prop="price">
|
|
|
</el-table-column>
|
|
|
<el-table-column align="center" min-width="100px" label="库存量" prop="actualStock">
|
|
|
</el-table-column>
|
|
|
@@ -157,9 +157,9 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item style="width: 800px" label="商品图片">
|
|
|
+ <el-form-item style="width: 800px" label="商品图片" prop="imgUrl">
|
|
|
<el-tooltip content="建议图片宽高比260*200" placement="top-start">
|
|
|
- <el-upload :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
|
|
|
+ <el-upload :limit="1" :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
|
|
|
:on-success="handleGallerySucess" :on-exceed="handleExceed" :before-upload="uploadBannerImg"
|
|
|
:on-remove="handleRemove">
|
|
|
<i class="el-icon-plus"></i>
|
|
|
@@ -167,8 +167,8 @@
|
|
|
</el-tooltip>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="积分" prop="integral">
|
|
|
- <el-input v-model="dataForm.integral"></el-input>
|
|
|
+ <el-form-item label="积分" prop="price">
|
|
|
+ <el-input v-model="dataForm.price"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="库存量" prop="actualStock">
|
|
|
<el-input-number :precision="0" :step="1" v-model="dataForm.actualStock"></el-input-number>
|
|
|
@@ -267,7 +267,7 @@ export default {
|
|
|
name: '类型1',
|
|
|
seq: 'sp123456',
|
|
|
productAttribute: 0,
|
|
|
- integral: '100',
|
|
|
+ price: '100',
|
|
|
actualStock: '12',
|
|
|
deliveryType: 0,
|
|
|
location: '北京',
|
|
|
@@ -280,7 +280,7 @@ export default {
|
|
|
name: '类型1',
|
|
|
seq: 'sp123456',
|
|
|
productAttribute: 1,
|
|
|
- integral: '100',
|
|
|
+ price: '100',
|
|
|
actualStock: '12',
|
|
|
deliveryType: 1,
|
|
|
location: '上海',
|
|
|
@@ -293,7 +293,7 @@ export default {
|
|
|
name: '类型1',
|
|
|
seq: 'sp123456',
|
|
|
productAttribute: 1,
|
|
|
- integral: '100',
|
|
|
+ price: '100',
|
|
|
actualStock: '12',
|
|
|
deliveryType: 1,
|
|
|
location: '洛阳',
|
|
|
@@ -357,7 +357,7 @@ export default {
|
|
|
seq: undefined,
|
|
|
productAttribute: undefined,
|
|
|
imgUrl: undefined,
|
|
|
- integral: undefined,
|
|
|
+ price: undefined,
|
|
|
actualStock: undefined,
|
|
|
deliveryType: undefined,
|
|
|
location: undefined,
|
|
|
@@ -373,7 +373,7 @@ export default {
|
|
|
name: [{ required: true, message: "请填写商品名称", trigger: "blur" }],
|
|
|
imgUrl: [{ required: true, message: "请上传商品图片", trigger: "blur" }],
|
|
|
productAttribute: [{ required: true, message: "请选择商品属性", trigger: "blur" }],
|
|
|
- integral: [{ required: true, message: "请填写商品积分", trigger: "blur" }],
|
|
|
+ price: [{ required: true, message: "请填写商品积分", trigger: "blur" }],
|
|
|
actualStock: [{ required: true, message: "请设置库存量", trigger: "blur" }],
|
|
|
deliveryType: [{ required: true, message: "请选择兑换方式", trigger: "blur" }],
|
|
|
location: [{ required: true, message: "请选择商品所在地", trigger: "blur" }],
|
|
|
@@ -385,7 +385,7 @@ export default {
|
|
|
created() {
|
|
|
// this.getCompanyTypeList();
|
|
|
// this.getDepTypeList();
|
|
|
- // this.getList();
|
|
|
+ this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
changeProductAttribute(val) {
|
|
|
@@ -418,7 +418,7 @@ export default {
|
|
|
let response = fileList[i].response;
|
|
|
let url = response.data.url;
|
|
|
images.push(url);
|
|
|
- this.dataForm.image = images.join(",");
|
|
|
+ this.dataForm.imgUrl = images.join(",");
|
|
|
}
|
|
|
},
|
|
|
uploadBannerImg(file) {
|
|
|
@@ -427,12 +427,12 @@ export default {
|
|
|
},
|
|
|
handleExceed(files, fileList) {
|
|
|
this.$message.warning(
|
|
|
- `当前限制选择 5 个文件，本次选择了 ${files.length} 个文件！，共选择了 ${files.length + fileList.length
|
|
|
+ `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件！，共选择了 ${files.length + fileList.length
|
|
|
} 个文件`
|
|
|
);
|
|
|
},
|
|
|
handleGallerySucess(res, file, fileList) {
|
|
|
- this.dataForm.image = ""; // 清空画廊图片数组
|
|
|
+ this.dataForm.imgUrl = ""; // 清空画廊图片数组
|
|
|
|
|
|
let images = [];
|
|
|
for (let i in fileList) {
|
|
|
@@ -447,7 +447,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- this.dataForm.image = images.join(",");
|
|
|
+ this.dataForm.imgUrl = images.join(",");
|
|
|
},
|
|
|
resetForm() {
|
|
|
this.dataForm = {
|
|
|
@@ -455,7 +455,7 @@ export default {
|
|
|
seq: undefined,
|
|
|
productAttribute: undefined,
|
|
|
imgUrl: undefined,
|
|
|
- integral: undefined,
|
|
|
+ price: undefined,
|
|
|
actualStock: undefined,
|
|
|
deliveryType: undefined,
|
|
|
location: undefined,
|
|
|
@@ -477,25 +477,19 @@ export default {
|
|
|
this.$refs["dataForm"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
console.log(this.dataForm);
|
|
|
- // if (!this.dataForm.imgUrl) {
|
|
|
- // this.$alert("请上传商品图片", "提示", {
|
|
|
- // confirmButtonText: "确定",
|
|
|
- // });
|
|
|
- // } else {
|
|
|
- // createItem(this.dataForm)
|
|
|
- // .then((response) => {
|
|
|
- // this.getList();
|
|
|
- // this.dialogFormVisible = false;
|
|
|
- // this.$notify({
|
|
|
- // title: "成功",
|
|
|
- // message: "创建成功",
|
|
|
- // type: "success",
|
|
|
- // duration: 2000,
|
|
|
- // });
|
|
|
- // this.reload();
|
|
|
- // })
|
|
|
- // .catch(() => { });
|
|
|
- // }
|
|
|
+ createItem(this.dataForm)
|
|
|
+ .then((response) => {
|
|
|
+ this.getList();
|
|
|
+ this.dialogFormVisible = false;
|
|
|
+ this.$notify({
|
|
|
+ title: "成功",
|
|
|
+ message: "创建成功",
|
|
|
+ type: "success",
|
|
|
+ duration: 2000,
|
|
|
+ });
|
|
|
+ this.reload();
|
|
|
+ })
|
|
|
+ .catch(() => { });
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -543,12 +537,7 @@ export default {
|
|
|
updateData() {
|
|
|
this.$refs['dataForm'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- if (!this.dataForm.imgUrl) {
|
|
|
- this.$alert("请上传商品图片", "提示", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- });
|
|
|
- } else {
|
|
|
- updateItem(this.dataForm).then(() => {
|
|
|
+ updateItem(this.dataForm).then(() => {
|
|
|
this.dialogFormVisible = false
|
|
|
this.$notify({
|
|
|
title: '成功',
|
|
|
@@ -558,7 +547,6 @@ export default {
|
|
|
})
|
|
|
this.getList()
|
|
|
})
|
|
|
- }
|
|
|
|
|
|
}
|
|
|
|
