chore：手动和dev合并

pages_goods/detail.vue

@@ -90,7 +90,10 @@
 						<view class="goods-tag-list" v-if="goodsSkuDetail.label_name">
 							<text class="tag-item">{{ goodsSkuDetail.label_name }}</text>
 						</view>
-						
+						<view class="logistics-wrap">
+							<text v-if="goodsSkuDetail.stock_show">{{$lang('stock')}}: {{ goodsSkuDetail.stock +goodsSkuDetail.unit}}</text>
+							<text v-if="goodsSkuDetail.sale_show">{{$lang('sales')}}: {{ goodsSkuDetail.sale_num+goodsSkuDetail.unit }}</text>
+						</view>
 						<!-- 会员卡 -->
 					<!-- 	<view class="member-card-wrap" @click="$util.redirectTo('/pages_tool/member/card_buy')" v-if="membercard">
 							<text class="iconfont icon-huiyuan"></text>

pages_goods/list.vue

@@ -319,7 +319,7 @@ export default {
 @import './public/css/list.scss';
 </style>
 <style scoped>
-.uni-tag--primary.uni-tag--inverted {
+>>>.uni-tag--primary.uni-tag--inverted {
 	background-color: #f5f5f5 !important;
 	
 }