Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents ae0ce075 182bc2f0
Showing 1 changed file with 15 additions and 21 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -56,9 +56,9 @@
             <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
               <view class="topBox">
                 <view class="imgBox">
-                  <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                  
                   <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
-                    <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                  
                     <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
                   </view>
@@ -97,9 +97,9 @@
               <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
                 <view class="topBox">
                   <view class="imgBox">
-                    <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                    
                     <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
-                      <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                    
                       <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
                     </view>
@@ -145,9 +145,9 @@
               <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
                 <view class="topBox">
                   <view class="imgBox">
-                    <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                    
                     <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
-                      <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                      
                       <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
                     </view>
@@ -243,7 +243,7 @@
                   <view class="topBox">
                     <view class="imgBox">
                       <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
-                        <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                        <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3"></image>
                       </view>
                       <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
                       <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
@@ -289,7 +289,7 @@
                   <view class="topBox">
                     <view class="imgBox">
                       <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
-                        <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                        <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3"></image>
                       </view>
                       <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
                       <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
@@ -327,7 +327,7 @@
                   <view class="topBox">
                     <view class="imgBox">
                       <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
-                        <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                        <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3"></image>
                       </view>
                       <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
                       <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
@@ -372,10 +372,8 @@
             <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad swiper_h new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')  + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
               <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
                 <view class="imgBox">
-                  <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
                   <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
-                    <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
-                    <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '  }}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                    <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '  }}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3"></image>
                   </view>
                   <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
@@ -490,7 +488,7 @@
     <view style="background-color: {{bg_color}};" wx:if="{{goods_array.length > 0  }}">
       <!--1个列表的时候-->
       <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
-        <block wx:for="{{goods_array}}">
+        <block wx:for="{{goods_array}}" wx:for-index="aind" >
           <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
             <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
               <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> -->
@@ -658,7 +656,7 @@
       </view>
       <!--2个一列-->
       <block wx:if="{{object.column==2}}">
-        <block wx:for="{{goods_array}}">
+        <block wx:for="{{goods_array}}" wx:for-index="aind" >
           <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
             <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}">
               <view class="zs_goods_ban">
@@ -828,7 +826,7 @@
       <!--3个一列-->
       <block wx:if='{{object.column==3}}'>
         <view class="zwp_3 flex wrap">
-          <block wx:for="{{goods_array}}">
+          <block wx:for="{{goods_array}}" wx:for-index="aind" >
             <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
               <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}">
                 <view class="zs_goods_san">
@@ -995,7 +993,7 @@
       </block>
       <!-- 列表显示 -->
       <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
-        <block wx:for="{{goods_array}}">
+        <block wx:for="{{goods_array}}" wx:for-index="aind">
           <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1 {{object.noboder==0?'list_border':'' }}">
             <view class="zs_goods_xiao_bottom {{g_filter.get_border_type(object.big_order_type)}}">
               <view class='zs_top_x'>
@@ -1007,10 +1005,6 @@
                 </block>
                 <block wx:else>
-                  <!-- 原来的 -->
-                  <!-- <image class="zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}"
-                                src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img"  lazy-load="true"
-                                binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> -->
                   <!-- 2021.11.27修改		 -->
                   <image class="block zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
@@ -1195,7 +1189,7 @@
                         <view style="position: relative; width: 100%; height: 100%">
                           <image src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
-                          <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                          <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
                         </view>
                       </block>