Browse Source

Accept Merge Request #5 合并 : (master -> test)

Merge Request: 合并
Created By: @albertshaw
Accepted By: @albertshaw
URL: https://coding.net/t/aft/p/AFT-WEB/git/merge/5
albertshaw 8 years ago
parent
commit
1cee98d8b6
61 changed files with 18 additions and 116760 deletions
  1. 1 1
      build/1.0.0/admin/index.js
  2. 1 1
      build/1.0.0/admin/login.js
  3. 1 1
      build/1.0.0/admin/servicesManage/copyright.js
  4. 1 1
      build/1.0.0/admin/servicesManage/highTech.js
  5. 1 1
      build/1.0.0/admin/servicesManage/patent.js
  6. 1 1
      build/1.0.0/admin/userManage.js
  7. 1 1
      build/1.0.0/user/account/index.js
  8. 1 1
      build/1.0.0/user/account/services.js
  9. 1 1
      build/1.0.0/user/account/set.js
  10. 1 1
      build/1.0.0/user/certify.js
  11. 1 1
      build/1.0.0/user/groupCertify.js
  12. 1 1
      build/1.0.0/user/index.js
  13. 1 1
      build/1.0.0/user/login.css
  14. 1 1
      build/1.0.0/user/login.js
  15. 1 1
      build/1.0.0/user/signIn.css
  16. 1 1
      build/1.0.0/user/signIn.js
  17. 1 1
      build/1.0.0/vendors.js
  18. 0 5310
      build/admin/index.css
  19. 0 32
      build/admin/index.html
  20. 0 35
      build/admin/index.js
  21. 0 3729
      build/admin/login.css
  22. 0 32
      build/admin/login.html
  23. 0 35
      build/admin/login.js
  24. 0 12401
      build/admin/servicesManage/copyright.css
  25. 0 32
      build/admin/servicesManage/copyright.html
  26. 0 35
      build/admin/servicesManage/copyright.js
  27. 0 12401
      build/admin/servicesManage/highTech.css
  28. 0 32
      build/admin/servicesManage/highTech.html
  29. 0 35
      build/admin/servicesManage/highTech.js
  30. 0 11743
      build/admin/servicesManage/patent.css
  31. 0 32
      build/admin/servicesManage/patent.html
  32. 0 35
      build/admin/servicesManage/patent.js
  33. 0 11052
      build/admin/userManage.css
  34. 0 32
      build/admin/userManage.html
  35. 0 35
      build/admin/userManage.js
  36. BIN
      build/image/bg.jpg
  37. 0 6321
      build/user/account/index.css
  38. 0 32
      build/user/account/index.html
  39. 0 35
      build/user/account/index.js
  40. 0 12146
      build/user/account/services.css
  41. 0 32
      build/user/account/services.html
  42. 0 35
      build/user/account/services.js
  43. 0 11382
      build/user/account/set.css
  44. 0 32
      build/user/account/set.html
  45. 0 35
      build/user/account/set.js
  46. 0 7188
      build/user/certify.css
  47. 0 32
      build/user/certify.html
  48. 0 35
      build/user/certify.js
  49. 0 7185
      build/user/groupCertify.css
  50. 0 32
      build/user/groupCertify.html
  51. 0 35
      build/user/groupCertify.js
  52. 0 32
      build/user/index.html
  53. 0 20
      build/user/index.js
  54. 0 7266
      build/user/login.css
  55. 0 32
      build/user/login.html
  56. 0 35
      build/user/login.js
  57. 0 7671
      build/user/signIn.css
  58. 0 32
      build/user/signIn.html
  59. 0 35
      build/user/signIn.js
  60. 0 24
      build/vendors.js
  61. 1 1
      webpack.config.js

File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/admin/index.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/admin/login.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/admin/servicesManage/copyright.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/admin/servicesManage/highTech.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/admin/servicesManage/patent.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/admin/userManage.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/user/account/index.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/user/account/services.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/user/account/set.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/user/certify.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/user/groupCertify.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/user/index.js


+ 1 - 1
build/1.0.0/user/login.css

@@ -66,7 +66,7 @@ body {
   min-height: 700px;
   margin: 0 auto;
   position: relative;
-  background-image: url(http://aftts.hnzhiming.com/1.0.0image/bg.jpg);
+  background-image: url(http://aftts.hnzhiming.com/1.0.0/image/bg.jpg);
 }
 .wrap .login-header {
   background: #fff;

File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/user/login.js


+ 1 - 1
build/1.0.0/user/signIn.css

@@ -38,7 +38,7 @@ body {
   min-height: 700px;
   margin: 0 auto;
   position: relative;
-  background-image: url(http://aftts.hnzhiming.com/1.0.0image/bg.jpg);
+  background-image: url(http://aftts.hnzhiming.com/1.0.0/image/bg.jpg);
 }
 .wrap .login-header {
   background: #fff;

File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/user/signIn.js


File diff suppressed because it is too large
+ 1 - 1
build/1.0.0/vendors.js


File diff suppressed because it is too large
+ 0 - 5310
build/admin/index.css


+ 0 - 32
build/admin/index.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-首页
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../admin/index.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../admin/index.js"></script><script type="text/javascript" src="../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/admin/index.js


File diff suppressed because it is too large
+ 0 - 3729
build/admin/login.css


+ 0 - 32
build/admin/login.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-登录
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../admin/login.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../admin/login.js"></script><script type="text/javascript" src="../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/admin/login.js


File diff suppressed because it is too large
+ 0 - 12401
build/admin/servicesManage/copyright.css


+ 0 - 32
build/admin/servicesManage/copyright.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-科技服务管理-软著
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../../admin/servicesManage/copyright.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../../admin/servicesManage/copyright.js"></script><script type="text/javascript" src="../../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/admin/servicesManage/copyright.js


File diff suppressed because it is too large
+ 0 - 12401
build/admin/servicesManage/highTech.css


+ 0 - 32
build/admin/servicesManage/highTech.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-科技服务管理-高企
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../../admin/servicesManage/highTech.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../../admin/servicesManage/highTech.js"></script><script type="text/javascript" src="../../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/admin/servicesManage/highTech.js


File diff suppressed because it is too large
+ 0 - 11743
build/admin/servicesManage/patent.css


+ 0 - 32
build/admin/servicesManage/patent.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-科技服务管理-专利
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../../admin/servicesManage/patent.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../../admin/servicesManage/patent.js"></script><script type="text/javascript" src="../../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/admin/servicesManage/patent.js


File diff suppressed because it is too large
+ 0 - 11052
build/admin/userManage.css


+ 0 - 32
build/admin/userManage.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        管理员-用户管理
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../admin/userManage.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../admin/userManage.js"></script><script type="text/javascript" src="../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/admin/userManage.js


BIN
build/image/bg.jpg


File diff suppressed because it is too large
+ 0 - 6321
build/user/account/index.css


+ 0 - 32
build/user/account/index.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户中心-首页
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../../user/account/index.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../../user/account/index.js"></script><script type="text/javascript" src="../../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/user/account/index.js


File diff suppressed because it is too large
+ 0 - 12146
build/user/account/services.css


+ 0 - 32
build/user/account/services.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户中心-科技服务
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../../user/account/services.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../../user/account/services.js"></script><script type="text/javascript" src="../../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/user/account/services.js


File diff suppressed because it is too large
+ 0 - 11382
build/user/account/set.css


+ 0 - 32
build/user/account/set.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户中心-设置
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../../user/account/set.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../../user/account/set.js"></script><script type="text/javascript" src="../../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/user/account/set.js


File diff suppressed because it is too large
+ 0 - 7188
build/user/certify.css


+ 0 - 32
build/user/certify.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        个人用户认证
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../user/certify.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../user/certify.js"></script><script type="text/javascript" src="../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/user/certify.js


File diff suppressed because it is too large
+ 0 - 7185
build/user/groupCertify.css


+ 0 - 32
build/user/groupCertify.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        团体用户认证
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../user/groupCertify.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../user/groupCertify.js"></script><script type="text/javascript" src="../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/user/groupCertify.js


+ 0 - 32
build/user/index.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户首页
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-</head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../user/index.js"></script><script type="text/javascript" src="../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 20
build/user/index.js


File diff suppressed because it is too large
+ 0 - 7266
build/user/login.css


+ 0 - 32
build/user/login.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户登录
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../user/login.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../user/login.js"></script><script type="text/javascript" src="../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/user/login.js


File diff suppressed because it is too large
+ 0 - 7671
build/user/signIn.css


+ 0 - 32
build/user/signIn.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <title>
-        用户注册
-    </title>
-    <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // }
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // }
-    </script>
-<link href="../user/signIn.css" rel="stylesheet"></head>
-
-<body>
-    <div id="root"></div>
-<script type="text/javascript" src="../user/signIn.js"></script><script type="text/javascript" src="../vendors.js"></script></body>
-
-</html>

File diff suppressed because it is too large
+ 0 - 35
build/user/signIn.js


File diff suppressed because it is too large
+ 0 - 24
build/vendors.js


+ 1 - 1
webpack.config.js

@@ -142,7 +142,7 @@ module.exports = (function () {
         default:
             break;
     }
-    staticHost = staticHost + '/' + version;
+    staticHost = staticHost + '/' + version + '/';
     return {
         entry: isWatch ? entries.watch : entries.prod,
         output: {