chore：手动合并和dev的代码

pages_goods/detail.vue

@@ -90,10 +90,7 @@
 						<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,8 +319,9 @@ 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;
+	
 }
 
 /deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {

pages_goods/public/css/list.scss

@@ -400,7 +400,7 @@
 			.price {
 				color: var(--price-color);
 				color: #fff !important;
-				font-size: 15rpx !important;
+				font-size: 27rpx !important;
 				font-weight: bold !important;
 			}
 		}