Authored by htoooth

fix

@@ -142,7 +142,7 @@ let infoCols = function() { @@ -142,7 +142,7 @@ let infoCols = function() {
142 align: 'center', 142 align: 'center',
143 render: (h, params) => { 143 render: (h, params) => {
144 return ( 144 return (
145 - <div>{params.row.goodsName} / {params.row.factoryGoodsName}</div> 145 + <div>{params.row.colorName || '-'} / {params.row.factoryGoodsName || '-'}</div>
146 ); 146 );
147 } 147 }
148 }, 148 },
@@ -151,7 +151,7 @@ let infoCols = function() { @@ -151,7 +151,7 @@ let infoCols = function() {
151 align: 'center', 151 align: 'center',
152 render: (h, params) => { 152 render: (h, params) => {
153 return ( 153 return (
154 - <div>{params.row.genderName} / {params.row.sizeName}</div> 154 + <div>{params.row.genderName || '-'} / {params.row.sizeName || '-'}</div>
155 ); 155 );
156 } 156 }
157 }, 157 },
@@ -160,7 +160,7 @@ let infoCols = function() { @@ -160,7 +160,7 @@ let infoCols = function() {
160 align: 'center', 160 align: 'center',
161 render: (h, params) => { 161 render: (h, params) => {
162 return ( 162 return (
163 - <div>{params.row.retailPrice} / {params.row.salesPrice}</div> 163 + <div>{params.row.retailPrice || '-'} / {params.row.salesPrice || '-'}</div>
164 ); 164 );
165 } 165 }
166 }, 166 },
@@ -176,8 +176,8 @@ let infoCols = function() { @@ -176,8 +176,8 @@ let infoCols = function() {
176 render: function(h, params) { 176 render: function(h, params) {
177 let percent = 0; 177 let percent = 0;
178 178
179 - if (params.row.inStoreNum && params.row.totalNum) {  
180 - percent = params.row.inStoreNum / params.row.totalNum; 179 + if (params.row.inStoreNum && params.row.buyingNums) {
  180 + percent = params.row.inStoreNum / params.row.buyingNums;
181 181
182 if (percent > 1) { 182 if (percent > 1) {
183 percent = 100; 183 percent = 100;
@@ -190,7 +190,7 @@ let infoCols = function() { @@ -190,7 +190,7 @@ let infoCols = function() {
190 <div> 190 <div>
191 <div><i-progress percent={ percent } 191 <div><i-progress percent={ percent }
192 hide-info={true}></i-progress></div> 192 hide-info={true}></i-progress></div>
193 - <div>{ params.row.inStoreNum || 0} / {params.row.totalNum || 0}</div> 193 + <div>{ params.row.inStoreNum || 0} / {params.row.buyingNums || 0}</div>
194 </div> 194 </div>
195 ); 195 );
196 }, 196 },