From 4b21e1a86916225ab69e4f5881566a0429e05677 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Tue, 13 Apr 2021 11:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=B8=BA=E7=A9=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/edit.html         | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html
index 28f151048..36d22dae6 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -947,8 +947,6 @@
         if(FIRSTFLAG==0){
             $("#firstawardprize").attr('disabled','true');
         }
-
-
     });
 
     $("#form-info-add").validate({
@@ -1109,9 +1107,17 @@
         var picval = $("#picval").val();
         $("#picimg").attr("src", picval);
         var btn1 = $("#btn1").val();
-        $("#btn1Pic").text(btn1);
+        if (btn1!= null && btn1 != ''){
+            $("#btn1Pic").text(btn1);
+        }else{
+            $("#btn1Pic").text("自定义按钮1");
+        }
         var btn2 = $("#btn2").val();
-        $("#btn2Pic").text(btn2);
+        if (btn2!= null && btn2 != ''){
+            $("#btn2Pic").text(btn2);
+        }else{
+            $("#btn2Pic").text("自定义按钮2");
+        }
         //加载步骤4数据
         var val = $("#activityPlayval").val();
         $("a[id = 'activityPlay']").each(function (){
@@ -1134,7 +1140,11 @@
         var agreement = $("#agreement").val();
         $("#agreementPri").text(agreement);
         var btn = $("#btn").val();
-        $("#btnPri").text(btn);
+        if (btn!= null && btn != ''){
+            $("#btnPri").text(btn);
+        }else{
+            $("#btnPri").text("自定义按钮");
+        }
         var pictureval = $("#pictureval").val();
         $("#pictureimg").attr("src", picval);
         $("input[type='checkbox'][name ^='actPageConfigUserinfo']").each(function (){
@@ -1292,7 +1302,7 @@
     }
 
     function activityTemplate(val) {
-        var path = "../../img/act/";
+        var path = "../../../img/act/";
         $(val).addClass('btn-success').siblings().removeClass('btn-success');
         var id = val.id;
         var valus = $("#"+id+".btn-success").attr("value");