Merge branch 'dev' into 'test'

Dev See merge request !192

Merge branch 'dev' into 'test'
Dev See merge request !192
后端研发-苏明海
2 parents 3ba985b5 b4452e67
Showing 5 changed files with 25 additions and 24 deletions
components/diy_advertising/diy_advertising.js
components/diy_advertising/diy_advertising.wxml
components/diy_advertising/diy_advertising.wxss
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -15,7 +15,8 @@ Component({
     autoplay:false,
     interval:5000,
     duration:1000,
-    someData: {}
+    someData: {},
+    max_sw_height:null,
   },
   methods: {
     customMethod: function () { },
@@ -23,6 +24,16 @@ Component({
     go_url:function(e){
 			  var url=e.currentTarget.dataset.url;
 			  getApp().goto(url);
-		}
+		},
+
+    imageLoad:function(e){
+      var imgwidth = e.detail.width;
+      var imgheight = e.detail.height;
+      //宽高比
+      var ratio = imgwidth / imgheight;
+      //计算的高度值
+      var viewHeight = 715 / ratio;
+      if (this.data.max_sw_height < viewHeight) this.setData({ max_sw_height: viewHeight });
+    }
   }
 })
 \ No newline at end of file
@@ -338,12 +338,12 @@
 <!--幻灯片-->
 <block wx:if='{{object.style==4}}'>
-  <swiper class="swiper" indicator-dots="true" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
+  <swiper class="swiper" indicator-dots="true" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" style="height:{{max_sw_height}}rpx" >
     <block wx:for="{{object.data}}" wx:for-index="index" >
       <block wx:if="{{item.src!=''}}">
         <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
           <swiper-item>
-            <image src="{{item.src}}" class="slide-image" mode="aspectFill" />
+            <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" />
           </swiper-item>
         </view>
       </block>
@@ -96,8 +96,6 @@
   width: 100%;
   color: #fff;
   font-size: 32rpx;
-  min-height: 300rpx;
-  line-height: 300rpx;
   text-align: center;
 }
@@ -106,8 +104,6 @@
   width: 98%;
   color: #fff;
   font-size: 32rpx;
-  min-height: 300rpx;
-  line-height: 300rpx;
   text-align: center;
   margin: 8rpx;
 }
@@ -125,8 +121,6 @@
   width: 97%;
   color: #fff;
   font-size: 32rpx;
-  min-height: 300rpx;
-  line-height: 300rpx;
   text-align: center;
   margin: 10rpx;
 }
@@ -141,7 +135,6 @@
   width: 48%;
   color: #fff;
   font-size: 32rpx;
-  line-height: 300rpx;
   text-align: center;
   float: left;
   margin-left: 8rpx;
@@ -153,8 +146,6 @@
   width: 48%;
   color: #fff;
   font-size: 32rpx;
-  line-height: 300rpx;
-  text-align: center;
   float: left;
   margin-left: 10rpx;
 }
@@ -278,9 +269,7 @@
 .s7_gk7_2 {
   width: 100%;
-  height: 362rpx;
   /* background-color: #99cc66; */
-  line-height: 300rpx;
   text-align: center;
   margin-right: 10rpx;
   margin-bottom: 8rpx;
@@ -328,7 +317,7 @@
 /**index.wxss**/
 .swiper {
-  height: 400rpx;
+  height: auto;
   width: 98%;
   padding:0 7rpx;
   padding-bottom: 7rpx;
@@ -337,7 +326,7 @@
 }
 .swiper image {
-  height: 100%;
+  height: auto;
   width: 100%;
   margin: 0;
 }
@@ -159,9 +159,9 @@ Component({
               item.shop_price = goods.shop_price;
               item.sales_sum = goods.sales_sum;
               item.goods_id = goods.goods_id;
-              item.cardprice1 = val.cardprice1;
-              item.cardprice2 = val.cardprice2;
-              item.cardprice3 = val.cardprice3;
+              item.cardprice1 = goods.cardprice1;
+              item.cardprice2 = goods.cardprice2;
+              item.cardprice3 = goods.cardprice3;
               prom_id = res.data.data.prom_id;
@@ -380,7 +380,7 @@
 /*一个3列*/
 .zs_goods_wai_san {
-  width: 230rpx;
+  width: 236rpx;
   display: flex;
   margin-left: 10rpx;
   float: left;
@@ -389,11 +389,11 @@
 }
 .zs_goods_san {
-  width: 240rpx;
+  width: 236rpx;
 }
 .zs_goods_3l {
-  width: 240rpx;
+  width: 236rpx;
   min-height: 300rpx;
   border: 2rpx #ddd solid;
   margin: 0 auto;
@@ -436,7 +436,8 @@
 .zs_wz2_3l {
   margin-bottom: 10rpx;
   font-size: 30rpx;
-  display: flex;
+  height: 70rpx;
+  line-height: 30rpx
 }
 .zs_wz3_3l {