Commit 1544b4e8 by 萱草

Merge branch 'feature/福利中心-礼品管理' into dev

# Conflicts:
#	dist/css/chunk-1348b363.ec65c424.css
#	dist/css/chunk-7c2af360.4384c739.css
#	dist/css/chunk-7c2af360.b267b7f2.css
#	dist/index.html
#	dist/js/app.ae42b252.js
#	dist/js/chunk-7c2af360.264fe1be.js
parents 5677a731 65dd7af7
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -60,7 +60,7 @@
<div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div>
</dm-upload-file>
<!-- 上传的文件列表 -->
<div class="pickup-list" v-if="isEdit && uploadFile.status == 0">
<div class="pickup-list" v-if="isEdit && uploadFile.status == 0 && data.shopNum != 0">
<!-- 编辑时展示示上传成功的数量 -->
<p class="pickup-list-total">
共上传<span class="pickup-list-number">{{ data.shopNum || 0 }}</span>个自提点
......
......@@ -581,6 +581,7 @@ export default {
this.goodsForm.deliveryList = [ this.goodsForm.deliveryType ];
};
this.diliveryData.shopSelectType = resResult.shopSelectType;
this.diliveryData.shopNum = resResult.shopNum != '0' ? resResult.shopNum : '0';
this.goodsForm.giftImages = resResult.giftImages;
this.goodsForm.stockUseType = resResult.stockUseType;
let img = resResult.giftImages.split(',');
......
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