From 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 四月 2023 17:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html |  176 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 146 insertions(+), 30 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html
index 3382f17..bd552cb 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCommercial/tCommercial_edit.html
@@ -1,40 +1,156 @@
 @layout("/common/_container.html"){
-<div class="ibox float-e-margins">
-    <div class="ibox-content">
-        <div class="form-horizontal">
-
-            <div class="row">
-                <div class="col-sm-6 b-r">
-                            <#input id="id" name="主键" value="${item.id}" underline="true"/>
-                            <#input id="type" name="类型(1=弹窗广告,2=底部广告)" value="${item.type}" underline="true"/>
-                            <#input id="name" name="名称" value="${item.name}" underline="true"/>
-                            <#input id="url" name="广告地址" value="${item.url}" underline="true"/>
-                            <#input id="device" name="设备(1=小程序,2=司机端)" value="${item.device}" underline="true"/>
-                            <#input id="isJump" name="是否跳转(0=否,1=是)" value="${item.isJump}" underline="true"/>
-                            <#input id="jumpType" name="跳转类型(1=内部跳转,2=外部跳转)" value="${item.jumpType}" underline="true"/>
-                            <#input id="jumpUrl" name="跳转连接" value="${item.jumpUrl}" />
-                </div>
-
-                <div class="col-sm-6">
-                            <#input id="html" name="富文本" value="${item.html}" underline="true"/>
-                            <#input id="sort" name="排序" value="${item.sort}" underline="true"/>
-                            <#input id="status" name="状态(1=正常,2=冻结,3=删除)" value="${item.status}" underline="true"/>
-                            <#input id="createTime" name="添加时间" value="${item.createTime}" underline="true"/>
-                            <#input id="createUserId" name="添加人员id" value="${item.createUserId}" underline="true"/>
-                            <#input id="updateTime" name="更新时间" value="${item.updateTime}" underline="true"/>
-                            <#input id="updateUserId" name="更新人员id" value="${item.updateUserId}" />
-                </div>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>添加</h5>
             </div>
+            <div class="ibox-content" id="commercialInfoForm">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
 
-            <div class="row btn-group-m-t">
-                <div class="col-sm-10">
-                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCommercialInfoDlg.editSubmit()"/>
-                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCommercialInfoDlg.close()"/>
+                        <input hidden id="id" value="${item.id}">
+                        <div class="col-sm-12" style="cursor: pointer;text-align: left;">
+
+                            <div class="initialLevel col-sm-12 control-label form-group"  >
+                                <div class="initialLevel col-sm-3 control-label form-group"  >
+                                    <span style="color:red">*</span>
+                                    <label class="control-label" >广告图名称:</label>
+                                    <input id="name" value="${item.name}" type="text" maxlength="40" placeholder="请输入广告图名称" style="height: 30px" required="required">
+                                </div>
+                            </div>
+
+                            <div class="initialLevel col-sm-12 control-label form-group" >
+                                <div class="initialLevel col-sm-3 control-label form-group"  >
+                                    <span style="color:red">*</span>
+                                    <label class="control-label" >广告图图片:</label>
+                                    <#uploadImg id="url" fileImg="${item.url}"/>
+                                </div>
+                            </div>
+
+                            <div class="initialLevel col-sm-12 control-label form-group"  >
+                                <div class="initialLevel col-sm-3 control-label form-group"  >
+                                    <span style="color:red">*</span>
+                                    <label class="control-label" >端&emsp;&emsp;口:&emsp;</label>
+                                    <select  id="device" style="width: 180px;height: 30px" name="device">
+                                        <option value="2"${item.device == 2 ? 'selected=selected' : ''}>司机端</option>
+                                        <option value="1"${item.device == 1 ? 'selected=selected' : ''}>小程序端</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="initialLevel col-sm-12 control-label form-group"  >
+                                <div class="initialLevel col-sm-3 control-label form-group"  >
+                                    <span style="color:red">*</span>
+                                    <label class="control-label" >广告类型:&emsp;</label>
+                                    <select  id="type" style="width: 180px;height: 30px" name="type">
+                                        <option value="1"${item.type == 1 ? 'selected=selected' : ''}>弹窗广告</option>
+                                        <option id="homePageBanner" value="2"${item.type == 2 ? 'selected=selected' : ''}>首页底部广告</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="initialLevel col-sm-12 control-label form-group"  >
+                                <div class="initialLevel col-sm-3 control-label form-group"  >
+                                    <span style="color:red">*</span>
+                                    <label class="control-label" >是否跳转:&emsp;</label>
+                                    <select  id="isJump" style="width: 180px;height: 30px" name="isJump">
+                                        <option value="1"${item.isJump == 1 ? 'selected=selected' : ''}>是</option>
+                                        <option value="0"${item.isJump == 0 ? 'selected=selected' : ''}>否</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="initialLevel col-sm-12 control-label form-group" id="jumpTypeIsShow" >
+                                <div class="initialLevel col-sm-3 control-label form-group"  >
+                                    <span style="color:red">*</span>
+                                    <label class="control-label" >跳转类型:&emsp;</label>
+                                    <select  id="jumpType" style="width: 180px;height: 30px" name="jumpType">
+                                        <option value="1"${item.jumpType == 1 ? 'selected=selected' : ''}>内部跳转</option>
+                                        <option value="2"${item.jumpType == 2 ? 'selected=selected' : ''}>外部跳转</option>
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="initialLevel col-sm-12 control-label form-group" id="jumpUrlIsShow" >
+                                <div class="initialLevel col-sm-3 control-label form-group"  >
+                                    <span style="color:red">*</span>
+                                    <label class="control-label" >跳转链接:&emsp;</label>
+                                    <input id="jumpUrl" value="${item.jumpUrl}" type="text" style="height: 30px" maxlength="200"  placeholder="请输入跳转链接" required="required">
+                                </div>
+                            </div>
+
+                            <div class="initialLevel col-sm-12 control-label form-group"  >
+                                <div class="initialLevel col-sm-3 control-label form-group"  >
+                                    <span style="color:red">*</span>
+                                    <label class="control-label" >排&emsp;&emsp;序:&emsp;</label>
+                                    <input id="sort" value="${item.sort}" type="number" style="height: 30px" maxlength="4"  placeholder="请输入排序" required="required">
+                                </div>
+                            </div>
+                            <div class="initialLevel col-sm-12 control-label form-group"  >
+                                <div class="initialLevel col-sm-6 control-label form-group"  >
+                                    <span style="color:red">*</span>
+                                    <label class="control-label" >详情内容:&emsp;</label>
+                                    <textarea type="text/plain" id="html" style="width:100%;height:350px;">${item.html}</textarea>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+                </div>
+
+                <div class="row btn-group-m-t">
+                    <div class="col-sm-10" style="text-align: center">
+                        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCommercialInfoDlg.close()"/>
+                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCommercialInfoDlg.editSubmit()"/>
+                    </div>
                 </div>
             </div>
         </div>
-
     </div>
 </div>
 <script src="${ctxPath}/static/modular/system/tCommercial/tCommercial_info.js"></script>
+<script type="text/javascript">
+    $(function () {
+        var idCardPositive = new $WebUpload("url");
+        idCardPositive.setUploadBarId("progressBar");
+        idCardPositive.init();
+
+        if(1 == $("#isJump").val()){
+            $("#jumpTypeIsShow").show()
+            $("#jumpUrlIsShow").show()
+        }else {
+            $("#jumpTypeIsShow").hide()
+            $("#jumpUrlIsShow").hide()
+        }
+
+        if(1 == $("#device").val()){
+            $("#homePageBanner").show()
+        }else {
+            $("#homePageBanner").hide()
+        }
+
+    });
+    //监听下拉菜单的变动操作
+    $("#isJump").change(function(){
+        if(this.value == 1){
+            $("#jumpTypeIsShow").show()
+            $("#jumpUrlIsShow").show()
+        }
+        if(this.value == 0){
+            $("#jumpTypeIsShow").hide()
+            $("#jumpUrlIsShow").hide()
+        }
+    })
+    //监听下拉菜单的变动操作
+    $("#device").change(function(){
+        if(this.value == 1){
+            $("#homePageBanner").show()
+        }
+        if(this.value == 2){
+            $("#homePageBanner").hide()
+        }
+    })
+</script>
 @}

--
Gitblit v1.7.1