From 7e4ee39caadf3cf9e8d15ab9c6a3d2bdc33c3342 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 23 Jan 2024 15:52:52 +0800
Subject: [PATCH] OA单优化赠品名称的显示

---
 pages/goods/goodsList/goodsList.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index b30e22c..1640e0a 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -302,12 +302,18 @@ Page({
                 })
              }
              //--送赠品--
-            if(parseInt(content.is_gift)) {
+            if(parseInt(content.is_gift) && content.zp_mode==0) {
                 //-- 获取 --
                 await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+content.gift+"&store_id="+oo.stoid, {
                 }).then(res => {
                     if(ut.ajax_ok(res))
+
                         arr[i].content.gift_name=res.data.data.pageData[0].goods_name;
+                        if(!content.zpname_type) content.zpname_type='';
+
+                        if(parseInt(content.zpname_type)>0){
+                            arr[i].content.gift_name=res.data.data.pageData[0].title;
+                        }
                 })
             }
 
--
libgit2 0.21.4