angelo
/
web-base-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lx-test' of gitee.com:cabbage_qd/web-base-admin into lx-online

This commit is contained in:
woody 2025-06-06 10:41:52 +08:00
parent 73516666b1 341efa9545
commit eab7683986
2 changed files with 18 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
View File

@ -552,33 +552,27 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item
label="商品视频"
prop="videoUrl"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg1"
@getImg="getImg1"
@delImg="delImg1"></UpDataImg> -->
<imageUpload
v-model="form.videoUrl"
:is-video="true"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
</el-col> -->
<el-col :span="8">
<el-form-item
label="视频封面"
label="商品封面"
prop="cover"
>
<imageUpload v-model="form.cover" />
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<el-row>
<el-row style="margin-top: 10px; margin-bottom: 10px;">
<el-col :span="8">
<el-form-item
:label="'图片'"
@ -622,44 +616,26 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item
:label="'图片'"
prop="cover4"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg6"
@getImg="getImg6"
@delImg="delImg6"></UpDataImg> -->
<imageUpload v-model="form.cover4" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'图片'">
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg7"
@getImg="getImg7"
@delImg="delImg7"></UpDataImg> -->
<imageUpload v-model="form.cover5" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'图片'">
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg8"
@getImg="getImg8"
@delImg="delImg8"></UpDataImg> -->
<imageUpload v-model="form.cover6" />
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row>
<el-col :span="24">
<el-form-item
@ -1181,7 +1157,7 @@ export default {
// videoUrl: [
// { required: true, message: '请上传商品视频', trigger: 'blur' }
// ],
// cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }],
cover: [{ required: true, message: '请上传商品封面', trigger: 'blur' }],
cover1: [
{ required: true, message: '请上传图片', trigger: 'blur' }
],

60
src/views/goodsManage/goodsRelease/jcsz.vue
View File

@ -521,45 +521,33 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item
:label="'主视频'"
prop="videoUrl"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg1"
@delImg="delImg1"></UpDataImg> -->
<imageUpload
v-model="form.videoUrl"
:is-video="true"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
</el-col> -->
<el-col :span="8">
<el-form-item
:label="'视频封面'"
label="商品封面"
prop="cover"
>
<imageUpload v-model="form.cover" />
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<el-row>
<el-row style="margin-top: 10px; margin-bottom: 10px;">
<el-col :span="8">
<el-form-item
:label="'图片'"
prop="cover1"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg3"
@delImg="delImg3"></UpDataImg> -->
<imageUpload v-model="form.cover1" />
</el-form-item>
</el-col>
@ -568,12 +556,6 @@
:label="'图片'"
prop="cover2"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg4"
@delImg="delImg4"></UpDataImg> -->
<imageUpload v-model="form.cover2" />
</el-form-item>
</el-col>
@ -582,54 +564,30 @@
:label="'图片'"
prop="cover3"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg5"
@delImg="delImg5"></UpDataImg> -->
<imageUpload v-model="form.cover3" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item
:label="'图片'"
prop="cover4"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg6"
@delImg="delImg6"></UpDataImg> -->
<imageUpload v-model="form.cover4" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'图片'">
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg7"
@delImg="delImg7"></UpDataImg> -->
<imageUpload v-model="form.cover5" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'图片'">
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg8"
@delImg="delImg8"></UpDataImg> -->
<imageUpload v-model="form.cover6" />
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row>
<el-col :span="24">
<el-form-item
@ -1137,7 +1095,7 @@ export default {
// videoUrl: [
// { required: true, message: '请上传商品视频', trigger: 'blur' }
// ],
// cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }],
cover: [{ required: true, message: '请上传商品封面', trigger: 'blur' }],
cover1: [
{ required: true, message: '请上传图片', trigger: 'blur' }
],