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

taiyuan
2 parents cc8f2109 85fa9583
Showing 5 changed files with 27 additions and 16 deletions
components/diy_picMax/diy_picMax.wxml
components/diy_picMax/diy_picMax.wxss
packageA/pages/myGift/myGift.js
packageA/pages/myGiftDetails/myGiftDetails.wxml
packageB/pages/zuhegou/index/index.js
@@ -2,15 +2,15 @@
 <wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
 <!-- 如果有纵向合并的时候，要求要按照绝对布局来实现 -->
 <block wx:if="{{is_yspan}}">
-    <view class="picMax2" style="height: {{pic_height}}rpx;" >
-	     <view wx:for="{{object.data}}"  class="pic_item2 width_{{item.x_span}} height_{{item.y_span}} mar_x{{item.fir.x}} mar_y{{item.fir.y}}">
+    <view class="picMax2" style="height: {{pic_height}}rpx; font-size: 0" >
+	     <view wx:for="{{object.data}}"  class="pic_item2 width_{{item.x_span}} height_{{item.y_span}} mar_x{{item.fir.x}} mar_y{{item.fir.y}} mgt2">
 	            <block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}" >
 	            		  <navigator url="{{item.wxapp_url}}">
-	               <image src="{{item.src}}"  style="display: block;" ></image>
+	               <image src="{{item.src}}"  style="display: block; height: 100%; width: 100%;" ></image>
 	            			 </navigator>
 	            </block>
 	            <block wx:else>
-	              <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}"  style="display: block;" ></image>
+	              <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}"  style="display: block; height: 100%; width: 100%;"></image>
 	            </block>
 		 </view>		 
 	</view>		
@@ -13,7 +13,7 @@
 .picMax-clear{clear: both;}
 .mgt2 {
-	margin-top: -2rpx;
+	margin-top: -2rpx !important;
 }
 .picMax2{
@@ -22,11 +22,16 @@
 .pic_item2{
 	position:absolute;top:0; left:0;
 }
-.pic_item2 image{}
+.pic_item2 image{
+	vertical-align: top;
+	vertical-align: text-top;
+	vertical-align: bottom;
+	vertical-align: text-bottom;
+}
 /* .width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:750rpx;} */
 .width_1{width: 25%}.width_2{width: 50%}.width_3{width: 75%}.width_4{width:100%}
-.height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} 
-.mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
-.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top:  562.5rpx}.mar_y4{margin-top: 748rpx;} 
 \ No newline at end of file
+.height_1{height: 186rpx;}.height_2{height: 372rpx;}.height_3{height: 558rpx}.height_4{height: 744rpx;}
+.mar_x1{left:187rpx;}.mar_x2{left:374rpx;}.mar_x3{left:561rpx}.mar_x4{left: 748rpx;}
+.mar_y1{top: 186rpx;}.mar_y2{top: 372rpx;}.mar_y3{top:  558rpx}.mar_y4{top: 744rpx;}
 \ No newline at end of file
@@ -35,6 +35,7 @@ Page({
 		if(index == 0) {
 			url = '/api/weshop/libao/libaoForm/page';
+            data.timetype=1;
 		} else if(index == 1) {
 			url = '/api/weshop/libao/libaoFormvip/page';
 		};
@@ -88,6 +89,7 @@ Page({
 				if(index == 0) {
 					url = '/api/weshop/libao/libaoForm/page';
+					data.timetype=1;
 				} else if(index == 1) {
 					url = '/api/weshop/libao/libaoFormvip/page';
 				};
@@ -125,17 +127,21 @@ Page({
       var url="";
       var index=this.data.currentIndex;
+
+      var req_data={
+          store_id: app.globalData.setting.stoid,
+          user_id: app.globalData.user_id,
+      }
+
       if(index == 0) {
           url = '/api/weshop/libao/libaoForm/page';
+          req_data.timetype=1;
       } else if(index == 1) {
           url = '/api/weshop/libao/libaoFormvip/page';
       };
-		this.scrollToLower(url, {
-			store_id: app.globalData.setting.stoid,
-			user_id: app.globalData.user_id,
-		});
+		this.scrollToLower(url, req_data);
   },
   /**
@@ -86,9 +86,9 @@
 			<block wx:for="{{item.goods_num-0}}" wx:for-item="nitem" wx:for-index="idx">
 				<view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)">
 					 <view class="flex fs28 fir_view">
-						 <view>满{{item.condition}}使用</view>
+						 <view>满{{item.condition?item.condition:'0.00'}}使用</view>
 						 <view wx:if="{{item.type==6}}" class="fs8" style="text-align: center; padding-right: 40rpx; font-size: 35rpx">包邮</view>
-						 <view wx:else class="fs8" style="text-align: right">￥{{item.money}}</view>
+						 <view wx:else class="fs8" style="text-align: center; width: 140rpx">￥{{filter.toFix(item.money,2)}}</view>
 					 </view>
@@ -938,7 +938,7 @@ Page({
             //让商品带上房间号
             if (th.data.sys_switch.is_skuroom_id == 1) {
-                if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
+                if (th.data.sele_g.goods_id == getApp().globalData.room_goods_id) {
                     newd.room_id = getApp().globalData.room_id;
                 }
             } else {