Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
21d80bf6
authored
Sep 22, 2017
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify the jquery address and css address
parent
a2adeefd
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
12 additions
and
11 deletions
src/main/java/com/ctrip/fun/admin/controller/callcenter/SipPhoneControl.java
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/contact.ftl
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetail.ftl
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetailTeeTime.ftl
src/main/webapp/WEB-INF/templates/golf/coursePreview.ftl
src/main/webapp/WEB-INF/templates/order/common/contact.ftl
src/main/webapp/WEB-INF/templates/order/common/financialSettlement.ftl
src/main/webapp/WEB-INF/templates/order/common/orderDetailTeeTime.ftl
src/main/webapp/WEB-INF/templates/tourOrder/common/contact.ftl
src/main/webapp/WEB-INF/templates/tourOrder/common/financialSettlement.ftl
src/main/webapp/WEB-INF/templates/tourOrder/common/orderDetailTeeTime.ftl
src/main/webapp/resource/js/lib/jquery-1.9.1.min.js
src/main/java/com/ctrip/fun/admin/controller/callcenter/SipPhoneControl.java
View file @
21d80bf6
...
...
@@ -115,7 +115,6 @@ public class SipPhoneControl {
// String agentAid = request.getAttribute("userName").toString();
String
agentAid
=
SpringSecurityUtil
.
getCurrentUserName
();
String
sipPhoneName
=
request
.
getParameter
(
"sipPhoneName"
);
System
.
out
.
println
(
"bind----agentAid----->"
+
agentAid
+
",sipPhoneName:"
+
sipPhoneName
);
return
sipPhoneService
.
bind
(
agentAid
,
sipPhoneName
);
}
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/contact.ftl
View file @
21d80bf6
...
...
@@ -82,7 +82,7 @@
<script src="
http://cdataportal.sh.ctripcorp.com/libs
/jquery-1.9.1.min.js">
<script src="
${staticServer}/js/lib
/jquery-1.9.1.min.js">
</script>
<script>
var inputName;
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetail.ftl
View file @
21d80bf6
...
...
@@ -72,6 +72,6 @@
</tr>
</table>
</div>
<script src="
http://cdataportal.sh.ctripcorp.com/libs
/jquery-1.9.1.min.js">
<script src="
${staticServer}/js/lib
/jquery-1.9.1.min.js">
</script>
<script type="text/javascript" src="${staticServer}/js/app/eventActivityOrder.js"></script>
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetailTeeTime.ftl
View file @
21d80bf6
...
...
@@ -75,6 +75,6 @@
</tr>
</table>
</div>
<script src="
http://cdataportal.sh.ctripcorp.com/libs
/jquery-1.9.1.min.js">
<script src="
${staticServer}/js/lib
/jquery-1.9.1.min.js">
</script>
<script type="text/javascript" src="${staticServer}/js/app/eventActivityOrder.js"></script>
src/main/webapp/WEB-INF/templates/golf/coursePreview.ftl
View file @
21d80bf6
...
...
@@ -12,7 +12,7 @@
<head
lang=
"zh-CN"
>
<meta
charset=
"UTF-8"
>
<title>
球场预览 - 主题游管理
</title>
<link
rel=
"stylesheet"
href=
"
http://cdataportal.sh.ctripcorp.com/istyle/code
/istyle.30626.css"
/>
<link
rel=
"stylesheet"
href=
"
${staticServer}/css
/istyle.30626.css"
/>
<link
rel=
"stylesheet"
href=
'${staticServer} path="/css/common.css'
/>
${pageJsContent}
<style
type=
"text/css"
>
...
...
src/main/webapp/WEB-INF/templates/order/common/contact.ftl
View file @
21d80bf6
...
...
@@ -61,7 +61,7 @@
<div class = "div-detail-right">
<#include "../common/orderProcessLog.ftl">
</div>
<script src="
http://cdataportal.sh.ctripcorp.com/libs
/jquery-1.9.1.min.js">
<script src="
${staticServer}/js/lib
/jquery-1.9.1.min.js">
</script>
<script>
var inputName;
...
...
src/main/webapp/WEB-INF/templates/order/common/financialSettlement.ftl
View file @
21d80bf6
<!-- 财务结算-->
<script src="
http://cdataportal.sh.ctripcorp.com/libs
/jquery-1.9.1.min.js">
<script src="
${staticServer}/js/lib
/jquery-1.9.1.min.js">
</script>
<script>
$(function() {
...
...
src/main/webapp/WEB-INF/templates/order/common/orderDetailTeeTime.ftl
View file @
21d80bf6
...
...
@@ -145,7 +145,9 @@
</#if>
</table>
</div>
<script src="http://cdataportal.sh.ctripcorp.com/libs/jquery-1.9.1.min.js">
<!--
<script src="http://cdataportal.sh.ctripcorp.com/libs/jquery-1.9.1.min.js">-->
<script src="${staticServer}/js/lib/jquery-1.9.1.min.js">
</script>
<script>
$(function(){
...
...
src/main/webapp/WEB-INF/templates/tourOrder/common/contact.ftl
View file @
21d80bf6
...
...
@@ -160,7 +160,7 @@
</div>
</div>
<script src="
http://cdataportal.sh.ctripcorp.com/libs
/jquery-1.9.1.min.js">
<script src="
${staticServer}/js/lib
/jquery-1.9.1.min.js">
</script>
<script>
var inputName;
...
...
src/main/webapp/WEB-INF/templates/tourOrder/common/financialSettlement.ftl
View file @
21d80bf6
<!-- 财务结算-->
<script src="
http://cdataportal.sh.ctripcorp.com/libs
/jquery-1.9.1.min.js">
<script src="
${staticServer}/js/lib
/jquery-1.9.1.min.js">
</script>
<script>
$(function() {
...
...
src/main/webapp/WEB-INF/templates/tourOrder/common/orderDetailTeeTime.ftl
View file @
21d80bf6
...
...
@@ -115,7 +115,7 @@
</tr>
</table>
</div>
<script src="
http://cdataportal.sh.ctripcorp.com/libs
/jquery-1.9.1.min.js">
<script src="
${staticServer}/js/lib
/jquery-1.9.1.min.js">
</script>
<script>
$(function(){
...
...
src/main/webapp/resource/js/lib/jquery-1.9.1.min.js
0 → 100644
View file @
21d80bf6
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment