Merge branch 'master' into release/3.0

@@ -8,6 +8,7 @@
             <ul class="notice">
                 <li><span>|<a href="/rules.pdf" target="_blank">平台规则</a></span></li>
                 <li><span>|<a href="/user-guide.pdf" target="_blank">使用手册</a></span></li>
+                <li><span>|<a href="/kpgg.docx" target="_blank">开票公告（重要）</a></span></li>
                 <li><span>|</span></li>
             </ul>
         </Col>

@@ -191,6 +191,25 @@ export default {
                         }
                     },
                     {
+                        title: '库存',
+                        render: (h, params) => {
+                            if (!params.index) {
+                                return <span>库存</span>;
+                            }
+                            return (
+                                <div class={{'prod-sku': true}}>
+                                    {params.row.sizeId.map(size => {
+                                        return (
+                                            <div class={{'row-span': true}}>
+                                                {size.storageNum || '-'}
+                                            </div>
+                                        );
+                                    })}
+                                </div>
+                            );
+                        }
+                    },
+                    {
                         title: '操作',
                         key: 'operator',
                         render: (h, params) => {

@@ -407,6 +407,7 @@ export default {
                     return;
                 }
                 newGoods.sizeId[index].productSku = s.productSku;
+                newGoods.sizeId[index].storageNum = s.storageNum;
                 if (s.factoryCode) {
                     newGoods.sizeCode[index].name = s.factoryCode;
                     newGoods.operator[index].value = true;

 {
   "name": "yoho-shop-manage",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "",
   "main": "app.js",
   "scripts": {