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

# Conflicts:
#	dist/index.html
#	dist/js/app.ede5502b.js

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

@@ -24,7 +24,7 @@
           <h3>规格/库存信息</h3>
           <el-form-item label="礼品规格">
             <div class="standard-info">
-              <div style="margin-bottom:20px">
+              <div>
                 <div class="add-sku-content">
                   <div class="add-sku-list" v-if="goodsStandardInfo.length">
                     <div class="add-sku-item" v-for="(item, index) in goodsStandardInfo" :key="index" :class="[ index ? 'mt10' : '']">
@@ -81,7 +81,7 @@
               </div>
             </div>
           </el-form-item>
-          <el-form-item label="规格明细">
+          <el-form-item label="规格明细" v-if="goodsSkuList.length > 0 && goodsStandardInfo.length > 0">
             <div class="sku-table-content" v-if="goodsSkuList.length > 0 && goodsStandardInfo.length > 0">
               <el-table class="sku-table" :data="goodsSkuList" :span-method="objectSpanMethod" :header-cell-class-name="starAdd">
                 <el-table-column v-for="(i, k) in skuCols" :label="i" :key="i" :class-name="k == skuCols.length - 1 ? 'pad-l-20' : 'right-border'">