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

components/goods/style1.vue

@@ -18,17 +18,18 @@
 		>
 			<div class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" /></div>
 			<image
-				style="width: calc(100vw - 24px); height: 66vw;"
+				style="width: calc(100vw - 24px); height: 50vw;border-top-left-radius: 10px; border-top-right-radius: 10px;"
 				:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
 				:src="item.picUrl"
 				v-if="goodsInfo.goodsCoverProportion == '3-2'"
 			/>
 			<image
 				style="
-          width: calc(100vw - 24px);
-          height: 100vw;
-          border-radius: 10rpx 10rpx 0 0;
-        "
+				  width: calc(100vw - 24px);
+				  height: 100vw;
+				  border-radius: 10rpx 10rpx 0 0;
+				  border-top-left-radius: 10px; border-top-right-radius: 10px;
+				"
 				v-if="goodsInfo.goodsCoverProportion == '1-1'"
 				:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
 				:src="item.picUrl"
@@ -40,7 +41,7 @@
 					<span class="price">{{ 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" @click.stop="showSkuHandler(item)">
+					<span class="buy" v-if="goodsInfo.showBuyBtn">
 						<u-icon name="cart-o" size="40" style="color:#ff4544" v-if="goodsInfo.buyBtn == 'cart'" />
 						<u-icon name="add-o" size="40" style="color:#ff4544" v-else-if="goodsInfo.buyBtn == 'add'" />
 						<u-button
@@ -147,12 +148,13 @@ export default {
 
 <style>
 .good-one {
-	margin: 12px;
-	position: relative;
-	border: 1rpx solid transparent;
-	border-radius: 10rpx;
-	padding-bottom: 10rpx;
-	overflow: hidden;
+  margin: 12px;
+  position: relative;
+  border: 1rpx solid transparent;
+  border-radius: 10px;
+  padding-bottom: 10rpx;
+  overflow: hidden;
+  box-shadow: 0 4px 10px 1px #D2D2D2;
 }
 .good-one .tips {
 	width: 64rpx;
@@ -199,7 +201,8 @@ export default {
 }
 .good-one .good-info .good-price-info .price {
 	color: #ff4544;
-	font-size: 14px;
+	font-size: 16px;
+	font-weight: 600;
 	flex: 1;
 }
 .good-one .good-info .good-price-info .buy {

components/goods/style5.vue

@@ -39,11 +39,11 @@
           <template v-if="item.subname">{{ item.subname }}</template>
         </view>
         <view class="good-price-info">
-          <view class="price" :style="{ color: mainColor }">
+          <view class="price">
             <view class="good-sub-name" style="flex: 1">{{
               item.thirdname
             }}</view>
-            <span style="color: #111">
+            <span>
               {{ goodsInfo.showGoodsPrice ? getPrice(item.price) : "" }}
             </span>
             <!-- <span style='text-decoration: line-through;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> -->