Gitinn Home Explore Help
Register Sign In
u102328
/
test
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

第二次

14715318824 7 years ago
parent
c46bfe98f0
commit
d9436c8b12
12 changed files with 115 additions and 27 deletions
Unified View Show Diff Stats
  1. 1 0
      userWeb/UI/css/about.css
  2. 1 0
      userWeb/UI/css/custom.css
  3. 1 0
      userWeb/UI/css/shop.css
  4. 5 0
      userWeb/UI/js/about.js
  5. 5 0
      userWeb/UI/js/custom.js
  6. 5 0
      userWeb/UI/js/shop.js
  7. 35 3
      userWeb/about.html
  8. 4 7
      userWeb/config/common.js
  9. 23 9
      userWeb/custom.html
  10. 35 7
      userWeb/shop.html
  11. 0 0
      杨金城.txt
  12. 0 1
      登录拉到文件修改提交.txt

+ 1 - 0
userWeb/UI/css/about.css
View File 

@@ -0,0 +1 @@
 
+#home{}

+ 1 - 0
userWeb/UI/css/custom.css
View File 

@@ -0,0 +1 @@
 
+#home{}

+ 1 - 0
userWeb/UI/css/shop.css
View File 

@@ -0,0 +1 @@
 
+#home{}

+ 5 - 0
userWeb/UI/js/about.js
View File 

@@ -0,0 +1,5 @@
 
+// 添加首页默认UI
 
+addUI("home",function(){
 
+	console.log("home加载回调")
 
+	// $("#home").show();
 
+});

+ 5 - 0
userWeb/UI/js/custom.js
View File 

@@ -0,0 +1,5 @@
 
+// 添加首页默认UI
 
+addUI("home",function(){
 
+	console.log("home加载回调")
 
+	// $("#home").show();
 
+});

+ 5 - 0
userWeb/UI/js/shop.js
View File 

@@ -0,0 +1,5 @@
 
+// 添加首页默认UI
 
+addUI("home",function(){
 
+	console.log("home加载回调")
 
+	// $("#home").show();
 
+});

+ 35 - 3
userWeb/about.html
View File 

@@ -1,3 +1,35 @@
 
-<div>
 
-    <h1>ABOUT</h1>
 
-</div>
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+    <meta charset="utf-8">
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
+    <title>关于</title>
 
+    <meta name="description" content="">
 
+    <meta name="keywords" content="">
 
+    <!-- 库 -->
 
+    <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
+    <script src="lib/jquery-2.1.1.min.js"></script>
 
+    <script src="lib/bootstrap/js/bootstrap.min.js"></script>
 
+    <!-- 配置 -->
 
+    <link href="config/common.css" rel="stylesheet">    <!-- 公共样式 -->
 
+    <script src="config/common.js"></script>            <!-- 公共配置 -->
 
+    <script src="config/language.js"></script>          <!-- currentLang-当前语言对象 -->
 
+    <!-- UI层样式 -->
 
+    <link href="UI/css/control.css" rel="stylesheet">
 
+    <link href="UI/css/about.css" rel="stylesheet">
 
+</head>
 
+<body>
 
+    <!-- UI层缓存区 -->
 
+    <div id="Temporary"></div>
 
+    <!-- UI层容器 -->
 
+    <div id="uiLayer" class="container-fluid"></div>
 
+    <!-- UI层配置 -->
 
+    <script src="UI/js/control.js"></script>            <!-- 公共导航及控件UI层  -->
 
+    <script>
 
+        function controlSuccess(){
 
+            dynamicLoadScript("UI/js/about.js")
 
+        }
 
+    </script>
 
+</body>
 
+</html>

+ 4 - 7
userWeb/config/common.js
View File 

@@ -2,8 +2,6 @@
 
 function addUI(
 
 function addUI(
 
 	uiName,//UI名
 
 	uiName,//UI名
 
 	loadDone,//加载完成回调
 
 	loadDone,//加载完成回调
 
-	// onShowFunc,//显示回调
 
-	// onHideFunc//隐藏回调
 
 ){
 
 ){
 
 	$("#Temporary").load("UI/"+uiName+".html",function(data,rt,obj){
 
 	$("#Temporary").load("UI/"+uiName+".html",function(data,rt,obj){
 
 		$("#Temporary").html("");
 
 		$("#Temporary").html("");
 
@@ -12,14 +10,14 @@ function addUI(
 
 		loadDone();
 
 		loadDone();
 
 	});
 
 	});
 
 }
 
 }
 
-// 获取url参数
 
-function GetQueryString(name){
 
+// 获取url参数   
+function GetQueryString(name){//name参数名字
 
      var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
 
      var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
 
      var r = window.location.search.substr(1).match(reg);
 
      var r = window.location.search.substr(1).match(reg);
 
      if(r!=null)return  unescape(r[2]); return null;
 
      if(r!=null)return  unescape(r[2]); return null;
 
 }
 
 }
 
 // 计数对象长度
 
 // 计数对象长度
 
-function objlen(obj){
 
+function objlen(obj){ //obj对象
 
 	var l = 0;
 
 	var l = 0;
 
 	for (var i in obj){
 
 	for (var i in obj){
 
 		l++
 
 		l++
 
@@ -27,8 +25,7 @@ function objlen(obj){
 
 	return l
 
 	return l
 
 }
 
 }
 
 // 动态载入 script
 
 // 动态载入 script
 
-function dynamicLoadScript(src)
 
-{
 
+function dynamicLoadScript(src){ //src相对路径
 
 	var scriptObj = document.createElement("script");
 
 	var scriptObj = document.createElement("script");
 
 	scriptObj.src = src; 
 	scriptObj.src = src; 
 	scriptObj.type = "text/javascript";
 
 	scriptObj.type = "text/javascript";

+ 23 - 9
userWeb/custom.html
View File 

@@ -1,21 +1,35 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
-	<meta charset="utf-8">
 
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
+    <meta charset="utf-8">
 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-	<title>定制</title>
 
-	<meta name="description" content="">
 
-	<meta name="keywords" content="">
 
-    <!-- jquery -->
 
-	<script src="lib/jquery-2.0.3.min.js"></script>
 
-    <!-- Bootstrap -->
 
+    <title>定制</title>
 
+    <meta name="description" content="">
 
+    <meta name="keywords" content="">
 
+    <!-- 库 -->
 
     <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
     <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
+    <script src="lib/jquery-2.1.1.min.js"></script>
 
     <script src="lib/bootstrap/js/bootstrap.min.js"></script>
 
     <script src="lib/bootstrap/js/bootstrap.min.js"></script>
 
-    <script src="pages/js/common.js"></script>     <!-- 加载 UI 界面 -->
 
+    <!-- 配置 -->
 
+    <link href="config/common.css" rel="stylesheet">    <!-- 公共样式 -->
 
+    <script src="config/common.js"></script>            <!-- 公共配置 -->
 
+    <script src="config/language.js"></script>          <!-- currentLang-当前语言对象 -->
 
+    <!-- UI层样式 -->
 
+    <link href="UI/css/control.css" rel="stylesheet">
 
+    <link href="UI/css/custom.css" rel="stylesheet">
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+    <!-- UI层缓存区 -->
 
+    <div id="Temporary"></div>
 
+    <!-- UI层容器 -->
 
+    <div id="uiLayer" class="container-fluid"></div>
 
+    <!-- UI层配置 -->
 
+    <script src="UI/js/control.js"></script>            <!-- 公共导航及控件UI层  -->
 
     <script>
 
     <script>
 
+        function controlSuccess() {
 
+            dynamicLoadScript("UI/js/custom.js")
 
+        }
 
     </script>
 
     </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 35 - 7
userWeb/shop.html
View File 

@@ -1,7 +1,35 @@
 
-<style>
 
-    #shop{}
 
-</style>
 
-<!-- 关于页面的UI层 -->
 
-<div id="shop">
 
-    
-</div>
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+	<meta charset="utf-8">
 
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
+	<title>商店</title>
 
+	<meta name="description" content="">
 
+	<meta name="keywords" content="">
 
+    <!-- 库 -->
 
+    <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
+	<script src="lib/jquery-2.1.1.min.js"></script>
 
+    <script src="lib/bootstrap/js/bootstrap.min.js"></script>
 
+    <!-- 配置 -->
 
+    <link href="config/common.css" rel="stylesheet">    <!-- 公共样式 -->
 
+    <script src="config/common.js"></script>            <!-- 公共配置 -->
 
+    <script src="config/language.js"></script>          <!-- currentLang-当前语言对象 -->
 
+    <!-- UI层样式 -->
 
+    <link href="UI/css/control.css" rel="stylesheet">
 
+    <link href="UI/css/shop.css" rel="stylesheet">
 
+</head>
 
+<body>
 
+    <!-- UI层缓存区 -->
 
+    <div id="Temporary"></div>
 
+    <!-- UI层容器 -->
 
+	<div id="uiLayer" class="container-fluid"></div>
 
+    <!-- UI层配置 -->
 
+    <script src="UI/js/control.js"></script>            <!-- 公共导航及控件UI层  -->
 
+    <script>
 
+        function controlSuccess() {
 
+            dynamicLoadScript("UI/js/shop.js")
 
+        }
 
+    </script>
 
+</body>
 
+</html>

+ 0 - 0
杨金城.txt
View File


+ 0 - 1
登录拉到文件修改提交.txt
View File 

@@ -1 +0,0 @@
 
-Со-