Commit c2dd61e4 authored by mengwenhao's avatar mengwenhao

fix:商品-开始结束时间及金山云接口调整

parent cd26d2b6
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<section class="width50p"> <section class="width50p">
<h4 style="margin-bottom:20px">商品详情图</h4> <h4 style="margin-bottom:20px">商品详情图</h4>
<el-upload <el-upload
:data="{ scenario: `goods` }" :data="{ type: 1 }"
:action="uploadUrl" :action="uploadUrl"
:on-preview="previewImage" :on-preview="previewImage"
:on-success="handleDetailSuccess" :on-success="handleDetailSuccess"
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<section class="width50p"> <section class="width50p">
<h4 style="margin-bottom:20px">商品介绍图</h4> <h4 style="margin-bottom:20px">商品介绍图</h4>
<el-upload <el-upload
:data="{ scenario: `goods` }" :data="{ type:1 }"
:disabled="$route.params.operation !== 'EDIT'" :disabled="$route.params.operation !== 'EDIT'"
:action="uploadUrl" :action="uploadUrl"
auto-upload auto-upload
...@@ -476,9 +476,7 @@ ...@@ -476,9 +476,7 @@
@change="pickerStartTime" @change="pickerStartTime"
> >
</el-time-picker> </el-time-picker>
<span v-else>{{ <span v-else>{{ goodsObj.rule_start_time }}</span>
goodsObj.rule_start_time + "-" + goodsObj.rule_end_time
}}</span>
</el-form-item> </el-form-item>
<el-form-item label="使用结束时间:"> <el-form-item label="使用结束时间:">
<el-time-picker <el-time-picker
...@@ -488,9 +486,7 @@ ...@@ -488,9 +486,7 @@
@change="pickerEndTime" @change="pickerEndTime"
> >
</el-time-picker> </el-time-picker>
<span v-else>{{ <span v-else>{{ goodsObj.rule_end_time }}</span>
goodsObj.rule_start_time + "-" + goodsObj.rule_end_time
}}</span>
</el-form-item> </el-form-item>
<el-form-item label="过期时间"> <el-form-item label="过期时间">
<el-date-picker <el-date-picker
...@@ -546,12 +542,12 @@ ...@@ -546,12 +542,12 @@
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="审核时间" label="更新时间"
prop="create_time" prop="create_time"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="审核描述" label="更新描述"
prop="note" prop="note"
align="center" align="center"
></el-table-column> ></el-table-column>
...@@ -690,7 +686,7 @@ export default { ...@@ -690,7 +686,7 @@ export default {
if (!val) { if (!val) {
this.rejectReason.reason = ""; this.rejectReason.reason = "";
} }
}, }
}, },
data () { data () {
...@@ -776,7 +772,7 @@ export default { ...@@ -776,7 +772,7 @@ export default {
activeStartTime: "", // 活动开始时间 activeStartTime: "", // 活动开始时间
activeEndTime: "", // 活动结束时间 activeEndTime: "", // 活动结束时间
uploadUrl: `${GOODS_URI}/merchant/lifeinner/upload`, // 金山云上传地址 uploadUrl: `${GOODS_URI}/ksy/ks3apiunencrypt/ks3api_upload`, // 金山云上传地址
addShopShow: false, // 添加门店弹框显示 addShopShow: false, // 添加门店弹框显示
...@@ -849,7 +845,7 @@ export default { ...@@ -849,7 +845,7 @@ export default {
// 上传图片的公共方法 // 上传图片的公共方法
uploadPicture (response, storageList) { uploadPicture (response, storageList) {
const responseURL = `${response.result.bucket}/${response.result.object_id}`; const responseURL = response.result.image_id;
storageList.push(responseURL); storageList.push(responseURL);
}, },
// 删除图片的公共方法 // 删除图片的公共方法
...@@ -992,12 +988,6 @@ export default { ...@@ -992,12 +988,6 @@ export default {
// } // }
// }, // },
// 取消新建门店 // 取消新建门店
closeAddShops () { closeAddShops () {
this.shopForm.shop_name = ""; this.shopForm.shop_name = "";
...@@ -1031,6 +1021,7 @@ export default { ...@@ -1031,6 +1021,7 @@ export default {
// 商品详情图上传成功时 // 商品详情图上传成功时
handleDetailSuccess (res) { handleDetailSuccess (res) {
console.log(res);
this.uploadPicture(res, this.detailUploadList); this.uploadPicture(res, this.detailUploadList);
}, },
// 商品详情图删除完成后的钩子 // 商品详情图删除完成后的钩子
...@@ -1274,6 +1265,8 @@ export default { ...@@ -1274,6 +1265,8 @@ export default {
return this.$message.error("请至少选择一个门店"); return this.$message.error("请至少选择一个门店");
} }
console.log(query);
const res = await editGoods(query); const res = await editGoods(query);
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.reason); return this.$message.error(res.reason);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment