Merge remote-tracking branch 'origin/feature/interaceAdjust-1114' into feature/yc-isSellOut-1103

components/store/CommodityInfo.vue

@@ -48,7 +48,7 @@
               <span class="name">封&nbsp;装</span>：<span v-text="commodity.encapsulation || '无封装信息'"></span>
             </div>
             <div class="com-info">
-              <span class="name">库&nbsp;存</span>：<span v-text="commodity.reserve || 0"></span>
+              <span class="name">库&nbsp;存</span>：<span v-text="commodity.reserve || 0"></span><em style="margin-left: 3px;">PCS</em>
               （<span v-text="commodity.minBuyQty || 1"></span>个起订）
               <span :class="commodity.breakUp?'div-sell can-div-sell':'div-sell not-div-sell'" v-text="commodity.breakUp?'可拆卖':'不可拆卖'" ></span>
             </div>
@@ -517,7 +517,11 @@ export default {
 		font-size: 14px;
 		line-height: 26px;
 	}
-
+  .commodity-detail .content .com-info em {
+    font-size: 14px;
+    line-height: 26px;
+    font-style: normal;
+  }
 	.input-group .input-group-operate {
 		padding: 6px 12px;
 		font-size: 14px;

components/store/CommodityList.vue

@@ -33,7 +33,7 @@
             <!--<th width="90"></th>-->
             <th width="150">品牌/型号</th>
             <th width="100">包装/生产日期</th>
-            <th width="90">库存</th>
+            <th width="90">库存(PCS)</th>
             <th width="90">数量</th>
             <!--<th width="90">香港交货<span style="font-size: 12px;">($)</span></th>-->
             <!--<th width="100">大陆交货<span style="font-size: 12px;">(￥)</span></th>-->