Initial commit

729278592 · Jan 16, 2018 · f1e23ce · f1e23ce
commit f1e23ce
Show file tree

Hide file tree

Showing 1,687 changed files with 253,236 additions and 0 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/webstorm/WebContent/META-INF/MANIFEST.MF b/webstorm/WebContent/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/webstorm/WebContent/WEB-INF/.gitignore b/webstorm/WebContent/WEB-INF/.gitignore
@@ -0,0 +1 @@
+/classes/
diff --git a/webstorm/WebContent/WEB-INF/lib/antlr-3.1.1.jar b/webstorm/WebContent/WEB-INF/lib/antlr-3.1.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/aopalliance-1.0.jar b/webstorm/WebContent/WEB-INF/lib/aopalliance-1.0.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/asm-3.3.jar b/webstorm/WebContent/WEB-INF/lib/asm-3.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/asm-commons-3.3.jar b/webstorm/WebContent/WEB-INF/lib/asm-commons-3.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/asm-tree-3.3.jar b/webstorm/WebContent/WEB-INF/lib/asm-tree-3.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/aspectjweaver-1.6.12.jar b/webstorm/WebContent/WEB-INF/lib/aspectjweaver-1.6.12.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/c3p0-0.9.2.1.jar b/webstorm/WebContent/WEB-INF/lib/c3p0-0.9.2.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar b/webstorm/WebContent/WEB-INF/lib/commons-beanutils-1.8.0.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/commons-codec-1.10.jar b/webstorm/WebContent/WEB-INF/lib/commons-codec-1.10.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar b/webstorm/WebContent/WEB-INF/lib/commons-collections-3.2.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/commons-fileupload-1.3.1.jar b/webstorm/WebContent/WEB-INF/lib/commons-fileupload-1.3.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/commons-io-2.2.jar b/webstorm/WebContent/WEB-INF/lib/commons-io-2.2.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/commons-lang-2.6.jar b/webstorm/WebContent/WEB-INF/lib/commons-lang-2.6.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/commons-lang3-3.2.jar b/webstorm/WebContent/WEB-INF/lib/commons-lang3-3.2.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/commons-logging-1.1.3.jar b/webstorm/WebContent/WEB-INF/lib/commons-logging-1.1.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/dom4j-1.6.1.jar b/webstorm/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/dubbo-2.5.4.jar b/webstorm/WebContent/WEB-INF/lib/dubbo-2.5.4.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/ehcache-core-2.6.8.jar b/webstorm/WebContent/WEB-INF/lib/ehcache-core-2.6.8.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/ezmorph-1.0.6.jar b/webstorm/WebContent/WEB-INF/lib/ezmorph-1.0.6.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/fastjson-1.1.39.jar b/webstorm/WebContent/WEB-INF/lib/fastjson-1.1.39.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/freemarker-2.3.19.jar b/webstorm/WebContent/WEB-INF/lib/freemarker-2.3.19.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/hibernate-c3p0-4.3.8.Final.jar b/webstorm/WebContent/WEB-INF/lib/hibernate-c3p0-4.3.8.Final.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/hibernate-commons-annotations-4.0.5.Final.jar b/webstorm/WebContent/WEB-INF/lib/hibernate-commons-annotations-4.0.5.Final.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/hibernate-core-4.3.8.Final.jar b/webstorm/WebContent/WEB-INF/lib/hibernate-core-4.3.8.Final.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/hibernate-ehcache-4.3.8.Final.jar b/webstorm/WebContent/WEB-INF/lib/hibernate-ehcache-4.3.8.Final.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar b/webstorm/WebContent/WEB-INF/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/httpclient-4.5.1.jar b/webstorm/WebContent/WEB-INF/lib/httpclient-4.5.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/httpcore-4.4.jar b/webstorm/WebContent/WEB-INF/lib/httpcore-4.4.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/jackson-annotations-2.5.1.jar b/webstorm/WebContent/WEB-INF/lib/jackson-annotations-2.5.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/jackson-core-2.5.1.jar b/webstorm/WebContent/WEB-INF/lib/jackson-core-2.5.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/jackson-databind-2.5.1.jar b/webstorm/WebContent/WEB-INF/lib/jackson-databind-2.5.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/jandex-1.1.0.Final.jar b/webstorm/WebContent/WEB-INF/lib/jandex-1.1.0.Final.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/javassist-3.18.1-GA.jar b/webstorm/WebContent/WEB-INF/lib/javassist-3.18.1-GA.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/javax.ws.rs-api-2.0.1.jar b/webstorm/WebContent/WEB-INF/lib/javax.ws.rs-api-2.0.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/jboss-logging-3.1.3.GA.jar b/webstorm/WebContent/WEB-INF/lib/jboss-logging-3.1.3.GA.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/jboss-logging-annotations-1.2.0.Beta1.jar b/webstorm/WebContent/WEB-INF/lib/jboss-logging-annotations-1.2.0.Beta1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/jboss-transaction-api_1.2_spec-1.0.0.Final.jar b/webstorm/WebContent/WEB-INF/lib/jboss-transaction-api_1.2_spec-1.0.0.Final.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/jcommon-1.0.22.jar b/webstorm/WebContent/WEB-INF/lib/jcommon-1.0.22.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar b/webstorm/WebContent/WEB-INF/lib/json-lib-2.4-jdk15.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/kryo-3.0.1-sources.jar b/webstorm/WebContent/WEB-INF/lib/kryo-3.0.1-sources.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/kryo-3.0.1.jar b/webstorm/WebContent/WEB-INF/lib/kryo-3.0.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/kryo-serializers-0.29.jar b/webstorm/WebContent/WEB-INF/lib/kryo-serializers-0.29.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/log4j-1.2.17.jar b/webstorm/WebContent/WEB-INF/lib/log4j-1.2.17.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/mchange-commons-java-0.2.3.4.jar b/webstorm/WebContent/WEB-INF/lib/mchange-commons-java-0.2.3.4.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/minlog-1.2.jar b/webstorm/WebContent/WEB-INF/lib/minlog-1.2.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/mysql-connector-java-5.1.11.jar b/webstorm/WebContent/WEB-INF/lib/mysql-connector-java-5.1.11.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/netty-3.2.5.Final.jar b/webstorm/WebContent/WEB-INF/lib/netty-3.2.5.Final.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/objenesis-1.2.jar b/webstorm/WebContent/WEB-INF/lib/objenesis-1.2.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/ognl-3.0.6.jar b/webstorm/WebContent/WEB-INF/lib/ognl-3.0.6.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/ojdbc14.jar b/webstorm/WebContent/WEB-INF/lib/ojdbc14.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar b/webstorm/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/slf4j-log4j12-1.6.1.jar b/webstorm/WebContent/WEB-INF/lib/slf4j-log4j12-1.6.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-aop-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-aop-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-aspects-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-aspects-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-beans-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-beans-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-cache-3.5.0-sources.jar b/webstorm/WebContent/WEB-INF/lib/spring-cache-3.5.0-sources.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-cache-3.5.0.jar b/webstorm/WebContent/WEB-INF/lib/spring-cache-3.5.0.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-context-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-context-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-context-support-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-context-support-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-core-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-core-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-expression-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-expression-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-instrument-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-instrument-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-instrument-tomcat-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-instrument-tomcat-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-jdbc-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-jdbc-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-jms-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-jms-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-messaging-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-messaging-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-orm-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-orm-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-oxm-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-oxm-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-tx-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-tx-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-web-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-web-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-webmvc-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-webmvc-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/spring-websocket-4.1.5.RELEASE.jar b/webstorm/WebContent/WEB-INF/lib/spring-websocket-4.1.5.RELEASE.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/struts2-config-browser-plugin-2.3.16.3.jar b/webstorm/WebContent/WEB-INF/lib/struts2-config-browser-plugin-2.3.16.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/struts2-convention-plugin-2.3.16.3.jar b/webstorm/WebContent/WEB-INF/lib/struts2-convention-plugin-2.3.16.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/struts2-core-2.3.16.3.jar b/webstorm/WebContent/WEB-INF/lib/struts2-core-2.3.16.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/struts2-jfreechart-plugin-2.3.16.3.jar b/webstorm/WebContent/WEB-INF/lib/struts2-jfreechart-plugin-2.3.16.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/struts2-json-plugin-2.3.16.3.jar b/webstorm/WebContent/WEB-INF/lib/struts2-json-plugin-2.3.16.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/struts2-spring-plugin-2.3.16.3.jar b/webstorm/WebContent/WEB-INF/lib/struts2-spring-plugin-2.3.16.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/xmlbeans-2.3.0.jar b/webstorm/WebContent/WEB-INF/lib/xmlbeans-2.3.0.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/xom-1.2.10.jar b/webstorm/WebContent/WEB-INF/lib/xom-1.2.10.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/xstream-1.3.1.jar b/webstorm/WebContent/WEB-INF/lib/xstream-1.3.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/xwork-core-2.3.16.3.jar b/webstorm/WebContent/WEB-INF/lib/xwork-core-2.3.16.3.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/zactivemq-client-1.0.0.jar b/webstorm/WebContent/WEB-INF/lib/zactivemq-client-1.0.0.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/zkclient-0.1.jar b/webstorm/WebContent/WEB-INF/lib/zkclient-0.1.jar
diff --git a/webstorm/WebContent/WEB-INF/lib/zookeeper-3.4.5.jar b/webstorm/WebContent/WEB-INF/lib/zookeeper-3.4.5.jar
diff --git a/webstorm/WebContent/WEB-INF/web.xml b/webstorm/WebContent/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+  <display-name>HC服务号</display-name>
+  <filter>
+    <filter-name>Check</filter-name>
+    <filter-class>com.hszp.com.CheckFilter</filter-class>
+    <init-param>
+      <param-name>unchecked</param-name>
+      <param-value>
+                home,weixin,skins,js,goodml,mine,getZen,pay,wxlogin,publish,shareRank,getZen4Weixin/getZen,login,share/add,share/page,share,check,goodmainline,good,order,auth,cashRanking,download,mine/showallApp,check/checkToken,qrCode/shareQrPic,terminalApi,home/newHome
+			</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>Check</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <filter>
+    <filter-name>struts2</filter-name>
+    <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>struts2</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>
+			classpath:/spring-hibernate.cfg.xml
+		</param-value>
+  </context-param>
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+  <session-config>
+    <session-timeout>30</session-timeout>
+  </session-config>
+  <welcome-file-list>
+    <welcome-file></welcome-file>
+  </welcome-file-list>
+</web-app>
diff --git a/webstorm/WebContent/address/address.html b/webstorm/WebContent/address/address.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>HC服务号</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+   	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0"/>
+	<link rel="stylesheet" href="../skins/css/util.css">
+	<link rel="stylesheet" href="../skins/address/css/address.css">
+    <script type="text/javascript" src="../js/jquery-2.2.1.min.js"></script>
+    <script type="text/javascript" src="../address/address.js"></script>
+</head>
+<body>
+    <header>
+	<div class="h-head">
+    	<a class="h-return h-sh" href="javascript:void(0);" id="backPage"></a>
+        <span class="h-title" style="width:86%;">收货地址</span>
+        <a href="javascript:void(0);" class="h-pic h-bj" id="complete">完成</a>
+        <input type="hidden" id="mdeId"><!-- 默认ID地址 -->
+        <input type="hidden" id="goodsId"><!-- 商品主键 -->
+    </div>
+</header>
+<section>
+	<div class="sh-dizi">
+    	<ul style="margin:0px; padding:0px;" id="addressList">
+
+        </ul>
+    </div>
+
+    <div style="padding-top: 10px;">
+		<input class="dz-bc" type="button" id="newAdd" value="新增地址"/>
+	</div>
+
+</section>
+</body>
+</html>
diff --git a/webstorm/WebContent/address/address.js b/webstorm/WebContent/address/address.js
@@ -0,0 +1,105 @@
+function GetQueryString(name){
+     var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+     var r = window.location.search.substr(1).match(reg);
+     if(r!=null)return  unescape(r[2]); return null;
+}
+
+$(function(){
+
+	$("#goodsId").val(GetQueryString("goodsId"));
+
+	var goodsNum = GetQueryString("gsn");//商品数量
+	var goodsColor = decodeURI(GetQueryString("gsc"));//商品颜色
+
+	//加载数据
+	$.ajax({
+		url : '../address/loadAddress.do',
+		type : 'POST',
+		dataType : 'JSON',
+		async : false,
+		success : function(result){
+			var htmlCode = "";
+			for(var i = 0;i < result.length;i ++){
+
+				var activeHtml = "";
+				if(result[i].m_default == 0){
+					activeHtml = '<i class="sh-ico active2" ></i>';
+					$("#mdeId").val(result[i].m_id);//把地址默认ID放到HTML页面中去
+				}else{
+					activeHtml = '<i class="sh-ico"></i>';
+				}
+
+				htmlCode += '<li class="bor" id="'+result[i].m_id+'">' +
+					        	'<div class="sh-box">' +
+					        		activeHtml + 
+					            	'<div class="sh-boxo">' +
+					                	'<div style=" float:left; width:66%;">' +
+					                		'<span class="sh-boxotext" style="width:80px;">'+result[i].m_user_name+'</span>' +
+					                        '<span class="sh-boxotexto" style="line-height:12px;">收货地址：'+result[i].m_province + result[i].m_city + result[i].m_county + result[i].m_address+'</span>' +
+					                    '</div>' +
+					                    '<div style="overflow:hidden;">' +
+					                    	'<span class="sh-boxt">'+result[i].m_phone+'</span>' +
+					                        '<i class="sh-boxotexto-ico sh-boxotexto-ico-o"></i>' +
+					                    '</div>' +
+					                '</div>' +
+					            '</div>' +
+				            '</li>';
+			}
+
+			$("#addressList").html(htmlCode);
+
+		}
+	});
+
+	//新增
+	$("#newAdd").click(function(){
+		var goodsId = $("#goodsId").val();
+		window.location.href = "../address/goToSaveAddress.do?showDefault=yes&goodsId="+goodsId+"&gsc="+encodeURI(encodeURI(goodsColor))+"&gsn="+goodsNum;
+	});
+
+	//选择
+	$(".bor").click(function(){
+		$(".bor .sh-box .sh-ico").removeClass("active2");
+		$(this).children().children(".sh-ico").addClass("active2");
+		//把选择的ID赋值到页面去
+		var addId = $(this).attr("id");
+		$("#mdeId").val(addId);
+	});
+
+	//删除
+	$(".sh-boxotexto-ico-o").click(function(){
+		if(confirm("确认删除该地址吗?")){
+			$(this).parent().parent().parent().parent().remove();
+			var addId = $(this).parent().parent().parent().parent().attr("id");
+			$.ajax({
+				url : '../address/delAddress.do',
+				data : {"addId":addId},
+				type : 'POST',
+				dataType : 'json'
+			});
+		}
+	});
+
+	//完成-并更新字段
+	$("#complete").click(function(){
+		var mid = $("#mdeId").val();
+
+		$.ajax({
+			url : '../address/completeAddress.do',
+			data : {"addId":mid,"defStatus":"0"},
+			type : 'POST',
+			dataType : 'JSON',
+			success : function(result){
+				var goodsId = $("#goodsId").val();
+				window.location.href = "../account/goToSubmitOrder.do?goodsColor="+encodeURI(encodeURI(goodsColor))+"&goodsNum="+goodsNum+"&goodsId="+goodsId;
+			}
+		});
+	});
+
+	//返回
+	$("#backPage").click(function(){
+		var goodsId = $("#goodsId").val();
+		window.location.href = "../account/goToSubmitOrder.do?goodsColor="+encodeURI(encodeURI(goodsColor))+"&goodsNum="+goodsNum+"&goodsId="+goodsId;
+	});
+
+});
diff --git a/webstorm/WebContent/address/addressList.html b/webstorm/WebContent/address/addressList.html
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>HC服务号</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+   	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0"/>
+	<link rel="stylesheet" href="../css/index.css">
+	<script src='../js_new/main.js'></script>
+</head>
+<body>
+	<div class='address-bg addressList-bg'>
+		<div class='address-top'>
+			<span class='icon' id='return'></span>地址管理
+		</div>
+		<div class='address-list'>
+			<ul class='list' id='addList'>
+
+			</ul>
+		</div>
+		<div class='address-btm'>
+			<div class='address-ipt'>新增地址</div>
+		</div>
+	</div>
+	<!-- 确认删除 -->
+	<div class='alert-bg hide'>
+		<div class='alert-content'>
+			<div class='title'>提示</div>
+			<div class='content'>您确定要删除该地址吗？</div>
+			<div class='bottom'>
+				<div class='left' id='cancle'>取消</div>
+				<div class='right' id='sure'>确定</div>
+			</div>
+		</div>
+	</div>
+</body>
+<script src='../js_new/zepto.min.js'></script>
+<script type='text/javascript'>
+	$(function(){
+		/*$(document).on('click','#default',function(){
+			if($(this).hasClass('selected')){
+				return false;
+			}else{
+				$('.default').removeClass('selected');
+				$(this).addClass('selected');
+				$('.default-ipt').prop('checked',false);
+				$(this).find('.default-ipt').prop('checked',true);
+			}
+		});*/
+		//返回
+		/*返回并刷新数据*/
+		var isPageHide = false; 
+		window.addEventListener('pageshow', function () { 
+		    if (isPageHide) { 
+		      window.location.reload(); 
+		    } 
+		  }); 
+		  window.addEventListener('pagehide', function () { 
+		    isPageHide = true; 
+		  }); 
+		/*结束*/
+		$('#return').on('click',function(){
+			history.go(-1);
+			return false;
+		});
+		//删除
+		var idds='';
+		$(document).on('touchstart','.delete',function(){
+			idds = $(this).attr('ids');
+			$('.alert-bg').removeClass('hide');
+		});
+		//确认删除地址
+		function sureAddress(id){
+			$.ajax({
+				url : '../address/delAddress.do',
+				data : {"addId":id},
+				type : 'POST',
+				dataType : 'json',
+				success: function(e){
+					getAddress();
+				}
+			});
+		}
+		//取消
+		$(document).on('touchstart','#cancle',function(){
+			$('.alert-bg').addClass('hide');
+		});
+		//确定
+		$(document).on('touchstart','#sure',function(){
+			sureAddress(idds);
+			idds='';
+			$('.alert-bg').addClass('hide');
+		});
+		//新增地址
+		$('.address-ipt').on('touchstart',function(){
+			window.location="../address/saveAddress.html";
+		});
+		//编辑地址
+		$(document).on('touchstart','.edit',function(){
+			var ids = $(this).attr('ids');
+			window.location="../address/editAddress.html?ids="+ids;
+		});
+		//设置默认地址
+		$(document).on('touchstart','#default',function(){
+			if($(this).hasClass('selected')){
+				return false;
+			}
+			var mid = $(this).attr('ids');
+			$.ajax({
+				url : '../address/completeAddress.do',
+				data : {"addId":mid,"defStatus":"0"},
+				type : 'POST',
+				dataType : 'JSON',
+				success : function(result){
+					getAddress();
+				}
+			});
+		});
+		//得到地址
+		function getAddress(){
+			$('#addList').html('');
+			$.ajax({
+				url : '../address/loadAddress.do',
+				type : 'POST',
+				dataType : 'JSON',
+				async : false,
+		       	success: function (d) {
+		       		d = JSON.parse(d);
+		       		//alert(JSON.stringify(d));
+		       		//return false;
+		    	   //数据列表
+		    	   var length = d.length;
+		    	   var li='';
+		    	   for(var i=0; i<length; i++){
+		    		   //是否为默认地址
+		    		   var j = d[i].m_default;
+		    		   if(j==0){
+		    			   li+= "<li>"
+								+"<span class='name'>"+d[i].m_user_name+"</span>"
+								+"<span class='tel'>"+d[i].m_phone+"</span>"
+								+"<span class='address'>"+d[i].m_address+"</span>"
+								+"<div class='bottom'>"
+									+"<span class='default selected' id='default' ids="+d[i].m_id+">"
+										+"<input type='checkbox' class='default-ipt' checked='checked'/>"
+										+"<i class='icon'></i>默认地址"
+									+"</span>"
+									+"<span class='right'>"
+									+"<span class='edit' ids="+d[i].m_id+">编辑</span>"
+										+"<span class='delete' ids="+d[i].m_id+">删除</span>"
+									+"</span>"
+								+"</div>"
+							+"</li>";
+		    		   }else{
+		    			   li+= "<li>"
+								+"<span class='name'>"+d[i].m_user_name+"</span>"
+								+"<span class='tel'>"+d[i].m_phone+"</span>"
+								+"<span class='address'>"+d[i].m_address+"</span>"
+								+"<div class='bottom'>"
+									+"<span class='default' id='default' ids="+d[i].m_id+">"
+										+"<input type='checkbox' class='default-ipt'/>"
+										+"<i class='icon'></i>默认地址"
+									+"</span>"
+									+"<span class='right'>"
+										+"<span class='edit' ids="+d[i].m_id+">编辑</span>"
+										+"<span class='delete' ids="+d[i].m_id+">删除</span>"
+									+"</span>"
+								+"</div>"
+							+"</li>";
+		    		   }
+		    	   }
+		    	   $('#addList').html(li);
+		        }
+			});
+		}
+		getAddress();
+	});
+</script>
+</html>