1.3.2颜选商城首页楼层增加无跳转方式

src/main/java/com/caimei/modules/newhome/entity/NewPageFloorContent.java

@@ -224,27 +224,27 @@ public class NewPageFloorContent implements Serializable {
     private String jumpImage5;
 
     /**
-     * 跳转类型1（颜选）：1链接，2商品，3图片
+     * 跳转类型1（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType1;
 
     /**
-     * 跳转类型2（颜选）：1链接，2商品，3图片
+     * 跳转类型2（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType2;
 
     /**
-     * 跳转类型3（颜选）：1链接，2商品，3图片
+     * 跳转类型3（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType3;
 
     /**
-     * 跳转类型4（颜选）：1链接，2商品，3图片
+     * 跳转类型4（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType4;
 
     /**
-     * 跳转类型5（颜选）：1链接，2商品，3图片
+     * 跳转类型5（颜选）：1链接，2商品，3图片，4无
      */
     private Integer jumpType5;
 

src/main/resources/config/dev/caimei.properties

@@ -159,43 +159,43 @@ keyword.product=E\:\\Knowlege\\keyword.txt
 
 #\u7528\u6237\u5546\u54C1\u4EF7\u683C\u8FC7\u5C0F\u90AE\u4EF6\u63D0\u793A
 #user.mails=jun.li@caimei365.com
-# 易宝分账后台
+# \u6613\u5B9D\u5206\u8D26\u540E\u53F0
 yeepay.appkey=BM12345678902069
 yeepay.secretKey=OH6huQqihk0ZfGzWgR1WcQ==
 yeepay.secretRoot=https://openapi.yeepay.com/yop-center
 yeepay.divideCallback=http://localhost:8181/a/order/newShouldPay/divideCallback
 yeepay.mails=jun.li@caimei365.com
 
-#΢���������
+#\u03A2\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 appId=wx91c4152b60ca91a3
 appSecret=a563dd2c07c9c815a4e697c8b6cb73dc
 token=caimei
-##�Ƿ����Ϣ���м��ܣ��Ƿ����Ϣ���м��ܣ���Ӧ��΢��ƽ̨����Ϣ�ӽ��ܷ�ʽ��false֧������ģʽ������ģʽ��true֧�ְ�ȫģʽ������ģʽ
+##\uFFFD\u01F7\uFFFD\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\uFFFD\uFFFD\u043C\uFFFD\uFFFD\u0723\uFFFD\uFFFD\u01F7\uFFFD\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\uFFFD\uFFFD\u043C\uFFFD\uFFFD\u0723\uFFFD\uFFFD\uFFFD\u04E6\uFFFD\uFFFD\u03A2\uFFFD\uFFFD\u01BD\u0328\uFFFD\uFFFD\uFFFD\uFFFD\u03E2\uFFFD\u04FD\uFFFD\uFFFD\u0737\uFFFD\u02BD\uFFFD\uFFFDfalse\u05A7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0123\u02BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0123\u02BD\uFFFD\uFFFDtrue\u05A7\uFFFD\u05B0\uFFFD\u022B\u0123\u02BD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0123\u02BD
 encryptMessage=false
 encodingAesKey=pxdm0VFrAEydPeZGCSz5QdyukwgFjmWohFDDy0dHiOk
-##΢�Žӿڵ�ַ
+##\u03A2\uFFFD\u017D\u04FF\u06B5\uFFFD\u05B7
 wx.getToken=https\://api.weixin.qq.com/cgi-bin/token
 wx.getMaterial=https\://api.weixin.qq.com/cgi-bin/material/batchget_material
 wx.getMaterialCount=https\://api.weixin.qq.com/cgi-bin/material/get_materialcount
 
-#运费商品默认ID
+#\u8FD0\u8D39\u5546\u54C1\u9ED8\u8BA4ID
 freightProductID=999
 
 cm.config=dev
-#直接读取服务器位置文件
+#\u76F4\u63A5\u8BFB\u53D6\u670D\u52A1\u5668\u4F4D\u7F6E\u6587\u4EF6
 export.template=export
 
-# SPI-server（CKEditor5图片上传API，搜索更新索引）
+# SPI-server\uFF08CKEditor5\u56FE\u7247\u4E0A\u4F20API\uFF0C\u641C\u7D22\u66F4\u65B0\u7D22\u5F15\uFF09
 caimei.spi=http://localhost:8008
 caimei.core=https://localhost:18002
 caimei.manager=http://localhost:9527
-#阿里云oss存储
+#\u963F\u91CC\u4E91oss\u5B58\u50A8
 aliyun.accessKeyId=LTAI4GBL3o4YkWnbKYgf2Xia
 aliyun.accessKeySecret=dBjAXqbYiEPP6Ukuk2ZsXQeET7FVkK
 aliyun.bucketName=caimei-oss
 aliyun.endpoint=https://oss-cn-shenzhen.aliyuncs.com
 
-#商品资料库文件临时路径
+#\u5546\u54C1\u8D44\u6599\u5E93\u6587\u4EF6\u4E34\u65F6\u8DEF\u5F84
 archive.tempPath=D:\\poi-test\\tempFile\\
-#ffmpeg路径
+#ffmpeg\u8DEF\u5F84
 ffmpeg.path=D:\\workSoftWare\\ffmpeg\\bin\\ffmpeg.exe

src/main/webapp/WEB-INF/views/modules/hehe/cmHeheFloorContentForm.jsp

@@ -403,6 +403,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType1" value="4" onchange="changeJumpType(1)" ${floorContent.jumpType1 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">
@@ -439,7 +442,7 @@
                                 <div style="margin-left: 100px">
                                     <div>
                                         <input type="radio" name="jumpType2" value="1" onchange="changeJumpType(2)" ${(floorContent.jumpType2 eq null || floorContent.jumpType2 eq 1 )? "checked" : ""} />链接：
-                                        <form:input path="adsLink1" htmlEscape="false" maxlength="255"
+                                        <form:input path="adsLink2" htmlEscape="false" maxlength="255"
                                                     class="input-xlarge"/>
                                     </div>
                                     <div style="margin-top: 20px">
@@ -450,6 +453,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType2" value="4" onchange="changeJumpType(2)" ${floorContent.jumpType2 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">
@@ -497,6 +503,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType3" value="4" onchange="changeJumpType(3)" ${floorContent.jumpType3 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">
@@ -544,6 +553,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType4" value="4" onchange="changeJumpType(4)" ${floorContent.jumpType4 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">
@@ -591,6 +603,9 @@
                                                           htmlEscape="false"/>
                                         </form:select>
                                     </div>
+                                    <div style="margin-top: 20px">
+                                        <input type="radio" name="jumpType5" value="4" onchange="changeJumpType(5)" ${floorContent.jumpType5 eq 4? "checked" : ""} />无
+                                    </div>
                                 </div>
                             </div>
                             <div style="float: left;margin: 25px 0px 0px 100px">