Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev

src/views/gift-manage/module/select-pickup-store.vue

@@ -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>个自提点

src/views/gift-manage/real-gift-detail.vue

@@ -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(',');