From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
index 53bec87..79b900e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
@@ -11,11 +11,13 @@
<div class="row row-lg">
<div class="col-sm-12">
<input type="hidden" id="id" value="${one.id}">
+ <input type="hidden" id="id1" value="${two.id}">
<div class="tabs-container">
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">用户指南设置</a></li>
</ul>
<div class="tab-content">
+
<div id="tab-1" class="tab-pane active">
<div class="col-sm-3" style="padding-top: 10px;">
<div class="input-group" style="width: 100%;">
@@ -26,8 +28,16 @@
</select>
</div>
</div>
+
+
<div class="panel-body" style="padding-top: 60px;">
- <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <span>用户端：</span>
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content!}</textarea>
+ <br>
+ <br>
+ <br>
+ <span>司机端：</span>
+ <textarea id="editor_2" type="text/plain" style="width:1200px;height:400px;">${two.content!}</textarea>
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5">
<#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
@@ -38,6 +48,8 @@
</div>
</div>
+
+
</div>
</div>
</div>
@@ -47,9 +59,11 @@
<script type="text/javascript">
var editor_1 = null;
+ var editor_2 = null;
$(function () {
//初始化编辑器
editor_1 = UE.getEditor('editor_1');
+ editor_2 = UE.getEditor('editor_2');
$('#language').on('change', function () {
var ajax = new $ax(Feng.ctxPath + "/tAgreement/getAgreement", function(data){
@@ -64,6 +78,19 @@
ajax.set("type", 3);
ajax.set("useType", 1);
ajax.start();
+
+ var ajax1 = new $ax(Feng.ctxPath + "/tAgreement/getAgreement", function(data){
+ if(null != data){
+ editor_2.setContent(data.content);
+ $('#id1').val(data.id);
+ }
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax1.set("language", $(this).val());
+ ajax1.set("type", 3);
+ ajax1.set("useType", 2);
+ ajax1.start();
})
});
@@ -72,10 +99,10 @@
Feng.error("内容不能为空!");
return;
}
- submitData(editor_1.getContent(), $('#id').val());
+ submitData(editor_1.getContent(), $('#id').val(),editor_2.getContent(), $('#id1').val());
}
- function submitData(content,id) {
+ function submitData(content,id,content1,id1) {
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
Feng.success("编辑成功!");
@@ -83,7 +110,9 @@
Feng.error("编辑失败!" + data.responseJSON.message + "!");
});
ajax.set("context", content);
+ ajax.set("context1", content1);
ajax.set("id", id);
+ ajax.set("id1", id1);
ajax.start();
}
</script>
--
Gitblit v1.7.1