Merge pull request 'yyw提交' (#15) from yyw into master

Reviewed-on: #15

src/views/commodity/cost.vue

@@ -29,12 +29,12 @@
 
         <el-table-column prop="target_type" label="商品类型" header-align="center">
           <template #default="scope">
-            <span v-if="scope.row.goods_sku == 'goods_sku'">商品规格</span>
-            <span v-else-if="scope.row.goods_sku == 'combination_goods'">组合商品</span>
+            <span v-if="scope.row.target_type == 'goods_sku'">商品规格</span>
+            <span v-else-if="scope.row.target_type == 'combination_goods'">组合商品</span>
           </template>
         </el-table-column>
-        <el-table-column prop="sum_goods_cost" label="商品ID" align="center" />
-        <el-table-column prop="sum_freight_cost" label="规格名称" align="center" />
+        <el-table-column prop="sum_goods_cost" label="商品成本" align="center" />
+        <el-table-column prop="sum_freight_cost" label="运费成本" align="center" />
       </el-table>
       <div class="page-pagination">
         <el-pagination