From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html |  143 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 115 insertions(+), 28 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
index 0f8dcaf..cab31e1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/advertisement/advertisement_edit.html
@@ -39,23 +39,27 @@
         margin-left: 255px;
     }
 
+
 </style>
 <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
 <div class="ibox float-e-margins">
-    <input hidden id="objectType" value="${objectType}">
-    <input hidden id="objectId" value="${objectId}">
+    <input hidden id="roleType" value="${roleType}">
+    <input hidden id="type" value="${type}">
+    <input hidden id="turnId" value="${data.turnId}">
+    <input hidden id="id" value="${data.id}">
+    <input hidden id="img1" value="${data.img}">
     <div class="ibox-content">
         <div class="form-horizontal" id="carInfoForm">
-
-            @if(roleType == 1){
+            @if(roleType==1){
             <div class="form-group">
                 <label class="col-sm-3 control-label">*广告类型:</label>
                 <div class="col-sm-9">
-                    <select style="width: 300px" class="form-control" id="position" name = "position">
-                        <option value="1"${data.position==1 ? 'selected=selected' : ''}>首页类型</option>
-                        <option value="2"${data.position==2 ? 'selected=selected' : ''}>线上课得积分</option>
-                        <option value="3"${data.position==3 ? 'selected=selected' : ''}>看视频得奖励</option>
-                        <option value="4"${data.position==4 ? 'selected=selected' : ''}>常见问题</option>
+                    <select style="width: 300px" class="form-control" id="position" onchange="updatePosition(this)" name = "position">
+                        <option value="">选择类型</option>
+                        <option value="1" ${data.position == 1 ? 'selected=selected' : ''}>首页banner</option>
+                        <option value="2" ${data.position == 2 ? 'selected=selected' : ''}>线上课得积分</option>
+                        <option value="3" ${data.position == 3 ? 'selected=selected' : ''}>看视频得奖励</option>
+                        <option value="4" ${data.position == 4 ? 'selected=selected' : ''}>常见问题</option>
                     </select>
                 </div>
             </div>
@@ -63,43 +67,47 @@
             <div class="form-group" >
                 <label class="col-sm-3 control-label">*广告名称:</label>
                 <div class="col-sm-9" style="display: flex;">
-                    <input style="width: 300px" class="form-control" value="${data.name}" id="name" name="name" placeholder="请输入广告名称" type="text">
+                    <input style="width: 300px" class="form-control" value="${data.name}" id="name" name="name"  placeholder="请输入广告名称" type="text">
                 </div>
             </div>
+
             <div class="form-group">
                 <label class="col-sm-3 control-label">*广告图片:</label>
-                <#avatar id="img" name="" avatarImg="${data.img}"/><span id = "imgPX">推荐像素:</span>
+                <div class="col-sm-9" style="display: flex;">
+                    <#avatar id="img" name="" avatarImg="${data.img}"/><span id = "imgPX">推荐像素:</span>
+                </div>
             </div>
             @if(roleType == 1){
             <div class="form-group">
                 <label class="col-sm-3 control-label">*跳转模块:</label>
                 <div class="col-sm-9">
-                    <select style="width: 300px" class="form-control" id="model" name = "model">
-                        <option value="0">不跳转</option>
-                        @for(obj in models){
-                        <option style="width: 300px" value="${obj.id}">${obj.name}</option>
-                        <option value="${obj.id}" ${obj.name == data.models ? 'selected=selected' : ''}>${obj.name}</option>
-                        @}
+                    <select style="width: 300px" class="form-control" id="model" name = "model" onchange="updateType(this)">
+                        <option value="">请选择</option>
+                        <option value="0"${data.model == '不跳转' ? 'selected=selected' : ''}>不跳转</option>
+                        <option value="1"${data.model == '加入玩湃' ? 'selected=selected' : ''}>加入玩湃</option>
+                        <option value="2"${data.model == '开始课程' ? 'selected=selected' : ''}>开始课程</option>
+                        <option value="3"${data.model == '使用福利' ? 'selected=selected' : ''}>使用福利</option>
+                        <option value="4"${data.model == '探索玩湃' ? 'selected=selected' : ''}>探索玩湃</option>
                     </select>
                 </div>
             </div>
             @}
-            <div class="form-group">
+            <div class="form-group" id="t1">
                 <label class="col-sm-3 control-label">*跳转页面:</label>
                 <div class="col-sm-9">
-                    <select style="width: 300px" class="form-control" id="page" name = "page">
+                    <select style="width: 300px" class="form-control" id="page" name = "page" onchange="updateOne(this)">
                         <option value="">请选择</option>
                         @for(obj in pages){
-                        <option value="${obj.id}" ${obj.id == data.pageId ? 'selected=selected' : ''}>${obj.name}</option>
+                        <option value="${obj.id}" ${obj.id == data.jumpPage ? 'selected=selected' : ''}>${obj.name}</option>
                         @}
                     </select>
                 </div>
             </div>
-
-            <div class="form-group">
+            @if(roleType == 1){
+            <div class="form-group" id="t2">
                 <label class="col-sm-3 control-label">*跳转类型:</label>
                 <div class="col-sm-9">
-                    <select style="width: 300px" class="form-control" id="type" name = "page">
+                    <select style="width: 300px" class="form-control" id="type" name = "page" onchange="updateT(this)">
                         <option value="">请选择</option>
                         @for(obj in types){
                         <option value="${obj.id}" ${obj.id == data.typeId ? 'selected=selected' : ''}>${obj.name}</option>
@@ -108,12 +116,13 @@
                 </div>
             </div>
 
-            <div class="form-group" >
+            <div class="form-group" id="t3">
                 <label class="col-sm-3 control-label">*跳转ID:</label>
                 <div class="col-sm-9" style="display: flex;">
-                    <input style="width: 300px" class="form-control" id="pageId" value="${data.turnId}" name="name" placeholder="请输入跳转id" type="number">
+                    <input style="width: 300px" value="${data.turnId}" class="form-control" id="pageId" name="name" placeholder="请输入跳转id" type="number">
                 </div>
             </div>
+
             @}
             <div class="form-group" >
                 <label class="col-sm-3 control-label">*排序:</label>
@@ -125,9 +134,8 @@
 
             <div class="row btn-group-m-t">
                 <div class="col-sm-10 col-sm-offset-5" >
-
                     @if(type==2){
-                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSite.addSubmit()"/>
+                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSite.updateSubmit()"/>
                     @}
                     <#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="TSite.close()"/>
                 </div>
@@ -140,10 +148,89 @@
 
 </div>
 
-<script src="${ctxPath}/modular/system/tSite/tSite.js"></script>
+<script src="${ctxPath}/modular/system/advertisement/advertisement.js"></script>
 <script src="${ctxPath}/js/vue/vue.js"></script>
 <script src="${ctxPath}/js/elementui/index.js"></script>
 <link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
 
+<script>
+    laydate.render({
+        elem: '#time',
+        range:true
+    });
 
+    function updateType(e) {
+        let name  =  $("#model").val();
+        console.log(name);
+        if(name =='0'){
+            $("#t1").hide()
+            $("#t2").hide()
+            $("#t3").hide()
+        }else {
+            $("#t1").show()
+            $("#t2").show()
+            $("#t3").show()
+
+            var oneId = $('#model option:selected').text();
+            var ajax = new $ax(Feng.ctxPath + "/tShop/typeChange", function(data){
+                if(data!=null){
+                    var content = '<option value="">请选择</option>';
+                    $.each(data, function(k,v) {
+
+                        content += "<option value='"+v.id+"'>"+v.name+"</option>";
+                    });
+                    $("#page").empty().append(content);
+                }
+            });
+            ajax.set("name",oneId);
+            ajax.start();
+        }
+    }
+
+
+    function updateOne(e) {
+        var oneId=$(e).val();
+        var ajax = new $ax(Feng.ctxPath + "/tShop/typeChangeOne", function(data){
+            if(data!=null){
+                var content1 = '<option value="">请选择</option>';
+                $.each(data, function(k,v) {
+                    content1 += "<option value='"+v.id+"'>"+v.name+"</option>";
+                });
+                $("#type").empty().append(content1);
+            }
+        });
+        ajax.set("id",oneId);
+        ajax.start();
+    }
+
+    function updatePosition(e) {
+        var oneId=$(e).val();
+        var res= document.getElementById("imgPX");
+        console.log(res)
+        if (oneId == "1"){
+            res.innerHTML ="推荐像素:780x472px";
+        }else{
+            res.innerHTML ="推荐像素:780x440px";
+        }
+        console.log(oneId)
+    }
+    function updateT(e) {
+        var oneId = $('#type option:selected').text();
+        console.log(oneId);
+        if (oneId!="详情"){
+            $("#t3").hide()
+        }else{
+            $("#t3").show()
+        }
+    }
+    window.onload = function() {
+        var temp = $("#turnId").val();
+        var res= document.getElementById("imgPX");
+        res.innerHTML ="推荐像素:780x472px";
+        console.log("看看temp",temp);
+        if (temp==""){
+            $("#t3").hide();
+        }
+    }
+</script>
 @}

--
Gitblit v1.7.1