Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel into master

components/goods/list.vue

@@ -15,7 +15,8 @@
 					</view>
 					<view class="good-info">
 						<view class="price">
-							{{$utils.getretailer()==true? cx.b2BPrice:cx.b2CPrice}}<text class="sell">起</text>
+							{{$utils.getretailer()==true? cx.b2BPrice:cx.b2CPrice}}
+							<!-- <text class="sell">起</text> -->
 						</view>
 						<view class="cart">
 							<u-icon name="cart-o" color="#ff4544" size="40" />

components/goods/style1.vue

@@ -38,7 +38,9 @@
 				<div class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</div>
 				<view class="good-sub-name" v-if="item.subname">{{item.subname}}</view>
 				<div class="good-price-info">
-					<span class="price">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}
+					<span class="price">
+						<span style="font-size: 28rpx;font-weight: 500;margin-right: 2rpx;">￥</span>
+						{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}
 						<!-- <span style='text-decoration: line-through;margin-left: 10px;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> -->
 					</span>
 					<span class="buy" v-if="goodsInfo.showBuyBtn">
@@ -58,7 +60,7 @@
 							:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
 							v-else
 						>
-						
+							
 							{{ goodsInfo.buyBtnText }}
 						</u-button>
 					</span>
@@ -152,7 +154,7 @@ export default {
   position: relative;
   border: 1rpx solid transparent;
   border-radius: 10px;
-  padding-bottom: 10rpx;
+  padding-bottom: 10px;
   overflow: hidden;
   box-shadow: 0 4px 10px 1px #D2D2D2;
 }