chore(代码合并): 代码从Custom/common分支合并

pages_goods/cart.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<view class="container">
 			<scroll-view class="scroll-view" :scroll-y="true" :show-scrollbar="false" :refresher-enabled="true" :refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">
 				<block v-if="hasData">

pages_goods/category.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<block v-if="diyData">
 			<block v-for="(item, index) in diyData.value" :key="index">
 				<view v-if="item.componentName == 'GoodsCategory'">

pages_goods/detail.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view>
+	<view :style="themeColor">
 		<!-- #ifndef H5 -->
 	<!-- 	<view class="page-header" v-if="goodsSkuDetail && goodsSkuDetail.config && goodsSkuDetail.config.nav_bar_switch == 0">
 			<ns-navbar :data="navbarData" :isBack="true"></ns-navbar>

pages_goods/list.vue

@@ -1,6 +1,5 @@
 <template>
-	<page-meta :page-style="themeColor"></page-meta>
-	<view class="content"> 
+	<view class="content" :style="themeColor"> 
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
@@ -63,7 +62,7 @@
 									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'咨询'}}</text>
+									<text class="price price-style large">{{langstatus?$lang('Make'):'询底价'}}</text>
 								</view>
 								
 								
@@ -148,7 +147,7 @@
 									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'咨询'}}</text>
+									<text class="price price-style large">{{langstatus?$lang('Make'):'询底价'}}</text>
 								</view>
 								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
@@ -271,6 +270,11 @@
 		<!-- 小程序隐私协议 -->
 		<privacy-popup ref="privacyPopup"></privacy-popup>
 		<!-- #endif -->
+
+		<!-- 底部tabBar -->
+		<view id="tab-bar">
+			<diy-bottom-nav></diy-bottom-nav>
+		</view>		
 	</view>
 </template>
 

pages_goods/public/css/list.scss

@@ -294,6 +294,8 @@
 }
 
 .lineheight-clear {
+	display: flex;
+	justify-content: flex-end;
 }
 
 // 商品列表单列样式
@@ -386,12 +388,20 @@
 			line-height: 1;
 			margin-top: 16rpx;
 
+			background-color: var(--main-color);
+			border-radius: 35rpx;
+			padding: 12rpx 24rpx;
+			box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
+
 			.unit {
 				margin-right: 6rpx;
 				color: var(--price-color);
 			}
 			.price {
 				color: var(--price-color);
+				color: #fff !important;
+				font-size: 15rpx !important;
+				font-weight: bold !important;
 			}
 		}