java/XianNingChuXing.git

			@@ -46,10 +46,13 @@
			TAgreement three = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 1).eq("type", 1));
			//隐私协议
			TAgreement four = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 1).eq("type", 11));
			//隐私协议
			TAgreement five = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 1).eq("type", 15));
			model.addAttribute("one",one);
			model.addAttribute("two",two);
			model.addAttribute("three",three);
			model.addAttribute("four",four);
			model.addAttribute("five",five);
			return PREFIX + "tAgreement.html";
			}

			@@ -160,8 +160,8 @@
			left join t_user c on (a.userId = c.id)
			left join t_driver d on (a.driverId = d.id)
			left join t_company e on (d.companyId = e.id)
			left join t_pub_transaction_details f on (a.id = f.orderId and f.userType = 2 and f.state = 2)
			where a.state in (8, 9) and a.isDelete = 1 and a.payManner = 1
			left join t_pub_transaction_details f on (a.id = f.orderId and f.userType = 6 and f.state = 2)
			where a.state in (6) and a.isDelete = 1
			<if test="null != paymentCode and '' != paymentCode">
			and b.code like CONCAT('%', #{paymentCode}, '%')
			</if>

			@@ -16,6 +16,7 @@
			<li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">用户协议</a></li>
			<li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">隐私协议</a></li>
			<li class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false">跨城出行须知</a></li>
			<li class=""><a data-toggle="tab" href="#tab-5" aria-expanded="false">同城小件物流须知</a></li>
			</ul>
			<div class="tab-content">
			<div id="tab-1" class="tab-pane active">
			@@ -58,6 +59,16 @@
			</div>
			</div>
			</div>
			<div id="tab-5" class="tab-pane">
			<div class="panel-body">
			<textarea type="text/plain" id="editor_5" style="width:1200px;height:400px;">${five.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_5(${five.id});"/>
			</div>
			</div>
			</div>
			</div>

			</div>
			</div>
			@@ -73,12 +84,14 @@
			var editor_2 = null;
			var editor_3 = null;
			var editor_4 = null;
			var editor_5 = null;
			$(function () {
			//初始化编辑器
			editor_1 = UE.getEditor('editor_1');
			editor_2 = UE.getEditor('editor_2');
			editor_3 = UE.getEditor('editor_3');
			editor_4 = UE.getEditor('editor_4');
			editor_5 = UE.getEditor('editor_5');
			});

			function update_1(id){
			@@ -109,6 +122,13 @@
			}
			submitData(editor_4.getContent(),id);
			}
			function update_5(id){
			if (editor_5.getContentTxt() == ""){
			Feng.error("内容不能为空!");
			return;
			}
			submitData(editor_5.getContent(),id);
			}

			function submitData(content,id) {
			//提交信息

	ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史