resolve conflict

3 years ago · fe00008882
parent b681f02fdf
commit fe00008882
8 changed files with 10 additions and 6 deletions
--- a/app/static/Image/img10.png
+++ b/app/static/Image/img10.png
--- a/app/static/Image/img42.png
+++ b/app/static/Image/img42.png
--- a/app/static/Image/img49.png
+++ b/app/static/Image/img49.png
--- a/app/static/Image/img50.png
+++ b/app/static/Image/img50.png
--- a/app/static/Image/img51.png
+++ b/app/static/Image/img51.png
--- a/app/static/Image/img52.png
+++ b/app/static/Image/img52.png
--- a/app/static/js/base.js
+++ b/app/static/js/base.js
@ -1,5 +1,7 @@
 // JavaScript Document

+// Reference: http://www.internetke.com/effects/list_2_11.html
+
 $(function(){

 	//导航菜单
--- a/app/templates/auth/guidance.html
+++ b/app/templates/auth/guidance.html
@ -1,3 +1,5 @@
+{#Reference: http://www.internetke.com/effects/list_2_11.html#}
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
@ -23,7 +25,7 @@
 					</div>
 					<div class="unfold" style="display:block">
 						<dl>
-							<dt><img src="images/img10.png" /></dt>
+							<dt><img src="../../static/Image/img10.png" /></dt>
 							<dd>
 								<b>JS源码<a href="http://www.internetke.com/">查看接口文档>></a></b>
 							</dd>
@ -38,7 +40,7 @@
 					</div>
 					<div class="unfold">
 						<dl>
-							<dt><img src="images/img42.png" /></dt>
+							<dt><img src="../../static/Image/img42.png" /></dt>
 							<dd>
 								<b>点击呼叫<a href="http://www.internetke.com/">查看接口文档>></a></b>
 							</dd>
@ -53,7 +55,7 @@
 					</div>
 					<div class="unfold">
 						<dl>
-							<dt><img src="images/img49.png" /></dt>
+							<dt><img src="../../static/Image/img49.png" /></dt>
 							<dd>
 								<b>直拨通话<a href="http://www.internetke.com/">查看接口文档>></a></b>
 							</dd>
@ -68,7 +70,7 @@
 					</div>
 					<div class="unfold">
 						<dl>
-							<dt><img src="images/img50.png" /></dt>
+							<dt><img src="../../static/Image/img50.png" /></dt>
 							<dd>
 								<b>回拨通话<a href="http://www.internetke.com/">查看接口文档>></a></b>
 							</dd>
@ -83,7 +85,7 @@
 					</div>
 					<div class="unfold">
 						<dl>
-							<dt><img src="images/img51.png" /></dt>
+							<dt><img src="../../static/Image/img51.png" /></dt>
 							<dd>
 								<b>互联网通话<a href="http://www.internetke.com/">查看接口文档>></a></b>
 							</dd>
@ -98,7 +100,7 @@
 					</div>
 					<div class="unfold">
 						<dl>
-							<dt><img src="images/img52.png" /></dt>
+							<dt><img src="../../static/Image/img52.png" /></dt>
 							<dd>
 								<b>语音会议<a href="http://www.internetke.com/">查看接口文档>></a></b>
 							</dd>