From d5cd7a75ecd755ca8e163908b35e8e91c17663a0 Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Thu, 7 Apr 2022 14:21:58 +0800
Subject: [PATCH] oa

---
 components/diy_picMax/diy_picMax.js   | 36 ++++++++++++++++++++++--------------
 components/diy_picMax/diy_picMax.wxml | 59 +++++++++++++++++++++++++++++------------------------------
 pages/cart/cart2/cart2.js             |  8 ++++----
 pages/goods/goodsInfo/goodsInfo.js    |  2 +-
 pages/goods/goodsInfo/goodsInfo.wxml  |  2 +-
 5 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/components/diy_picMax/diy_picMax.js b/components/diy_picMax/diy_picMax.js
index 61b6ea3..a293a74 100644
--- a/components/diy_picMax/diy_picMax.js
+++ b/components/diy_picMax/diy_picMax.js
@@ -9,28 +9,36 @@ Component({
   data: {
     // 这里是一些组件内部数据
     someData: {},
-    pic_height:0,//图片组合的高度
-	is_yspan:0,  //是否要严格按照比例来实现 
+    pic_height: 0,//图片组合的高度
+    is_yspan: 0,  //是否要严格按照比例来实现 
   },
   ready: function () {
-     //-- console.log(this.data.object.data) --
-     //-- 计算图片组合占用的高度 --
-     var height=0;
-	 var is_yspan=0;
-     this.properties.object.data.forEach(function (val,ind) {
-         if(val.fir.x==0){
-           height+=val.y_span*187;
-         }
-		 if(val.y_span>1) is_yspan=1;
-		 
-     })
-     this.setData({pic_height:height,is_yspan:is_yspan})  
+    //-- console.log(this.data.object.data) --
+    //-- 计算图片组合占用的高度 --
+    var height = 0;
+    var is_yspan = 0;
+    this.properties.object.data.forEach(function (val, ind) {
+      if (val.fir.x == 0) {
+        height += val.y_span * 187;
+      }
+      if (val.y_span > 1) is_yspan = 1;
+
+    })
+    this.setData({ pic_height: height, is_yspan: is_yspan })
   },
   methods: {
     //-- 智能跳转到页面 --
     gopage(e) {
       var url = e.currentTarget.dataset.url;
       getApp().goto(url);
+    },
+   
+    previewImage(e){
+      let src =e.currentTarget.dataset.src;
+      wx.previewImage({
+			  current: src, // 当前显示图片的http链接
+			  urls: [src] ,// 需要预览的图片http链接列表
+			});
     }
   }
 })
\ No newline at end of file
diff --git a/components/diy_picMax/diy_picMax.wxml b/components/diy_picMax/diy_picMax.wxml
index f344a39..2003182 100644
--- a/components/diy_picMax/diy_picMax.wxml
+++ b/components/diy_picMax/diy_picMax.wxml
@@ -1,34 +1,33 @@
-<!--图片组合-->
+<!-- 图片组合 -->
 <wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
 <!-- 如果有纵向合并的时候，要求要按照绝对布局来实现 -->
 <block wx:if="{{is_yspan}}">
-    <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; height: 100%; width: 100%;" ></image>
-	            			 </navigator>
-	            </block>
-	            <block wx:else>
-	              <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}"  style="display: block; height: 100%; width: 100%;"></image>
-	            </block>
-		 </view>		 
-	</view>		
-</block>	
-<block wx:else>
-<view class="picMax" >
-    <view wx:for="{{object.data}}"  class="pic_item width_{{item.x_span}} mgt2">
-        <block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}" >	 
-				  <navigator url="{{item.wxapp_url}}">
-           <image src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
-					 </navigator>
-        </block>
-        <block wx:else>
-          <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
-        </block>
-    </view>
-	<view class="picMax-clear"></view>
-</view>
-
-
+	<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; height: 100%; width: 100%;"></image>
+				</navigator>
+			</block>
+			<block wx:else>
+				<image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image>
+				<image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image>
+			</block>
+		</view>
+	</view>
 </block>
+<block wx:else>
+	<view class="picMax">
+		<view wx:for="{{object.data}}" class="pic_item width_{{item.x_span}} mgt2">
+			<block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
+				<navigator url="{{item.wxapp_url}}">
+					<image src="{{item.src}}" mode="widthFix" style="display: block;"></image>
+				</navigator>
+			</block>
+			<block wx:else>
+				<image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;"></image>
+			</block>
+		</view>
+		<view class="picMax-clear"></view>
+	</view>
+</block>
\ No newline at end of file
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 1da7322..fd21201 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -408,7 +408,7 @@ Page({
 
     //-----真的获取购物车,入口--------
     get_cart: function () {
-        var th = this, app = getApp();
+        var th = this, app = getApp(); 
         var state = 0;
         if (th.data.state) state = 1;
         a.get("/api/weshop/cart/list", {
@@ -3794,8 +3794,8 @@ Page({
 
             for (var i in goodlist) {
                 var gd = goodlist[i];
-                //--如果是秒杀就跳出,如果是赠品，如果是组合购，如果是限制使用优惠券--
-                if (gd.prom_type == 1 || gd.is_gift || (gd.prom_type == 7 && gd.act.is_xz_yh)) {
+                //--如果是秒杀就跳出,如果是赠品，如果是组合购限制使用优惠券--
+                if (gd.prom_type == 1 || gd.is_gift || (gd.prom_type == 7 && gd.act.is_xz_yh) || gd.is_xz_yh == 1) {
                     continue;
                 }
 
@@ -3811,7 +3811,7 @@ Page({
                     }
                 }
 
-                //--如果是团购，要判断有没有限制使用优惠券
+                //--如果是阶梯购，要判断有没有限制使用优惠券
                 if (gd.prom_type == 10) {
                     var prom1 = null;
                     await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + gd.prom_id, {
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 8d8a824..eb45600 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3566,7 +3566,7 @@ Page({
                 data: get_datas
             }).then(res => {
                 if (res.data.code == 0) {
-                    integrals = res.data.data.Integral;
+                    integrals = res.data.data?.Integral?res.data.data?.Integral:0;
                 }
             })
 
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index f1a93ee..c478891 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -596,7 +596,7 @@
           </block>
         </block>
         <!-- 许程 7.24暂时注释 -->
-        <view class="bdt16" wx:if="{{prom_type!=1&& prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}">
+        <view class="bdt16" wx:if="{{prom_type!=1&& prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1}}">
           <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
             <view class="cx-sizs fs30">领券</view>
             <view class="flex ai_c f1 pdh20">
--
libgit2 0.21.4