Browse Source

app代码提交

liujiankang 7 years ago
parent
commit
63addb06aa
100 changed files with 13749 additions and 0 deletions
  1. 39 0
      iamberry-app-api/.classpath
  2. 42 0
      iamberry-app-api/.project
  3. 12 0
      iamberry-app-api/.settings/.jsdtscope
  4. 6 0
      iamberry-app-api/.settings/org.eclipse.core.resources.prefs
  5. 8 0
      iamberry-app-api/.settings/org.eclipse.jdt.core.prefs
  6. 4 0
      iamberry-app-api/.settings/org.eclipse.m2e.core.prefs
  7. 23 0
      iamberry-app-api/.settings/org.eclipse.wst.common.component
  8. 7 0
      iamberry-app-api/.settings/org.eclipse.wst.common.project.facet.core.xml
  9. 1 0
      iamberry-app-api/.settings/org.eclipse.wst.jsdt.ui.superType.container
  10. 1 0
      iamberry-app-api/.settings/org.eclipse.wst.jsdt.ui.superType.name
  11. 1 0
      iamberry-app-api/.svn/entries
  12. 1 0
      iamberry-app-api/.svn/format
  13. BIN
      iamberry-app-api/.svn/pristine/00/0037091291c411365e33a03f3e4ba814d54c7ab9.svn-base
  14. BIN
      iamberry-app-api/.svn/pristine/00/0065a650eb2d462f755c873b939baa6fa2c7dc0e.svn-base
  15. BIN
      iamberry-app-api/.svn/pristine/01/0121bdc96ca760ac1b35707746df1aea1f0b507e.svn-base
  16. BIN
      iamberry-app-api/.svn/pristine/01/01e486c8aca83a4f9b1b59b10a4f6f80a5deac91.svn-base
  17. BIN
      iamberry-app-api/.svn/pristine/03/031b1589222ebb8b2a454b61c09b1759252a6cc1.svn-base
  18. BIN
      iamberry-app-api/.svn/pristine/03/03d6df1b9a832fbd0aead6961bc996f5b29a5fdd.svn-base
  19. BIN
      iamberry-app-api/.svn/pristine/04/04510e248184f5a419fb71cc9d3618649269a08e.svn-base
  20. 9 0
      iamberry-app-api/.svn/pristine/04/0499c7a86e798864e1429a1d6077c1fe82370f00.svn-base
  21. BIN
      iamberry-app-api/.svn/pristine/04/04cb675321757cb8e907483fa88d3c203e1f3004.svn-base
  22. BIN
      iamberry-app-api/.svn/pristine/05/0521856c4ec1fd7fca23cbcfeb3b978a38b81c4d.svn-base
  23. BIN
      iamberry-app-api/.svn/pristine/06/063514935fac40a84cc7f633d19c95962c5f55e5.svn-base
  24. BIN
      iamberry-app-api/.svn/pristine/06/06a9240a13da4a5e0d4292784af6b42f4d6b6e93.svn-base
  25. BIN
      iamberry-app-api/.svn/pristine/06/06bf97251d0ff45c9a81fc4d463fd8582f3d5eb9.svn-base
  26. BIN
      iamberry-app-api/.svn/pristine/07/07117e59c4950e05543c1da17990a8a6e17fbfa5.svn-base
  27. 295 0
      iamberry-app-api/.svn/pristine/07/0791663ffcc294a566574e72b34dd05408c400f8.svn-base
  28. BIN
      iamberry-app-api/.svn/pristine/08/086ab744610b1dd32e89f671931592d667022ed3.svn-base
  29. BIN
      iamberry-app-api/.svn/pristine/09/0915fc7e711b81af2e54f1888ed77208bfa7f626.svn-base
  30. BIN
      iamberry-app-api/.svn/pristine/09/09abd9e0a447afa242544b27107cdf066eb255a8.svn-base
  31. BIN
      iamberry-app-api/.svn/pristine/0a/0a603841ae068c2d8ae4f83ba84657bf884a5ded.svn-base
  32. 3 0
      iamberry-app-api/.svn/pristine/0a/0ac31322f56a67c073c5f02f58b943797fbce766.svn-base
  33. BIN
      iamberry-app-api/.svn/pristine/0b/0b3cb955c1506d5c8897e6445461608e9d0e08e8.svn-base
  34. BIN
      iamberry-app-api/.svn/pristine/0d/0d580791c5f14b05a0e56a31a0e61549f352a88c.svn-base
  35. BIN
      iamberry-app-api/.svn/pristine/0d/0d778e1ed03701169dc3a24bf53959487a14d015.svn-base
  36. BIN
      iamberry-app-api/.svn/pristine/0e/0e31916a436c83da142ddcd038a0f1b904451d85.svn-base
  37. BIN
      iamberry-app-api/.svn/pristine/0e/0e68c61fc3a18b4503c0872f9e2d158487ec7d8d.svn-base
  38. 1 0
      iamberry-app-api/.svn/pristine/10/100a2a505de1c9f8bafada4a60456a043ba0ab0c.svn-base
  39. BIN
      iamberry-app-api/.svn/pristine/10/100d5ef88a0579e4a99943746f98f6fffec5d809.svn-base
  40. 194 0
      iamberry-app-api/.svn/pristine/10/10a1086a012fe40ee266977536a9c7f367cee861.svn-base
  41. 57 0
      iamberry-app-api/.svn/pristine/10/10b715e59ee1fbf1c23d4efa71975202fa7638ce.svn-base
  42. BIN
      iamberry-app-api/.svn/pristine/11/116519e9b9b1f464fc918070f2edcdad3bd520c0.svn-base
  43. 45 0
      iamberry-app-api/.svn/pristine/11/1176ba93ac3593bee832c145d0378c634e09acfa.svn-base
  44. 206 0
      iamberry-app-api/.svn/pristine/12/12367eeb5eb93f9b713f7bd0d234bc3be00118dd.svn-base
  45. BIN
      iamberry-app-api/.svn/pristine/12/123915b29f0dafe203a7058437fe1ac903a9b8bf.svn-base
  46. BIN
      iamberry-app-api/.svn/pristine/12/1279108c36134e560713eed538bcc0128c2b5cc1.svn-base
  47. BIN
      iamberry-app-api/.svn/pristine/12/12a491d19ac2fffaac7000e01da310270531d547.svn-base
  48. BIN
      iamberry-app-api/.svn/pristine/12/12f3f250fbbc40843f7e8ced9413782e4b5238c1.svn-base
  49. BIN
      iamberry-app-api/.svn/pristine/13/13b303c36264cdeeb567cb51ab23bcd23284c240.svn-base
  50. BIN
      iamberry-app-api/.svn/pristine/14/141771d62271f408570823601fd6bba69efe6848.svn-base
  51. 355 0
      iamberry-app-api/.svn/pristine/14/1438efeb9d7e4a6ec6761c22674696265882ba92.svn-base
  52. BIN
      iamberry-app-api/.svn/pristine/15/1517ea778162dacdba017fa0d36a3a5e2f1a53ed.svn-base
  53. 78 0
      iamberry-app-api/.svn/pristine/15/15ba0bd7d71e0329da589f1fe875237976a947b9.svn-base
  54. 413 0
      iamberry-app-api/.svn/pristine/16/1648c0ea14423a4877251d9b1d79ac078ffb26dd.svn-base
  55. BIN
      iamberry-app-api/.svn/pristine/17/170af7b454acb140ffdde1763bcd07f65d57550d.svn-base
  56. BIN
      iamberry-app-api/.svn/pristine/17/17b86874390f911ffb9993c1b8a8f63bdf2be931.svn-base
  57. BIN
      iamberry-app-api/.svn/pristine/17/17c372678aafb3bc1a7b37320b5cc1d8af433527.svn-base
  58. BIN
      iamberry-app-api/.svn/pristine/17/17f9a0cae0c4418ab7cc6afb65e15f81348f0fc0.svn-base
  59. 182 0
      iamberry-app-api/.svn/pristine/18/18034b900853c3a53f31b37100d9f11e7dd6da12.svn-base
  60. 664 0
      iamberry-app-api/.svn/pristine/19/194ccfd4747531f20615ec9d17f781092fee6069.svn-base
  61. BIN
      iamberry-app-api/.svn/pristine/19/197150071bd389a4195c508f1a2422b5d96e6f05.svn-base
  62. 25 0
      iamberry-app-api/.svn/pristine/19/19f1bda800b3dd9a55c1e554c8a7737ce5eab63a.svn-base
  63. 22 0
      iamberry-app-api/.svn/pristine/1a/1a77603ebeafb23bf34943675dbb982ecc049f22.svn-base
  64. BIN
      iamberry-app-api/.svn/pristine/1a/1a7a790dac1b9916ebc018aacd7b1c501e36bd8c.svn-base
  65. 39 0
      iamberry-app-api/.svn/pristine/1c/1c25dc40e1e4b0230e14ba2592abb05d7dff1dcc.svn-base
  66. 5 0
      iamberry-app-api/.svn/pristine/1c/1c30fe3f0904ea359f2eefe7fce1f150d04fc913.svn-base
  67. BIN
      iamberry-app-api/.svn/pristine/1c/1c36949861913cb026f6d7a8e5153311aea91ad0.svn-base
  68. 8 0
      iamberry-app-api/.svn/pristine/1c/1c3825da5df587aabb6bb1fe4ff92a9c05e6ad78.svn-base
  69. 44 0
      iamberry-app-api/.svn/pristine/1c/1c5bf2b398fac287af2fd7ee95cd885f8c492967.svn-base
  70. 10216 0
      iamberry-app-api/.svn/pristine/1c/1c6d31ce30341f8116e6124a77c89c930204b96d.svn-base
  71. BIN
      iamberry-app-api/.svn/pristine/1d/1d4687ee7912407d455aa9b0456486030512de9d.svn-base
  72. BIN
      iamberry-app-api/.svn/pristine/1d/1d4c3b00786a4c3ef7402dc29195e0ad6d85609f.svn-base
  73. 10 0
      iamberry-app-api/.svn/pristine/1e/1e59675aee8dc721e6f150ad1ee27d6a189305ca.svn-base
  74. BIN
      iamberry-app-api/.svn/pristine/1e/1ec3f97c5214acf31519955826b6d7f8cddfa678.svn-base
  75. BIN
      iamberry-app-api/.svn/pristine/1e/1edbb9d5b56f06cc29c26ff6266c0215b679b02d.svn-base
  76. BIN
      iamberry-app-api/.svn/pristine/20/205815e18102fd0b5cd312b11da06afd22277dbd.svn-base
  77. BIN
      iamberry-app-api/.svn/pristine/21/214f3f913d342d8b28c93a88cd138d562d0c49a4.svn-base
  78. 89 0
      iamberry-app-api/.svn/pristine/22/225ba874aa7b2b63b23a80d0107330291678dc49.svn-base
  79. BIN
      iamberry-app-api/.svn/pristine/23/2381587d2b373ad123f811c396bce6731694e357.svn-base
  80. 1 0
      iamberry-app-api/.svn/pristine/23/23939b6c8792fde82ee302eb4aca45067895dac2.svn-base
  81. BIN
      iamberry-app-api/.svn/pristine/25/2507b0f9973523be7e4a4eeb6e41e8b9fafa99df.svn-base
  82. 12 0
      iamberry-app-api/.svn/pristine/25/250bbdae7886c4c506953e7f84b4de6cd1ae56a2.svn-base
  83. BIN
      iamberry-app-api/.svn/pristine/25/2528e588690e910eabb58747fd865319f34289eb.svn-base
  84. 27 0
      iamberry-app-api/.svn/pristine/25/255d01003cd947f0b7354cce0589016482a87c54.svn-base
  85. BIN
      iamberry-app-api/.svn/pristine/26/2691733dbdb7ce0f537d51804a34a6e68bcdd623.svn-base
  86. 100 0
      iamberry-app-api/.svn/pristine/26/269cfab97a62986e245a1a0d6577ce23a565cf76.svn-base
  87. 305 0
      iamberry-app-api/.svn/pristine/27/2732dd5ccd56a25a5ceb8a96b7c77b0a9f3b3614.svn-base
  88. BIN
      iamberry-app-api/.svn/pristine/27/27fd23ecc8971f0dd463b14d24e50f0c414f1ba4.svn-base
  89. 164 0
      iamberry-app-api/.svn/pristine/29/298dcc88ee469812763e716265e667895016b509.svn-base
  90. BIN
      iamberry-app-api/.svn/pristine/2a/2a6f8aee589dd055d47ed7b151d022238d741261.svn-base
  91. BIN
      iamberry-app-api/.svn/pristine/2a/2ac17299127cb7b488edaac4fcd4bb99a5b0ed8d.svn-base
  92. 12 0
      iamberry-app-api/.svn/pristine/2c/2c4e764a3d5365b60daddaeaed59fd6db10519d5.svn-base
  93. BIN
      iamberry-app-api/.svn/pristine/2c/2c5247fe32b396b411a02853a3d8177c1acc501a.svn-base
  94. 23 0
      iamberry-app-api/.svn/pristine/2c/2cc92060ddd3759147602ac6d64c0c6f07adad54.svn-base
  95. BIN
      iamberry-app-api/.svn/pristine/2c/2cde996b40294ca63015209d0b735c6d81a302db.svn-base
  96. BIN
      iamberry-app-api/.svn/pristine/2d/2d06a579340976e904601ac157a153e8e374ae46.svn-base
  97. BIN
      iamberry-app-api/.svn/pristine/2d/2d76112fd504f0fd222d646df634cbee31c55f92.svn-base
  98. BIN
      iamberry-app-api/.svn/pristine/2d/2dd8d0e72ceb0f6e3a93f9d7e6e9cd84b0ef5c97.svn-base
  99. BIN
      iamberry-app-api/.svn/pristine/2d/2dedb7d62c6bc2b24b30b7f2b865e7ea49aa06ef.svn-base
  100. 0 0
      iamberry-app-api/.svn/pristine/2e/2e9ea6f0d12b671dd4ae04aa85ba081aa5dce3f1.svn-base

+ 39 - 0
iamberry-app-api/.classpath

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

+ 42 - 0
iamberry-app-api/.project

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>iamberry-app-api</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

+ 12 - 0
iamberry-app-api/.settings/.jsdtscope

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

+ 6 - 0
iamberry-app-api/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

+ 8 - 0
iamberry-app-api/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

+ 4 - 0
iamberry-app-api/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

+ 23 - 0
iamberry-app-api/.settings/org.eclipse.wst.common.component

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="iamberry-app-api">
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <dependent-module archiveName="iamberry-common-web-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/iamberry-common-web/iamberry-common-web">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="iamberry-app-interface-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/iamberry-app-interface/iamberry-app-interface">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="iamberry-common-core-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/iamberry-common-core/iamberry-common-core">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="iamberry-common-tool-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/iamberry-common-tool/iamberry-common-tool">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="iamberry-app-api"/>
+        <property name="java-output-path" value="/iamberry-app-api/target/classes"/>
+    </wb-module>
+</project-modules>

+ 7 - 0
iamberry-app-api/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>

+ 1 - 0
iamberry-app-api/.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary

+ 1 - 0
iamberry-app-api/.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

+ 1 - 0
iamberry-app-api/.svn/entries

@@ -0,0 +1 @@
+12

+ 1 - 0
iamberry-app-api/.svn/format

@@ -0,0 +1 @@
+12

BIN
iamberry-app-api/.svn/pristine/00/0037091291c411365e33a03f3e4ba814d54c7ab9.svn-base


BIN
iamberry-app-api/.svn/pristine/00/0065a650eb2d462f755c873b939baa6fa2c7dc0e.svn-base


BIN
iamberry-app-api/.svn/pristine/01/0121bdc96ca760ac1b35707746df1aea1f0b507e.svn-base


BIN
iamberry-app-api/.svn/pristine/01/01e486c8aca83a4f9b1b59b10a4f6f80a5deac91.svn-base


BIN
iamberry-app-api/.svn/pristine/03/031b1589222ebb8b2a454b61c09b1759252a6cc1.svn-base


BIN
iamberry-app-api/.svn/pristine/03/03d6df1b9a832fbd0aead6961bc996f5b29a5fdd.svn-base


BIN
iamberry-app-api/.svn/pristine/04/04510e248184f5a419fb71cc9d3618649269a08e.svn-base


File diff suppressed because it is too large
+ 9 - 0
iamberry-app-api/.svn/pristine/04/0499c7a86e798864e1429a1d6077c1fe82370f00.svn-base


BIN
iamberry-app-api/.svn/pristine/04/04cb675321757cb8e907483fa88d3c203e1f3004.svn-base


BIN
iamberry-app-api/.svn/pristine/05/0521856c4ec1fd7fca23cbcfeb3b978a38b81c4d.svn-base


BIN
iamberry-app-api/.svn/pristine/06/063514935fac40a84cc7f633d19c95962c5f55e5.svn-base


BIN
iamberry-app-api/.svn/pristine/06/06a9240a13da4a5e0d4292784af6b42f4d6b6e93.svn-base


BIN
iamberry-app-api/.svn/pristine/06/06bf97251d0ff45c9a81fc4d463fd8582f3d5eb9.svn-base


BIN
iamberry-app-api/.svn/pristine/07/07117e59c4950e05543c1da17990a8a6e17fbfa5.svn-base


+ 295 - 0
iamberry-app-api/.svn/pristine/07/0791663ffcc294a566574e72b34dd05408c400f8.svn-base

@@ -0,0 +1,295 @@
+function flightHandler(){
+}
+//Array.prototype.indexOf = function(item) { 
+//	for (var i = 0; i < this.length; i++) { 
+//		if (!!this[i]&&this[i].indexOf(item+"|")!=-1) 
+//			return i; 
+//	}
+//	return -1; 
+//} 
+var firstcity="深圳";
+var regcity=/[^\u4E00-\u9FA5]/g ;
+$(document).ready(function(){
+	 $("#weather").css("background","url(img/onloading.gif) no-repeat center");
+	changeStyle();
+	$(window).resize(function(){
+	  changeStyle();  
+	});
+	loadJsonp("深圳");
+$("#city .city").unbind();
+$("#city .change").click(function(e){
+	var cityname=$("#city .city").text();
+    $("#city .city").hide();
+    $(this).hide();
+	var left=$(".Infobottom").offset().left;
+	var top=$(".air").offset().top+30;
+    $(".demo").css({"top":top-30,"left":left});
+	$(".demo").show();
+	$(".blackone").show();
+	$("#citySelect").attr("value",cityname);
+	$("#citySelect")[0].click();
+	
+	var $city = $("#cityBox a:visible");
+	$city.unbind();
+	$city.click(function(){
+		var valueone=$("#citySelect").val();
+		 emptyAll();
+         loadJsonp(valueone);
+         var $selCity =  $("#city .city");
+         $selCity.text(valueone);
+         $selCity.show();
+    	 $("#city .change").show();
+    	 $(".blackone").hide();
+    	 $(".demo").hide();  
+	});
+	//$(".cityslide li").unbind();
+ 	//$(".cityslide").on("click","li",function(){
+ 		
+	//});
+	e.stopPropagation();
+});
+$(".blackone").click(function(){
+	var valueone=$("#citySelect").val();
+	var cityname1="";
+	// console.log(valueone.replace(regcity,""));
+if(findcity(valueone.replace(regcity,"")+"|")!=-1&&valueone.replace(regcity,"")!=""){	
+		 cityname1=valueone.replace(regcity,""); 
+		 emptyAll();
+         loadJsonp(cityname1);
+	}else{  
+		cityname1=firstcity;
+	}
+	 $("#city .city").text(cityname1);
+	 $("#city .city").show();
+	 $("#city .change").show();
+	 $(this).hide();
+	 $(".demo").hide();  
+
+});
+
+});
+function findcity(item){
+      for (var i = 0; i < Vcity.allCity.length-1; ++i) {
+                     if(Vcity.allCity[i].indexOf(item)==0)
+                         return i;        
+      };
+
+ return -1;
+}
+function emptyAll(){
+	$("#city .city").empty();
+    $(".airquality").text("获取中");
+//	var li=$(".mid li")
+//	for(var i=0;i<li.length;++i)
+//	 if(!li.eq(i).children("img")&&!li.eq(i).children("img"))
+//	     li.eq(i).empty(); 
+	$(".mid li:not(:has(img)):not(:has(span))").empty();
+	$(".mid li img").attr("src","");
+	$(".mid li span").empty();
+	$("#warning").empty();
+    $("#weather").css("background","url(img/onloading.gif) no-repeat center");
+}
+function selfliCallback(){
+	var valueone=$("#citySelect").val();
+	// console.log(valueone);
+	// console.log(Vcity.allCity.indexOf(valueone.replace(regcity,"")+"|"));
+	if(valueone!="对不起"){	
+		emptyAll();
+	loadJsonp(valueone.replace(regcity,""));
+	 $("#city .city").text(valueone.replace(regcity,""));
+	 $("#city .city").show();
+	 $("#city .change").show();
+	 $(".demo").hide();  
+	 $(".blackone").hide();
+	}
+	else {
+		 $(".demo").hide();  
+		 $(".blackone").hide();
+		 $("#city .city").show();	
+		 $("#city .change").show();
+	};
+}
+//初始化改变部分样式
+function changeStyle(){
+	var left=$(".Infobottom").offset().left;
+	var top=$(".air").offset().top+30;
+    $(".demo").css({"top":top-30,"left":left});
+    $(".citySelector").css({"top":top,"left":left});
+	var contentH = $("#indexWindow").height()-$(".head").height()-40;
+	var main_height= contentH - 81;
+	//$("#mainCal").height(main_height);
+	$("#cont").height(main_height-32);
+	$(".d_right,.black").unbind();
+	$(".d_right").click(function(){
+	   $("#BigE").toggle();
+	   $(".black").toggle();
+	});
+	$(".black").click(function(){
+		$("#BigE").hide();
+		 $(".black").hide();
+	});
+	setLeftHeight();
+}
+
+function setLeftHeight(){
+	$(".everydayinfo").height($("#mainCal").prev()[0].clientHeight + $("#mainCal")[0].clientHeight);
+}
+
+function loadJsonp(w_city){
+    $.ajax({
+        type: "get",
+        async: false,
+        url: "http://wthrcdn.etouch.cn/weather_mini?city="+w_city+"&callback=flightHandler",
+        dataType: "jsonp",
+        jsonp: "callback",//传递给请求处理程序或页面的,用以获得jsonp回调函数名的参数名(一般默认为:callback)
+        jsonpCallback:"flightHandler",//自定义的jsonp回调函数名称,默认为jQuery自动生成的随机函数名,也可以写"?",jQuery会自动为你处理数据
+        success: function(data){
+        	if(data.status == 1000){
+	        	 d=data.data;
+	        	 var tips="";
+	        	 var d_index=d.ganmao.indexOf(",");
+	        	 var j_index=d.ganmao.indexOf("。");
+	        	 if(j_index>19) {tips=d.ganmao.slice(0,d_index)+"。";}
+	        	 else{
+	        	 	if(d.ganmao.length<=19){tips=d.ganmao;}
+                    else{tips=d.ganmao.slice(0,j_index)+"。";}
+	        	  }
+
+	        	 $("#city .city").text(d.city);
+	             firstcity=d.city; 
+	        	 var _aqi=d.aqi;
+	        	 var level="";
+	        	 if(_aqi<=50&&_aqi>0) level="优秀";
+	        	 if(_aqi<=100&&_aqi>50) level="良好";
+	        	 if(_aqi<=150&&_aqi>100) level="一般";
+	        	 if(_aqi<=200&&_aqi>150)  level="很差";
+	        	 if(_aqi>200)  level="很差";
+	        	$("#city .airquality").text(_aqi+level);
+	        	 if(!_aqi) {
+	        		 level="暂缺";
+	        	 $("#city .airquality").text(level);
+	        	 }
+	        	$("#weather").css("background","none");
+	        	var src="";
+	        	var src1="";
+	        	var src2="";
+	        	var reg=/[\u4E00-\u9FA5]/g;
+	        	var lower=[];
+	        	var higher=[];
+	        	if(d.forecast[0].type=="多云")
+	        		src2="img/cloudl.png";
+	        	if(d.forecast[0].type=="小雨")
+	        		src2="img/small_rainl.png";
+	        	if(d.forecast[0].type=="小到中雨")
+	        		src2="img/stom_rainl.png";
+	        	if(d.forecast[0].type=="阴")
+	        		src2="img/overcastl.png";
+	        	if(d.forecast[0].type=="晴")
+	        		src2="img/finel.png";
+	        	if(d.forecast[0].type=="阵雨")
+	        		src2="img/quick_rainl.png";
+	        	if(d.forecast[0].type=="雷阵雨")
+	        		src2="img/lquick_rainl.png";
+	        	if(d.forecast[0].type=="大雨"||d.forecast[0].type=="中到大雨")
+	        		src2="img/big_rainl.png";
+	        	if(d.forecast[0].type=="暴雨"||d.forecast[0].type=="大暴雨"||d.forecast[0].type=="特大暴雨"||d.forecast[0].type=="大到暴雨"||d.forecast[0].type=="暴雨到大暴雨"||d.forecast[0].type=="大暴雨到特大暴雨")
+	        		src2="img/mbig_rainl.png";
+	        	if(d.forecast[0].type=="中雨")
+	        		src2="img/mid_rainl.png";
+	        	if(d.forecast[0].type=="雷阵雨伴有冰雹")
+	        		src2="img/quick_rain_icel.png";
+	        	if(d.forecast[0].type=="雨夹雪")
+	        		src2="img/rain_snowl.png";
+	        	if(d.forecast[0].type=="阵雪")
+	        		src2="img/quick_snowl.png";
+	        	if(d.forecast[0].type=="雾")
+	        		src2="img/fogl.png";
+	        	if(d.forecast[0].type=="沙尘暴"||d.forecast[0].type=="浮尘"||d.forecast[0].type=="扬沙"||d.forecast[0].type=="强沙尘暴"||d.forecast[0].type=="雾霾")
+	        		src2="img/sandl.png";
+	        	if(d.forecast[0].type=="冻雨")
+	        		src2="img/ice_rainl.png";
+	        	if(d.forecast[0].type=="无天气类型")
+	        		src2="img/unknownl.png";
+	        	$("#mainCal .today a").css("background","url("+src2+") no-repeat 0 0");
+	        	for(var i=0;i<3;++i){
+	        		var day=$("#day"+i);
+	        		lower[i]=d.forecast[i].low.replace(reg,'' );
+	        		higher[i]=d.forecast[i].high.replace(reg,'' );
+		        	if(d.forecast[i].type=="多云") 
+		        		{
+		        		src="img/cloud.png";
+		        		
+		        	    src1="img/cloud2.png";
+		        		}
+		        	if(d.forecast[i].type=="晴")
+		        		{src="img/fine.png";
+		        	    src1="img/fine2.png";}
+		        	if(d.forecast[i].type=="阴")
+		        		{src="img/overcast.png";
+		        	src1="img/overcast2.png";}
+		        	if(d.forecast[i].type=="小雨")
+		        		{src="img/small_rain.png";
+		        	    src1="img/small_rain2.png";}
+		        	if(d.forecast[i].type=="小到中雨")
+		        	{src="img/stom_rain.png";
+		    	    src1="img/stom_rain2.png";}
+		        	if(d.forecast[i].type=="大雨"||d.forecast[i].type=="中到大雨")
+		        		{src="img/big_rain.png";
+		        		src1="img/big_rain2.png";}
+		        	if(d.forecast[i].type=="暴雨"||d.forecast[i].type=="大暴雨"||d.forecast[i].type=="特大暴雨"||d.forecast[i].type=="大到暴雨"||d.forecast[i].type=="暴雨到大暴雨"||d.forecast[i].type=="大暴雨到特大暴雨")
+		        	{src="img/mbig_rain.png";
+		    		src1="img/mbig_rain2.png";}
+		        	if(d.forecast[i].type=="雨夹雪")
+		        		{src="img/rain_snow.png";
+		        	    src1="img/rain_snow2.png";}
+		        	if(d.forecast[i].type=="阵雪")
+		    		{src="img/quick_snow.png";
+		    	    src1="img/quick_snow2.png";}
+		        	if(d.forecast[i].type=="雾")
+		    		{src="img/fog.png";
+		    	    src1="img/fog2.png";}
+		        	if(d.forecast[i].type=="沙尘暴"||d.forecast[i].type=="浮尘"||d.forecast[i].type=="扬沙"||d.forecast[i].type=="强沙尘暴"||d.forecast[i].type=="雾霾")
+		    		{src="img/sand.png";
+		    	    src1="img/sand2.png";}
+		        	if(d.forecast[i].type=="冻雨")
+		        	{src="img/ice_rain.png";
+		    	    src1="img/ice_rain2.png";}
+		        	if(d.forecast[i].type=="中雨")
+		        	{src="img/mid_rain.png";
+		        	    src1="img/mid_rain2.png";}
+		        	if(d.forecast[i].type=="雷阵雨伴有冰雹")
+		        	    {src="img/quick_rain_ice.png";
+		        	    src="img/quick_rain_ice2.png";}
+		        	if(d.forecast[i].type=="阵雨")
+		        		{src="img/quick_rain.png";
+		        	    src1="img/quick_rain2.png";}
+		        	if(d.forecast[i].type=="雷阵雨")
+		        	{ src="img/lquick_rain.png";
+		        	   src1="img/lquick_rain2.png";}
+		        	if(d.forecast[i].type=="无天气类型")
+		        	{ src="img/unknown.png";
+		        	   src1="img/unknown2.png";}
+		        	//   console.log(src,src1);
+		        	//   console.log(day);
+		        	day.find("li:eq(0)").text(d.forecast[i].date);
+		        	day.find("li:eq(1)").find("img").attr("src",src1);
+		        	day.find("#today_icon").attr("src",src);
+		        	day.find("li:eq(3)").text(d.forecast[i].type);
+		        	day.find("#today_tem").text(d.wendu).append("<span class='juhao'>&#186;</span>");
+		        	day.find("li:eq(4)").text(lower[i]+"~"+higher[i]);
+		        	day.find("li:eq(5)").find("span:eq(0)").text(d.forecast[i].fengxiang); 
+		        	day.find("li:eq(5)").find("span:eq(1)").text(d.forecast[i].fengli);
+	        	}
+	        	$("#warning").text(tips);
+        	}else{
+        		 emptyAll();
+                 $("#weather").css("background","url(img/wrong.png) no-repeat center");
+        	}
+        },
+        error: function(){
+            emptyAll();
+            $("#weather").css("background","url(img/wrong.png) no-repeat center");
+        }
+    });
+};
+

BIN
iamberry-app-api/.svn/pristine/08/086ab744610b1dd32e89f671931592d667022ed3.svn-base


BIN
iamberry-app-api/.svn/pristine/09/0915fc7e711b81af2e54f1888ed77208bfa7f626.svn-base


BIN
iamberry-app-api/.svn/pristine/09/09abd9e0a447afa242544b27107cdf066eb255a8.svn-base


BIN
iamberry-app-api/.svn/pristine/0a/0a603841ae068c2d8ae4f83ba84657bf884a5ded.svn-base


+ 3 - 0
iamberry-app-api/.svn/pristine/0a/0ac31322f56a67c073c5f02f58b943797fbce766.svn-base

@@ -0,0 +1,3 @@
+account	¸öÈËÖÐÐÄ
+info	¸öÈË×ÊÁÏ
+role	½ÇÉ«

BIN
iamberry-app-api/.svn/pristine/0b/0b3cb955c1506d5c8897e6445461608e9d0e08e8.svn-base


BIN
iamberry-app-api/.svn/pristine/0d/0d580791c5f14b05a0e56a31a0e61549f352a88c.svn-base


BIN
iamberry-app-api/.svn/pristine/0d/0d778e1ed03701169dc3a24bf53959487a14d015.svn-base


BIN
iamberry-app-api/.svn/pristine/0e/0e31916a436c83da142ddcd038a0f1b904451d85.svn-base


BIN
iamberry-app-api/.svn/pristine/0e/0e68c61fc3a18b4503c0872f9e2d158487ec7d8d.svn-base


File diff suppressed because it is too large
+ 1 - 0
iamberry-app-api/.svn/pristine/10/100a2a505de1c9f8bafada4a60456a043ba0ab0c.svn-base


BIN
iamberry-app-api/.svn/pristine/10/100d5ef88a0579e4a99943746f98f6fffec5d809.svn-base


+ 194 - 0
iamberry-app-api/.svn/pristine/10/10a1086a012fe40ee266977536a9c7f367cee861.svn-base

@@ -0,0 +1,194 @@
+/*H-ui.admin.js v2.3.1 date:15:42 2015.08.19 by:guojunhui*/
+/*获取顶部选项卡总长度*/
+function tabNavallwidth(){
+	var taballwidth=0,
+		$tabNav = $(".acrossTab"),
+		$tabNavWp = $(".Hui-tabNav-wp"),
+		$tabNavitem = $(".acrossTab li"),
+		$tabNavmore =$(".Hui-tabNav-more");
+	if (!$tabNav[0]){return}
+	$tabNavitem.each(function(index, element) {
+        taballwidth+=Number(parseFloat($(this).width()+60))});
+	$tabNav.width(taballwidth+25);
+	var w = $tabNavWp.width();
+	if(taballwidth+25>w){
+		$tabNavmore.show()}
+	else{
+		$tabNavmore.hide();
+		$tabNav.css({left:0})}
+}
+
+/*左侧菜单响应式*/
+function Huiasidedisplay(){
+	if($(window).width()>=768){
+		$(".Hui-aside").show()
+	} 
+}
+function getskincookie(){
+	var v = getCookie("Huiskin");
+	if(v==null||v==""){
+		v="default";
+	}
+	$("#skin").attr("href","/iamberry/common/admin/skin/"+v+"/skin.css");
+}
+$(function(){
+	getskincookie();
+	//layer.config({extend: 'extend/layer.ext.js'});
+	Huiasidedisplay();
+	var resizeID;
+	$(window).resize(function(){
+		clearTimeout(resizeID);
+		resizeID = setTimeout(function(){
+			Huiasidedisplay();
+		},500);
+	});
+	
+	$(".Hui-nav-toggle").click(function(){
+		$(".Hui-aside").slideToggle();
+	});
+	$(".Hui-aside").on("click",".menu_dropdown dd li a",function(){
+		if($(window).width()<768){
+			$(".Hui-aside").slideToggle();
+		}
+	});
+	/*左侧菜单*/
+	$.Huifold(".menu_dropdown dl dt",".menu_dropdown dl dd","fast",1,"click");
+	/*选项卡导航*/
+	
+	$(".Hui-aside").on("click",".menu_dropdown a",function(){
+		if($(this).attr('_href')){
+			var bStop=false;
+			var bStopIndex=0;
+			var _href=$(this).attr('_href');
+			var _titleName=$(this).html();
+			var topWindow=$(window.parent.document);
+			var show_navLi=topWindow.find("#min_title_list li");
+			show_navLi.each(function() {
+				if($(this).find('span').attr("data-href")==_href){
+					bStop=true;
+					bStopIndex=show_navLi.index($(this));
+					return false;
+				}
+			});
+			if(!bStop){
+				creatIframe(_href,_titleName);
+				min_titleList();
+			}
+			else{
+				show_navLi.removeClass("active").eq(bStopIndex).addClass("active");
+				var iframe_box=topWindow.find("#iframe_box");
+				iframe_box.find(".show_iframe").hide().eq(bStopIndex).show().find("iframe").attr("src",_href);
+			}
+		}
+	});
+	
+	function min_titleList(){
+		var topWindow=$(window.parent.document);
+		var show_nav=topWindow.find("#min_title_list");
+		var aLi=show_nav.find("li");
+	};
+	function creatIframe(href,titleName){
+		var topWindow=$(window.parent.document);
+		var show_nav=topWindow.find('#min_title_list');
+		show_nav.find('li').removeClass("active");
+		var iframe_box=topWindow.find('#iframe_box');
+		show_nav.append('<li class="active"><span data-href="'+href+'">'+titleName+'</span><i></i><em></em></li>');
+		tabNavallwidth();
+		var iframeBox=iframe_box.find('.show_iframe');
+		iframeBox.hide();
+		iframe_box.append('<div class="show_iframe"><div class="loading"></div><iframe frameborder="0" src='+href+'></iframe></div>');
+		var showBox=iframe_box.find('.show_iframe:visible');
+		showBox.find('iframe').attr("src",href).load(function(){
+			showBox.find('.loading').hide();
+		});
+	}
+
+	var num=0;
+	var oUl=$("#min_title_list");
+	var hide_nav=$("#Hui-tabNav");
+	$(document).on("click","#min_title_list li",function(){
+		var bStopIndex=$(this).index();
+		var iframe_box=$("#iframe_box");
+		$("#min_title_list li").removeClass("active").eq(bStopIndex).addClass("active");
+		iframe_box.find(".show_iframe").hide().eq(bStopIndex).show();
+	});
+	$(document).on("click","#min_title_list li i",function(){
+		var aCloseIndex=$(this).parents("li").index();
+		$(this).parent().remove();
+		$('#iframe_box').find('.show_iframe').eq(aCloseIndex).remove();	
+		num==0?num=0:num--;
+		tabNavallwidth();
+	});
+	$(document).on("dblclick","#min_title_list li",function(){
+		var aCloseIndex=$(this).index();
+		var iframe_box=$("#iframe_box");
+		if(aCloseIndex>0){
+			$(this).remove();
+			$('#iframe_box').find('.show_iframe').eq(aCloseIndex).remove();	
+			num==0?num=0:num--;
+			$("#min_title_list li").removeClass("active").eq(aCloseIndex-1).addClass("active");
+			iframe_box.find(".show_iframe").hide().eq(aCloseIndex-1).show();
+			tabNavallwidth();
+		}else{
+			return false;
+		}
+	});
+	tabNavallwidth();
+	
+	$('#js-tabNav-next').click(function(){
+		num==oUl.find('li').length-1?num=oUl.find('li').length-1:num++;
+		toNavPos();
+	});
+	$('#js-tabNav-prev').click(function(){
+		num==0?num=0:num--;
+		toNavPos();
+	});
+	
+	function toNavPos(){
+		oUl.stop().animate({'left':-num*100},100);
+	}
+	
+	/*换肤*/
+	$("#Hui-skin .dropDown-menu a").click(function(){
+		var v = $(this).attr("data-val");
+		setCookie("Huiskin", v);
+		$("#skin").attr("href","/iamberry/common/admin/skin/"+v+"/skin.css");
+	});
+}); 
+/*弹出层*/
+/*
+	参数解释:
+	title	标题
+	url		请求的url
+	id		需要操作的数据id
+	w		弹出层宽度(缺省调默认值)
+	h		弹出层高度(缺省调默认值)
+*/
+function layer_show(title,url,w,h){
+	if (title == null || title == '') {
+		title=false;
+	};
+	if (url == null || url == '') {
+		url="404.html";
+	};
+	if (w == null || w == '') {
+		w=800;
+	};
+	if (h == null || h == '') {
+		h=($(window).height() - 50);
+	};
+	layer.open({
+		type: 2,
+		area: [w+'px', h +'px'],
+		fix: false, //不固定
+		maxmin: true,
+		shade:0.4,
+		title: title,
+		content: url
+	});
+}
+/*关闭弹出框口*/
+function layer_close(){
+	var index = parent.layer.getFrameIndex(window.name);
+	parent.layer.close(index);
+}

File diff suppressed because it is too large
+ 57 - 0
iamberry-app-api/.svn/pristine/10/10b715e59ee1fbf1c23d4efa71975202fa7638ce.svn-base


BIN
iamberry-app-api/.svn/pristine/11/116519e9b9b1f464fc918070f2edcdad3bd520c0.svn-base


+ 45 - 0
iamberry-app-api/.svn/pristine/11/1176ba93ac3593bee832c145d0378c634e09acfa.svn-base

@@ -0,0 +1,45 @@
+.ui-dialog {pointer-events: auto;display: none; border: 1px solid #ccc; background-color: #fff; font-family: arial, 'Hiragino Sans GB', sans-serif; position: absolute;left:40%;top:40%;}
+.ui-dialog-close { position: absolute; right: 10px;cursor: pointer;color:#FFF; font-weight: bold;font-family: cursive;}
+.ui-dialog-mask{position: fixed;width:100%;height:100%;left:0;top:0;background:#000;opacity: .3;display: none;filter:alpha(opacity=30);}
+.ui-dialog-title{background-color:#288df0;color:#fff;padding:5px 10px;}
+@-webkit-keyframes zoomIn {
+	0% { opacity: 0; -webkit-transform: scale3d(.3, .3, .3); -moz-transform: scale3d(.3, .3, .3); -ms-transform: scale3d(.3, .3, .3); transform: scale3d(.3, .3, .3); }
+	100% { opacity: 1; }
+}
+@-moz-keyframes zoomIn {
+	0% { opacity: 0; -webkit-transform: scale3d(.3, .3, .3); -moz-transform: scale3d(.3, .3, .3); -ms-transform: scale3d(.3, .3, .3); transform: scale3d(.3, .3, .3); }
+	100% { opacity: 1; }
+}
+@keyframes zoomIn {
+	0% { opacity: 0; -webkit-transform: scale3d(.3, .3, .3); -moz-transform: scale3d(.3, .3, .3); -ms-transform: scale3d(.3, .3, .3); transform: scale3d(.3, .3, .3);}
+	100% { opacity: 1; }
+}
+@keyframes zoomOut {
+	0% { opacity: 1; -webkit-transform: scale3d(1, 1, 1); -moz-transform: scale3d(1, 1, 1); -ms-transform: scale3d(1, 1, 1); transform: scale3d(1, 1, 1);}
+	100% { opacity: 0;}
+}
+@-webkit-keyframes zoomOut {
+	0% { opacity: 1; -webkit-transform: scale3d(1, 1, 1); -moz-transform: scale3d(1, 1, 1); -ms-transform: scale3d(1, 1, 1); transform: scale3d(1, 1, 1);}
+	100% { opacity: 0; }
+}
+@-moz-keyframes zoomOut {
+	0% { opacity: 1; -webkit-transform: scale3d(1, 1, 1); -moz-transform: scale3d(1, 1, 1); -ms-transform: scale3d(1, 1, 1); transform: scale3d(1, 1, 1); }
+	100% { opacity: 1; }
+}
+.zoomIn { -webkit-animation-name: zoomIn; animation-name: zoomIn; }
+.zoomOut { -webkit-animation-name: zoomOut; animation-name: zoomOut;display: none\0 !important; }
+.animated { -webkit-animation-duration: .5s; animation-duration: .5s; -webkit-animation-fill-mode: both; -ms-animation-fill-mode: both; -moz-animation-fill-mode: both; animation-fill-mode: both; }
+#confirmDialog{width: 350px;background-color: #fff;}
+.ui-confirm-title,.ui-alert-title{white-space:nowrap; text-align: center;font-size: 18px;font-weight: bold;color:#333;line-height: 40px;}
+.confirm-title2{font-size: 16px;font-weight: normal; color: #666;text-align: center;line-height: 1.8;}
+.ui-dialog-submit,.ui-alert-submit,.ui-confirm-submit{background-color: #e05658;}
+.ui-dialog-cancel{background-color:#999999;}
+.ui-dialog-action{pointer-events: auto;text-align: center;margin-top: 20px;width:100%;border:none;}
+.ui-dialog-action td{text-align: center;border:none;}
+.ui-dialog-action button{display: inline-block;border-radius: 5px;padding:5px 20px;color:#fff;border:none;outline: none;cursor: pointer;box-sizing: border-box;}
+
+.ui-alert{border-radius: 5px;overflow: hidden;padding:20px;}
+.ui-alert .ui-dialog-close{display: none;}
+.ui-alert .ui-alert-submit{margin: 0 auto;}
+.ui-alert-info{text-align: center;margin-top:20px;}
+.ui-confirm-close,.ui-confirm-no{background-color: #999999;}

File diff suppressed because it is too large
+ 206 - 0
iamberry-app-api/.svn/pristine/12/12367eeb5eb93f9b713f7bd0d234bc3be00118dd.svn-base


BIN
iamberry-app-api/.svn/pristine/12/123915b29f0dafe203a7058437fe1ac903a9b8bf.svn-base


BIN
iamberry-app-api/.svn/pristine/12/1279108c36134e560713eed538bcc0128c2b5cc1.svn-base


BIN
iamberry-app-api/.svn/pristine/12/12a491d19ac2fffaac7000e01da310270531d547.svn-base


BIN
iamberry-app-api/.svn/pristine/12/12f3f250fbbc40843f7e8ced9413782e4b5238c1.svn-base


BIN
iamberry-app-api/.svn/pristine/13/13b303c36264cdeeb567cb51ab23bcd23284c240.svn-base


BIN
iamberry-app-api/.svn/pristine/14/141771d62271f408570823601fd6bba69efe6848.svn-base


File diff suppressed because it is too large
+ 355 - 0
iamberry-app-api/.svn/pristine/14/1438efeb9d7e4a6ec6761c22674696265882ba92.svn-base


BIN
iamberry-app-api/.svn/pristine/15/1517ea778162dacdba017fa0d36a3a5e2f1a53ed.svn-base


+ 78 - 0
iamberry-app-api/.svn/pristine/15/15ba0bd7d71e0329da589f1fe875237976a947b9.svn-base

@@ -0,0 +1,78 @@
+package com.iamberry.app.api.controller;
+
+import static com.iamberry.app.config.Response.SUCCESS;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.iamberry.app.config.Response;
+import com.iamberry.app.config.ResponseHeader;
+import com.iamberry.wechat.file.FileUtils;
+import com.iamberry.wechat.file.UploadResultBean;
+
+/**
+ * 接受APP报错日志
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年12月21日
+ */
+@Controller
+@RequestMapping("/log")
+public class AppLogController {
+
+	private static String SAVE_MILK_IMAGE_PATH = "/log/";
+	
+	/**
+	 * 防止上传木马文件,需要屏蔽web访问的功能
+	 * @param response
+	 * @author 献
+	 * @throws IOException 
+	 * @Time   2016年12月21日
+	 */
+	@RequestMapping(value = "/{filename}")
+	public void get(HttpServletResponse response) throws IOException {
+		response.sendRedirect("http://www.iamberry.com");
+	}
+	
+	/**
+	 * 防止上传木马文件,需要屏蔽web访问的功能
+	 * @param response
+	 * @author 献
+	 * @throws IOException 
+	 * @Time   2016年12月21日
+	 */
+	@RequestMapping(value = "/{path}/{filename}")
+	public void post(HttpServletResponse response) throws IOException {
+		response.sendRedirect("http://www.iamberry.com");
+	}
+	
+	/**
+	 * @param model
+	 * @param request
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/upload_error_file", method = RequestMethod.POST)
+	public Response uploadFileImage(@RequestParam("file")MultipartFile file, HttpServletRequest request) {
+		// 保存文件
+		UploadResultBean bean = FileUtils.saveFile(request.getServletContext(), file, SAVE_MILK_IMAGE_PATH, true);
+		if (bean == null) {
+			// 文件有误
+			return new Response(new ResponseHeader(4204, "文件有误!", -1));
+		}
+		return SUCCESS.setData(null);
+	}
+}

+ 413 - 0
iamberry-app-api/.svn/pristine/16/1648c0ea14423a4877251d9b1d79ac078ffb26dd.svn-base

@@ -0,0 +1,413 @@
+/**
+ * ueditor完整配置项
+ * 可以在这里配置整个编辑器的特性
+ */
+/**************************提示********************************
+ * 所有被注释的配置项均为UEditor默认值。
+ * 修改默认配置请首先确保已经完全明确该参数的真实用途。
+ * 主要有两种修改方案,一种是取消此处注释,然后修改成对应参数;另一种是在实例化编辑器时传入对应参数。
+ * 当升级编辑器时,可直接使用旧版配置文件替换新版配置文件,不用担心旧版配置文件中因缺少新功能所需的参数而导致脚本报错。
+ **************************提示********************************/
+
+(function () {
+
+    /**
+     * 编辑器资源文件根路径。它所表示的含义是:以编辑器实例化页面为当前路径,指向编辑器资源文件(即dialog等文件夹)的路径。
+     * 鉴于很多同学在使用编辑器的时候出现的种种路径问题,此处强烈建议大家使用"相对于网站根目录的相对路径"进行配置。
+     * "相对于网站根目录的相对路径"也就是以斜杠开头的形如"/myProject/ueditor/"这样的路径。
+     * 如果站点中有多个不在同一层级的页面需要实例化编辑器,且引用了同一UEditor的时候,此处的URL可能不适用于每个页面的编辑器。
+     * 因此,UEditor提供了针对不同页面的编辑器可单独配置的根路径,具体来说,在需要实例化编辑器的页面最顶部写上如下代码即可。当然,需要令此处的URL等于对应的配置。
+     * window.UEDITOR_HOME_URL = "/xxxx/xxxx/";
+     */
+    var URL = window.UEDITOR_HOME_URL || getUEBasePath();
+
+    /**
+     * 配置项主体。注意,此处所有涉及到路径的配置别遗漏URL变量。
+     */
+    window.UEDITOR_CONFIG = {
+
+        //为编辑器实例添加一个路径,这个不能被注释
+        UEDITOR_HOME_URL: URL
+
+        // 服务器统一请求接口路径
+        , serverUrl: URL + "php/controller.php"
+
+        //工具栏上的所有的功能按钮和下拉框,可以在new编辑器的实例时选择自己需要的从新定义
+        , toolbars: [[
+            'fullscreen', 'source', '|', 'undo', 'redo', '|',
+            'bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|',
+            'rowspacingtop', 'rowspacingbottom', 'lineheight', '|',
+            'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|',
+            'directionalityltr', 'directionalityrtl', 'indent', '|',
+            'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|',
+            'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|',
+            'simpleupload', 'insertimage', 'emotion', 'scrawl', 'insertvideo', 'music', 'attachment', 'map', 'gmap', 'insertframe', 'insertcode', 'webapp', 'pagebreak', 'template', 'background', '|',
+            'horizontal', 'date', 'time', 'spechars', 'snapscreen', 'wordimage', '|',
+            'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|',
+            'print', 'preview', 'searchreplace', 'help', 'drafts'
+        ]]
+        //当鼠标放在工具栏上时显示的tooltip提示,留空支持自动多语言配置,否则以配置值为准
+        //,labelMap:{
+        //    'anchor':'', 'undo':''
+        //}
+
+        //语言配置项,默认是zh-cn。有需要的话也可以使用如下这样的方式来自动多语言切换,当然,前提条件是lang文件夹下存在对应的语言文件:
+        //lang值也可以通过自动获取 (navigator.language||navigator.browserLanguage ||navigator.userLanguage).toLowerCase()
+        //,lang:"zh-cn"
+        //,langPath:URL +"lang/"
+
+        //主题配置项,默认是default。有需要的话也可以使用如下这样的方式来自动多主题切换,当然,前提条件是themes文件夹下存在对应的主题文件:
+        //现有如下皮肤:default
+        //,theme:'default'
+        //,themePath:URL +"themes/"
+
+        //,zIndex : 900     //编辑器层级的基数,默认是900
+
+        //针对getAllHtml方法,会在对应的head标签中增加该编码设置。
+        //,charset:"utf-8"
+
+        //若实例化编辑器的页面手动修改的domain,此处需要设置为true
+        //,customDomain:false
+
+        //常用配置项目
+        //,isShow : true    //默认显示编辑器
+
+        //,textarea:'editorValue' // 提交表单时,服务器获取编辑器提交内容的所用的参数,多实例时可以给容器name属性,会将name给定的值最为每个实例的键值,不用每次实例化的时候都设置这个值
+
+        //,initialContent:'欢迎使用ueditor!'    //初始化编辑器的内容,也可以通过textarea/script给值,看官网例子
+
+        //,autoClearinitialContent:true //是否自动清除编辑器初始内容,注意:如果focus属性设置为true,这个也为真,那么编辑器一上来就会触发导致初始化的内容看不到了
+
+        //,focus:false //初始化时,是否让编辑器获得焦点true或false
+
+        //如果自定义,最好给p标签如下的行高,要不输入中文时,会有跳动感
+        //,initialStyle:'p{line-height:1em}'//编辑器层级的基数,可以用来改变字体等
+
+        //,iframeCssUrl: URL + '/themes/iframe.css' //给编辑器内部引入一个css文件
+
+        //indentValue
+        //首行缩进距离,默认是2em
+        //,indentValue:'2em'
+
+        //,initialFrameWidth:1000  //初始化编辑器宽度,默认1000
+        //,initialFrameHeight:320  //初始化编辑器高度,默认320
+
+        //,readonly : false //编辑器初始化结束后,编辑区域是否是只读的,默认是false
+
+        //,autoClearEmptyNode : true //getContent时,是否删除空的inlineElement节点(包括嵌套的情况)
+
+        //启用自动保存
+        //,enableAutoSave: true
+        //自动保存间隔时间, 单位ms
+        //,saveInterval: 500
+
+        //,fullscreen : false //是否开启初始化时即全屏,默认关闭
+
+        //,imagePopup:true      //图片操作的浮层开关,默认打开
+
+        //,autoSyncData:true //自动同步编辑器要提交的数据
+        //,emotionLocalization:false //是否开启表情本地化,默认关闭。若要开启请确保emotion文件夹下包含官网提供的images表情文件夹
+
+        //粘贴只保留标签,去除标签所有属性
+        //,retainOnlyLabelPasted: false
+
+        //,pasteplain:false  //是否默认为纯文本粘贴。false为不使用纯文本粘贴,true为使用纯文本粘贴
+        //纯文本粘贴模式下的过滤规则
+        //'filterTxtRules' : function(){
+        //    function transP(node){
+        //        node.tagName = 'p';
+        //        node.setStyle();
+        //    }
+        //    return {
+        //        //直接删除及其字节点内容
+        //        '-' : 'script style object iframe embed input select',
+        //        'p': {$:{}},
+        //        'br':{$:{}},
+        //        'div':{'$':{}},
+        //        'li':{'$':{}},
+        //        'caption':transP,
+        //        'th':transP,
+        //        'tr':transP,
+        //        'h1':transP,'h2':transP,'h3':transP,'h4':transP,'h5':transP,'h6':transP,
+        //        'td':function(node){
+        //            //没有内容的td直接删掉
+        //            var txt = !!node.innerText();
+        //            if(txt){
+        //                node.parentNode.insertAfter(UE.uNode.createText(' &nbsp; &nbsp;'),node);
+        //            }
+        //            node.parentNode.removeChild(node,node.innerText())
+        //        }
+        //    }
+        //}()
+
+        //,allHtmlEnabled:false //提交到后台的数据是否包含整个html字符串
+
+        //insertorderedlist
+        //有序列表的下拉配置,值留空时支持多语言自动识别,若配置值,则以此值为准
+        //,'insertorderedlist':{
+        //      //自定的样式
+        //        'num':'1,2,3...',
+        //        'num1':'1),2),3)...',
+        //        'num2':'(1),(2),(3)...',
+        //        'cn':'一,二,三....',
+        //        'cn1':'一),二),三)....',
+        //        'cn2':'(一),(二),(三)....',
+        //     //系统自带
+        //     'decimal' : '' ,         //'1,2,3...'
+        //     'lower-alpha' : '' ,    // 'a,b,c...'
+        //     'lower-roman' : '' ,    //'i,ii,iii...'
+        //     'upper-alpha' : '' , lang   //'A,B,C'
+        //     'upper-roman' : ''      //'I,II,III...'
+        //}
+
+        //insertunorderedlist
+        //无序列表的下拉配置,值留空时支持多语言自动识别,若配置值,则以此值为准
+        //,insertunorderedlist : { //自定的样式
+        //    'dash' :'— 破折号', //-破折号
+        //    'dot':' 。 小圆圈', //系统自带
+        //    'circle' : '',  // '○ 小圆圈'
+        //    'disc' : '',    // '● 小圆点'
+        //    'square' : ''   //'■ 小方块'
+        //}
+        //,listDefaultPaddingLeft : '30'//默认的左边缩进的基数倍
+        //,listiconpath : 'http://bs.baidu.com/listicon/'//自定义标号的路径
+        //,maxListLevel : 3 //限制可以tab的级数, 设置-1为不限制
+
+        //,autoTransWordToList:false  //禁止word中粘贴进来的列表自动变成列表标签
+
+        //fontfamily
+        //字体设置 label留空支持多语言自动切换,若配置,则以配置值为准
+        //,'fontfamily':[
+        //    { label:'',name:'songti',val:'宋体,SimSun'},
+        //    { label:'',name:'kaiti',val:'楷体,楷体_GB2312, SimKai'},
+        //    { label:'',name:'yahei',val:'微软雅黑,Microsoft YaHei'},
+        //    { label:'',name:'heiti',val:'黑体, SimHei'},
+        //    { label:'',name:'lishu',val:'隶书, SimLi'},
+        //    { label:'',name:'andaleMono',val:'andale mono'},
+        //    { label:'',name:'arial',val:'arial, helvetica,sans-serif'},
+        //    { label:'',name:'arialBlack',val:'arial black,avant garde'},
+        //    { label:'',name:'comicSansMs',val:'comic sans ms'},
+        //    { label:'',name:'impact',val:'impact,chicago'},
+        //    { label:'',name:'timesNewRoman',val:'times new roman'}
+        //]
+
+        //fontsize
+        //字号
+        //,'fontsize':[10, 11, 12, 14, 16, 18, 20, 24, 36]
+
+        //paragraph
+        //段落格式 值留空时支持多语言自动识别,若配置,则以配置值为准
+        //,'paragraph':{'p':'', 'h1':'', 'h2':'', 'h3':'', 'h4':'', 'h5':'', 'h6':''}
+
+        //rowspacingtop
+        //段间距 值和显示的名字相同
+        //,'rowspacingtop':['5', '10', '15', '20', '25']
+
+        //rowspacingBottom
+        //段间距 值和显示的名字相同
+        //,'rowspacingbottom':['5', '10', '15', '20', '25']
+
+        //lineheight
+        //行内间距 值和显示的名字相同
+        //,'lineheight':['1', '1.5','1.75','2', '3', '4', '5']
+
+        //customstyle
+        //自定义样式,不支持国际化,此处配置值即可最后显示值
+        //block的元素是依据设置段落的逻辑设置的,inline的元素依据BIU的逻辑设置
+        //尽量使用一些常用的标签
+        //参数说明
+        //tag 使用的标签名字
+        //label 显示的名字也是用来标识不同类型的标识符,注意这个值每个要不同,
+        //style 添加的样式
+        //每一个对象就是一个自定义的样式
+        //,'customstyle':[
+        //    {tag:'h1', name:'tc', label:'', style:'border-bottom:#ccc 2px solid;padding:0 4px 0 0;text-align:center;margin:0 0 20px 0;'},
+        //    {tag:'h1', name:'tl',label:'', style:'border-bottom:#ccc 2px solid;padding:0 4px 0 0;margin:0 0 10px 0;'},
+        //    {tag:'span',name:'im', label:'', style:'font-style:italic;font-weight:bold'},
+        //    {tag:'span',name:'hi', label:'', style:'font-style:italic;font-weight:bold;color:rgb(51, 153, 204)'}
+        //]
+
+        //打开右键菜单功能
+        //,enableContextMenu: true
+        //右键菜单的内容,可以参考plugins/contextmenu.js里边的默认菜单的例子,label留空支持国际化,否则以此配置为准
+        //,contextMenu:[
+        //    {
+        //        label:'',       //显示的名称
+        //        cmdName:'selectall',//执行的command命令,当点击这个右键菜单时
+        //        //exec可选,有了exec就会在点击时执行这个function,优先级高于cmdName
+        //        exec:function () {
+        //            //this是当前编辑器的实例
+        //            //this.ui._dialogs['inserttableDialog'].open();
+        //        }
+        //    }
+        //]
+
+        //快捷菜单
+        //,shortcutMenu:["fontfamily", "fontsize", "bold", "italic", "underline", "forecolor", "backcolor", "insertorderedlist", "insertunorderedlist"]
+
+        //elementPathEnabled
+        //是否启用元素路径,默认是显示
+        //,elementPathEnabled : true
+
+        //wordCount
+        //,wordCount:true          //是否开启字数统计
+        //,maximumWords:10000       //允许的最大字符数
+        //字数统计提示,{#count}代表当前字数,{#leave}代表还可以输入多少字符数,留空支持多语言自动切换,否则按此配置显示
+        //,wordCountMsg:''   //当前已输入 {#count} 个字符,您还可以输入{#leave} 个字符
+        //超出字数限制提示  留空支持多语言自动切换,否则按此配置显示
+        //,wordOverFlowMsg:''    //<span style="color:red;">你输入的字符个数已经超出最大允许值,服务器可能会拒绝保存!</span>
+
+        //tab
+        //点击tab键时移动的距离,tabSize倍数,tabNode什么字符做为单位
+        //,tabSize:4
+        //,tabNode:'&nbsp;'
+
+        //removeFormat
+        //清除格式时可以删除的标签和属性
+        //removeForamtTags标签
+        //,removeFormatTags:'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var'
+        //removeFormatAttributes属性
+        //,removeFormatAttributes:'class,style,lang,width,height,align,hspace,valign'
+
+        //undo
+        //可以最多回退的次数,默认20
+        //,maxUndoCount:20
+        //当输入的字符数超过该值时,保存一次现场
+        //,maxInputCount:1
+
+        //autoHeightEnabled
+        // 是否自动长高,默认true
+        //,autoHeightEnabled:true
+
+        //scaleEnabled
+        //是否可以拉伸长高,默认true(当开启时,自动长高失效)
+        //,scaleEnabled:false
+        //,minFrameWidth:800    //编辑器拖动时最小宽度,默认800
+        //,minFrameHeight:220  //编辑器拖动时最小高度,默认220
+
+        //autoFloatEnabled
+        //是否保持toolbar的位置不动,默认true
+        //,autoFloatEnabled:true
+        //浮动时工具栏距离浏览器顶部的高度,用于某些具有固定头部的页面
+        //,topOffset:30
+        //编辑器底部距离工具栏高度(如果参数大于等于编辑器高度,则设置无效)
+        //,toolbarTopOffset:400
+
+        //pageBreakTag
+        //分页标识符,默认是_ueditor_page_break_tag_
+        //,pageBreakTag:'_ueditor_page_break_tag_'
+
+        //autotypeset
+        //自动排版参数
+        //,autotypeset: {
+        //    mergeEmptyline: true,           //合并空行
+        //    removeClass: true,              //去掉冗余的class
+        //    removeEmptyline: false,         //去掉空行
+        //    textAlign:"left",               //段落的排版方式,可以是 left,right,center,justify 去掉这个属性表示不执行排版
+        //    imageBlockLine: 'center',       //图片的浮动方式,独占一行剧中,左右浮动,默认: center,left,right,none 去掉这个属性表示不执行排版
+        //    pasteFilter: false,             //根据规则过滤没事粘贴进来的内容
+        //    clearFontSize: false,           //去掉所有的内嵌字号,使用编辑器默认的字号
+        //    clearFontFamily: false,         //去掉所有的内嵌字体,使用编辑器默认的字体
+        //    removeEmptyNode: false,         // 去掉空节点
+        //    //可以去掉的标签
+        //    removeTagNames: {标签名字:1},
+        //    indent: false,                  // 行首缩进
+        //    indentValue : '2em',            //行首缩进的大小
+        //    bdc2sb: false,
+        //    tobdc: false
+        //}
+
+        //tableDragable
+        //表格是否可以拖拽
+        //,tableDragable: true
+
+        //,disabledTableInTable:true  //禁止表格嵌套
+
+        //sourceEditor
+        //源码的查看方式,codemirror 是代码高亮,textarea是文本框,默认是codemirror
+        //注意默认codemirror只能在ie8+和非ie中使用
+        //,sourceEditor:"codemirror"
+        //如果sourceEditor是codemirror,还用配置一下两个参数
+        //codeMirrorJsUrl js加载的路径,默认是 URL + "third-party/codemirror/codemirror.js"
+        //,codeMirrorJsUrl:URL + "third-party/codemirror/codemirror.js"
+        //codeMirrorCssUrl css加载的路径,默认是 URL + "third-party/codemirror/codemirror.css"
+        //,codeMirrorCssUrl:URL + "third-party/codemirror/codemirror.css"
+        //编辑器初始化完成后是否进入源码模式,默认为否。
+        //,sourceEditorFirst:false
+
+        //iframeUrlMap
+        //dialog内容的路径 ~会被替换成URL,垓属性一旦打开,将覆盖所有的dialog的默认路径
+        //,iframeUrlMap:{
+        //    'anchor':'~/dialogs/anchor/anchor.html',
+        //}
+
+        //webAppKey 百度应用的APIkey,每个站长必须首先去百度官网注册一个key后方能正常使用app功能,注册介绍,http://app.baidu.com/static/cms/getapikey.html
+        //, webAppKey: ""
+    };
+
+    function getUEBasePath(docUrl, confUrl) {
+
+        return getBasePath(docUrl || self.document.URL || self.location.href, confUrl || getConfigFilePath());
+
+    }
+
+    function getConfigFilePath() {
+
+        var configPath = document.getElementsByTagName('script');
+
+        return configPath[ configPath.length - 1 ].src;
+
+    }
+
+    function getBasePath(docUrl, confUrl) {
+
+        var basePath = confUrl;
+
+
+        if (/^(\/|\\\\)/.test(confUrl)) {
+
+            basePath = /^.+?\w(\/|\\\\)/.exec(docUrl)[0] + confUrl.replace(/^(\/|\\\\)/, '');
+
+        } else if (!/^[a-z]+:/i.test(confUrl)) {
+
+            docUrl = docUrl.split("#")[0].split("?")[0].replace(/[^\\\/]+$/, '');
+
+            basePath = docUrl + "" + confUrl;
+
+        }
+
+        return optimizationPath(basePath);
+
+    }
+
+    function optimizationPath(path) {
+
+        var protocol = /^[a-z]+:\/\//.exec(path)[ 0 ],
+            tmp = null,
+            res = [];
+
+        path = path.replace(protocol, "").split("?")[0].split("#")[0];
+
+        path = path.replace(/\\/g, '/').split(/\//);
+
+        path[ path.length - 1 ] = "";
+
+        while (path.length) {
+
+            if (( tmp = path.shift() ) === "..") {
+                res.pop();
+            } else if (tmp !== ".") {
+                res.push(tmp);
+            }
+
+        }
+
+        return protocol + res.join("/");
+
+    }
+
+    window.UE = {
+        getUEBasePath: getUEBasePath
+    };
+
+})();

BIN
iamberry-app-api/.svn/pristine/17/170af7b454acb140ffdde1763bcd07f65d57550d.svn-base


BIN
iamberry-app-api/.svn/pristine/17/17b86874390f911ffb9993c1b8a8f63bdf2be931.svn-base


BIN
iamberry-app-api/.svn/pristine/17/17c372678aafb3bc1a7b37320b5cc1d8af433527.svn-base


BIN
iamberry-app-api/.svn/pristine/17/17f9a0cae0c4418ab7cc6afb65e15f81348f0fc0.svn-base


File diff suppressed because it is too large
+ 182 - 0
iamberry-app-api/.svn/pristine/18/18034b900853c3a53f31b37100d9f11e7dd6da12.svn-base


+ 664 - 0
iamberry-app-api/.svn/pristine/19/194ccfd4747531f20615ec9d17f781092fee6069.svn-base

@@ -0,0 +1,664 @@
+/*H-ui.js v2.3 date:9:53 2015-07-17 by:guojunhui*/
+if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
+  var msViewportStyle = document.createElement("style")
+  msViewportStyle.appendChild(
+    document.createTextNode(
+      "@-ms-viewport{width:auto!important}"
+    )
+  )
+  document.getElementsByTagName("head")[0].appendChild(msViewportStyle);
+}
+
+
+/*添加收藏
+<a title="收藏本站" href="javascript:;" onClick="addFavoritepage('H-ui前端框架','http://www.h-ui.net/');">收藏本站</a>
+*/
+/*收藏主站*/
+function addFavorite(name,site){
+	try{window.external.addFavorite(site,name);}
+	catch(e){
+		try{window.sidebar.addPanel(name,site,"");}
+			catch(e){alert("加入收藏失败,请使用Ctrl+D进行添加");}
+	}
+}
+/*收藏页面
+<a title="收藏本页" href="javascript:addFavoritepage(0);">收藏本页</a>
+*/
+function addFavoritepage(){var sURL=window.location.href;var sTitle=document.title;try{window.external.addFavorite(sURL,sTitle);}catch(e){try{window.sidebar.addPanel(sTitle,sURL,"");}catch(e){alert("加入收藏失败,请使用Ctrl+D进行添加");}}}
+
+/*设为首页*/
+function setHome(obj){
+  try{obj.style.behavior="url(#default#homepage)";obj.setHomePage(webSite);}
+  catch(e){if(window.netscape){
+	  try {netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");}
+	  catch(e){alert("此操作被浏览器拒绝!\n请在浏览器地址栏输入\"about:config\"并回车\n然后将 [signed.applets.codebase_principal_support]的值设置为'true',双击即可。");}
+	  var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch);
+	  prefs.setCharPref('browser.startup.homepage',url);}}
+}
+/*滚动*/
+function marquee(height,speed,delay){
+	var scrollT;
+	var pause = false;
+	var ScrollBox = document.getElementById("marquee");
+	if(document.getElementById("holder").offsetHeight <= height) return;
+	var _tmp = ScrollBox.innerHTML.replace('holder', 'holder2')
+	ScrollBox.innerHTML += _tmp;
+	ScrollBox.onmouseover = function(){pause = true}
+	ScrollBox.onmouseout = function(){pause = false}
+	ScrollBox.scrollTop = 0;
+	function start(){
+	    scrollT = setInterval(scrolling,speed);
+	    if(!pause) ScrollBox.scrollTop += 2;
+	}
+	function scrolling(){
+	    if(ScrollBox.scrollTop % height != 0){
+	        ScrollBox.scrollTop += 2;
+	        if(ScrollBox.scrollTop >= ScrollBox.scrollHeight/2) ScrollBox.scrollTop = 0;
+	    }
+		else{
+	        clearInterval(scrollT);
+	        setTimeout(start,delay);
+	    }
+	}
+	setTimeout(start,delay);
+}
+
+/*隐藏显示密码*/
+(function ( $ ) {
+    $.fn.togglePassword = function( options ) {
+        var s = $.extend( $.fn.togglePassword.defaults, options ),
+        input = $( this );
+
+        $( s.el ).on( s.ev, function() {
+            "password" == $( input ).attr( "type" ) ?
+                $( input ).attr( "type", "text" ) :
+                $( input ).attr( "type", "password" );
+        });
+    };
+
+    $.fn.togglePassword.defaults = {
+        ev: "click"
+    };
+}( jQuery ));
+!function ($) {
+	"use strict";
+	$(function () {
+		$.support.transition = (function () {
+			var transitionEnd = (function () {
+				var el = document.createElement('bootstrap'),
+				transEndEventNames = {
+					'WebkitTransition' : 'webkitTransitionEnd',
+					'MozTransition'    : 'transitionend',
+					'OTransition'      : 'oTransitionEnd otransitionend',
+					'transition'       : 'transitionend'
+				},
+				name
+				for (name in transEndEventNames){
+					if (el.style[name] !== undefined) {
+						return transEndEventNames[name]
+					}
+				}
+			}())
+			return transitionEnd && {
+				end: transitionEnd
+			}
+		})()
+	});
+}(window.jQuery);
+
+/*左侧菜单-隐藏显示*/
+function displaynavbar(obj){
+	if($(obj).hasClass("open")){
+		$(obj).removeClass("open");
+		$("body").removeClass("big-page");
+	}else{
+		$(obj).addClass("open");
+		$("body").addClass("big-page");
+					
+	}
+}
+
+/*模拟下拉菜单*/
+jQuery.Huiselect = function(divselectid,inputselectid) {
+	var inputselect = $(inputselectid);
+	$(divselectid+" cite").click(function(){
+		var ul = $(divselectid+" ul");
+		ul.slideToggle();
+	});
+	$(divselectid+" ul li a").click(function(){
+		var txt = $(this).text();
+		$(divselectid+" cite").html(txt);
+		var value = $(this).attr("selectid");
+		inputselect.val(value);
+		$(divselectid+" ul").hide();
+	});
+	$(document).click(function(){$(divselectid+" ul").hide();});
+};
+
+/*hover*/
+jQuery.Huihover =function(obj) {
+	$(obj).hover(function(){$(this).addClass("hover");},function(){$(this).removeClass("hover");});
+};
+/*得到失去焦点*/
+jQuery.Huifocusblur = function(obj) {
+	$(obj).focus(function() {$(this).addClass("focus").removeClass("inputError");});
+	$(obj).blur(function() {$(this).removeClass("focus");});
+};
+/*tab选项卡*/
+jQuery.Huitab =function(tabBar,tabCon,class_name,tabEvent,i){
+  	var $tab_menu=$(tabBar);
+	// 初始化操作
+	$tab_menu.removeClass(class_name);
+	$(tabBar).eq(i).addClass(class_name);
+	$(tabCon).hide();
+	$(tabCon).eq(i).show();
+	
+	$tab_menu.on(tabEvent,function(){
+		$tab_menu.removeClass(class_name);
+		$(this).addClass(class_name);
+		var index=$tab_menu.index(this);
+		$(tabCon).hide();
+		$(tabCon).eq(index).show();
+	});
+}
+
+/*折叠*/
+jQuery.Huifold = function(obj,obj_c,speed,obj_type,Event){
+	if(obj_type == 2){
+		$(obj+":first").find("b").html("-");
+		$(obj_c+":first").show();
+	}			
+	$(obj).on(Event,function(){
+		if($(this).next().is(":visible")){
+			if(obj_type == 2){
+				return false;
+			}else{
+				$(this).next().slideUp(speed).end().removeClass("selected");
+				if($(this).find("b")){
+					$(this).find("b").html("+");
+				}
+			}
+		}
+		else{
+			if(obj_type == 3){
+				$(this).next().slideDown(speed).end().addClass("selected");
+				if($(this).find("b")){
+					$(this).find("b").html("-");
+				}
+			}else{
+				$(obj_c).slideUp(speed);
+				$(obj).removeClass("selected");
+				if($(this).find("b")){
+					$(obj).find("b").html("+");
+				}
+				$(this).next().slideDown(speed).end().addClass("selected");
+				if($(this).find("b")){
+					$(this).find("b").html("-");
+				}
+			}
+		}
+	});
+}
+/*返回顶部*/
+var $backToTopEle=$('<a href="javascript:void(0)" class="Hui-iconfont toTop" title="返回顶部" alt="返回顶部" style="display:none">&#xf0023;</a>').appendTo($("body")).click(function(){
+	$("html, body").animate({ scrollTop: 0 }, 120);
+});
+var $backToTopFun = function() {
+	var st = $(document).scrollTop(), winh = $(window).height();
+	(st > 0)? $backToTopEle.show(): $backToTopEle.hide();
+	/*IE6下的定位*/
+	if(!window.XMLHttpRequest){
+		$backToTopEle.css("top", st + winh - 166);
+	}
+};
+/*textarea 字数限制*/
+function textarealength(obj,maxlength){
+	var v = $(obj).val();
+	var l = v.length;
+	if( l > maxlength){
+		v = v.substring(0,maxlength);
+	}
+	$(obj).parent().find(".textarea-length").text(v.length);
+}
+/*Huimodalalert*/
+function Huimodal_alert(info,speed){
+	$(document.body).append(
+	'<div id="modal-alert" class="modal hide modal-alert">'+
+	  '<div class="modal-alert-info">'+info+'</div>'+
+	'</div>'
+	);
+	$("#modal-alert").fadeIn();
+	
+	setTimeout("Huimodal_alert_hide()",speed);
+}
+function Huimodal_alert_hide() {
+	$("#modal-alert").fadeOut("normal",function(){
+		$("#modal-alert").remove();
+	});
+}
+/*设置cookie*/
+function setCookie(name, value, Days){
+	if(Days == null || Days == ''){
+		Days = 300;
+	}
+	var exp  = new Date();
+	exp.setTime(exp.getTime() + Days*24*60*60*1000);
+	document.cookie = name + "="+ escape (value) + "; path=/;expires=" + exp.toGMTString();
+}
+
+/*获取cookie*/
+function getCookie(name) {
+    var arr,reg=new RegExp("(^| )"+name+"=([^;]*)(;|$)");
+    if(arr=document.cookie.match(reg))
+        return unescape(arr[2]); 
+    else 
+        return null; 
+}
+$(function(){
+	/*****表单*****/
+    $.Huifocusblur(".input-text,.textarea");
+	/*按钮loading*/
+	$('.btn-loading').click(function () {
+		var $btn = $(this);
+		var btnval = $btn.val();
+		$btn.addClass("disabled").val("loading").attr("disabled","disabled");
+		setTimeout(function(){
+			$btn.removeClass("disabled").val(btnval).removeAttr("disabled");
+		}, 3000);
+	});	
+	/**/
+	$.Huiselect("#divselect","#inputselect");
+
+	/*全选*/
+	$("table thead th input:checkbox").on("click" , function(){
+		$(this).closest("table").find("tr > td:first-child input:checkbox").prop("checked",$("table thead th input:checkbox").prop("checked"));
+    });
+	
+    /*上传*/
+    $(document).on("change",".input-file",function(){
+		var uploadVal=$(this).val();
+		$(this).parent().find(".upload-url").val(uploadVal).focus().blur();
+	});
+	
+	/*下拉菜单*/
+	$(document).on("mouseenter",".dropDown",function(){
+		$(this).addClass("hover");
+	});
+	$(document).on("mouseleave",".dropDown",function(){
+		$(this).removeClass("hover");
+	});
+	$(document).on("mouseenter",".dropDown_hover",function(){
+		$(this).addClass("open");
+	});
+	$(document).on("mouseleave",".dropDown_hover",function(){
+		$(this).removeClass("open");
+	});
+	$(document).on("click",".dropDown-menu li a",function(){
+		$(".dropDown").removeClass('open');
+	});
+	$(document).on('click', function(event){
+		var e_t = $(event.target).parents('.dropDown_click');
+		if($(".dropDown_click").hasClass('open')){
+			if(e_t.hasClass('open')){
+				e_t.removeClass('open');
+				return;
+			}
+			$(".dropDown_click").removeClass('open');
+			e_t.toggleClass('open');
+		}else{
+			e_t.toggleClass('open');
+		}
+	});
+
+	/*搜索框*/
+	$.Huifocusblur('.searchTxt');
+	$.Huihover('.ac_results li');
+	$(".ac_results li").click(function (event){
+		$(".searchTxt").addClass("focus").val($(this).find("p").text());
+		$(".ac_results").hide();
+		//$(".form-search").submit();/*提交表单*/
+		b_onclick();/*临时测试*/
+		return false;
+	});
+	$(".searchTxt").focus(function(){$(".ac_results").show();return false;});
+	$(".ac_results").blur(function(){$(this).hide();});
+	$("body").click(function(){$(".ac_results").hide();});
+	$(".searchTxt").click(function(){$(".ac_results").show();return false;});
+	function BindEnter(obj){
+    	var searchBtn = $("#searchBtn");
+    	if(obj.keyCode == 13){searchBtn.click();obj.returnValue = false;}
+	}
+	
+	/*tag标签*/
+	var tags_a = $(".tags a");
+	tags_a.each(function(){
+		var x = 9;
+		var y = 0;
+		var rand = parseInt(Math.random() * (x - y + 1) + y);
+		$(this).addClass("tags"+rand);
+	});
+		
+	/*对联广告*/
+	var dual = $(".dual");
+	var dual_close = $("a.dual_close");	
+	var screen_w = screen.width;
+	if(screen_w>1024){dual.show();}
+	$(window).scroll(function(){
+		var scrollTop = $(window).scrollTop();
+		dual.stop().animate({top:scrollTop+260});
+	});
+	dual_close.click(function(){
+		$(this).parent().hide();
+		return false;
+	});
+
+	/*顶部展开定时自动关闭广告*/ 
+	$("#banner").slideDown("slow");
+	
+	/*图片预览*/
+	$("a.preview").hover(
+		function(){
+			$(this).addClass("active");
+			$("#tooltip-preview").remove();
+			var winW=$(window).width();
+			var winW5=winW/2;
+			this.myTitle = this.title;
+			this.title = "";
+			var midimg = $(this).attr('data-preview');
+			if(midimg ==''){return false;}
+			else{
+				var imgT=$(this).parents(".imgItem").offset().top;
+				var imgL=$(this).parents(".imgItem").offset().left;	
+				var imgW=$(this).parents(".imgItem").width();
+				var imgH=$(this).parents(".imgItem").height();
+				var ww=(imgL+imgW/2);
+				if(ww < winW5){
+					var tooltipLeft=(imgW+imgL)+"px";	
+				}
+				else{
+					var tooltipRight=(winW-imgL)+"px";
+				}
+				var tooltip_keleyi_com = "<div id='tooltip-preview' style='top:"+ imgT +"px;right:"+ tooltipRight +";left:"+ tooltipLeft +"'><span id='tooltip-keleyi-div' class='loading' style='width:50px; height:50px'></span></div>";
+				$("body").append(tooltip_keleyi_com);
+				var midimgW = $(this).attr('data-width');
+				var midimgH = $(this).attr('data-height');
+				var imgTitle = this.myTitle ? "<br />" + this.myTitle + " 产品预览图" : "";
+				/*图片预加载*/
+				var image = new Image();/*创建一个Image对象*/
+				image.onload = function () {
+					if($('a.preview.active').attr('data-preview') == midimg){
+						var midingW2 = this.width;
+						var midingH2 = this.height;
+						$("#tooltip-keleyi-div").css({"width":midingW2+"px","height":midingH2+"px"});
+						$('#tooltip-keleyi-div').append(this);	
+					}
+				};
+				image.src = midimg;
+			}
+		},
+		function(){
+			$(this).removeClass("active");
+			this.title = this.myTitle;
+			$("#tooltip-preview").remove();
+		}
+	);
+	
+	/*Huialert*/
+	$.Huihover('.Huialert i');
+	$(".Huialert i").on("click",function(){
+		var Huialert = $(this).parents(".Huialert");
+		Huialert.fadeOut("normal",function(){
+		  Huialert.remove();
+		});
+	});
+
+	/*tag标签*/
+	var time1;
+	$(".Hui-tags-lable").show();
+	$(".Hui-tags-input").val("");
+	$(document).on("blur",".Hui-tags-input",function(){
+		time1 = setTimeout(function(){
+			$(this).parents(".Hui-tags").find(".Hui-tags-list").slideUp();
+		}, 400);
+	});
+	$(document).on("focus",".Hui-tags-input",function(){
+		clearTimeout(time1);
+	});
+	$(document).on("click",".Hui-tags-input",function(){
+		$(this).find(".Hui-tags-input").focus();
+		$(this).find(".Hui-tags-list").slideDown();
+	});
+	function gettagval(obj){
+		var str ="";
+		var token =$(obj).parents(".Hui-tags").find(".Hui-tags-token");
+		//alert(token.length)
+		if(token.length<1){
+			$(obj).parents(".Hui-tags").find(".Hui-tags-val").val("");
+			return false;
+		}
+		for(var i = 0;i< token.length;i++){
+			str += token.eq(i).text() + ",";
+			$(obj).parents(".Hui-tags").find(".Hui-tags-val").val(str);
+		}
+	}
+	$(document).on("keydown",".Hui-tags-input",function(event){
+		$(this).next().hide();
+		var v = $(this).val().replace(/\s+/g, "");
+		var reg=/^,|,$/gi;
+		v=v.replace(reg,"");
+		v=$.trim(v);
+		var token =$(this).parents(".Hui-tags").find(".Hui-tags-token");
+		if(v!=''){
+			if(event.keyCode==13||event.keyCode==108||event.keyCode==32){
+				$('<span class="Hui-tags-token">'+v+'</span>').insertBefore($(this).parents(".Hui-tags").find(".Hui-tags-iptwrap"));
+				$(this).val("");
+				gettagval(this);
+			}
+		}else{
+			if(event.keyCode==8){
+				if(token.length>=1){
+					$(this).parents(".Hui-tags").find(".Hui-tags-token:last").remove();
+					gettagval(this);
+				}
+				else{
+					$(this).parents(".Hui-tags").find(".Hui-tags-lable").show();
+					return false;
+				}
+				
+			}
+		}	
+	});
+	
+	$(document).on("click",".Hui-tags-has span",function(){
+		var taghasV = $(this).text();
+		taghasV=taghasV.replace(/(^\s*)|(\s*$)/g,"");
+		$('<span class="Hui-tags-token">'+taghasV+'</span>').insertBefore($(this).parents(".Hui-tags").find(".Hui-tags-iptwrap"));
+		gettagval(this);
+		$(this).parents(".Hui-tags").find(".Hui-tags-input").focus();
+	});
+	$(document).on("click",".Hui-tags-token",function(){
+		var token =$(this).parents(".Hui-tags").find(".Hui-tags-token");
+		var it = $(this).parents(".Hui-tags");
+		$(this).remove();
+		switch(token.length){
+			case 1 : it.find(".Hui-tags-lable").show();
+			break;
+		}
+		var str ="";
+		var token =it.find(".Hui-tags-token");
+		//alert(token.length)
+		if(token.length<1){
+			it.find(".Hui-tags-val").val("");
+			return false;
+		}
+		for(var i = 0;i< token.length;i++){
+			str += token.eq(i).text() + ",";
+			it.find(".Hui-tags-val").val(str);
+		}		
+	});
+});
+
+function displayimg(){
+	$("#banner").slideUp(1000,function(){
+		$("#top").slideDown(1000);
+	});
+}
+setTimeout("displayimg()",4000);
+/*placeholder兼容性处理*/
+(function(window, document, $) {
+	var isInputSupported = 'placeholder' in document.createElement('input');
+	var isTextareaSupported = 'placeholder' in document.createElement('textarea');
+	var prototype = $.fn;
+	var valHooks = $.valHooks;
+	var propHooks = $.propHooks;
+	var hooks;
+	var placeholder;
+
+	if (isInputSupported && isTextareaSupported) {
+		placeholder = prototype.placeholder = function() {
+			return this;
+		};
+		placeholder.input = placeholder.textarea = true;
+	} else {
+		placeholder = prototype.placeholder = function() {
+			var $this = this;
+			$this
+				.filter((isInputSupported ? 'textarea' : ':input') + '[placeholder]')
+				.not('.placeholder')
+				.bind({
+					'focus.placeholder': clearPlaceholder,
+					'blur.placeholder': setPlaceholder
+				})
+				.data('placeholder-enabled', true)
+				.trigger('blur.placeholder');
+			return $this;
+		};
+		placeholder.input = isInputSupported;
+		placeholder.textarea = isTextareaSupported;
+		hooks = {
+			'get': function(element) {
+				var $element = $(element);
+				var $passwordInput = $element.data('placeholder-password');
+				if ($passwordInput) {
+					return $passwordInput[0].value;
+				}
+				return $element.data('placeholder-enabled') && $element.hasClass('placeholder') ? '' : element.value;
+			},
+			'set': function(element, value) {
+				var $element = $(element);
+				var $passwordInput = $element.data('placeholder-password');
+				if ($passwordInput) {
+					return $passwordInput[0].value = value;
+				}
+				if (!$element.data('placeholder-enabled')) {
+					return element.value = value;
+				}
+				if (value == '') {
+					element.value = value;
+					if (element != safeActiveElement()) {
+						setPlaceholder.call(element);
+					}
+				} else if ($element.hasClass('placeholder')) {
+					clearPlaceholder.call(element, true, value) || (element.value = value);
+				} else {
+					element.value = value;
+				}
+				return $element;
+			}
+		};
+
+		if (!isInputSupported) {
+			valHooks.input = hooks;
+			propHooks.value = hooks;
+		}
+		if (!isTextareaSupported) {
+			valHooks.textarea = hooks;
+			propHooks.value = hooks;
+		}
+
+		$(function() {
+			$(document).delegate('form', 'submit.placeholder', function() {
+				var $inputs = $('.placeholder', this).each(clearPlaceholder);
+				setTimeout(function() {
+					$inputs.each(setPlaceholder);
+				}, 10);
+			});
+		});
+
+		$(window).bind('beforeunload.placeholder', function() {
+			$('.placeholder').each(function() {
+				this.value = '';
+			});
+		});
+	}
+
+	function args(elem) {
+		var newAttrs = {};
+		var rinlinejQuery = /^jQuery\d+$/;
+		$.each(elem.attributes, function(i, attr) {
+			if (attr.specified && !rinlinejQuery.test(attr.name)) {
+				newAttrs[attr.name] = attr.value;
+			}
+		});
+		return newAttrs;
+	}
+
+	function clearPlaceholder(event, value) {
+		var input = this;
+		var $input = $(input);
+		if (input.value == $input.attr('placeholder') && $input.hasClass('placeholder')) {
+			if ($input.data('placeholder-password')) {
+				$input = $input.hide().next().show().attr('id', $input.removeAttr('id').data('placeholder-id'));
+				if (event === true) {
+					return $input[0].value = value;
+				}
+				$input.focus();
+			} else {
+				input.value = '';
+				$input.removeClass('placeholder');
+				input == safeActiveElement() && input.select();
+			}
+		}
+	}
+
+	function setPlaceholder() {
+		var $replacement;
+		var input = this;
+		var $input = $(input);
+		var id = this.id;
+		if (input.value == '') {
+			if (input.type == 'password') {
+				if (!$input.data('placeholder-textinput')) {
+					try {
+						$replacement = $input.clone().prop('type','text');
+					} catch(e) {
+						$replacement = $('<input>').prop($.extend(args(this), { 'type': 'text' }));
+					}
+					$replacement
+						.removeAttr('name')
+						.data({
+							'placeholder-password': $input,
+							'placeholder-id': id
+						})
+						.bind('focus.placeholder', clearPlaceholder);
+					$input
+						.data({
+							'placeholder-textinput': $replacement,
+							'placeholder-id': id
+						})
+						.before($replacement);
+				}
+				$input = $input.removeAttr('id').hide().prev().attr('id', id).show();
+			}
+			$input.addClass('placeholder');
+			$input[0].value = $input.attr('placeholder');
+		} else {
+			$input.removeClass('placeholder');
+		}
+	}
+	function safeActiveElement() {
+		try {
+			return document.activeElement;
+		} catch (exception) {}
+	}
+}(this, document, jQuery));

BIN
iamberry-app-api/.svn/pristine/19/197150071bd389a4195c508f1a2422b5d96e6f05.svn-base


+ 25 - 0
iamberry-app-api/.svn/pristine/19/19f1bda800b3dd9a55c1e554c8a7737ce5eab63a.svn-base

@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.iamberry</groupId>
+		<artifactId>iamberry-parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>iamberry-app-api</artifactId>
+	<packaging>war</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.iamberry</groupId>
+			<artifactId>iamberry-common-web</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.iamberry</groupId>
+			<artifactId>iamberry-app-interface</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+	</dependencies>
+</project>

+ 22 - 0
iamberry-app-api/.svn/pristine/1a/1a77603ebeafb23bf34943675dbb982ecc049f22.svn-base

@@ -0,0 +1,22 @@
+@charset "utf-8";
+/* 蓝色 */
+a{color:#333}a:hover,a:focus,.maincolor,.maincolor a{color:#06c}
+.Hui-header{ color:#fff}/*头部颜色*/
+	.Hui-logo,.Hui-logo-m,.Hui-subtitle,.Hui-userbox{color:#fff}/*logo 及 用户信息文字颜色*/
+	.Hui-logo:hover,.Hui-logo-m:hover{color:#fff;text-decoration: none}
+	
+.Hui-header{background-color:#2d6dcc}/*顶部导航*/
+#Hui-nav > ul > li > a{ color:#fff}/*顶部导航文字颜色*/
+#Hui-nav > ul > li > a:hover,#Hui-nav > ul > li.current > a{ color:#fff}/*导航高亮状态*/
+.Hui-userbar > li > a{ color:#fff}
+.Hui-userbar > li > a:hover,.Hui-userbar > li.current > a{ color:#fff}/*用户信息条高亮*/
+.Hui-aside{}/*侧边栏*/
+	.Hui-aside .menu_dropdown dt{color:#333}/*左侧二级导航菜单*/
+	.Hui-aside .menu_dropdown dt:hover{color:#148cf1}
+	.Hui-aside .menu_dropdown dt:hover [class^="icon-"]{ color:#7e8795}
+	.Hui-aside .menu_dropdown li a{color:#666;border-bottom: 1px solid #e5e5e5}
+	.Hui-aside .menu_dropdown li a:hover{color:#148cf1;background-color:#fafafa}
+	.Hui-aside .menu_dropdown li.current a,.menu_dropdown li.current a:hover{color:#148cf1}
+	.Hui-aside .menu_dropdown dt .Hui-iconfont{ color:#a0a7b1}
+	.Hui-aside .menu_dropdown dt .menu_dropdown-arrow{ color:#b6b7b8}	
+	.dislpayArrow a{background:url(icon_arrow.png) no-repeat 0 0}

BIN
iamberry-app-api/.svn/pristine/1a/1a7a790dac1b9916ebc018aacd7b1c501e36bd8c.svn-base


+ 39 - 0
iamberry-app-api/.svn/pristine/1c/1c25dc40e1e4b0230e14ba2592abb05d7dff1dcc.svn-base

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

File diff suppressed because it is too large
+ 5 - 0
iamberry-app-api/.svn/pristine/1c/1c30fe3f0904ea359f2eefe7fce1f150d04fc913.svn-base


BIN
iamberry-app-api/.svn/pristine/1c/1c36949861913cb026f6d7a8e5153311aea91ad0.svn-base


File diff suppressed because it is too large
+ 8 - 0
iamberry-app-api/.svn/pristine/1c/1c3825da5df587aabb6bb1fe4ff92a9c05e6ad78.svn-base


+ 44 - 0
iamberry-app-api/.svn/pristine/1c/1c5bf2b398fac287af2fd7ee95cd885f8c492967.svn-base

@@ -0,0 +1,44 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/xml; charset=utf-8" />
+<title>My97DatePicker</title>
+<script type="text/javascript" src="config.js"></script>
+<script>
+if(parent==window)
+	location.href = 'http://www.my97.net/dp/demo/';
+
+var $d, $dp, $pdp = parent.$dp, $dt, $tdt, $sdt, $lastInput, $IE=$pdp.ie, $FF = $pdp.ff,$OPERA=$pdp.opera, $ny, $cMark = false;
+
+if ($pdp.eCont) {
+	$dp = {};
+	for (var p in $pdp) {
+		$dp[p] = $pdp[p];
+	}
+}
+else
+	$dp = $pdp;
+$dp.realLang = getCurr(langList, $dp.lang);
+document.write("<script src='lang/" + $dp.realLang.name + ".js' charset='" + $dp.realLang.charset + "'><\/script>");
+for (var i = 0; i < skinList.length; i++) {
+    document.write('<link rel="stylesheet" type="text/css" href="skin/' + skinList[i].name + '/datepicker.css" title="' + skinList[i].name + '" charset="' + skinList[i].charset + '" disabled="true"/>');
+}
+function getCurr(arr, name){
+	var isFound = false;
+	var item = arr[0];
+	for (var i = 0; i < arr.length; i++) {
+		if (arr[i].name == name) {
+			item = arr[i];
+			break;
+		}
+	}
+	return item;
+}
+</script>
+<script type="text/javascript" src="calendar.js"></script>
+</head>
+<body leftmargin="0" topmargin="0" onLoad="$c.autoSize()">
+</body>
+</html>
+<script>
+new My97DP();
+</script>

File diff suppressed because it is too large
+ 10216 - 0
iamberry-app-api/.svn/pristine/1c/1c6d31ce30341f8116e6124a77c89c930204b96d.svn-base


BIN
iamberry-app-api/.svn/pristine/1d/1d4687ee7912407d455aa9b0456486030512de9d.svn-base


BIN
iamberry-app-api/.svn/pristine/1d/1d4c3b00786a4c3ef7402dc29195e0ad6d85609f.svn-base


+ 10 - 0
iamberry-app-api/.svn/pristine/1e/1e59675aee8dc721e6f150ad1ee27d6a189305ca.svn-base

@@ -0,0 +1,10 @@
+.Wdate{
+	border:#999 1px solid;
+	height:20px;
+	background:#fff url(datePicker.gif) no-repeat right;
+}
+
+.WdateFmtErr{
+	font-weight:bold;
+	color:red;
+}

BIN
iamberry-app-api/.svn/pristine/1e/1ec3f97c5214acf31519955826b6d7f8cddfa678.svn-base


BIN
iamberry-app-api/.svn/pristine/1e/1edbb9d5b56f06cc29c26ff6266c0215b679b02d.svn-base


BIN
iamberry-app-api/.svn/pristine/20/205815e18102fd0b5cd312b11da06afd22277dbd.svn-base


BIN
iamberry-app-api/.svn/pristine/21/214f3f913d342d8b28c93a88cd138d562d0c49a4.svn-base


+ 89 - 0
iamberry-app-api/.svn/pristine/22/225ba874aa7b2b63b23a80d0107330291678dc49.svn-base

@@ -0,0 +1,89 @@
+package com.iamberry.app.api.util;
+import java.io.Serializable;
+import org.apache.commons.lang3.StringUtils;
+/**
+ * @company	深圳爱贝源科技有限公司
+ * @website www.iamberry.com
+ * @author 	献
+ * @tel		18271840547
+ * @date	2016年12月8日
+ * @explain	APP版本,用于定位接口版本
+ */
+public class AppVersion implements Serializable {
+
+	private static final long serialVersionUID = 6519521054213394115L;
+
+	/**
+	 * 手机系统:
+	 * 	1、Android
+	 * 	2、iOS
+	 * 	3、其他
+	 */
+	private int os;
+	
+	/**
+	 * 手机型号
+	 */
+	private int version;
+
+	public int getOs() {
+		return os;
+	}
+
+	public void setOs(int os) {
+		this.os = os;
+	}
+
+	public int getVersion() {
+		return version;
+	}
+
+	public void setVersion(int version) {
+		this.version = version;
+	}
+	
+	public AppVersion(int os, int version) {
+		super();
+		this.os = os;
+		this.version = version;
+	}
+
+	/**
+	 * 解析APP版本
+	 * @param userAgent
+	 * @return
+	 * @author 献
+	 * @Time   2016年12月8日
+	 */
+	public static AppVersion parseUserAgent(String userAgent) {
+		userAgent = userAgent.toLowerCase();
+		if (userAgent.indexOf("ios") != -1) {
+			// iOS
+			return new AppVersion(2, parseVersion(userAgent));
+		} else if (userAgent.indexOf("android") != -1) {
+			// Android
+			return new AppVersion(1, parseVersion(userAgent));
+		}
+		// 其他
+		return new AppVersion(3, parseVersion(userAgent));
+	}
+	
+	/**
+	 * 解析版本号
+	 * @param agent
+	 * @return
+	 * @author 献
+	 * @Time   2016年12月8日
+	 */
+	private static int parseVersion(String agent) {
+		int index = StringUtils.indexOf(agent, "/");
+		agent = StringUtils.substring(agent, index+1);
+		index = StringUtils.indexOf(agent, " ");
+		index = index == -1 ? StringUtils.indexOf(agent, "(") : index;
+		try {return Integer.parseInt(StringUtils.replace(StringUtils.substring(agent, 0, index), ".", ""));} catch (Exception e) {return 0;}
+	}
+
+	public String toString() {
+		return "{\"os\":\"" + os + "\", \"version\":\"" + version + "\"}";
+	}
+}

BIN
iamberry-app-api/.svn/pristine/23/2381587d2b373ad123f811c396bce6731694e357.svn-base


File diff suppressed because it is too large
+ 1 - 0
iamberry-app-api/.svn/pristine/23/23939b6c8792fde82ee302eb4aca45067895dac2.svn-base


BIN
iamberry-app-api/.svn/pristine/25/2507b0f9973523be7e4a4eeb6e41e8b9fafa99df.svn-base


+ 12 - 0
iamberry-app-api/.svn/pristine/25/250bbdae7886c4c506953e7f84b4de6cd1ae56a2.svn-base

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

BIN
iamberry-app-api/.svn/pristine/25/2528e588690e910eabb58747fd865319f34289eb.svn-base


+ 27 - 0
iamberry-app-api/.svn/pristine/25/255d01003cd947f0b7354cce0589016482a87c54.svn-base

@@ -0,0 +1,27 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('pagebreak', function(K) {
+	var self = this;
+	var name = 'pagebreak';
+	var pagebreakHtml = K.undef(self.pagebreakHtml, '<hr style="page-break-after: always;" class="ke-pagebreak" />');
+
+	self.clickToolbar(name, function() {
+		var cmd = self.cmd, range = cmd.range;
+		self.focus();
+		var tail = self.newlineTag == 'br' || K.WEBKIT ? '' : '<span id="__kindeditor_tail_tag__"></span>';
+		self.insertHtml(pagebreakHtml + tail);
+		if (tail !== '') {
+			var p = K('#__kindeditor_tail_tag__', self.edit.doc);
+			range.selectNodeContents(p[0]);
+			p.removeAttr('id');
+			cmd.select();
+		}
+	});
+});

BIN
iamberry-app-api/.svn/pristine/26/2691733dbdb7ce0f537d51804a34a6e68bcdd623.svn-base


+ 100 - 0
iamberry-app-api/.svn/pristine/26/269cfab97a62986e245a1a0d6577ce23a565cf76.svn-base

@@ -0,0 +1,100 @@
+/* container */
+.ke-container-simple {
+	display: block;
+	border: 1px solid #CCC;
+	background-color: #FFF;
+	overflow: hidden;
+}
+/* toolbar */
+.ke-container-simple .ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #FFF;
+	padding: 2px 5px;
+	overflow: hidden;
+}
+.ke-container-simple .ke-toolbar .ke-outline {
+	border: 1px solid #FFF;
+	background-color: transparent;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-container-simple .ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-container-simple .ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-container-simple .ke-toolbar  .ke-disabled {
+	cursor: default;
+}
+/* statusbar */
+.ke-container-simple .ke-statusbar {
+	position: relative;
+	background-color: #FFF;
+	border-top: 1px solid #CCCCCC;
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+/* menu */
+.ke-menu-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FFF;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-simple .ke-menu-item {
+	border: 1px solid #FFF;
+	background-color: #FFF;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-simple .ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #FFF;
+}
+/* colorpicker */
+.ke-colorpicker-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FEFEFE;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}

+ 305 - 0
iamberry-app-api/.svn/pristine/27/2732dd5ccd56a25a5ceb8a96b7c77b0a9f3b3614.svn-base

@@ -0,0 +1,305 @@
+.jp_bodyCeng { height:100%; width:100%; position:absolute; z-index:1; top:0; left:0; }
+.jp_content{
+	border:1px solid #6ac5ff;
+	width:425px;
+	position:fixed;
+	_position:absolute;
+	z-index:9999;
+	background:#FFFFFF;
+	display:none;
+}
+.jp_content .cla_head_layout{
+    float:left;
+	margin:-1px 0 0 42px; 
+	-moz-user-select:none;
+}
+.jp_content .inlineblock { display:inline-block; *zoom:1; *display:inline; }
+.jp_content .ymd-w{
+	float:left;
+	height:auto;
+	line-height:12px;
+}
+
+.jp_content .dropdown{
+	*margin-left:10px;
+	position:relative;
+}
+
+.jp_content .solarBtn,.jp_content .lodarBtn{
+	padding:0;
+	border:solid 1px #6EC5FF;
+    color:#333;
+    cursor:pointer;
+    background:none;
+    line-height:12px;
+    *line-height:12px;
+    padding:4px;
+    *padding-bottom:2px;
+    font-size:12px;
+    *margin-left:-1px;
+    *margin-top:-3px;
+    margin-right:10px;
+}
+.jp_content .solarBtn { 
+	border-right:none; 
+	margin-right:0; 
+}
+.jp_content .active {
+	color: #1DA2FF;
+	background: #B8E2FF;
+}
+.jp_content #jptoday_button {
+	float:left;
+	cursor:pointer;
+	font-size:12px;
+	line-height:26px;
+	margin-left:2px;
+}
+.jp_content #year_func,.jp_content #month_func{
+	display:inline-block;
+	font-family:"Microsoft Yahei";
+}
+.jp_content #year_func span,.jp_content #month_func span { 
+	font-size:12px;
+	font-weight:bold;
+	color:#333;
+}
+.jp_content #year_func{
+	*margin-left:0px;
+	text-align:center;
+} 
+.jp_content #month_func{
+	text-align:center;
+}
+
+.jp_content #year_func,.jp_content #month_func
+{
+	color: #2A4564;
+    display: inline-block;
+    font-size: 14px;
+    line-height: 26px;
+    text-align: center;
+}
+
+.jp_content .open .dropdown-menu { 
+	display: block;
+}
+.jp_content .nong { color:#F89406; line-height:22px; }
+.jp_content .dropdown-menu a { padding:3px 5px; color:#B0B0B0; display:block; text-align:center; }
+.jp_content a.pl9IE7 { *padding-left:9px; }
+.jp_content a.pl13IE7 { *padding-left:13px; }
+.jp_content .dropdown-menu a:hover { background:#B6D2EA; }
+.jp_content .dropdown-menu { min-width:0;
+	background-clip: padding-box;
+    background-color: #FFFFFF;
+    border: 1px solid #D2D2D2;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    border-radius: 5px 5px 5px 5px;
+    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+    display: none;
+    left:0;
+    list-style: none outside none;
+    margin: 1px 0 0;
+    min-width: 40px;
+    text-align:center;
+    padding:0;
+    position: absolute;
+    top: 100%;
+    z-index: 1000;
+}
+.jp_content #month_num { margin-left:3px; *margin-left:0; text-align: center; }
+
+.jp_content .jpcontent { }
+
+.jp_content #cal_downleft{
+    height: 100%;
+	float: left;
+}
+
+.jp_content #jp_mainCal {
+   padding:4px 6px 6px;
+   color:#939698;
+}
+
+#jp_mainCal table, #jp_mainCal td{
+	border-collapse:collapse;
+	border-spacing:0;
+	padding: 0px;
+}
+
+#jp_mainCal .block
+{
+	text-align: left;
+	vertical-align: top;
+	cursor: pointer;
+	display: table-cell;
+	font-famlily:Microsoft YaHei;
+}
+#jp_mainCal .tablehead{
+	font-size:12px;
+	font-family:Microsoft YaHei;
+	color:#333;
+}
+
+#jp_mainCal .thead {
+    border-right: 0 none;
+    height: 20px;
+    text-align: center;
+}
+#jp_mainCal .block_content{
+	padding:0;
+	margin:1px 3px;
+}
+.jp_content .today_button {
+	color:#54ac1d;
+}
+#jp_mainCal .block:hover .block_content,#jp_mainCal .clickBlock .block_content{
+	box-shadow: 0 0 2px 1px #32a7f9 inset;
+	background: #32a7f9;
+}
+#jp_mainCal .today .block_content {
+	background: #e7ffde;
+}
+#jp_mainCal .number,#jp_mainCal .weekendNum{
+	font-size:12px;
+	font-family:Arial;
+	width:30px;
+	overflow: hidden;
+	height:18px;
+	line-height:18px;
+	color:#B1BABF;
+	padding:0;
+	text-align:center;
+	margin:0;
+	font-weight:normal;
+}
+#jp_mainCal .clickBlock .number,#jp_mainCal .block:hover .number,
+#jp_mainCal .clickBlock .weekendNum,#jp_mainCal .block:hover .weekendNum{ color:#FFF; }
+#jp_mainCal .today .number { width:28px;
+height:16px;
+line-height:16px;
+border:solid 1px #93da67;
+color:#B1BABF;
+}
+
+#jp_mainCal .none{
+    display:none;
+}
+.clearfloat { 
+	clear:both; margin:0; padding:0;
+}
+
+.jp_content #cal_rightboard{
+	width: 140px;
+	margin-top: 12px;
+}
+.jp_content #gregorianDayStr{
+	font-size: 14px;
+	text-align: center;
+}
+
+.jp_content .chinaDay{
+	width:100%; 
+	text-align:center; 
+	font-size:12px;
+	margin-top:22px;
+	line-height:12px;
+	height:12px;
+}
+
+.jp_content .time { 
+	text-align:center; margin-top:10px;
+}
+.jp_content .time span {
+	font-size:16px;
+}
+.jp_content .timeInput {
+	width:40px;
+	height:26px;
+	line-height:26px;
+	font-size:18px;
+	padding:0;
+	margin:0;
+	border:solid 1px #d2d2d2;
+	text-align:center;
+}
+.jp_content .year_funcless,.jp_content .year_funcmore,.jp_content .month_funcless,.jp_content .month_funcmore
+ { position:relative; height:15px; line-height:15px; width:100%; cursor:pointer; *dispaly:inline; *overflow:hidden; }
+.jp_content a.up{
+	cursor: pointer;
+    display: inline-block;
+    font-size: 0;
+    height: 0;
+    line-height: 0;
+    width: 0;
+    border-bottom-color: #999999;
+    padding:0;
+    position:absolute;
+    left:40%;
+    top:5px;
+}.jp_content a.up{
+	border-color: transparent transparent #000000;
+    border-style: dashed dashed solid;
+    border-width: 0 4px 4px;
+}
+.jp_content a.down{
+	cursor: pointer;
+    display: inline-block;
+    font-size: 0;
+    height: 0;
+    line-height: 0;
+    width: 0;
+    border-top-color: #999999;
+    padding:0;
+    position:absolute;
+    left:40%;
+    bottom:5px
+}
+.jp_content a.down{
+	border-color: #000000 transparent transparent;
+    border-style: solid dashed dashed;
+    border-width: 4px 4px 0;
+}
+
+.jp_content .cal_btn_w {
+	margin-top:13px;
+	text-align:center
+}
+
+.jp_content .prevBtn,.jp_content .nextBtn{
+	display: inline-block;
+	height: 20px;
+	margin-bottom: -5px;
+	padding-left: 20px;
+	background: url(../img/sl-time-btns.png) no-repeat 8px -195px;
+	cursor:pointer;
+}
+.jp_content .prevBtn { *margin-right:-9px }
+.jp_content .nextBtn{
+	background-position:8px -245px;
+}
+
+.jp_content .button_ok, .jp_content .button_cancel {
+	background: url(../img/sl-time-btns.png) no-repeat 0 0;
+	height: 20px;
+	width: 46px;
+	cursor: pointer;
+	padding: 0;
+	margin: 0;
+	border: 0;
+}
+.jp_content .button_cancel {
+   	background-position: 0 -50px;
+}
+
+.jp_content .can_right{
+	float:left;
+}
+.jp_content .can_haedw {
+	padding-top:2px;
+	height:30px;
+	line-height:30px;
+	background-color:#f0f0f0;
+	position:relative;
+	z-index:100;
+}

BIN
iamberry-app-api/.svn/pristine/27/27fd23ecc8971f0dd463b14d24e50f0c414f1ba4.svn-base


+ 164 - 0
iamberry-app-api/.svn/pristine/29/298dcc88ee469812763e716265e667895016b509.svn-base

@@ -0,0 +1,164 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="renderer" content="webkit|ie-comp|ie-stand">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="viewport"
+	content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+<meta http-equiv="Cache-Control" content="no-siteapp" />
+<LINK rel="Bookmark" href="/favicon.ico">
+<LINK rel="Shortcut Icon" href="/favicon.ico" />
+<!--[if lt IE 9]>
+<script type="text/javascript" src="lib/html5.js"></script>
+<script type="text/javascript" src="lib/respond.min.js"></script>
+<script type="text/javascript" src="lib/PIE_IE678.js"></script>
+<![endif]-->
+<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+
+<!--[if IE 6]>
+<script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
+<script>DD_belatedPNG.fix('*');</script>
+<![endif]-->
+<title>消息列表</title>
+</head>
+<body>
+	<nav class="breadcrumb">
+		<i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span>
+		消息管理 <span class="c-gray en">&gt;</span> 消息列表 <a
+			class="btn btn-success radius r mr-20"
+			style="line-height: 1.6em; margin-top: 3px"
+			href="javascript:location.replace(location.href);" title="刷新"><i
+			class="Hui-iconfont">&#xe68f;</i></a>
+	</nav>
+	<div class="pd-20">
+	
+ 	<form action="${pageContext.request.contextPath }/secure/message/sendMessage" class="form form-horizontal" id="form-addGoods" method="POST" >
+		
+		
+		<div class="row cl">
+			<label id="integralLabel" class="form-label col-2"><span class="c-red">*</span>发送内容:</label>
+			<div id="integralDiv" class="formControls col-2">
+				<textarea id="content"  name="content" class="textarea-text" placeholder="" style="width:800px;height:300px;"></textarea>
+			</div>
+		</div>
+		
+		<div class="row cl">
+			<label class="form-label col-2"><span class="c-red">*</span>消息url:</label>
+			<div class="formControls col-5">
+				<input id="url" type="text" name="url" id="" placeholder="格式:http://www.baidu.com" value="" class="input-text" ></div>
+		</div>
+		
+		<div class="row cl">
+			<label id="integralLabel" class="form-label col-2"><span class="c-red">*</span>目标平台:</label>
+			<div id="integralDiv" class="formControls col-8">
+			
+				<input type="radio" id="aa" name="platform" value="all" checked><label for="aa">所有用户</label> &nbsp;&nbsp;&nbsp;&nbsp;
+				<input type="radio" id="bb" name="platform" value="android" ><label for="bb"> 安卓android 用户</label>&nbsp;&nbsp;&nbsp;&nbsp;
+				<input type="radio" id="cc" name="platform" value="ios"><label for="cc">  苹果IOS 用户</label>&nbsp;&nbsp;
+			</div>
+		</div>
+		
+		<div class="row cl">
+			<label class="form-label col-2">目标人群:</label>
+			<div class="formControls col-6">
+			<input id="user" name="tag" type="hidden" readonly="readonly"  style="width:50%;"  class="input-text" value=""  >
+			
+				<input id="username"  name="username"  readonly="readonly" 
+				  type="text"  placeholder="默认所有" value="" class="input-text" style="width:50%">
+			
+			 <span onclick="  goods_edit('选择用户','${pageContext.request.contextPath }/secure/message/listuser','','400');"> 
+					 	选择接受用户
+			</span>  
+			</div>
+		</div>
+		
+		<div class="row cl">
+			<div class="col-10 col-offset-2">
+				<button onClick="return checkMessage();" class="btn btn-primary radius" type="submit">
+					<i class="Hui-iconfont">&#xe632;</i>立即发送
+				</button>
+			</div>
+		</div>
+	</form>
+ 	
+ 	
+	</div>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/js/page/jqPaginator.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/goods/js/utils.js"></script>
+	<script type="text/javascript">
+	/*$(document).ready(function(){
+		$('#beginDate').datepicker();//时间控件
+        $('#endDate').datepicker();
+	});*/
+	
+	function  checkMessage(){
+		//消息内容
+		if(!commonLengthJdg('content',1,200,null,true)){
+			layer.msg("消息内容不能为空!",{icon: 2,time:2000});
+			return false;
+		}
+		
+		//url
+		if(!commonLengthJdg('url',1,200,null,true)){
+			layer.msg("消息URL不能为空!",{icon: 2,time:2000});
+			return false;
+		}
+		
+		return true;
+	}
+	/**
+	 * 打开界面
+	 */
+	function goods_edit(title,url,id,w,h){
+		/*layer_show(title,url,w,h);*/
+		var iWidth = 1000;
+	var iHeight = 700;
+	var iTop = (window.screen.availHeight - 30 - iHeight) / 2;
+	var iLeft = (window.screen.availWidth - 10 - iWidth) / 2;
+	 window.open(url, title, "width=" + iWidth + ", height=" + iHeight + ",top=" + iTop + ",left=" + iLeft + ",toolbar=no, menubar=no, scrollbars=no, resizable=no,location=no, status=no,alwaysRaised=yes,depended=yes");
+		 
+
+	}
+	
+	/* ,function(){
+		$.ajax({
+	        url: '${pageContext.request.contextPath }/admin/product/updateStatus',
+	        type: "POST",
+	        dataType: "json",
+	        data: {productId : id},
+	        error:function(){
+	      	  layer.msg(data,{icon: 5,time:2000});
+	        },
+	        success:  function(data){
+	      		obj.val(data);
+	        }
+	    });
+	} */
+	
+	
+
+
+/**
+ * 打开修改商品界面
+ */
+
+</script>
+</body>
+</html>

BIN
iamberry-app-api/.svn/pristine/2a/2a6f8aee589dd055d47ed7b151d022238d741261.svn-base


BIN
iamberry-app-api/.svn/pristine/2a/2ac17299127cb7b488edaac4fcd4bb99a5b0ed8d.svn-base


+ 12 - 0
iamberry-app-api/.svn/pristine/2c/2c4e764a3d5365b60daddaeaed59fd6db10519d5.svn-base

@@ -0,0 +1,12 @@
+var langList = 
+[
+	{name:'en',		charset:'UTF-8'},
+	{name:'zh-cn',	charset:'gb2312'},
+	{name:'zh-tw',	charset:'GBK'}
+];
+
+var skinList = 
+[
+	{name:'default',	charset:'gb2312'},
+	{name:'whyGreen',	charset:'gb2312'}
+];

BIN
iamberry-app-api/.svn/pristine/2c/2c5247fe32b396b411a02853a3d8177c1acc501a.svn-base


+ 23 - 0
iamberry-app-api/.svn/pristine/2c/2cc92060ddd3759147602ac6d64c0c6f07adad54.svn-base

@@ -0,0 +1,23 @@
+@charset "utf-8";
+/* 默认 黑色 */	
+/*全站默认字体颜色*/
+a{color:#333}a:hover,a:focus,.maincolor,.maincolor a{color:#06c}
+.Hui-header{ color:#fff}/*头部颜色*/
+	.Hui-logo,.Hui-logo-m,.Hui-subtitle,.Hui-userbar{color:#fff}/*logo 及 用户信息文字颜色*/
+	.Hui-logo:hover,.Hui-logo-m:hover{color:#fff;text-decoration: none}
+	
+.Hui-header{background-color:#222}/*顶部导航*/
+#Hui-nav > ul > li > a{ color:#fff}/*顶部导航文字颜色*/
+#Hui-nav > ul > li > a:hover,#Hui-nav > ul > li.current > a{ color:#fff}/*导航高亮状态*/
+.Hui-userbar > li > a{ color:#fff}
+.Hui-userbar > li > a:hover,.Hui-userbar > li.current > a{ color:#fff}/*用户信息条高亮*/
+.Hui-aside{}/*侧边栏*/
+	.Hui-aside .menu_dropdown dt{color:#333}/*左侧二级导航菜单*/
+	.Hui-aside .menu_dropdown dt:hover{color:#148cf1}
+	.Hui-aside .menu_dropdown dt:hover [class^="icon-"]{ color:#7e8795}
+	.Hui-aside .menu_dropdown li a{color:#666;border-bottom: 1px solid #e5e5e5}
+	.Hui-aside .menu_dropdown li a:hover{color:#148cf1;background-color:#fafafa}
+	.Hui-aside .menu_dropdown li.current a,.menu_dropdown li.current a:hover{color:#148cf1}
+	.Hui-aside .menu_dropdown dt .Hui-iconfont{ color:#a0a7b1}
+	.Hui-aside .menu_dropdown dt .menu_dropdown-arrow{ color:#b6b7b8}	
+	.dislpayArrow a{background:url(icon_arrow.png) no-repeat 0 0}

BIN
iamberry-app-api/.svn/pristine/2c/2cde996b40294ca63015209d0b735c6d81a302db.svn-base


BIN
iamberry-app-api/.svn/pristine/2d/2d06a579340976e904601ac157a153e8e374ae46.svn-base


BIN
iamberry-app-api/.svn/pristine/2d/2d76112fd504f0fd222d646df634cbee31c55f92.svn-base


BIN
iamberry-app-api/.svn/pristine/2d/2dd8d0e72ceb0f6e3a93f9d7e6e9cd84b0ef5c97.svn-base


BIN
iamberry-app-api/.svn/pristine/2d/2dedb7d62c6bc2b24b30b7f2b865e7ea49aa06ef.svn-base


+ 0 - 0
iamberry-app-api/.svn/pristine/2e/2e9ea6f0d12b671dd4ae04aa85ba081aa5dce3f1.svn-base


Some files were not shown because too many files changed in this diff