From 91e4d0c81321f9ccfec7fca41898a00ff6f57001 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Feb 2022 15:03:25 +0800
Subject: [PATCH] merge api_score_merge

---
 zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html
index 084a646..000a29b 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html
@@ -722,8 +722,8 @@
                 if(zjw != null && zjh != null){
                     cNode.nodeStyleStr = '{"width":"'+zjw+'px","height":"'+zjh+'px"}';
                 }
-                if(this.interval != null && this.previousMargin != null && this.nextMargin != null){
-                    cNode.nodeAttribute = '{"interval":'+this.interval+',"previous-margin":'+this.previousMargin+',"next-margin":'+this.nextMargin+'}';
+                if(this.interval != null && this.previousMargin != null && this.nextMargin != null && this.interval != '' && this.previousMargin != '' && this.nextMargin != ''){
+                    cNode.nodeAttribute = '{\"interval\":'+this.interval+',\"previous-margin\":'+this.previousMargin+',\"next-margin\":'+this.nextMargin+'}';
                 }
 
                 if (cNode.nodeStyleStr != null && cNode.nodeStyleStr.length > 1) {

--
Gitblit v1.9.1