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

# Conflicts:
#	dist/index.html
#	dist/js/app.c5158997.js
#	dist/js/app.e635e46a.js
#	dist/js/app.fae3d1c3.js

src/views/gift-manage/module/update-real-cost.vue

@@ -21,6 +21,7 @@
               </el-popover>
             </template>
             <template slot-scope="scope">
+              {{ skuSellObj[scope.row.mapId].giftSkuCostPrice }}
               <dm-input-amount width="200px" @change="changeSingleCost(skuSellObj[scope.row.mapId].giftSkuId, skuSellObj[scope.row.mapId].giftSkuCostPrice)" v-model.trim="skuSellObj[scope.row.mapId].giftSkuCostPrice" precision="2" :min="0" :max="999999.99"></dm-input-amount>
             </template>
           </el-table-column>
@@ -136,6 +137,9 @@ export default {
             console.log(this.skuSellObj);
           }
           this.goodsStandardInfo = this.giftSpecInfo ? JSON.parse(this.giftSpecInfo) : []; // 礼品规格信息
+          if(this.goodsStandardInfo.length === 0){
+            this.costPrice = res.result.costPrice;
+          }
           if (this.goodsStandardInfo.length > 0) {
             this.isStdImg = this.goodsStandardInfo[0].standardimg === 2 ? true : false;
           } else {
@@ -228,6 +232,7 @@ export default {
       }
       this.skuSellObj = deepClone(this.skuSellObj);
       this.costPrice = this.skuSellObj[this.goodsSkuList[0].mapId].giftSkuCostPrice;
+      console.log(this.costPrice);
       // this.giftSkuId = this.skuSellObj[this.goodsSkuList[0].mapId].giftSkuId;
       this.refash = !this.refash;
     },

src/views/performance-manage/record.vue

@@ -72,8 +72,8 @@
               <span>发货单号：</span>
               <el-button type="text" @click="linkToDetail(row.deliveryOrderId)">{{row.deliveryOrderId}}</el-button>
             </div>
-            <div v-if="row.orderFlag == 1 && row.giftType == 2" class="mt10">
-              {{row.deliveryInfo}}
+            <div v-if="row.orderFlag == 1 && row.giftType == 2" class="mt10" v-html="row.deliveryInfo">
+              <!-- {{row.deliveryInfo}} -->
             </div>
             <div v-else-if="row.orderFlag == 0" class="mt10">
               <span style="display:flex">