修改后台页面样式

tooth-common-core/tooth-common-core.iml

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="tooth-common-tool" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
+    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
+    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+  </component>
+</module>

tooth-common-tool/tooth-common-tool.iml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
+    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
+    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+  </component>
+</module>

tooth-common-web/tooth-common-web.iml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
+    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
+    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+  </component>
+</module>

tooth-wechat-interface/tooth-wechat-interface.iml

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="tooth-common-core" />
+    <orderEntry type="module" module-name="tooth-common-tool" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
+    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
+    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+  </component>
+</module>

tooth-wechat-service/tooth-wechat-service.iml

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="tooth-wechat-interface" />
+    <orderEntry type="module" module-name="tooth-common-core" />
+    <orderEntry type="module" module-name="tooth-common-tool" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
+    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
+    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+  </component>
+</module>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/admin/addUI.jsp

@@ -94,7 +94,7 @@
 		</div>
 		<div class="row cl">
 			<div class="col-9 col-offset-3">
-				<input id="submit" class="btn btn-primary radius" type="button" value="&nbsp;&nbsp;提交&nbsp;&nbsp;" onclick="admin_add()">
+				<input id="submit" class="btn btn-danger" type="button" value="&nbsp;&nbsp;提交&nbsp;&nbsp;" onclick="admin_add()">
 			</div>
 		</div>
 	</form>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/admin/listUI.jsp

@@ -35,7 +35,7 @@ scale=1.0,user-scalable=no" />
 	<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"
+			class="btn btn-danger 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>
@@ -45,15 +45,15 @@ scale=1.0,user-scalable=no" />
 		<div class="text-c">
 			<input type="text" class="input-text" value="${adminLoginName }" style="width: 250px"
 				placeholder="输入管理员名称" id="administratorName" name="administratorName">
-			<button type="submit" class="btn btn-success" id=""> <i class="Hui-iconfont">&#xe665;</i>搜用户</button>
+			<button type="submit" class="btn btn-danger" id=""> <i class="Hui-iconfont">&#xe665;</i>搜用户</button>
 		</div>
 	</form>
 	<form id="adminlist" >
 		<div class="cl pd-5 bg-1 bk-gray mt-20">
 			<span class="l"><a href="javascript:;" onclick="datadel()"
-				class="btn btn-danger radius">批量删除</a> <a href="javascript:;"
+				class="btn btn-danger">批量删除</a> <a href="javascript:;"
 				onclick="admin_add('${pageContext.request.contextPath }/admin/admin/toaddUI')"
-				class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i>添加管理员</a>
+				class="btn btn-danger"><i class="Hui-iconfont">&#xe600;</i>添加管理员</a>
 				</span>
 		</div>
 		<table class="table table-border table-bordered table-bg">

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/banner/add.jsp

@@ -29,21 +29,21 @@
     <div class="row cl">
       <label class="form-label col-3"><span class="c-red">*</span>名称：</label>
       <div class="formControls col-5">
-        <input type="text" class="input-text" value="" placeholder="" id="member-name" name="bannerName" datatype="*2-16" nullmsg="名称不能为空">
+        <input type="text" class="input-text" value="" placeholder="轮播图名称" id="member-name" name="bannerName" datatype="*2-16" nullmsg="名称不能为空">
       </div>
       <div class="col-4"> </div>
     </div>
     <div class="row cl">
       <label class="form-label col-3"><span class="c-red">*</span>开始时间：</label>
       <div class="formControls col-5">
-        <input type="text" readonly="readonly" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01 00:00:00\'}'})" id="beginDate" name="bannerStartDate" class="input-text Wdate">
+        <input type="text" readonly="readonly" placeholder="轮播图生效时间" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01 00:00:00\'}'})" id="beginDate" name="bannerStartDate" class="input-text Wdate">
       </div>
       <div class="col-4"> </div>
     </div>
     <div class="row cl">
       <label class="form-label col-3"><span class="c-red">*</span>结束时间：</label>
       <div class="formControls col-5">
-        <input type="text" readonly="readonly" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01 00:00:00'})" id="endDate" name="bannerEndDate" class="input-text Wdate">
+        <input type="text" readonly="readonly" placeholder="轮播图结束时间" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01 00:00:00'})" id="endDate" name="bannerEndDate" class="input-text Wdate">
       </div>
       <div class="col-4"> </div>
     </div>
@@ -72,14 +72,14 @@
     <div class="row cl">
       <label class="form-label col-3">简介：</label>
       <div class="formControls col-5">
-        <textarea name="bannerDesc" cols="" rows="" class="textarea"  placeholder="banner简介" datatype="*0-100" dragonfly="true" nullmsg="简介不能为空！" onKeyUp="textarealength(this,100)"></textarea>
+        <textarea name="bannerDesc" cols="" rows="" class="textarea"  placeholder="轮播图简介" datatype="*0-100" dragonfly="true" nullmsg="简介不能为空！" onKeyUp="textarealength(this,100)"></textarea>
         <p class="textarea-numberbar"><em class="textarea-length">0</em>/100</p>
       </div>
       <div class="col-4"> </div>
     </div>
     <div class="row cl">
       <div class="col-9 col-offset-3">
-        <input class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+        <input class="btn btn-danger" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
       </div>
     </div>
   </form>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/banner/list.jsp

@@ -24,17 +24,17 @@
 <title>用户管理</title>
 </head>
 <body>
-<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> banner管理 <span class="c-gray en">&gt;</span> banner列表 <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>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> banner管理 <span class="c-gray en">&gt;</span> banner列表 <a class="btn btn-danger 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 }/admin/banner/listUI" method="post" >
 	<div class="text-c">
 		<input type="text" class="input-text" style="width:250px" placeholder="输入banner名称、简介" id="" value="${text }" name="text">
-		<button type="submit" class="btn btn-success radius" id=""  name=""><i class="Hui-iconfont">&#xe665;</i> 搜Banner</button>
+		<button type="submit" class="btn btn-danger" id=""  name=""><i class="Hui-iconfont">&#xe665;</i> 搜Banner</button>
 	</div>
 	</form>
 	<div class="cl pd-5 bg-1 bk-gray mt-20"> 
 		<span class="l">
-			<a href="javascript:;" onclick="member_add('添加Banner','${pageContext.request.contextPath}/admin/banner/addUI','','510')" class="btn btn-primary radius">
+			<a href="javascript:;" onclick="member_add('添加Banner','${pageContext.request.contextPath}/admin/banner/addUI','','510')" class="btn btn-danger">
 				<i class="Hui-iconfont">&#xe600;</i> 添加Banner
 			</a>
 		</span>
@@ -87,10 +87,12 @@
 		</tbody>
 	</table>
 	</div>
+	<br/>
+	<div align="right">
+		<%@include file="/common/other/paper/pager.jsp"%>
+	</div>
 </div>
-<div align="right">
-	<%@include file="/common/other/paper/pager.jsp"%>
-</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/lib/laypage/1.2/laypage.js"></script> 

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/banner/update.jsp

@@ -98,7 +98,7 @@
     </div>
     <div class="row cl">
       <div class="col-9 col-offset-3">
-        <input class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+        <input class="btn btn-danger" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
       </div>
     </div>
   </form>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/coupon/addCouponType.jsp

@@ -25,7 +25,7 @@
 <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>
+<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-danger 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}/admin/couponType/add" method="post" class="form form-horizontal" id="form-coupon-add">
 
@@ -157,13 +157,13 @@
 	<div class="row cl">
 		<label class="form-label col-2">优惠券备注：</label>
 		<div  class="formControls col-2">
-			<textarea id="couponRemark" name="couponRemark" class="textarea-text" placeholder="" style="width:200px;height:60px;"></textarea>
+			<textarea id="couponRemark" name="couponRemark" class="textarea-text" placeholder="" style="width:400px;height:60px;"></textarea>
 		</div>
 	</div>
 
     <div class="row cl">
       <div class="col-9 col-offset-3">
-        <input class="btn btn-primary radius" onclick="return checkForm()" type="submit" id="submitBtn" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+        <input class="btn btn-danger" onclick="return checkForm()" type="submit" id="submitBtn" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
       </div>
     </div>
   </form>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/coupon/couponItemList.jsp

@@ -26,7 +26,7 @@
 <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>
+<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-danger 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">
 	<div class="text-c">
 	<form action="${pageContext.request.contextPath }/admin/couponItem/getAllCouponItem" method="post" id="searchForm">
@@ -34,7 +34,7 @@
 			<input type="text" name="text" id="text" value="${text }" placeholder="优惠券名称/优惠券使用人" style="width: 300px" class="input-text">
 			<%--截止日期：
 			<input type="text" readonly="readonly" onfocus="WdatePicker({maxDate:'2050-10-01', dateFmt:'yyyy-MM-dd HH:mm:ss'})" id="beginDate" value="${beginDate }" name="beginDate" class="input-text Wdate" style="width: 120px;">--%>
-			<button name="" id="submitBtn" class="btn btn-success" type="submit">
+			<button name="" id="submitBtn" class="btn btn-danger" type="submit">
 				<i class="Hui-iconfont">&#xe665;</i> 搜索
 			</button>
 		<div class="mt-20">
@@ -71,7 +71,7 @@
 							<td>${cpuponItem.couponItemRemark }</td>
 							<td class="td-manage">
 								<c:if test="${cpuponItem.couponUseStatus != 7 && cpuponItem.couponUseStatus != 2}">
-									<input id="through" class="btn btn-primary radius upload-btn" onclick="updateCType('修改优惠券使用详情','${pageContext.request.contextPath }/admin/couponItem/updateCouponItem?couponItemId=${cpuponItem.couponItemId }','','700');" type="button" value="修改" />&nbsp;
+									<input id="through" class="btn btn-danger upload-btn" onclick="updateCType('修改优惠券使用详情','${pageContext.request.contextPath }/admin/couponItem/updateCouponItem?couponItemId=${cpuponItem.couponItemId }','','700');" type="button" value="修改" />&nbsp;
 								</c:if>
 							</td>
 						</tr>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/coupon/couponTypeList.jsp

@@ -26,7 +26,7 @@
 <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>
+<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-danger 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 }/admin/couponType/typeList" method="post" id="searchForm">
 	<div class="text-c"> 
@@ -58,7 +58,7 @@
 		    </select>
 	    </span>
 		
-		<button type="button" class="btn btn-success radius" id="searchButton" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+		<button type="button" class="btn btn-danger" id="searchButton" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
 	</div>
 	</form>
 	<div class="mt-20">
@@ -157,11 +157,13 @@
 			</c:if>
 		</tbody>
 	</table>
+		<br/>
+		<div align="right">
+			<%@include file="/common/other/paper/pager.jsp"%>
+		</div>
 	</div>
 </div>
-<div align="right">
-	<%@include file="/common/other/paper/pager.jsp"%>
-</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/lib/laypage/1.2/laypage.js"></script> 

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/bindingPlaceInfo.jsp

@@ -47,8 +47,8 @@
 				</div>
 				<div class="row cl">
 					<div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-3">
-						 <input class="btn btn-primary" type="button" onclick ="binding();" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
-					     <input class="btn btn-primary" type="button" onclick="closeWindow()"  value="&nbsp;&nbsp;取消&nbsp;&nbsp;">
+						 <input class="btn btn-danger" type="button" onclick ="binding();" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+					     <input class="btn btn-danger" type="button" onclick="closeWindow()"  value="&nbsp;&nbsp;取消&nbsp;&nbsp;">
 					</div>
 				</div>
 			</form>
@@ -58,7 +58,7 @@
 	<form action="${pageContext.request.contextPath }/admin/drp/bindingPlaceInfo" method="post" id="form-admin-add">
 	<div class="text-c"> 
 		<input type="text" class="input-text" style="width:250px" placeholder="输入会员昵称、电话" value="${userInput }" id="" name="userInput">
-		<button type="submit" class="btn btn-success radius" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜用户</button>
+		<button type="submit" class="btn btn-danger" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜用户</button>
 	</div>
 	</form>
 	<!-- <div class="cl pd-5 bg-1 bk-gray mt-20"> <span class="l"><a href="javascript:;" onclick="datadel()" class="btn btn-danger radius"><i class="Hui-iconfont">&#xe6e2;</i> 批量删除</a> <a href="javascript:;" onclick="member_add('添加用户','member-add.html','','510')" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i> 添加用户</a></span> <span class="r">共有数据：<strong>88</strong> 条</span> </div> -->

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/main/index.jsp

@@ -41,9 +41,9 @@
 </head>
 <body>
 	<header class="Hui-header cl">
-		<a class="Hui-logo l" title="上朵微商场管理系统" href="#">上朵微商场管理系统</a>
+		<a class="Hui-logo l" title="上朵微商场管理系统" href="#"><img width="100px" src="${pageContext.request.contextPath }/common/admin/images/logo.png" /></a>
 		<a class="Hui-logo-m l" href="#" title="上朵微商场管理系统">上朵微商场管理系统</a>
-		<span class="Hui-subtitle l">V1.0</span>
+		<span class="Hui-subtitle l">微信商城-V1.0</span>
 		<%-- 快捷操作 --%>
 		<nav class="mainnav cl" id="Hui-nav">
 			<ul>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/main/login.jsp

@@ -42,6 +42,7 @@
 	<div class="loginWraper">
 		<div id="loginform" class="loginBox">
 			<form onsubmit="checkLogin()" class="form form-horizontal" id="login-from" action="${pageContext.request.contextPath }/login" method="post">
+				<h3>用户登录</h3>
 				<input type="hidden"
 					value="<%=session.getAttribute("loginToken")%>" name="loginToken">
 				<c:if test="${!empty isShowDiv}">
@@ -65,19 +66,20 @@
 				</c:choose>
 				</c:if>
 				<div class="row cl">
-					<label class="form-label col-3"><i class="Hui-iconfont">&#xe60d;</i></label>
+					<label class="form-label col-3"><i class="Hui-iconfont c-red">&#xe60d;</i></label>
 					<div class="formControls col-8">
 						<input id="adminLoginName" autocomplete="off" name="adminLoginName" type="text" value="<%= loginName %>" placeholder="请输入账号" class="input-text size-L">
 					</div>
 				</div>
 				<div class="row cl">
-					<label class="form-label col-3"><i class="Hui-iconfont">&#xe60e;</i></label>
+					<label class="form-label col-3"><i class="Hui-iconfont c-red">&#xe60e;</i></label>
 					<div class="formControls col-8">
 						<input id="adminLoginPwd" autocomplete="off" name="adminLoginPwd" type="password" placeholder="请输入密码" class="input-text size-L">
 					</div>
 				</div>
 				<div class="row cl">
-					<div class="formControls col-8 col-offset-3">
+					<label class="form-label col-3"><i class="Hui-iconfont c-red">&#xe6c6;</i></label>
+					<div class="formControls col-8">
 						<input class="input-text size-L" autocomplete="off" id="verifyCode" name="verifyCode"
 							type="text" placeholder="验证码"
 							onblur="if(this.value==''){this.value='验证码:'}"
@@ -87,15 +89,16 @@
 							id="verifyCode"> <a id="kanbuq" href="javascript:;">看不清，换一张</a>
 					</div>
 				</div>
+				<br/>
 				<div class="row">
-					<div class="formControls  col-8 col-offset-3">
-						<input name="" id="login-btn-id" type="button" class="btn btn-block btn-primary radius size-L my-btn-login" value="立即登录">
+					<div class="formControls  col-6 col-offset-4">
+						<input name="" id="login-btn-id" type="button" class="btn btn-gray size-L my-btn-login" value="确定">
 					</div>
 				</div>
 			</form>
 		</div>
 	</div>
-	<div class="footer">Copyright 深圳爱贝源科技有限公司</div>
+	<div class="footer">Copyright &copy; 深圳爱贝源科技有限公司</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/js/H-ui.js"></script>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/member/list.jsp

@@ -31,15 +31,15 @@
 
 </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>
+<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-danger 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 }/admin/member/listUI" method="get" id="form-admin-add">
 		<div class="text-c">
 			关注时间：
-			<input readonly="readonly" type="text" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" name="beginDate" value="${beginDate }" class="input-text Wdate" style="width: 120px;">
-			- <input readonly="readonly" type="text" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" name="endDate" value="${endDate }" class="input-text Wdate" style="width: 120px;">
+			<input readonly="readonly" placeholder="开始时间" type="text" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" name="beginDate" value="${beginDate }" class="input-text Wdate" style="width: 120px;">
+			- <input readonly="readonly" placeholder="结束时间" type="text" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" name="endDate" value="${endDate }" class="input-text Wdate" style="width: 120px;">
 			<input type="text" class="input-text" style="width:250px" placeholder="输入会员昵称、电话" value="${userInput }" id="" name="userInput">
-			<button type="submit" class="btn btn-success radius" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜用户</button>
+			<button type="submit" class="btn btn-danger" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜用户</button>
 		</div>
 	</form>
 	<!-- <div class="cl pd-5 bg-1 bk-gray mt-20"> <span class="l"><a href="javascript:;" onclick="datadel()" class="btn btn-danger radius"><i class="Hui-iconfont">&#xe6e2;</i> 批量删除</a> <a href="javascript:;" onclick="member_add('添加用户','member-add.html','','510')" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i> 添加用户</a></span> <span class="r">共有数据：<strong>88</strong> 条</span> </div> -->
@@ -92,11 +92,13 @@
 			</c:if>
 			</tbody>
 		</table>
+		<br/>
+		<div align="right">
+			<%@include file="/common/other/paper/pager.jsp"%>
+		</div>
 	</div>
 </div>
-<div align="right">
-	<%@include file="/common/other/paper/pager.jsp"%>
-</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/lib/laypage/1.2/laypage.js"></script>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/member/memberinfo.jsp

@@ -26,7 +26,7 @@
 <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>
+<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-danger 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">
 <div style="float:right; margin-right: 25">
 	<a href="javascript:history.go(-1)" >返回</a>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/order.jsp

@@ -22,7 +22,7 @@
 <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>
+	<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-danger 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">
 			<div style="float:right;">
 				<a href="javascript:window.location.href = document.referrer;" >返回</a>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -18,6 +18,12 @@
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<style>
+	.tabBar{border-bottom:1px solid #ccc;margin: 10px 0;display: table;}
+	.tabBar span{background-color: #fff;color: #999;display: table-cell;height: 40px;line-height: 40px;}
+	.tabBar span.current{background-color: #fff;color:#333;position: relative;}
+	.tabBar span.current:after{content: '';position: absolute;left: 50%;height: 2px;width: 50px;margin-left: -25px;bottom: 0;background-color: #333;}
+</style>
 <title>订单管理</title>
 </head>
 <body>
@@ -60,7 +66,7 @@
 		</div>
 		<br>
 		<div class="col-9 col-offset-3">
-	        <input class="btn btn-primary radius" onclick="return submitSendOrder()" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+	        <input class="btn btn-danger" onclick="return submitSendOrder()" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
 	      </div>
 	    </form>
 		<span class="layui-layer-setwin">
@@ -86,7 +92,7 @@
 			</div>
 			<br>
 			<div class="col-9 col-offset-3">
-				<input class="btn btn-primary radius" onclick="return submitSynOrder()" type="button" value="&nbsp;&nbsp;同步&nbsp;&nbsp;">
+				<input class="btn btn-danger" onclick="return submitSynOrder()" type="button" value="&nbsp;&nbsp;同步&nbsp;&nbsp;">
 			</div>
 		</form>
 		<span class="layui-layer-setwin">
@@ -108,7 +114,7 @@
 			</div>
 			<br>
 			<div class="col-9 col-offset-3">
-				<input class="btn btn-primary radius" onclick="return audit_order()" type="submit" value="&nbsp;&nbsp;确认&nbsp;&nbsp;">
+				<input class="btn btn-danger" onclick="return audit_order()" type="submit" value="&nbsp;&nbsp;确认&nbsp;&nbsp;">
 			</div>
 		</form>
 		<span class="layui-layer-setwin">
@@ -141,7 +147,7 @@
 		</div>
 		<br>
 		<div class="col-9 col-offset-3">
-	        <input class="btn btn-primary radius" type="button" onclick="remrakSumbit()" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+	        <input class="btn btn-danger" type="button" onclick="remrakSumbit()" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
 	      </div>
 	    </form>
 		<span class="layui-layer-setwin">
@@ -153,29 +159,14 @@
 		首页 <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="刷新">
+		<a class="btn btn-danger 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">
-		<div class="text-c">
-		<form action="${pageContext.request.contextPath }/admin/order/selectShopOrderByOrderId" method="post" id="myForm">
-			<input type="hidden" name="orderStatus" value="${orderStatusStr }" />
-			<input type="text" name="text" id="text" value="${selectInput }" placeholder="订单编号" style="width: 150px" class="input-text">
-			<input type="text" name="salesAddressTel" id="salesAddressTel" value="${salesAddressTel }" placeholder="电话号码" style="width: 150px" class="input-text">
-			<input type="text" name="salesAddressName" id="salesAddressName" value="${salesAddressName }" placeholder="收货人" style="width: 150px" class="input-text">
-			<input type="text" name="salesAddressInfo" id="salesAddressInfo" value="${salesAddressInfo }" placeholder="地址" style="width: 150px" class="input-text">
-			日期范围： 
-			<input type="text" readonly="readonly" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" value="${beginDate }" name="beginDate" class="input-text Wdate" style="width: 120px;">
-			- <input type="text" readonly="readonly" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" value="${endDate }" name="endDate" class="input-text Wdate" style="width: 120px;">
-			<button name="" id="submitBtn" class="btn btn-success" type="submit">
-				<i class="Hui-iconfont">&#xe665;</i> 搜索
-			</button>
-		</form>
-		</div>
 		<div class="cl pd-5 bg-1 bk-gray mt-20">
 			<div id="tab_demo" class="HuiTab">
 			  <div class="tabBar cl">
-			  	<span onclick="location.href='${pageContext.request.contextPath }${statusUrl }&orderStatus=allOrder'" class="allOrder">所有订单</span>
+			  	<span onclick="location.href='${pageContext.request.contextPath }${statusUrl }&orderStatus=allOrder'" class="allOrder">全部订单</span>
 			  	<span onclick="location.href='${pageContext.request.contextPath }${statusUrl }&orderStatus=returnOrderEtc'" class="returnOrderEtc">申请退货中</span>
 			  	<span onclick="location.href='${pageContext.request.contextPath }${statusUrl }&orderStatus=inOrder'" class="inOrder">申请换货中</span>
 			  	<span onclick="location.href='${pageContext.request.contextPath }${statusUrl }&orderStatus=paySuccess'" class="paySuccess">已支付、待发货</span>
@@ -192,8 +183,24 @@
 			  </div>
 			</div>
 		</div>
+		<br/>
+		<div class="text-l">
+			<form action="${pageContext.request.contextPath }/admin/order/selectShopOrderByOrderId" method="post" id="myForm">
+				<input type="hidden" name="orderStatus" value="${orderStatusStr }" />
+				<input type="text" name="text" id="text" value="${selectInput }" placeholder="订单编号" style="width: 150px" class="input-text">
+				<input type="text" name="salesAddressTel" id="salesAddressTel" value="${salesAddressTel }" placeholder="电话号码" style="width: 150px" class="input-text">
+				<input type="text" name="salesAddressName" id="salesAddressName" value="${salesAddressName }" placeholder="收货人" style="width: 150px" class="input-text">
+				<input type="text" name="salesAddressInfo" id="salesAddressInfo" value="${salesAddressInfo }" placeholder="地址" style="width: 150px" class="input-text">
+				日期范围：
+				<input type="text" readonly="readonly" placeholder="开始日期" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" value="${beginDate }" name="beginDate" class="input-text Wdate" style="width: 120px;">
+				- <input type="text" readonly="readonly" placeholder="结束日期" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" value="${endDate }" name="endDate" class="input-text Wdate" style="width: 120px;">
+				 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button name="" id="submitBtn" class="btn btn-danger" type="submit">
+					<i class="Hui-iconfont">&#xe665;</i> 搜索
+				</button>
+			</form>
+		</div>
 		<div class="mt-20">
-			<table class="table table-border table-bordered table-bg table-hover table-sort">
+			<table class="table table-border table-bordered table-bg table-hover table-sort ">
 				<thead>
 					<tr class="text-c">
 						<th width="10">订单编号</th>
@@ -297,9 +304,9 @@
 
 								<td width="100">${order.storesName }</td>
 								<td width="100">${order.vipName }</td>
-								<td width="100">${order.userResource }</td>
+								<td class="text-c" width="100">${order.userResource }</td>
 								<!-- 遍历操作 -->
-							<td class="td-manage">
+							<td class="td-manage text-c">
 								<div class="dropDown dropDown_hover">
 								  <a class="dropDown_A" href="#">操作</a>
 								  <div class="dropDown-menu box-shadow" style="left:-22px;">
@@ -323,6 +330,7 @@
 				</tbody>
 				</table>
 				</div>
+		<br/>
 				<div align="right">
 					<%@include file="/common/other/paper/pager.jsp"%>
 				</div>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/probationOrderList.jsp

@@ -18,6 +18,12 @@
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+	<style>
+		.tabBar{border-bottom:1px solid #ccc;margin: 10px auto;display: table;}
+		.tabBar span{background-color: #fff;color: #999;display: table-cell;height: 40px;line-height: 40px;}
+		.tabBar span.current{background-color: #fff;color:#333;position: relative;}
+		.tabBar span.current:after{content: '';position: absolute;left: 50%;height: 2px;width: 50px;margin-left: -25px;bottom: 0;background-color: #333;}
+	</style>
 <title>订单管理</title>
 </head>
 <body>
@@ -110,7 +116,7 @@
 		首页 <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="刷新">
+		<a class="btn btn-danger 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">
@@ -119,9 +125,9 @@
 			<input type="hidden" name="orderStatus" value="${orderStatusStr }" />
 			<input type="text" name="text" id="text" value="${selectInput }" placeholder="订单编号" style="width: 300px" class="input-text">
 			日期范围： 
-			<input type="text" readonly="readonly" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" value="${beginDate }" name="beginDate" class="input-text Wdate" style="width: 120px;">
-			- <input type="text" readonly="readonly" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" value="${endDate }" name="endDate" class="input-text Wdate" style="width: 120px;">
-			<button name="" id="submitBtn" class="btn btn-success" type="submit">
+			<input type="text" readonly="readonly" placeholder="开始时间" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" value="${beginDate }" name="beginDate" class="input-text Wdate" style="width: 120px;">
+			- <input type="text" readonly="readonly" placeholder="结束时间" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" value="${endDate }" name="endDate" class="input-text Wdate" style="width: 120px;">
+			<button name="" id="submitBtn" class="btn btn-danger" type="submit">
 				<i class="Hui-iconfont">&#xe665;</i> 搜索
 			</button>
 		</form>
@@ -248,6 +254,7 @@
 				</tbody>
 				</table>
 				</div>
+		<br/>
 				<div align="right">
 					<%@include file="/common/other/paper/pager.jsp"%>
 				</div>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/product/productList.jsp

@@ -34,7 +34,7 @@
 	<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"
+			class="btn btn-danger 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>
@@ -46,14 +46,14 @@
 					<input name="maxMoney" value="${maxMoney }" id="maxMoney" style="width: 100px" class="input-text" type="text"> 元&nbsp;&nbsp; --%>
 			<%--日期范围： <input  id="beginDate" value="${beginDate }" name="beginDate" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'endDate\')||\'%y-%M-%d\'}'})" readonly>
 				 - <input  id="endDate" value="${endDate }" name="endDate" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'beginDate\')||\'%y-%M-%d\'}'})" readonly>--%>
-			<button name="" id="submitBtn" onclick="return dataCheck();" class="btn btn-success" type="submit">
+			<button name="" id="submitBtn" onclick="return dataCheck();" class="btn btn-danger" type="submit">
 				<i class="Hui-iconfont"></i> 搜索
 			</button>
 	</form>
 	<form id="goodsform" >
 		<div class="cl pd-5 bg-1 bk-gray mt-20">
 			<span class="l"><a href="javascript:;" onclick="toAdd('${pageContext.request.contextPath }/admin/product/toAdd')"
-				class="btn btn-primary radius">添加商品</a>&nbsp;
+				class="btn btn-danger">添加商品</a>&nbsp;
 		    </span>
 		</div>
 		<table class="table table-border table-bordered table-bg" id="example">

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/product/productPriceList.jsp

@@ -34,7 +34,7 @@
 <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"
+    class="btn btn-danger 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>
@@ -42,7 +42,7 @@
 <div class="pd-20">
     <div class="cl pd-5 bg-1 bk-gray mt-20">
 		<span class="l">
-			<a href="${pageContext.request.contextPath }/admin/product/_add_product_price" class="btn btn-primary radius">
+			<a href="${pageContext.request.contextPath }/admin/product/_add_product_price" class="btn btn-danger">
 				<i class="Hui-iconfont">&#xe600;</i> 添加优惠价格
 			</a>
 		</span>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/product/productTypeList.jsp

@@ -34,7 +34,7 @@
 	<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"
+			class="btn btn-danger 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>
@@ -42,7 +42,7 @@
 	<div class="pd-20">
 	<div class="cl pd-5 bg-1 bk-gray mt-20"> 
 		<span class="l">
-			<a href="${pageContext.request.contextPath }/admin/productType/toAdd" class="btn btn-primary radius">
+			<a href="${pageContext.request.contextPath }/admin/productType/toAdd" class="btn btn-danger">
 				<i class="Hui-iconfont">&#xe600;</i> 添加产品类型
 			</a>
 		</span>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/product/updateProduct.jsp

@@ -43,7 +43,7 @@
 			<div class="col-10 ">
 				<img alt="介绍图" src="${product.productIntroduceImg }" id="introduceImg" width="90" height="80">
 				<input type="hidden" id="productIntroduceImg" name="productIntroduceImg" value="${product.productIntroduceImg }"/>
-				<input type="button" id="insertfileIntroduce" class="btn btn-primary radius upload-btn" value="选择文件" />
+				<input type="button" id="insertfileIntroduce" class="btn btn-danger upload-btn" value="选择文件" />
 				<%-- <c:forEach items="${product.pictureList }" var="picture">
 					<img style="border:2px solid #0A6999;"  src="${picture.pictureUrl }" onclick="deleteImg(${picture.pictureId },this)" width="50" height="50"></img>
 				</c:forEach> --%>
@@ -68,7 +68,7 @@
 
 		<div id="spots" class="row cl">
 			<label class="form-label col-2"></label>
-			<input id="addimages" class="btn btn-primary radius upload-btn" type="button" value="新增banner图" />
+			<input id="addimages" class="btn btn-danger upload-btn" type="button" value="新增banner图" />
 		</div>
 
 		<div class="row cl">
@@ -135,7 +135,7 @@
 					</div>
 					<c:if test="${status.index == 0}">
 						<span class="l" id="addColorBtn"><a href="javascript:;" onclick="toAddColorDiv(this)"
-							class="btn btn-danger radius">添加颜色</a>&nbsp;
+							class="btn btn-danger">添加颜色</a>&nbsp;
 					    </span>
 					</c:if>
 	            <!-- </div> -->
@@ -162,7 +162,7 @@
 		<div class="row cl">
 			<div class="col-10 col-offset-2">
 				<!-- <button onClick="return admin_addGoods();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 保存</button> -->
-				<button onClick="return checkProduct();" class="btn btn-primary radius" type="submit">
+				<button onClick="return checkProduct();" class="btn btn-danger" type="submit">
 					<i class="Hui-iconfont">&#xe632;</i> 保存
 				</button>
 			</div>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/product/updateProductPrice.jsp

@@ -96,7 +96,7 @@
             </div>
         </div>
         <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-3">
-            <input class="btn btn-primary" type="submit" onclick="return checkValue();" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+            <input class="btn btn-danger" type="submit" onclick="return checkValue();" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
         </div>
     </form>
 </div>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/product/updateProductType.jsp

@@ -38,7 +38,7 @@
 		<div class="row cl">
 			<div class="col-10 col-offset-2">
 				<!-- <button onClick="return admin_addGoods();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 保存</button> -->
-				<button onClick="return checkProoduct();" class="btn btn-primary radius" type="submit">
+				<button onClick="return checkProoduct();" class="btn btn-danger" type="submit">
 					<i class="Hui-iconfont">&#xe632;</i> 保存
 				</button>
 			</div>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/rent/machine/filterList.jsp

@@ -59,7 +59,7 @@
 		</div>
 		<br>
 		<div class="col-9 col-offset-3">
-	        <input class="btn btn-primary radius" onclick="return submitSendOrder()" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+	        <input class="btn btn-danger" onclick="return submitSendOrder()" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
 	      </div>
 	    </form>
 		<span class="layui-layer-setwin">
@@ -73,7 +73,7 @@
 		首页 <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="刷新">
+		<a class="btn btn-danger 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 .pd-20>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/rent/order/list.jsp

@@ -59,7 +59,7 @@
 		</div>
 		<br>
 		<div class="col-9 col-offset-3">
-	        <input class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+	        <input class="btn btn-danger" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
 	      </div>
 	    </form>
 		<span class="layui-layer-setwin">
@@ -73,7 +73,7 @@
 		首页 <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="刷新">
+		<a class="btn btn-danger 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 .pd-20>
@@ -91,7 +91,7 @@
 			<%-- 日期范围： 
 			<input type="text" readonly="readonly" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" value="${beginDate }" name="beginDate" class="input-text Wdate" style="width: 120px;">
 			- <input type="text" readonly="readonly" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" value="${endDate }" name="endDate" class="input-text Wdate" style="width: 120px;"> --%>
-			<button name="" id="submitBtn" class="btn btn-success" type="submit">
+			<button name="" id="submitBtn" class="btn btn-danger" type="submit">
 				<i class="Hui-iconfont">&#xe665;</i> 搜索
 			</button>
 		</form>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/withdrawlogs/withdrawCashLogsList.jsp

@@ -30,7 +30,7 @@ scale=1.0,user-scalable=no" />
 	<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"
+			class="btn btn-danger 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>
@@ -39,10 +39,10 @@ scale=1.0,user-scalable=no" />
 	<form action="${pageContext.request.contextPath }/admin/withdraw/seachInfo" method="get" id="form-admin-add">
 		<div class="text-c"> 
 			日期范围：
-			<input readonly="readonly" type="text" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" name="beginDate" value="${beginDate }" class="input-text Wdate" style="width: 120px;">
-			- <input readonly="readonly" type="text" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" name="endDate" value="${endDate }" class="input-text Wdate" style="width: 120px;">
+			<input readonly="readonly" placeholder="开始时间" type="text" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'endDate\')||\'2020-10-01\'}'})" id="beginDate" name="beginDate" value="${beginDate }" class="input-text Wdate" style="width: 120px;">
+			- <input readonly="readonly" placeholder="结束时间" type="text" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'2020-10-01'})" id="endDate" name="endDate" value="${endDate }" class="input-text Wdate" style="width: 120px;">
 			<input type="text" class="input-text" style="width:250px" placeholder="输入会员昵称、电话" value="${userInput }" id="userInput" name="userInput">
-			<button type="submit" class="btn btn-success radius" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜用户</button>
+			<button type="submit" class="btn btn-danger" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜用户</button>
 		</div>
 	</form>
 	<form id="adminlist">

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/withdrawlogs/withdrawCashLogsRemark.jsp

@@ -42,7 +42,7 @@
 		
 	    <div class="row cl">
 	      <div class="col-9 col-offset-3">	      
-	        <input class="btn btn-primary radius"  onclick="updateWithdrawStatus(${withdrawId },${whthdrawStatus });" type="button"  value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
+	        <input class="btn btn-danger"  onclick="updateWithdrawStatus(${withdrawId },${whthdrawStatus });" type="button"  value="&nbsp;&nbsp;提交&nbsp;&nbsp;">
 	      </div>
 	    </div>
 </div>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/wx/firseAccess/firstanswers.jsp

@@ -44,8 +44,8 @@ String basePath = path + "/common/";
 	  <div class="text-c bk-gray radius box-shadow" style="width: 800px;">
 		<div class="text-l bk-gray radius pd-5 f-16 c-black"  style="background-color: #F5FAFE; font-weight: bold;">&nbsp;素材资源
 			<div  class="text-c pl-10" style="float: right;">
-				<input class="btn btn-success radius"  type="button" value="确认" onclick="sureImageText()">&nbsp;&nbsp;&nbsp;
-				<input class="btn radius" type="button" onclick="closeWindow(this, '')" value="取消">
+				<input class="btn btn-danger"  type="button" value="确认" onclick="sureImageText()">&nbsp;&nbsp;&nbsp;
+				<input class="btn" type="button" onclick="closeWindow(this, '')" value="取消">
 			</div>
 		</div>
 		<div class="text-c radius pt-10 pb-10" style="float: inherit;padding-left: 2%; padding-right: 2%;" id="imageTextList">
@@ -93,16 +93,16 @@ String basePath = path + "/common/";
 	  <!-- <div style="background-color:rgba(0,0,0,0.6); float: left;width: 100%; height: 50px; z-index: 2000;position:fixed;">dsfad</div> -->
 </div>
 
-<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>
+<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-danger 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" align="center">
-  <div class="text-c bk-gray radius box-shadow" style="width: 700px;">
-	<div class="text-l bk-gray radius pd-5 f-16 c-black"  style="background-color: #F5FAFE; font-weight: bold;">&nbsp;首次关注回复</div>
+  <div class="text-c bk-gray box-shadow" style="width: 700px;">
+	<div class="text-l bk-gray pd-5 f-16 c-black"  style="background-color: #F5FAFE; font-weight: bold;">&nbsp;首次关注回复</div>
 	<div class="text-c radius pt-10 pb-10" style="float: inherit;padding-left: 4%; padding-right: 4%;">
 		<!-- 显示在左侧的素材 -->
 		<div class="text-c f-l" style="width: 650px;">
 		<form action="${pageContext.request.contextPath }/admin/wx/updateandaddFirstJoinKey/${token}" method="post" id="myForm">
 			<!-- 添加素材按钮 -->
-			<div class="text-c bk-gray radius pd-20 mt-20">
+			<div class="text-c bk-gray pd-20 mt-20">
 				
 				<div class="text-l pt-10">
 					回复类型：<span class="select-box inline" style="width: 100px;">
@@ -126,7 +126,7 @@ String basePath = path + "/common/";
 					<div id="imgtext" style="display: none;">
 						<div class="text-l mt-20">
 							图文资源：<span class="btn-upload form-group">
-										<a href="javascript:void();" class="btn btn-primary upload-btn" onclick="return searchimgtext()"><i class="Hui-iconfont">&#xe642;</i>选择图文</a>
+										<a href="javascript:void();" class="btn btn-danger upload-btn" onclick="return searchimgtext()"><i class="Hui-iconfont">&#xe642;</i>选择图文</a>
 									</span>
 										（<font style="color: red;">*</font><font style="font-size: 13px;">必填，请选择一条图文素材</font>）
 						</div>
@@ -169,7 +169,7 @@ String basePath = path + "/common/";
 						</div>
 						<c:if test="${!empty imageTextInfo }">
 							<!-- 一个图文素材 -->
-							<div class="text-c bk-gray radius mt-20 box-shadow" style="width: 350px;" id="imageText">
+							<div class="text-c bk-gray mt-20 box-shadow" style="width: 350px;" id="imageText">
 								<input type="hidden" id="refImageTextId" name="refImageTextId" value="${imageTextInfo.imagetextno }"/>
 								<div  class="text-l pl-10 pt-10 pr-10">
 									<span class="matext" id="mobanTitle">${imageTextInfo.title }</span>
@@ -202,8 +202,8 @@ String basePath = path + "/common/";
 				</c:if>
 				<!-- 保存取消按钮 -->
 				<div  class="text-l pl-10 pt-20 pr-10 pb-20">
-					<input class="btn btn-success radius" id="saveKeyAnswerButton" type="button" value="保存">&nbsp;&nbsp;&nbsp;
-					<input class="btn disabled radius" type="button" value="取消">
+					<input class="btn btn-danger" id="saveKeyAnswerButton" type="button" value="保存">&nbsp;&nbsp;&nbsp;
+					<input class="btn disabled" type="button" value="取消">
 				</div>
 			</div>
 		</form>	

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/wx/imagetext/editmoreimagetext.jsp

@@ -44,7 +44,7 @@ String basePath = path + "/common/";
 </script>
 </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>
+<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-danger 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" align="center">
   <div class="text-c bk-gray radius box-shadow" style="width: 800px;">
 	<div class="text-l bk-gray radius pd-5 f-16 c-black"  style="background-color: #E8F5FF; font-weight: bold;">&nbsp;添加多图文</div>
@@ -53,7 +53,7 @@ String basePath = path + "/common/";
 		<div class="text-c f-l mt-10 mb-10" style="width:375px;background-color: #F8F8F8;">
 			<!-- 一个图文素材 -->
 			<c:if test="${!empty imgtxtMore }">
-			<div class="text-c bk-gray radius box-shadow">
+			<div class="text-c bk-gray box-shadow">
 				<div class="text-l pl-10 pt-10 pr-10">
 					<p>${imgtxtMore.createtime}</p>
 				</div>
@@ -65,7 +65,7 @@ String basePath = path + "/common/";
 							<i class="Hui-iconfont" onclick="showEditDiv(1)">&#xe6df;</i>
 						</div>
 					</a>
-					<div id="MaxsuonueImage" class="maimg bk-gray radius" style="position: relative;background-size:100% 100%; background-image: url('${imgtxtMore.imageurl}');"><!-- 这里将素材图片作为div背景放置 -->
+					<div id="MaxsuonueImage" class="maimg bk-gray" style="position: relative;background-size:100% 100%; background-image: url('${imgtxtMore.imageurl}');"><!-- 这里将素材图片作为div背景放置 -->
 						<div class="text-l" style="width: 100%;  filter:alpha(opacity:30);opacity:0.4; background-color: black;position: absolute;bottom: 0;"><!-- 放置标题 -->
 							<p class="text-l f-16" style="font-weight: bold; color:white;" id="title1">${imgtxtMore.title }</p>
 						</div>
@@ -118,7 +118,7 @@ String basePath = path + "/common/";
 				<!-- 新增素材按钮 -->
 				<div class="text-l pd-20 min_img box-shadow pb-5" style="border-bottom: 1px solid #F5FAFE;">
 					<a href="javascript:void();" id="addMoreImageTextButton"  style="color:gray; text-decoration: none;">
-						<div class="text-c bk-gray radius pd-20" style="border: 2px dashed gray;">
+						<div class="text-c bk-gray pd-20" style="border: 2px dashed gray;">
 							<i class="Hui-iconfont">&#xe604;</i>增加一条
 						</div>
 					</a>
@@ -131,7 +131,7 @@ String basePath = path + "/common/";
 			<%-- <c:forEach begin="1" end="8" var="editerCount"> --%>
 				<c:if test="${!empty imgtxtMore }">
 					<form action="${pageContext.request.contextPath }/admin/wx/updateMoreImageText/${token}" method="post" id="myForm1" name="edit">
-						<div class="text-c bk-gray radius box-shadow">
+						<div class="text-c bk-gray box-shadow">
 							<div  class="text-l pl-10 pt-10 pr-10">
 								<span class="f-16"><font style="color: red;">*正在编辑1号图文</font><font style="font-size: 13px;"></font></span>
 							</div>
@@ -145,7 +145,7 @@ String basePath = path + "/common/";
 								<span class="f-16">封面<font style="color: red;">*</font><font style="font-size: 13px;">(必须上传一张图片, 大图片建议尺寸：360像素 * 200像素)</font></span>
 								<p style="width: 300px;">
 									<span class="btn-upload form-group" style="width: 300px;">
-									  <input class="input-text upload-url radius" style="width: 180px;" value="${imgtxtMore.imageurl}"  type="text" name="moreImageTextImage" id="imageUrl1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
+									  <input class="input-text upload-url" style="width: 180px;" value="${imgtxtMore.imageurl}"  type="text" name="moreImageTextImage" id="imageUrl1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
 									  <input type="button" id="image1" style="width: 180px;" class="input-file">
 									</span>
 								</p>
@@ -159,28 +159,28 @@ String basePath = path + "/common/";
 							<div  class="text-l pl-10 pt-5 pr-10">
 								<c:if test="${empty imgtxtMore.clickouturl }">
 									<span class="f-16"  id="outlink1"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加外链接</a></span>
-									<p><input type='text' name='outLink' id='chain1' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='outLink' id='chain1' style="display: none;" class='input-text size-M'/></p>
 								</c:if>
 								<c:if test="${!empty imgtxtMore.clickouturl }">
 									<span class="f-16"  id="outlink1"><span class='f-16'>外链接地址<br/><font style='font-size: 13px;'>(设置后，点击图文消息，不会进入图文详情，而进入外链所设地址)</font></span></span>
-									<p><input type='text' name='outLink' id='chain1' style="display: block;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='outLink' id='chain1' style="display: block;" class='input-text size-M'/></p>
 								</c:if>
 							</div>
 							
 							<div  class="text-l pl-10 pt-5 pr-10">
 								<c:if test="${empty imgtxtMore.sourceurl }">
 									<span class="f-16"  id="originallink1"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加原文链接</a></span>
-									<p><input type='text' name='originlLink' id='sourceURL1' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='originlLink' id='sourceURL1' style="display: none;" class='input-text size-M'/></p>
 								</c:if>
 								<c:if test="${!empty imgtxtMore.sourceurl }">
 									<span class="f-16"  id="originallink1"><span class='f-16'>原文链接<font style='font-size: 13px;'>(在图文详情页面中会生成“阅读原文”链接)</font></span></span>
-									<p><input type='text' name='originlLink' id='sourceURL1' style="display: block;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='originlLink' id='sourceURL1' style="display: block;" class='input-text size-M'/></p>
 								</c:if>
 							</div>
 							
 							<div  class="text-l pl-10 pt-20 pr-10 pb-20">
-								<input class="btn btn-success radius" type="button" id="submitButton1" value="保存">&nbsp;&nbsp;&nbsp;
-								<input class="btn disabled radius" type="button" value="取消">
+								<input class="btn btn-danger" type="button" id="submitButton1" value="保存">&nbsp;&nbsp;&nbsp;
+								<input class="btn disabled" type="button" value="取消">
 							</div>
 						</div>
 					</form>
@@ -188,7 +188,7 @@ String basePath = path + "/common/";
 					<c:if test="${!empty imgtxtMore.subVoList }">
 						<c:forEach items="${imgtxtMore.subVoList }" var="voList" varStatus="editerCount">
 							<form action="${pageContext.request.contextPath }/admin/wx/updateMoreImageText/${token}" method="post" id="myForm${editerCount.index+2 }" style="display: none;" name="edit">
-								<div class="text-c bk-gray radius box-shadow">
+								<div class="text-c bk-gray box-shadow">
 									<div  class="text-l pl-10 pt-10 pr-10">
 										<span class="f-16"><font style="color: red;">*正在编辑${editerCount.index+2 }号图文</font><font style="font-size: 13px;"></font></span>
 									</div>
@@ -202,7 +202,7 @@ String basePath = path + "/common/";
 										<span class="f-16">封面<font style="color: red;">*</font><font style="font-size: 13px;">(必须上传一张图片, 大图片建议尺寸：360像素 * 200像素)</font></span>
 										<p style="width: 300px;">
 											<span class="btn-upload form-group" style="width: 300px;">
-											  <input class="input-text upload-url radius" style="width: 180px;" value="${voList.imageUrl }"  type="text" name="oneImageTextImage" id="imageUrl${editerCount.index+2 }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
+											  <input class="input-text upload-url" style="width: 180px;" value="${voList.imageUrl }"  type="text" name="oneImageTextImage" id="imageUrl${editerCount.index+2 }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
 											  <input type="button" name="" id="image${editerCount.index+2 }" style="width: 180px;" class="input-file">
 											</span>
 										</p>
@@ -216,28 +216,28 @@ String basePath = path + "/common/";
 									<div  class="text-l pl-10 pt-5 pr-10">
 										<c:if test="${empty voList.clickOutUrl }">
 											<span class="f-16"  id="outlink${editerCount.index+2 }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加外链接</a></span>
-											<p><input type='text' name='outLink' id='chain${editerCount.index+2 }' style="display: none;" class='input-text radius size-M'/></p>
+											<p><input type='text' name='outLink' id='chain${editerCount.index+2 }' style="display: none;" class='input-text size-M'/></p>
 										</c:if>
 										<c:if test="${!empty voList.clickOutUrl }">
 											<span class="f-16"  id="outlink${editerCount.index+2 }"><span class='f-16'>外链接地址<br/><font style='font-size: 13px;'>(设置后，点击图文消息，不会进入图文详情，而进入外链所设地址)</font></span></span>
-											<p><input type='text' value="${voList.clickOutUrl }" name='outLink' id='chain${editerCount.index+2 }' style="display: block;" class='input-text radius size-M'/></p>
+											<p><input type='text' value="${voList.clickOutUrl }" name='outLink' id='chain${editerCount.index+2 }' style="display: block;" class='input-text size-M'/></p>
 										</c:if>
 									</div>
 									
 									<div  class="text-l pl-10 pt-5 pr-10">
 										<c:if test="${empty voList.sourceUrl }">
 											<span class="f-16"  id="originallink${editerCount.index+2 }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加原文链接</a></span>
-											<p><input type='text' name='originlLink' id='sourceURL${editerCount.index+2 }' style="display: none;" class='input-text radius size-M'/></p>
+											<p><input type='text' name='originlLink' id='sourceURL${editerCount.index+2 }' style="display: none;" class='input-text size-M'/></p>
 										</c:if>
 										<c:if test="${!empty voList.sourceUrl }">
 											<span class="f-16"  id="originallink${editerCount.index+2 }"><span class='f-16'>原文链接<font style='font-size: 13px;'>(在图文详情页面中会生成“阅读原文”链接)</font></span></span>
-											<p><input type='text' value="${voList.sourceUrl }" name='originlLink' id='sourceURL${editerCount.index+2 }' style="display: block;" class='input-text radius size-M'/></p>
+											<p><input type='text' value="${voList.sourceUrl }" name='originlLink' id='sourceURL${editerCount.index+2 }' style="display: block;" class='input-text size-M'/></p>
 										</c:if>
 									</div>
 									
 									<div  class="text-l pl-10 pt-20 pr-10 pb-20">
-										<input class="btn btn-success radius" type="button" id="submitButton${editerCount.index+2 }" value="保存">&nbsp;&nbsp;&nbsp;
-										<input class="btn disabled radius" type="button" value="取消">
+										<input class="btn btn-danger" type="button" id="submitButton${editerCount.index+2 }" value="保存">&nbsp;&nbsp;&nbsp;
+										<input class="btn disabled" type="button" value="取消">
 									</div>
 								</div>
 							</form>
@@ -245,21 +245,21 @@ String basePath = path + "/common/";
 					</c:if>
 						<c:forEach begin="${fn:length(imgtxtMore.subVoList)+2 }" end="8" var="editerCount">
 						<form action="${pageContext.request.contextPath }/admin/wx/updateMoreImageText/${token}" method="post" id="myForm${editerCount }" style="display: none;" name="noedit">
-							<div class="text-c bk-gray radius box-shadow">
+							<div class="text-c bk-gray box-shadow">
 								<div  class="text-l pl-10 pt-10 pr-10">
 									<span class="f-16"><font style="color: red;">*正在编辑${editerCount }号图文</font><font style="font-size: 13px;"></font></span>
 								</div>
 								<input type="hidden" id="imageTextNO${editerCount }" value=""/>
 								<div  class="text-l pl-10 pt-10 pr-10">
 									<span class="f-16">标题<font style="color: red;">*</font><font style="font-size: 13px;">(必填，不能超过64个字)</font></span>
-									<p><input type="text" value="" name="moreImageTextTitle" id="moreImageTextTitle${editerCount }" class="input-text radius size-M"/></p>
+									<p><input type="text" value="" name="moreImageTextTitle" id="moreImageTextTitle${editerCount }" class="input-text size-M"/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16">封面<font style="color: red;">*</font><font style="font-size: 13px;">(必须上传一张图片, 大图片建议尺寸：360像素 * 200像素)</font></span>
 									<p style="width: 300px;">
 										<span class="btn-upload form-group" style="width: 300px;">
-										  <input class="input-text upload-url radius" style="width: 180px;" value=""  type="text" name="oneImageTextImage" id="imageUrl${editerCount }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
+										  <input class="input-text upload-url" style="width: 180px;" value=""  type="text" name="oneImageTextImage" id="imageUrl${editerCount }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
 										  <input type="button" name="" id="image${editerCount }" style="width: 180px;" class="input-file">
 										</span>
 									</p>
@@ -272,17 +272,17 @@ String basePath = path + "/common/";
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16"  id="outlink${editerCount }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加外链接</a></span>
-									<p><input type='text' name='outLink' id='chain${editerCount }' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='outLink' id='chain${editerCount }' style="display: none;" class='input-text size-M'/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16"  id="originallink${editerCount }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加原文链接</a></span>
-									<p><input type='text' name='originlLink' id='sourceURL${editerCount }' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='originlLink' id='sourceURL${editerCount }' style="display: none;" class='input-text size-M'/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-20 pr-10 pb-20">
-									<input class="btn btn-success radius" type="button" id="submitButton${editerCount }" value="保存">&nbsp;&nbsp;&nbsp;
-									<input class="btn disabled radius" type="button" value="取消">
+									<input class="btn btn-danger" type="button" id="submitButton${editerCount }" value="保存">&nbsp;&nbsp;&nbsp;
+									<input class="btn disabled" type="button" value="取消">
 								</div>
 							</div>
 						</form>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/wx/imagetext/editoneimagetext.jsp

@@ -39,15 +39,15 @@ String basePath = path + "/common/";
 
 </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>
+<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-danger 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" align="center">
-  <div class="text-c bk-gray radius box-shadow" style="width: 800px;">
-	<div class="text-l bk-gray radius pd-5 f-16 c-black"  style="background-color: #E8F5FF; font-weight: bold;">&nbsp;修改单图文</div>
+  <div class="text-c bk-gray box-shadow" style="width: 800px;">
+	<div class="text-l bk-gray pd-5 f-16 c-black"  style="background-color: #E8F5FF; font-weight: bold;">&nbsp;修改单图文</div>
 	<div class="text-c radius pt-10 pb-10" style="float: inherit;padding-left: 2%; padding-right: 2%;">
 		<!-- 显示在左侧的素材 -->
 		<div class="text-c f-l mt-10" style="width: 375px;background-color: #F8F8F8;">
 			<!-- 一个图文素材 -->
-			<div class="text-c bk-gray radius box-shadow">
+			<div class="text-c bk-gray box-shadow">
 				<div  class="text-l pl-10 pt-10 pr-10">
 					<span class="matext" id="oneImageTextTitleEG">${imageTextInfo.title }</span>
 					<p><fmt:formatDate value="${imageTextInfo.createTime }" pattern="yyyy-MM-dd"/></p>
@@ -64,17 +64,17 @@ String basePath = path + "/common/";
 		<form action="${pageContext.request.contextPath }/admin/wx/addOrUpdateOneImageText/${operationType}/${token}" method="post" id="myForm">
 			<input type="hidden" name="updateImageTextId" id="updateImageTextId" value="${imageTextInfo.imageTextMD5 }">
 			<!-- 一个图文素材 -->
-			<div class="text-c bk-gray radius box-shadow">
+			<div class="text-c bk-gray box-shadow">
 				<div  class="text-l pl-10 pt-10 pr-10">
 					<span class="f-16">标题<font style="color: red;">*</font><font style="font-size: 13px;">(必填，不能超过64个字)</font></span>
-					<p><input type="text" value="${imageTextInfo.title }" id="oneImageTextTitle" name="oneImageTextTitle" class="input-text radius size-M"/></p>
+					<p><input type="text" value="${imageTextInfo.title }" id="oneImageTextTitle" name="oneImageTextTitle" class="input-text size-M"/></p>
 				</div>
 				
 				<div  class="text-l pl-10 pt-5 pr-10">
 					<span class="f-16">封面<font style="color: red;">*</font><font style="font-size: 13px;">(必须上传一张图片, 大图片建议尺寸：360像素 * 200像素)</font></span>
 					<p style="width: 300px;">
 						<span class="btn-upload form-group" style="width: 300px;">
-						  <input class="input-text upload-url radius" style="width: 180px;" value="${imageTextInfo.imageUrl }"  type="text" name="oneImageTextImage" id="imageUrl" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
+						  <input class="input-text upload-url" style="width: 180px;" value="${imageTextInfo.imageUrl }"  type="text" name="oneImageTextImage" id="imageUrl" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
 						  <input type="button" name="" id="image1" style="width: 180px;" class="input-file">
 						</span>
 					</p>
@@ -99,28 +99,28 @@ String basePath = path + "/common/";
 				<div  class="text-l pl-10 pt-5 pr-10">
 					<c:if test="${empty imageTextInfo.clickOutUrl }">
 						<span class="f-16"  id="outlink"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加外链接</a></span>
-						<p id="outlink1" style="display: none;"><input type='text' id="externalLlink" name='externalLlink' class='input-text radius size-M'/></p>
+						<p id="outlink1" style="display: none;"><input type='text' id="externalLlink" name='externalLlink' class='input-text size-M'/></p>
 					</c:if>
 					<c:if test="${!empty imageTextInfo.clickOutUrl }">
 						<span class="f-16"  id="outlink"><span class='f-16'>外链接地址<br/><font style='font-size: 13px;'>(设置后，点击图文消息，不会进入图文详情，而进入外链所设地址)</font></span></span>
-						<p><input type='text' value="${imageTextInfo.clickOutUrl }" id="externalLlink" name='externalLlink' class='input-text radius size-M'/></p>
+						<p><input type='text' value="${imageTextInfo.clickOutUrl }" id="externalLlink" name='externalLlink' class='input-text size-M'/></p>
 					</c:if>
 				</div>
 				
 				<div  class="text-l pl-10 pt-5 pr-10">
 					<c:if test="${empty imageTextInfo.sourceUrl }">
 						<span class="f-16"  id="originallink"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加原文链接</a></span>
-						<p id="originallink1" style="display: none;"><input type='text' name='originalLink' id="originalLink" class='input-text radius size-M'/></p>
+						<p id="originallink1" style="display: none;"><input type='text' name='originalLink' id="originalLink" class='input-text size-M'/></p>
 					</c:if>
 					<c:if test="${!empty imageTextInfo.sourceUrl }">
 						<span class="f-16"  id="originallink"><span class='f-16'>原文链接<font style='font-size: 13px;'>(在图文详情页面中会生成“阅读原文”链接)</font></span></span>
-						<p><input type='text' value="${imageTextInfo.sourceUrl }" name='originalLink' id="originalLink" class='input-text radius size-M'/></p>
+						<p><input type='text' value="${imageTextInfo.sourceUrl }" name='originalLink' id="originalLink" class='input-text size-M'/></p>
 					</c:if>
 				</div>
 				
 				<div  class="text-l pl-10 pt-20 pr-10 pb-20">
-					<input class="btn btn-success radius" type="button" id="submitForm" value="保存">&nbsp;&nbsp;&nbsp;
-					<input class="btn disabled radius" type="button" value="取消">
+					<input class="btn btn-danger" type="button" id="submitForm" value="保存">&nbsp;&nbsp;&nbsp;
+					<input class="btn disabled" type="button" value="取消">
 				</div>
 			</div>
 		</div>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/wx/imagetext/moreimagetext.jsp

@@ -39,15 +39,15 @@ String basePath = path + "/common/";
 
 </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>
+<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-danger 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" align="center">
-  <div class="text-c bk-gray radius box-shadow" style="width: 800px;">
-	<div class="text-l bk-gray radius pd-5 f-16 c-black"  style="background-color: #E8F5FF; font-weight: bold;">&nbsp;添加多图文</div>
-	<div class="text-c radius pt-10 pb-10" style="float: inherit;padding-left: 2%; padding-right: 2%;">
+  <div class="text-c bk-gray box-shadow" style="width: 800px;">
+	<div class="text-l bk-gray pd-5 f-16 c-black"  style="background-color: #E8F5FF; font-weight: bold;">&nbsp;添加多图文</div>
+	<div class="text-c pt-10 pb-10" style="float: inherit;padding-left: 2%; padding-right: 2%;">
 		<!-- 显示在左侧的素材 -->
 		<div class="text-c f-l mt-10 mb-10" style="width:375px;background-color: #F8F8F8;">
 			<!-- 一个图文素材 -->
-			<div class="text-c bk-gray radius box-shadow">
+			<div class="text-c bk-gray box-shadow">
 				<div class="text-l pl-10 pt-10 pr-10">
 					<p>${currDate}</p>
 				</div>
@@ -59,7 +59,7 @@ String basePath = path + "/common/";
 							<i class="Hui-iconfont" onclick="showEditDiv(1)">&#xe6df;</i>
 						</div>
 					</a>
-					<div id="MaxsuonueImage" class="maimg bk-gray radius" style="position: relative;background-size:100% 100%;"><!-- 这里将素材图片作为div背景放置 -->
+					<div id="MaxsuonueImage" class="maimg bk-gray" style="position: relative;background-size:100% 100%;"><!-- 这里将素材图片作为div背景放置 -->
 						<div class="text-l" style="width: 100%;  filter:alpha(opacity:30);opacity:0.4; background-color: black;position: absolute;bottom: 0;"><!-- 放置标题 -->
 							<p class="text-l f-16" style="font-weight: bold; color:white;" id="title1">标题</p>
 						</div>
@@ -110,7 +110,7 @@ String basePath = path + "/common/";
 				<!-- 新增素材按钮 -->
 				<div class="text-l pd-20 min_img box-shadow pb-5" style="border-bottom: 1px solid #F5FAFE;">
 					<a href="javascript:void();" id="addMoreImageTextButton"  style="color:gray; text-decoration: none;">
-						<div class="text-c bk-gray radius pd-20" style="border: 2px dashed gray;">
+						<div class="text-c bk-gray pd-20" style="border: 2px dashed gray;">
 							<i class="Hui-iconfont">&#xe604;</i>增加一条
 						</div>
 					</a>
@@ -124,7 +124,7 @@ String basePath = path + "/common/";
 				<c:choose>
 					<c:when test="${editerCount == 1}">
 						<form action="${pageContext.request.contextPath }/admin/wx/addOrUpdateMoreImageText/${token}" method="post" id="myForm${editerCount }" name="edit">
-							<div class="text-c bk-gray radius box-shadow">
+							<div class="text-c bk-gray box-shadow">
 								<div  class="text-l pl-10 pt-10 pr-10">
 									<span class="f-16"><font style="color: red;">*正在编辑${editerCount }号图文</font><font style="font-size: 13px;"></font></span>
 								</div>
@@ -138,7 +138,7 @@ String basePath = path + "/common/";
 									<span class="f-16">封面<font style="color: red;">*</font><font style="font-size: 13px;">(必须上传一张图片, 大图片建议尺寸：360像素 * 200像素)</font></span>
 									<p style="width: 300px;">
 										<span class="btn-upload form-group" style="width: 300px;">
-										  <input class="input-text upload-url radius" style="width: 180px;"  type="text" name="moreImageTextImage" id="imageUrl${editerCount }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
+										  <input class="input-text upload-url" style="width: 180px;"  type="text" name="moreImageTextImage" id="imageUrl${editerCount }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
 										  <input type="button" id="image${editerCount }" style="width: 180px;" class="input-file">
 										</span>
 									</p>
@@ -151,38 +151,38 @@ String basePath = path + "/common/";
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16"  id="outlink${editerCount }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加外链接</a></span>
-									<p><input type='text' name='outLink' id='chain${editerCount }' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='outLink' id='chain${editerCount }' style="display: none;" class='input-text size-M'/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16"  id="originallink${editerCount }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加原文链接</a></span>
-									<p><input type='text' name='originlLink' id='sourceURL${editerCount }' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='originlLink' id='sourceURL${editerCount }' style="display: none;" class='input-text size-M'/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-20 pr-10 pb-20">
-									<input class="btn btn-success radius" type="button" id="submitButton${editerCount }" value="保存">&nbsp;&nbsp;&nbsp;
-									<input class="btn disabled radius" type="button" value="取消">
+									<input class="btn btn-danger" type="button" id="submitButton${editerCount }" value="保存">&nbsp;&nbsp;&nbsp;
+									<input class="btn disabled" type="button" value="取消">
 								</div>
 							</div>
 						</form>
 					</c:when>
 					<c:when test="${editerCount == 2}">
 						<form action="${pageContext.request.contextPath }/admin/wx/addOrUpdateMoreImageText/${token}" method="post" id="myForm${editerCount }" style="display: none;" name="edit">
-							<div class="text-c bk-gray radius box-shadow">
+							<div class="text-c bk-gray box-shadow">
 								<div  class="text-l pl-10 pt-10 pr-10">
 									<span class="f-16"><font style="color: red;">*正在编辑${editerCount }号图文</font><font style="font-size: 13px;"></font></span>
 								</div>
 								
 								<div  class="text-l pl-10 pt-10 pr-10">
 									<span class="f-16">标题<font style="color: red;">*</font><font style="font-size: 13px;">(必填，不能超过64个字)</font></span>
-									<p><input type="text" value="" name="moreImageTextTitle" id="moreImageTextTitle${editerCount }" class="input-text radius size-M"/></p>
+									<p><input type="text" value="" name="moreImageTextTitle" id="moreImageTextTitle${editerCount }" class="input-text size-M"/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16">封面<font style="color: red;">*</font><font style="font-size: 13px;">(必须上传一张图片, 大图片建议尺寸：360像素 * 200像素)</font></span>
 									<p style="width: 300px;">
 										<span class="btn-upload form-group" style="width: 300px;">
-										  <input class="input-text upload-url radius" style="width: 180px;"  type="text" name="oneImageTextImage" id="imageUrl${editerCount }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
+										  <input class="input-text upload-url" style="width: 180px;"  type="text" name="oneImageTextImage" id="imageUrl${editerCount }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
 										  <input type="button" name="" id="image${editerCount }" style="width: 180px;" class="input-file">
 										</span>
 									</p>
@@ -195,38 +195,38 @@ String basePath = path + "/common/";
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16"  id="outlink${editerCount }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加外链接</a></span>
-									<p><input type='text' name='outLink' id='chain${editerCount }' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='outLink' id='chain${editerCount }' style="display: none;" class='input-text size-M'/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16"  id="originallink${editerCount }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加原文链接</a></span>
-									<p><input type='text' name='originlLink' id='sourceURL${editerCount }' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='originlLink' id='sourceURL${editerCount }' style="display: none;" class='input-text size-M'/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-20 pr-10 pb-20">
-									<input class="btn btn-success radius" type="button" id="submitButton${editerCount }" value="保存">&nbsp;&nbsp;&nbsp;
-									<input class="btn disabled radius" type="button" value="取消">
+									<input class="btn btn-danger" type="button" id="submitButton${editerCount }" value="保存">&nbsp;&nbsp;&nbsp;
+									<input class="btn disabled" type="button" value="取消">
 								</div>
 							</div>
 						</form>
 					</c:when>
 					<c:otherwise>
 						<form action="${pageContext.request.contextPath }/admin/wx/addOrUpdateMoreImageText/${token}" method="post" id="myForm${editerCount }" style="display: none;" name="noedit">
-							<div class="text-c bk-gray radius box-shadow">
+							<div class="text-c bk-gray box-shadow">
 								<div  class="text-l pl-10 pt-10 pr-10">
 									<span class="f-16"><font style="color: red;">*正在编辑${editerCount }号图文</font><font style="font-size: 13px;"></font></span>
 								</div>
 								
 								<div  class="text-l pl-10 pt-10 pr-10">
 									<span class="f-16">标题<font style="color: red;">*</font><font style="font-size: 13px;">(必填，不能超过64个字)</font></span>
-									<p><input type="text" value="" name="moreImageTextTitle" id="moreImageTextTitle${editerCount }" class="input-text radius size-M"/></p>
+									<p><input type="text" value="" name="moreImageTextTitle" id="moreImageTextTitle${editerCount }" class="input-text size-M"/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16">封面<font style="color: red;">*</font><font style="font-size: 13px;">(必须上传一张图片, 大图片建议尺寸：360像素 * 200像素)</font></span>
 									<p style="width: 300px;">
 										<span class="btn-upload form-group" style="width: 300px;">
-										  <input class="input-text upload-url radius" style="width: 180px;"  type="text" name="oneImageTextImage" id="imageUrl${editerCount }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
+										  <input class="input-text upload-url" style="width: 180px;"  type="text" name="oneImageTextImage" id="imageUrl${editerCount }" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
 										  <input type="button" name="" id="image${editerCount }" style="width: 180px;" class="input-file">
 										</span>
 									</p>
@@ -239,17 +239,17 @@ String basePath = path + "/common/";
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16"  id="outlink${editerCount }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加外链接</a></span>
-									<p><input type='text' name='outLink' id='chain${editerCount }' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='outLink' id='chain${editerCount }' style="display: none;" class='input-text size-M'/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-5 pr-10">
 									<span class="f-16"  id="originallink${editerCount }"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加原文链接</a></span>
-									<p><input type='text' name='originlLink' id='sourceURL${editerCount }' style="display: none;" class='input-text radius size-M'/></p>
+									<p><input type='text' name='originlLink' id='sourceURL${editerCount }' style="display: none;" class='input-text size-M'/></p>
 								</div>
 								
 								<div  class="text-l pl-10 pt-20 pr-10 pb-20">
-									<input class="btn btn-success radius" type="button" id="submitButton${editerCount }" value="保存">&nbsp;&nbsp;&nbsp;
-									<input class="btn disabled radius" type="button" value="取消">
+									<input class="btn btn-danger" type="button" id="submitButton${editerCount }" value="保存">&nbsp;&nbsp;&nbsp;
+									<input class="btn disabled" type="button" value="取消">
 								</div>
 							</div>
 						</form>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/wx/imagetext/oneimagetext.jsp

@@ -37,15 +37,15 @@ String basePath = path + "/common/";
 
 </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>
+<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-danger 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" align="center">
-  <div class="text-c bk-gray radius box-shadow" style="width: 800px;">
-	<div class="text-l bk-gray radius pd-5 f-16 c-black"  style="background-color: #E8F5FF; font-weight: bold;">&nbsp;添加单图文</div>
-	<div class="text-c radius pt-10 pb-10" style="float: inherit;padding-left: 2%; padding-right: 2%;">
+  <div class="text-c bk-gray box-shadow" style="width: 800px;">
+	<div class="text-l bk-gray pd-5 f-16 c-black"  style="background-color: #E8F5FF; font-weight: bold;">&nbsp;添加单图文</div>
+	<div class="text-c pt-10 pb-10" style="float: inherit;padding-left: 2%; padding-right: 2%;">
 		<!-- 显示在左侧的素材 -->
 		<div class="text-c f-l mt-10" style="width: 375px;background-color: #F8F8F8;">
 			<!-- 一个图文素材 -->
-			<div class="text-c bk-gray radius box-shadow">
+			<div class="text-c bk-gray box-shadow">
 				<div  class="text-l pl-10 pt-10 pr-10">
 					<span class="matext" id="oneImageTextTitleEG">标题</span>
 					<p>${currDate }</p>
@@ -62,17 +62,17 @@ String basePath = path + "/common/";
 		<form action="${pageContext.request.contextPath }/admin/wx/addOrUpdateOneImageText/${operationType}/${token}" method="post" id="myForm">
 			<input type="hidden" name="updateImageTextId" id="updateImageTextId" value="">
 			<!-- 一个图文素材 -->
-			<div class="text-c bk-gray radius box-shadow">
+			<div class="text-c bk-gray box-shadow">
 				<div  class="text-l pl-10 pt-10 pr-10">
 					<span class="f-16">标题<font style="color: red;">*</font><font style="font-size: 13px;">(必填，不能超过64个字)</font></span>
-					<p><input type="text" value="" id="oneImageTextTitle" name="oneImageTextTitle" class="input-text radius size-M"/></p>
+					<p><input type="text" value="" id="oneImageTextTitle" name="oneImageTextTitle" class="input-text size-M"/></p>
 				</div>
 				
 				<div  class="text-l pl-10 pt-5 pr-10">
 					<span class="f-16">封面<font style="color: red;">*</font><font style="font-size: 13px;">(必须上传一张图片, 大图片建议尺寸：360像素 * 200像素)</font></span>
 					<p style="width: 300px;">
 						<span class="btn-upload form-group" style="width: 300px;">
-						  <input class="input-text upload-url radius" style="width: 180px;"  type="text" name="oneImageTextImage" id="imageUrl" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
+						  <input class="input-text upload-url" style="width: 180px;"  type="text" name="oneImageTextImage" id="imageUrl" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont" >&#xe642;</i> 浏览图片</a>
 						  <input type="button" name="" id="image1" style="width: 180px;" class="input-file">
 						</span>
 					</p>
@@ -90,17 +90,17 @@ String basePath = path + "/common/";
 				
 				<div  class="text-l pl-10 pt-5 pr-10">
 					<span class="f-16"  id="outlink"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加外链接</a></span>
-					<p id="outlink1" style="display: none;"><input type='text' id="externalLlink" name='externalLlink' class='input-text radius size-M'/></p>
+					<p id="outlink1" style="display: none;"><input type='text' id="externalLlink" name='externalLlink' class='input-text size-M'/></p>
 				</div>
 				
 				<div  class="text-l pl-10 pt-5 pr-10">
 					<span class="f-16"  id="originallink"><a href="javascript:void();" style="color:#0088CC; text-decoration: none;">添加原文链接</a></span>
-					<p id="originallink1" style="display: none;"><input type='text' name='originalLink' id="originalLink" class='input-text radius size-M'/></p>
+					<p id="originallink1" style="display: none;"><input type='text' name='originalLink' id="originalLink" class='input-text size-M'/></p>
 				</div>
 				
 				<div  class="text-l pl-10 pt-20 pr-10 pb-20">
-					<input class="btn btn-success radius" type="button" id="submitForm" value="保存">&nbsp;&nbsp;&nbsp;
-					<input class="btn disabled radius" type="button" value="取消">
+					<input class="btn btn-danger" type="button" id="submitForm" value="保存">&nbsp;&nbsp;&nbsp;
+					<input class="btn disabled" type="button" value="取消">
 				</div>
 			</div>
 		</div>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/wx/keyset/keywordlist.jsp

@@ -31,15 +31,15 @@ String basePath = path + "/common/";
 <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>
+<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-danger 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">
 	<div class="text-c">
 	<form action="${pageContext.request.contextPath }/admin/wx/showKeyWordList" method="post" id="searchForm">
 		<input type="text" class="input-text" style="width:250px" placeholder="输入关键词" id="word" name="word" value="${word }">
-		<button type="button" class="btn btn-success" id="searchWordButton" name=""><i class="Hui-iconfont">&#xe665;</i> 搜关键字</button>
+		<button type="button" class="btn btn-danger" id="searchWordButton" name=""><i class="Hui-iconfont">&#xe665;</i> 搜关键字</button>
 	</form>
 	</div>
-	<div class="cl pd-5 bg-1 bk-gray mt-20"> <span class="l"><a href="javascript:;" id="batchDelKeyWordButton" class="btn btn-danger radius"><i class="Hui-iconfont">&#xe6e2;</i> 批量删除</a> <a href="javascript:;" onclick="location.href='${pageContext.request.contextPath}/admin/wx/showEditKeyWordAnswer'" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i> 添加关键字</a></span></div>
+	<div class="cl pd-5 bg-1 bk-gray mt-20"> <span class="l"><a href="javascript:;" id="batchDelKeyWordButton" class="btn btn-danger"><i class="Hui-iconfont">&#xe6e2;</i> 批量删除</a> <a href="javascript:;" onclick="location.href='${pageContext.request.contextPath}/admin/wx/showEditKeyWordAnswer'" class="btn btn-danger"><i class="Hui-iconfont">&#xe600;</i> 添加关键字</a></span></div>
 	<table class="table table-border table-bordered table-bg">
 		<thead>
 			<tr>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/wx/material/materiallist.jsp

@@ -39,7 +39,7 @@ String basePath = path + "/common/";
 
 </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>
+<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-danger 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" align="center">
   <div class="text-c bk-gray radius box-shadow" style="width: 800px;">
 	<div class="text-l bk-gray radius pd-5 f-16 c-black"  style="background-color: #E8F5FF; font-weight: bold;">&nbsp;素材管理</div>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/wx/menu/wxtree.jsp

@@ -15,7 +15,7 @@ String basePath = path + "/common";
 <link rel="stylesheet" href="<%=basePath %>/css/admin/css/keyset/wxmenu.css" type="text/css">
 <link rel="stylesheet" href="<%=basePath %>/css/admin/css/keyset/appmsg.css">
 <link rel="stylesheet" href="<%=basePath %>/css/admin/css/keyset/bootstrap.min.css">
-<link rel="stylesheet" href="<%=basePath %>/css/admin/css/keyset/theme.css">
+<%--<link rel="stylesheet" href="<%=basePath %>/css/admin/css/keyset/theme.css">--%>
 <link rel="stylesheet" href="<%=basePath %>/css/admin/css/keyset/zTreeStyle/zTreeStyle.css" type="text/css">
 <link rel="stylesheet" href="<%=basePath %>/css/admin/css/keyset/font-awesome/css/font-awesome.css" type="text/css">
 <script type="text/javascript" src="<%=basePath %>/js/admin/public/wxtree.js"></script>
@@ -97,7 +97,7 @@ $(document).ready(function(){
 				<ul id="treeDemo" class="ztree"></ul>
 			</div>
 			<div style="margin: 10px 0 0 35px;">
-				<button type="button" class="btn-mine" onclick="saveMenu();">保&nbsp;存</button>
+				<button type="button" class="btn btn-danger" onclick="saveMenu();">保&nbsp;存</button>
 				<button type="button" class="btn"  onclick="previewMenu();">预&nbsp;览</button>
 				<button type="button" class="btn" onclick="createMenu();">发&nbsp;布</button>
 			</div>

tooth-wechat-web/src/main/webapp/common/admin/css/H-ui.admin.css

@@ -25,11 +25,11 @@ h4{line-height:30px}
 	/*logo*/
 	.Hui-logo,.Hui-logo-m{height:44px; margin-left:20px;cursor:pointer;font-size:16px; font-weight:bold; line-height:44px}
 	.Hui-logo{display:inline-block;padding-right:5px}
-	.Hui-logo:hover,.Hui-logo-m:hover{text-decoration:none; color:#0C0}
+	.Hui-logo:hover,.Hui-logo-m:hover{text-decoration:none; color:#f16071}
 	.Hui-logo-m{display:none;width:45px;margin-left:10px}
-	.Hui-subtitle{ font-size:12px; color:#eee; padding-top:15px}
+	.Hui-subtitle{ font-size:12px; color:#666; padding-top:15px}
 	.viewhome{ line-height:44px; padding-right:15px}
-	.viewhome a{ color:#FFF; padding-left:20px; background:url(../images/icon_link.png) no-repeat 0 center}
+	.viewhome a{ color:#FFF; padding-left:20px; background:url(../images/icon_link.png) no-repeat 0 center;}
 	
 	/*导航*/
 	#Hui-nav{ margin-left:200px; margin-right:260px; background-color:transparent}

tooth-wechat-web/src/main/webapp/common/admin/css/H-ui.login.css

@@ -17,13 +17,14 @@ body{font-size:14px}
 .header{top:0; height:60px; background:#426374 url(../images/logo.png) no-repeat 0 center}
 
 .loginWraper{ position:absolute;width:100%; left:0; top:0; bottom:0; right:0; z-index:1; background:#3283AC url(../images/admin-login-bg.jpg) no-repeat center}
-.loginBox{ position:absolute; width:617px; height:330px; background:url(../images/admin-loginform-bg.png) no-repeat; left:50%; top:50%; margin-left:-309px; margin-top:-184px; padding-top:38px}
+.loginBox{ position:absolute; width:1200px; height:566px; background:url(../images/admin-loginform-bg.png) no-repeat; left:50%; top:50%; margin-left:-600px; margin-top:-240px;}
 @media (max-width:617px) {
 	.loginbox{ width:100%; position:static; margin-top:0; margin-left:0;}
 }
 .loginBox .row{margin-top:20px;}
 .loginBox .row .form-label .Hui-iconfont{ font-size:24px}
 .loginBox .input-text{ width:360px}
+.loginBox .input-text:hover{border: 0;    border-bottom: solid 1px #ddd;}
 @media (max-width:617px) {
 	.loginBox .input-text{ width:75%}
 }
@@ -35,7 +36,7 @@ body{font-size:14px}
 .hd_msg a{ color:#fff}
 .hd_msg a:hover{ color:#fff; text-decoration:underline}
 
-.footer{ height:46px; line-height:46px; bottom:0; text-align:center; color:#fff; font-size:12px; background-color:#426374}
+.footer{ height:46px; line-height:46px; bottom:0; text-align:center; color:#666; font-size:12px; background-color:#f4f5f8;}
 
 #ie6-warning{background:#fff url(/jscss/demoimg/201006/warning.gif) no-repeat 3px center;position:absolute;top:0;left:0;font-size:12px;color:#333;width:97%;padding: 2px 15px 2px 23px;text-align:left}
 #ie6-warning a {text-decoration:none}

tooth-wechat-web/src/main/webapp/common/admin/css/login.css

@@ -1,6 +1,8 @@
-.loginWraper{background: #fff url(../images/admin-login-bg.png) no-repeat top;}
-.loginBox{padding-top: 88px;background: url(../images/admin-loginform-bg.png) top right no-repeat;background-size:90% 80%;padding-bottom: 50px;}
-.input-text, .textarea {border: 0;border-bottom: solid 1px #ddd;text-indent: 2em;}
+.loginWraper{background: #f4f5f8 url(../images/admin-login-bg.png) no-repeat top;}
+.loginBox{background: url(../images/admin-loginform-bg.png) top right no-repeat;background-size:100%;}
+.loginWraper form{width: 650px;margin: 80px 0 auto auto;}
+.loginWraper form h3{display: block;width: 110px;text-align: center; margin: 0 auto;}
+.input-text, .textarea {border: 0;border-bottom: solid 1px #ddd;text-indent: 1em;}
 .user_count{background: url(../images/ipt_head.png) left center no-repeat /30px !important;}
 .pass_word{background: url(../images/ipt_suo.png) left center no-repeat /30px !important;}
 .validate{background: url(../images/ipt_img.png) left center no-repeat /30px !important;width:210px !important;}

tooth-wechat-web/src/main/webapp/common/other/paper/pager.jsp

@@ -39,7 +39,7 @@
 	<form action="" id="myForm" method="post"></form>
   		<div class="btn-group">
 		    <%--上一页 --%>
-		    <span class="btn btn-lowblue radius">
+		    <span class="btn">
 			    <c:choose>
 			      <c:when test="${pageNO eq 1 }">
 			        <a class="active">上一页</a>
@@ -79,10 +79,10 @@
 		    <c:forEach var="page" begin="${begin }" end="${end }">
 		      <c:choose>
 		        <c:when test="${page eq pageNO }">
-		          <span class="btn btn-lowblue radius"><a  class="active">${page }</a></span>
+		          <span class="btn"><a  class="active">${page }</a></span>
 		        </c:when>
 		        <c:otherwise>
-		          <span class="btn btn-lowblue radius"><a href="${pageContext.request.contextPath }${url}${page}" class="aBtn">${page }</a></span>
+		          <span class="btn"><a href="${pageContext.request.contextPath }${url}${page}" class="aBtn">${page }</a></span>
 		        </c:otherwise>
 		      </c:choose>
 		    </c:forEach>
@@ -94,7 +94,7 @@
 		    </c:if>
     
 		     <%--下一页 --%>
-		     <span class="btn btn-lowblue radius">
+		     <span class="btn">
 			     <c:choose>
 			      <c:when test="${pageNO eq pageSize || pageSize == 0}">
 			        <a class="active">下一页</a>
@@ -110,8 +110,8 @@
     
     <%-- 共N页 到M页 --%>
     <span class="btn" style="cursor: default;">共<a class="active">${pageSize }</a>页</span>
-    <span class="btn" style="cursor: default;">到<a class="active" style="max-height: 36px;min-height: 34px"><input type="text" id="pageCode" value="${pageNO }" class="input-text radius" style="width: 36px;height:22px" maxlength="3"/></a>页</span>
-    <span class="btn btn-lowblue radius"><a href="javascript:_go();" class="active">确定</a></span>
+    <span class="btn" style="cursor: default;">到<a class="active" style="max-height: 36px;min-height: 34px;"><input type="text" id="pageCode" value="${pageNO }" class="input-text radius" style="width: 36px;height:20px;margin:0 3px;text-align: center;" maxlength="3"/></a>页</span>
+    <span class="btn btn-danger"><a href="javascript:_go();" class="active" style="color: #fff;">确定</a></span>
     <a href="#" style="overflow:hidden" class="active"></a>
   </div>
 </div>

tooth-wechat-web/tooth-wechat-web.iml

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="tooth-common-web" />
+    <orderEntry type="module" module-name="tooth-wechat-service" />
+    <orderEntry type="module" module-name="tooth-wechat-interface" />
+    <orderEntry type="module" module-name="tooth-common-core" />
+    <orderEntry type="module" module-name="tooth-common-tool" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:javax.servlet.jsp-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.7.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.20" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:jconsole:1.8.0">
+        <CLASSES>
+          <root url="jar://C:/Program Files/Java/jdk1.7.0_55/lib/jconsole.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:tools:1.8.0">
+        <CLASSES>
+          <root url="jar://C:/Program Files/Java/jdk1.7.0_55/lib/tools.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.1.6" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.12" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.3" level="project" />
+    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjtools:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.4" level="project" />
+    <orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:1.3" level="project" />
+    <orderEntry type="library" name="Maven: jsptags:pager-taglib:2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.11.2" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
+    <orderEntry type="library" name="Maven: com.mortennobel:java-image-scaling:0.8.5" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
+    <orderEntry type="library" name="Maven: QRCode:QRCode:3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.sogyf:goja-qrcode:0.1.2" level="project" />
+    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" name="Maven: jexcelapi:jxl:2.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.antisamy:antisamy:1.4.3" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.1.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.beanshell:bsh-core:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.2" level="project" />
+    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
+    <orderEntry type="library" name="Maven: com.101tec:zkclient:0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:dubbo:2.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.5.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+    <orderEntry type="library" name="Maven: cn.jpush.api:jpush-client:3.2.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.3.RELEASE" level="project" />
+  </component>
+</module>