debug

pages/components/blockList/blockList.json

@@ -6,10 +6,7 @@
     "homeThree":"../blocks/home3/homeThree",
     "divider":"../blocks/divider/divider",
     "horizon":"../blocks/horizon/horizon",
-<<<<<<< HEAD
-    "home_goods": "../blocks/home_goods/home_goods"
-=======
+    "home_goods": "../blocks/home_goods/home_goods",
     "homeGrid": "../blocks/homeGrid/homeGrid"
->>>>>>> 76504e363370e5d5dbcf5b0480a64d58cda7e9ce
   }
 }

pages/components/blockList/blockList.wxml

@@ -3,13 +3,7 @@
     <divider wx:if="{{item.item_type == 'divider'}}" items="{{item}}"></divider> 
     <homeThree wx:if="{{item.item_type == 'home3'}}" items="{{item.items}}"></homeThree> 
     <homeOne wx:if="{{item.item_type == 'home1'}}" items="{{item.items}}" ></homeOne>
-<<<<<<< HEAD
     <horizon wx:if="{{item.item_type == 'horizon'}}" items="{{item.items}}"></horizon>
-    <home_goods wx:if="{{item.item_type == 'home_goods'}}" summery="{{summery}}" goods_items="{{item.items}}"></home_goods>   
+    <home_goods wx:if="{{item.item_type == 'home_goods'}}" summery="{{summery}}" goods_items="{{item.items}}"></home_goods>
+    <homeGrid wx:if="{{item.item_type == 'home_grid'}}" items="{{item.items}}"></homeGrid>   
 </view>
-=======
-    <horizon wx:if="{{item.item_type == 'horizon'}}" items="{{item.items}}"></horizon> 
-    <homeGrid wx:if="{{item.item_type == 'home_grid'}}" items="{{item.items}}"></homeGrid> 
-</view>
-
->>>>>>> 76504e363370e5d5dbcf5b0480a64d58cda7e9ce

pages/components/blocks/goods_item/goods_item.wxml

@@ -2,15 +2,16 @@
   <view class='goods_thumbnail'>
       <image class='img'  mode='scaleToFill' src="{{goods.goods_image_url}}"></image>
   </view>
-  <view class="goods_msg">
+  <view class='goods_box'>
+    <view class="goods_msg">
       <view>
           <text class='goods_name'>{{goods.goods_mobile_name}}</text>
       </view>
       <view class='goods_desc'>
           <text>{{goods.goods_jingle}}</text>
       </view>
-  </view>
-  <view class="goods_price">
+    </view>
+    <view class="goods_price">
       <view>
         <text class="current_price">{{goods.bonus_price}}</text>
       </view>
@@ -18,5 +19,7 @@
         <text class="original_price">天猫价{{goods.goods_price}}</text>
         <text class="discount">红包抵{{goods.goods_price - goods.bonus_price}}元</text>
       </view>
-  </view>  
+    </view>  
+  </view>
+  
 </view>

pages/components/blocks/goods_item/goods_item.wxss

@@ -1,15 +1,20 @@
 .goods_item {
    background: #fff;
    font-size: 22rpx;
-   max-width: 364rpx;
+   max-width: 367rpx;
    overflow: hidden;
+   margin-top: 6.5rpx;
+   margin-left: 6.5rpx;
 }
 .goods_item .img {
-  width: 370rpx;
-  height: 370rpx;
+  width: 368rpx;
+  height: 368rpx;
 }
 .goods_item .goods_name {
   color: #4a4a4a;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
 }
 .goods_item .goods_desc {
     display: -webkit-box;
@@ -17,5 +22,8 @@
     -webkit-line-clamp: 2;
     overflow: hidden;
     color: #7e7e7e;
-    height: 34rpx;
+    min-height: 60rpx;
+}
+.goods_item .goods_box {
+  padding: 12rpx;
 }

pages/components/blocks/home_goods/home_goods.wxss

@@ -1,6 +1,7 @@
 .home_goods {
   width: 750rpx;
-  background: #f9f9f9;
+  /* background: #f9f9f9; */
+  background: red;
   display: -webkit-flex;
   flex: 1;
   flex-wrap:wrap;

pages/discover/discover.wxml

@@ -1,8 +1,8 @@
 <!--pages/discover/discover.wxml-->
 <view class="discover_container" style="background-color: #F7F7F7">
     <view class="discover_tab">
-      <view class="discover_tab_item" bindtap="secTabs" data-item="backward">品牌</view>
-      <view class="discover_tab_item" bindtap="secTabs" data-item="forward">功效</view>
+      <view class="discover_tab_item {{direction == 'backward' ? 'discover_tab_selected' : ''}}" bindtap="secTabs" data-item="backward">品牌</view>
+      <view class="discover_tab_item {{direction == 'backward' ? '' : 'discover_tab_selected'}}"  bindtap="secTabs" data-item="forward">功效</view>
       <view 
         class="discover_tab_ink-bar {{direction == 'backward' ? 'ink-bar-transition-backward' :     'ink-bar-transition-forward'}}">                 
       </view>