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

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

@@ -43,7 +43,7 @@
 						{{ 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

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> -->
@@ -183,7 +183,7 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
 .her-scoller {
   overflow-x: auto !important;
   padding: 12px;
@@ -212,7 +212,7 @@ export default {
   z-index: 4;
 }
 .her-scoller .good-five .img-box-style5 {
-  width: 100%;
+  /* width: 100%; */
   height: 224rpx;
   border-radius: 20rpx;
   overflow: hidden;