ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/activity' into activity

This commit is contained in:
dy 2021-04-09 11:00:06 +08:00
parent 8c8d031f33 92276296f5
commit efdfa7bde8
4 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/templates/demo/form/basic.html
View File

@ -203,7 +203,7 @@
<a class="close-link">
<i class="fa fa-times"></i>
</a>
</div>复选框&
</div>
</div>
<div class="ibox-content">
<form method="get" class="form-horizontal">

26
sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigSubscribe.java
View File

@ -30,15 +30,16 @@ public class ActPageConfigSubscribe extends BaseEntity
@Excel(name = "背景图片")
private String bgImg;
/** 二维码图片 */
@Excel(name = "二维码图片")
private String bgImg2;
/** 关注二维码描述 */
@Excel(name = "关注二维码描述")
/** 二维码 */
@Excel(name = "二维码")
private String qrCode;
public void setId(Integer id)
public String getBgImg() {
return bgImg;
}
public void setId(Integer id)
{
this.id = id;
}
@ -70,19 +71,7 @@ public class ActPageConfigSubscribe extends BaseEntity
this.bgImg = bgImg;
}
public String getBgImg()
{
return bgImg;
}
public void setBgImg2(String bgImg2)
{
this.bgImg2 = bgImg2;
}
public String getBgImg2()
{
return bgImg2;
}
public void setQrCode(String qrCode)
{
this.qrCode = qrCode;
@ -100,7 +89,6 @@ public class ActPageConfigSubscribe extends BaseEntity
.append("actCode", getActCode())
.append("description", getDescription())
.append("bgImg", getBgImg())
.append("bgImg2", getBgImg2())
.append("qrCode", getQrCode())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())

7
sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml
View File

@ -9,14 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="actCode" column="act_code" />
<result property="description" column="description" />
<result property="bgImg" column="bg_img" />
<result property="bgImg2" column="bg_img2" />
<result property="qrCode" column="qr_code" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectActPageConfigSubscribeVo">
select id, act_code, description, bg_img, bg_img2, qr_code, create_time, update_time from act_page_config_subscribe
select id, act_code, description, bg_img, qr_code, create_time, update_time from act_page_config_subscribe
</sql>
<select id="selectActPageConfigSubscribeList" parameterType="ActPageConfigSubscribe" resultMap="ActPageConfigSubscribeResult">
@ -25,7 +24,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="actCode != null and actCode != ''"> and act_code = #{actCode}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
<if test="bgImg != null and bgImg != ''"> and bg_img = #{bgImg}</if>
<if test="bgImg2 != null and bgImg2 != ''"> and bg_img2 = #{bgImg2}</if>
<if test="qrCode != null and qrCode != ''"> and qr_code = #{qrCode}</if>
</where>
</select>
@ -41,7 +39,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="actCode != null and actCode != ''">act_code,</if>
<if test="description != null">description,</if>
<if test="bgImg != null">bg_img,</if>
<if test="bgImg2 != null">bg_img2,</if>
<if test="qrCode != null">qr_code,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
@ -50,7 +47,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="actCode != null and actCode != ''">#{actCode},</if>
<if test="description != null">#{description},</if>
<if test="bgImg != null">#{bgImg},</if>
<if test="bgImg2 != null">#{bgImg2},</if>
<if test="qrCode != null">#{qrCode},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
@ -63,7 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
<if test="description != null">description = #{description},</if>
<if test="bgImg != null">bg_img = #{bgImg},</if>
<if test="bgImg2 != null">bg_img2 = #{bgImg2},</if>
<if test="qrCode != null">qr_code = #{qrCode},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>

6
sino-activity/src/main/resources/templates/activity/info/add.html
View File

@ -661,7 +661,7 @@
onclick="updateText(this)">姓名</input>
</label>
<label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-phone" id="phone"
<input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone"
onclick="updateText(this)">手机号</input>
</label>
<label class="checkbox-inline">
@ -837,7 +837,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">关注二维码描述：</label>
<div class="col-sm-8">
<input id="qrCode" name="actPageConfigSubscribe-qrCode"
<input id="qrCode" name="actPageConfigSubscribe-description"
placeholder="例如：扫描二维码参加活动" class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)">
</div>
@ -879,7 +879,7 @@
</div>
</div>
</div>
<input id="qrCodeImgval" type="hidden" name="actPageConfigSubscribe-bgImg2"
<input id="qrCodeImgval" type="hidden" name="actPageConfigSubscribe-qrCode"
value="">
</div>
</div>