From a6cc3980bf6cff9c8a32a778fbe7d34bd4936d31 Mon Sep 17 00:00:00 2001
From: abson <antploy.ni@meidd.com>
Date: Fri, 29 Apr 2022 14:29:57 +0800
Subject: [PATCH] 4.26 oa测试返回

---
 components/diy_picMax/diy_picMax.wxml | 2 +-
 pages/cart/cart2/cart2.js             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/diy_picMax/diy_picMax.wxml b/components/diy_picMax/diy_picMax.wxml
index 3dabf3e..77393e1 100644
--- a/components/diy_picMax/diy_picMax.wxml
+++ b/components/diy_picMax/diy_picMax.wxml
@@ -11,7 +11,7 @@
 			</block>
 			<block wx:elif="{{item.AppId}}">
 				<navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}">
-					<image src="{{item.src}}" mode="widthFix" style="display: block;"></image>
+					<image src="{{item.src}}" mode="widthFix" style="display: block; height: 100%; width: 100%;"></image>
 				</navigator>
 			</block>
 			<block wx:else>
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index e2e2a41..47c4498 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1404,7 +1404,7 @@ Page({
         //g_lb_num我的礼包 g_zxlb_num专享礼包
         r_data.forEach(r_d => {
             let arr = [];
-            if (r_d.g_zxlb_num.length > 0) {
+            if (r_d.g_zxlb_num) {
                 let g_lb = r_d.g_zxlb_num;
                 for (let i = 0; i < g_lb.length; i++) {
                     let item = g_lb[i];
@@ -1425,7 +1425,7 @@ Page({
                     send_lb[r_d.pickup_id] = arr;
                 }
             }
-            if (r_d.g_lb_num.length > 0) {
+            if (r_d.g_lb_num) {
                 let zx_lb = r_d.g_lb_num;
                 for (let i = 0; i < zx_lb.length; i++) {
                     let item = zx_lb[i];
--
libgit2 0.21.4