Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/Product.java

@@ -48,7 +48,7 @@ public class Product implements java.io.Serializable{
 	
 	private String productRemark;			//产品备注
 	
-	private Integer productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色
+	private String productColor;			//产品颜色		1：红色	2：橙色	3：黄色	4：绿色
 											//			5：青色	6：蓝色	7：紫色	8：白色
 	private ProductType productType;			//商品类型
 	
@@ -227,11 +227,11 @@ public class Product implements java.io.Serializable{
 		this.productRemark = productRemark;
 	}
 
-	public Integer getProductColor() {
+	public String getProductColor() {
 		return productColor;
 	}
 
-	public void setProductColor(Integer productColor) {
+	public void setProductColor(String productColor) {
 		this.productColor = productColor;
 	}
 

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/ProductFittings.java

@@ -11,7 +11,9 @@ public class ProductFittings implements java.io.Serializable {
     private static final long serialVersionUID = -5278198298126095215L;
 
     private Integer fittingsId;         //id
-    private Integer productId;          //产品id
+    private Integer productColorId;          //产品颜色id
+    private Integer productChildType;          //产品子类型
+    private String fittingsColor;          //配件颜色
     private String fittingsName;        //配件名称
     private Integer fittingsPrice;      //配件市场价
     private Integer fittingsDiscount;   //配件折扣价
@@ -29,12 +31,28 @@ public class ProductFittings implements java.io.Serializable {
         this.fittingsId = fittingsId;
     }
 
-    public Integer getProductId() {
-        return productId;
+    public Integer getProductColorId() {
+        return productColorId;
     }
 
-    public void setProductId(Integer productId) {
-        this.productId = productId;
+    public void setProductColorId(Integer productColorId) {
+        this.productColorId = productColorId;
+    }
+
+    public Integer getProductChildType() {
+        return productChildType;
+    }
+
+    public void setProductChildType(Integer productChildType) {
+        this.productChildType = productChildType;
+    }
+
+    public String getFittingsColor() {
+        return fittingsColor;
+    }
+
+    public void setFittingsColor(String fittingsColor) {
+        this.fittingsColor = fittingsColor;
     }
 
     public String getFittingsName() {

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -11,11 +11,27 @@
 	
 	<!-- 分页查询商品信息 -->
 	<select id="selectPageProduct" parameterType="PaperBean" resultType="Product">
-		SELECT 
-			<include refid="product" />
+		SELECT
+		PRODUCT_ID productId,
+		PRODUCT_NAME productName,
+		PRODUCT_ABBREVIATION productAbbreviation,
+		color_discount productDiscount,
+		color_price productPrice,
+		PRODUCT_SALESNUM productSalesnum,
+		PRODUCT_ACCESSNUM productAccessnum,
+		PRODUCT_STATUS productStatus,
+		color_product_pic productIntroduceImg,
+		PRODUCT_PARAMETER_IMG productParameterImg,
+		PRODUCT_CREATE_DATE productCreateDate,
+		PRODUCT_SORT_NUM productSortNum,
+		PRODUCT_COLOR_DES productColorDes,
+		PRODUCT_REMARK productRemark,
+		color_name productColor
 		FROM 
-			TB_IAMBERRY_PRODUCT_INFO 
-		WHERE 
+			TB_IAMBERRY_PRODUCT_INFO
+		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR
+		on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id
+		WHERE
 			PRODUCT_STATUS = 1 
 			<if test="str != null and str != ''">
 				AND PRODUCT_NAME like #{str} 
@@ -40,11 +56,17 @@
 	<!-- 查询首页产品 -->
 	<select id="selectIndexPageProduct" resultType="Product">
 		SELECT 
-			PRODUCT_ID productId, PRODUCT_COLOR_DES productColorDes,
-			PRODUCT_DISCOUNT productDiscount, PRODUCT_INTRODUCE_IMG productIntroduceImg,
-			PRODUCT_NAME productName, PRODUCT_COLOR productColor, PRODUCT_PRICE productPrice
+			PRODUCT_ID productId,
+			PRODUCT_COLOR_DES productColorDes,
+			color_discount productDiscount,
+			color_product_pic productIntroduceImg,
+			PRODUCT_NAME productName,
+			color_name productColor,
+			color_price productPrice
 		FROM 
-			TB_IAMBERRY_PRODUCT_INFO 
+			TB_IAMBERRY_PRODUCT_INFO
+			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR
+		on TB_IAMBERRY_PRODUCT_INFO.product_id = TB_IAMBERRY_PRODUCT_COLOR.color_product_id
 		WHERE 
 			PRODUCT_STATUS = 1
 		LIMIT 

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productMapper.xml

@@ -29,6 +29,15 @@
 		TYPE_UPDATE_DATE typeUpdateDate,
 		TYPE_STATE typeState
 	</sql>
+
+	<sql id="allChildTypeField">
+		child_type_id typeId,
+		child_type_name typeName,
+		child_type_detilas typeDetilas,
+		child_type_create_date typeCreateDate,
+		child_type_update_date typeUpdateDate,
+		child_type_state typeState
+	</sql>
 	<!-- 商品模糊查询 -->
 	<select id="getProductByFuzzy" parameterType="String" resultType="product">
 		select
@@ -46,10 +55,10 @@
 	<select id="selectAllProductInfo" resultType="product" parameterType="product">
 		SELECT
 			<include refid="allField"></include>,
-			TYPE_ID "productType.typeId",
-			TYPE_NAME "productType.typeName"
+			child_type_id "productType.typeId",
+			child_type_name "productType.typeName"
 		FROM TB_IAMBERRY_PRODUCT_INFO 
-		JOIN TB_IAMBERRY_PRODUCT_TYPE ON PRODUCT_TYPE = TYPE_ID
+		JOIN tb_iamberry_product_child_type ON tb_iamberry_product_child_type.child_type_id = TB_IAMBERRY_PRODUCT_INFO.product_child_type
 		<where>
 			<if test="productName != null and productName != ''">
 				PRODUCT_NAME LIKE CONCAT('%',#{productName},'%')
@@ -80,10 +89,10 @@
 	<select id="selectProductByProductId" resultType="product" parameterType="int">
 		SELECT 
 			<include refid="allField"></include>,
-			TYPE_ID "productType.typeId",
-			TYPE_NAME "productType.typeName"	
+			child_type_id "productType.typeId",
+			child_type_name "productType.typeName"
 		FROM TB_IAMBERRY_PRODUCT_INFO
-		JOIN TB_IAMBERRY_PRODUCT_TYPE ON PRODUCT_TYPE = TYPE_ID
+		JOIN tb_iamberry_product_child_type ON tb_iamberry_product_child_type.child_type_id = TB_IAMBERRY_PRODUCT_INFO.product_child_type
 		WHERE PRODUCT_ID=#{productId}
 	</select>
 	
@@ -204,46 +213,46 @@
 	<!-- 						【产品返利类型】							 -->
 	<select id="getAll" resultType="ProductType">
 		SELECT
-			<include refid="allTypeField"></include>
+			<include refid="allChildTypeField"></include>
 		FROM
-			TB_IAMBERRY_PRODUCT_TYPE
+		tb_iamberry_product_child_type
 	</select>
 	<!-- 						【根据id查询一个产品返利类型】							 -->
 	<select id="selectOneById" parameterType="Integer" resultType="ProductType">
 		SELECT
-			<include refid="allTypeField"></include>
+			<include refid="allChildTypeField"></include>
 		FROM
-			TB_IAMBERRY_PRODUCT_TYPE
-		WHERE TYPE_ID = #{typeId}
+		tb_iamberry_product_child_type
+		WHERE child_type_id = #{typeId}
 	</select>
 	
 	<!-- 						【添加产品返利类型】							 -->
 	<insert id="insertProductType" parameterType="ProductType" 
 		useGeneratedKeys="true" keyProperty="typeId">
-		INSERT INTO TB_IAMBERRY_PRODUCT_TYPE 
-			(TYPE_NAME ,TYPE_DETILAS ,TYPE_CREATE_DATE ,TYPE_UPDATE_DATE ,TYPE_STATE) 
+		INSERT INTO tb_iamberry_product_child_type
+			(child_type_name ,child_type_detilas ,child_type_create_date ,child_type_update_date ,child_type_state)
 		values
 			(#{typeName},#{typeDetilas},#{typeCreateDate},#{typeUpdateDate},#{typeState})
 	</insert>
 	
 	<!-- 						【根据类型id修改一个产品返利类型】							 -->
 	<update id="updateProductTypeById" parameterType="ProductType">
-		UPDATE TB_IAMBERRY_PRODUCT_TYPE
-		SET 
-			TYPE_UPDATE_DATE = NOW(),
+		UPDATE tb_iamberry_product_child_type
+		SET
+		child_type_update_date = NOW(),
 		<if test="typeName != null and typeName != ''">
-			TYPE_NAME = #{typeName},
+			child_type_name = #{typeName},
 		</if>
 		<if test="typeDetilas != null and typeDetilas != ''">
-			TYPE_DETILAS = #{typeDetilas}
+			child_type_detilas = #{typeDetilas}
 		</if>
-		WHERE TYPE_ID = #{typeId}
+		WHERE child_type_id = #{typeId}
 	</update>
 	
 	<update id="updateProductTypeStatusById" parameterType="ProductType">
-		UPDATE TB_IAMBERRY_PRODUCT_TYPE
-		SET TYPE_STATE = #{typeState}, 
-			TYPE_UPDATE_DATE = NOW()
-		WHERE TYPE_ID = #{typeId}
+		UPDATE tb_iamberry_product_child_type
+		SET child_type_state = #{typeState},
+			child_type_update_date = NOW()
+		WHERE child_type_id = #{typeId}
 	</update>
 </mapper>

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/rewardsMapper.xml

@@ -77,10 +77,10 @@ PUBLIC
 	<select id="selectRewardsList" resultType="RewardsRank">
 		SELECT 
 			<include refid="allRewardsField"></include>,
-			TYPE_ID "productType.typeId",
-			TYPE_NAME "productType.typeName"	
+			child_type_id "productType.typeId",
+			child_type_name "productType.typeName"
 		FROM TB_IAMBERRY_MEMBER_RANK
-		JOIN TB_IAMBERRY_PRODUCT_TYPE ON RANK_PRODUCT_TYPE = TYPE_ID
+		JOIN tb_iamberry_product_child_type ON RANK_PRODUCT_TYPE = child_type_id
 	</select>
 	<!-- 【添加一个分销奖励规则】 -->
 	<insert id="insertRewardsRank" parameterType="RewardsRank"
@@ -94,10 +94,10 @@ PUBLIC
 	<select id="selectRewardsRankById" parameterType="Integer" resultType="RewardsRank">
 		SELECT 
 			<include refid="allRewardsField"></include>,
-			TYPE_ID "productType.typeId",
-			TYPE_NAME "productType.typeName"	
+			child_type_id "productType.typeId",
+			child_type_name "productType.typeName"
 		FROM TB_IAMBERRY_MEMBER_RANK
-		JOIN TB_IAMBERRY_PRODUCT_TYPE ON RANK_PRODUCT_TYPE = TYPE_ID
+		JOIN tb_iamberry_product_child_type ON RANK_PRODUCT_TYPE = child_type_id
 		WHERE RANK_ID = #{rankId}
 	</select>
 	

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/taskMapper.xml

@@ -5,13 +5,13 @@
 	<!-- 获取某一页的数据 -->
 	<select id="getAll" parameterType="PaperBean" resultType="WechatTask">
 		SELECT
-			t.*, type.TYPE_NAME "productType.typeName"
+			t.*, type.child_type_name "productType.typeName"
 		FROM
 			TB_IAMBERRY_MEMBER_TASK t
 		LEFT JOIN
-			TB_IAMBERRY_PRODUCT_TYPE type
+			tb_iamberry_product_child_type type
 		ON
-			type.TYPE_ID = t.TASK_PRODUCT_TYPE
+			type.child_type_id = t.TASK_PRODUCT_TYPE
 		LIMIT
 			#{minNum}, #{maxNum}
 	</select>

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -134,6 +134,7 @@ public class CartHandlers {
 	@ResponseBody
 	@RequestMapping("/getCartNumByCartOpenId")
 	public ResultMsg getCartNumByCartOpenId(HttpServletRequest request) throws Exception {
+
 		ResultMsg remsg=new ResultMsg();
 		Member member = wechatUtils.getUserBySession(request);
 		if (member == null || member.getUserOpenid() == null || "null".equals(member.getUserOpenid())) {

iamberry-wechat-web/src/main/resources/log4j.properties

@@ -1,14 +1,14 @@
 #levels: debug, info, warn, error, fatal
 log4j.rootLogger=info,stdout,infoLog,errorLog
 
-#\u63a7\u5236\u53f0
+#\u63A7\u5236\u53F0
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m %n
 log4j.appender.stdout.File=D:/log/iamberry/iamberry_wechat_out.log
 
-#\u4e3b\u65e5\u5fd7\u6587\u4ef6
+#\u4E3B\u65E5\u5FD7\u6587\u4EF6
 log4j.appender.infoLog=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.infoLog.File=D:/log/iamberry/iamberry_wechat_info.log
 log4j.appender.infoLog.Append=true
@@ -17,7 +17,7 @@ log4j.appender.infoLog.layout=org.apache.log4j.PatternLayout
 log4j.appender.infoLog.layout.ConversionPattern=%d %p [%c] - %m %n 
 log4j.appender.infoLog.encoding=UTF-8
 
-#\u9519\u8bef\u65e5\u5fd7
+#\u9519\u8BEF\u65E5\u5FD7
 log4j.appender.errorLog=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.errorLog.File=D:/log/iamberry/iamberry_wechat_error.log
 log4j.appender.errorLog.Append=true
@@ -26,7 +26,8 @@ log4j.appender.errorLog.layout=org.apache.log4j.PatternLayout
 log4j.appender.errorLog.layout.ConversionPattern=%d %p [%c] - %m %n 
 log4j.appender.errorLog.encoding=UTF-8
 
-#\u663e\u793aSQL\u8bed\u53e5\u90e8\u5206
+#\u663E\u793ASQL\u8BED\u53E5\u90E8\u5206
+log4j.logger.com.iamberry.wechat.service=DEBUG
 log4j.logger.java.sql.ResultSet=INFO
 log4j.logger.org.apache=INFO
 log4j.logger.java.sql.Connection=INFO

iamberry-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_list.html

@@ -61,8 +61,9 @@
 		<script src="http://static.iamberry.com/js/mui.min.js?v=2016101701"></script>
 		<script src="http://static.iamberry.com/js/jquery-2.1.1.min.js"></script>
 		<script src="http://static.iamberry.com/js/shop/main.js?v=2016101701"></script>
-		<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>
+		<!--<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>-->
 		<script src="http://static.iamberry.com/js/shop/validate.js?v=2016101701"></script>
-		<script src="http://static.iamberry.com/js/shop/chanpin_list.js?v=2016101701"></script>
+		<!--<script src="http://static.iamberry.com/js/shop/chanpin_list.js?v=2016101701"></script>-->
+		<script src="/iamberry/common/shop/js/page/chanpin_list.js?v=2016101701"></script>
 	</body>
 </html>

iamberry-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html

@@ -83,6 +83,7 @@
 		<script src="http://static.iamberry.com/js/jquery-2.1.1.min.js"></script>
 		<script src="http://static.iamberry.com/js/shop/main.js?v=2016101701"></script>
 		<script src="http://static.iamberry.com/js/shop/wechat-utils-1.0.js"></script>
-		<script src="http://static.iamberry.com/js/shop/index.js?v=2016101701"></script>
+		<!--<script src="http://static.iamberry.com/js/shop/index.js?v=2016101701"></script>-->
+		<script src="/iamberry/common/shop/js/page/index.js?v=2016101701"></script>
 	</body>
 </html>

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/wechat/event/WeChatHandler.java

@@ -32,8 +32,16 @@ public class WeChatHandler {
 
 	@RequestMapping(method=RequestMethod.GET)
 	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+		String echostr = request.getParameter("echostr");
+		if (echostr == null) {
+			response.getWriter().print("connect Server! echostr Error!");
+			return;
+		}
+		PrintWriter out = response.getWriter();
+		out.print(echostr);
+		out.close();
 		// 微信加密签名,必须非空
-		String signature = request.getParameter("signature");
+		/*String signature = request.getParameter("signature");
 		if (signature == null) {
 			response.getWriter().print("connect Server! signature Error!您的输入格式有误!<a>请重新输入!</a>");
 			return;
@@ -65,7 +73,7 @@ public class WeChatHandler {
 			response.getWriter().print("connect Server! check signature Error!");
 			return;
 		}
-		out.close();
+		out.close();*/
 	}
 	
 	@RequestMapping(method=RequestMethod.POST)

watero-wechat-web/src/main/webapp/WEB-INF/views/other/index.html

@@ -90,7 +90,7 @@
                 //在微信中打开
                 mask.show(); //显示遮罩
                 }else{
-                location.href='https://itunes.apple.com/cn/app/bi-bi-meng/id1117339790?mt=8';
+                location.href='//itunes.apple.com/cn/app/bi-bi-meng/id1117339790?mt=8';
                 }
 		});
 	});
@@ -107,7 +107,7 @@
 	}
 	
 	function toAibeiyuan(){
-		location.href='http://www.iamberry.com';
+		location.href='//www.iamberry.com';
 	}
 	
 	</script>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/add_information.html

@@ -1,83 +1,83 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.picker.min.css"/>
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.poppicker.css"/>
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/add_information.css" />
-		<script type="text/javascript">
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-		<div class="mui-loading">
-			<div class="mui-spinner">
-			</div>
-			&nbsp;&nbsp;加载中...
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.picker.min.css?v=2016101701"/>
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.poppicker.css?v=2016101701"/>
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/add_information.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
+		&nbsp;&nbsp;加载中...
 	</div>
-			<div class="mui-content">
-				<!-- 遮罩层 start -->
-				<div id="guize-picture" class="mui-popover mui-popover-action mui-popover-bottom" style="top:0">
-					<img style="margin-top:40%;margin-left: 5%;" width="90%" src="/watero/wateroimages/shop/place_show_eg.png?v=2016102001" />
-				</div>
-				<!-- 遮罩层end -->
-				
-				<div class="tips more">
-					
-				</div>
-				<div class="tips-title" style="height: 100%;width: 100%;text-align: center;line-height: 31px;"><span>请您完善以下信息，并确保真实！</span><a href="#guize-picture" style="font-size: 14px;">查看示例</a></div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label>联系人姓名</label>
-						<input type="text" class="mui-input-clear" placeholder="请输入您的联系人姓名" id="ipt-name" maxlength="10">
-					</div>
-					<div class="mui-input-row">
-						<label>手机号码</label>
-						<input type="tel" class="mui-input-clear" placeholder="请输入您的真实号码" id="ipt-phone" maxlength="12">
-					</div>
-					<div class="mui-input-row">
-						<label style='width:35%'>店铺/代理名称</label>
-						<input style='width:65%' type="text" class="mui-input-clear" placeholder="请输入您的店铺/代理名称" id="ipt-shop-name" maxlength="30">
-					</div>
-					<div class="mui-input-row">
+</div>
+<div class="mui-content">
+	<!-- 遮罩层 start -->
+	<div id="guize-picture" class="mui-popover mui-popover-action mui-popover-bottom" style="top:0">
+		<img style="margin-top:40%;margin-left: 5%;" width="90%" src="//s.iamberry.com/watero/images/shop/place_show_eg.png?v=2016102001" />
+	</div>
+	<!-- 遮罩层end -->
+
+	<div class="tips more">
+
+	</div>
+	<div class="tips-title" style="height: 100%;width: 100%;text-align: center;line-height: 31px;"><span>请您完善以下信息，并确保真实！</span><a href="#guize-picture" style="font-size: 14px;">查看示例</a></div>
+	<form class="mui-input-group">
+		<div class="mui-input-row">
+			<label>联系人姓名</label>
+			<input type="text" class="mui-input-clear" placeholder="请输入您的联系人姓名" id="ipt-name" maxlength="10">
+		</div>
+		<div class="mui-input-row">
+			<label>手机号码</label>
+			<input type="tel" class="mui-input-clear" placeholder="请输入您的真实号码" id="ipt-phone" maxlength="12">
+		</div>
+		<div class="mui-input-row">
+			<label style='width:35%'>店铺/代理名称</label>
+			<input style='width:65%' type="text" class="mui-input-clear" placeholder="请输入您的店铺/代理名称" id="ipt-shop-name" maxlength="30">
+		</div>
+		<div class="mui-input-row">
 						<span class="my-arrowright">
 								<span class="triangle-down"></span>
 						</span>
-						<label>所在区域</label>
-						<input type="text" readonly="readonly" placeholder="请选择您的所在区域" id='showCityPicker3'>
-					</div>
-					<div class="mui-input-row">
-						<label>详细地址</label>
-						<input type="text" class="mui-input-clear" placeholder="请输入您的详细地址" id="ipt-address" maxlength="30">
-					</div>
-				</form>
-				<br />
-				<div class="mui-content-padded">
-					<button type="button" class="mui-btn mui-btn-block mui-btn-red" id="btn_submit" >提交,进入分销中心>></button>
-				</div>
+			<label>所在区域</label>
+			<input type="text" readonly="readonly" placeholder="请选择您的所在区域" id='showCityPicker3'>
+		</div>
+		<div class="mui-input-row">
+			<label>详细地址</label>
+			<input type="text" class="mui-input-clear" placeholder="请输入您的详细地址" id="ipt-address" maxlength="30">
 		</div>
-	<div id='cityResult3' class="ui-alert"></div>
-	<div id="popover" class="mui-popover">
-		<div class="yes-dalog"><div><div class="content-yes"><span><span class="mui-icon mui-icon-checkmarkempty"></span></span></div><h4>已提交审核！</h4><h5>信息将进入后台审核，请耐心等候</h5><div class="btn-yes">确认</div></div></div>
+	</form>
+	<br />
+	<div class="mui-content-padded">
+		<button type="button" class="mui-btn mui-btn-block mui-btn-red" id="btn_submit" >提交,进入分销中心>></button>
 	</div>
-	<script src="/watero/waterojs/mui.min.js?v=2016101701"></script>
-	<script src="/watero/waterojs/mui.picker.min.js?v=2016101701"></script>
-	<script src="/watero/waterojs/mui.poppicker.js?v=2016101701"></script>
-	<script src="/watero/waterojs/city.data.js?v=2016101701" charset="utf-8"></script>
-	<script src="/watero/waterojs/city.data-3.js?v=2016101701" charset="utf-8"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js?v=2016101701"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/add_information.js?v=2016101200301001sdf"></script>
-	</body>
+</div>
+<div id='cityResult3' class="ui-alert"></div>
+<div id="popover" class="mui-popover">
+	<div class="yes-dalog"><div><div class="content-yes"><span><span class="mui-icon mui-icon-checkmarkempty"></span></span></div><h4>已提交审核！</h4><h5>信息将进入后台审核，请耐心等候</h5><div class="btn-yes">确认</div></div></div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/mui.picker.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/mui.poppicker.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/city.data.js?v=2016101701" charset="utf-8"></script>
+<script src="//s.iamberry.com/watero/js/city.data-3.js?v=2016101701" charset="utf-8"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/add_information.js?v=2016101200301001sdf"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/cash_log.html

@@ -1,71 +1,71 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title>金额记录</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/cash_log.css" />
-		<script type="text/javascript">
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title>金额记录</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/cash_log.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-	</nav>
-		<div class="cash-header">
-			<div>
-				用户总余额（元）
-				<div class="box-child">
-					<div id="userIncome">0.00</div>
-					<div><span class="my-btn-tx go_tixian_cash">提现</span></div>
-				</div>
-			</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="cash-header">
+	<div>
+		用户总余额（元）
+		<div class="box-child">
+			<div id="userIncome">0.00</div>
+			<div><span class="my-btn-tx go_tixian_cash">提现</span></div>
 		</div>
+	</div>
+</div>
 
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表开始-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
-					
-				</ul>
-				<!--数据列表结束-->
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/cash_log.js"></script>
-	</body>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表开始-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+
+		</ul>
+		<!--数据列表结束-->
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/cash_log.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_details.html

@@ -1,114 +1,114 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/icons-extra.css"/>
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/chanpin_details.css" />
-		<style type="text/css">
-			.chanpin-ditails-dic img{width:100%;height:100%;}
-			.return{position: fixed;
-    right: 30px;
-    bottom: 80px;
-    background: rgba(0,0,0,.2);
-    padding: 12px;
-    border-radius: 50%;
-    text-align: center;
-    opacity: .9;color: #333;display: none;}
-		</style>
-		<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
-	</head>
+<head>
+	<meta charset="utf-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/icons-extra.css?v=2016111701"/>
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/chanpin_details.css?v=2016111701" />
+	<style type="text/css">
+		.chanpin-ditails-dic img{width:100%;height:100%;}
+		.return{position: fixed;
+			right: 30px;
+			bottom: 80px;
+			background: rgba(0,0,0,.2);
+			padding: 12px;
+			border-radius: 50%;
+			text-align: center;
+			opacity: .9;color: #333;display: none;}
+	</style>
+	<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div id="tabbar-chanpin-details" class="mui-segmented-control">
+		<a class="mui-control-item mui-active" href="#item1">
+			商品信息
+		</a>
+		<!-- 					<a class="mui-control-item" id="click-product-desc" href="#item2">
+                                商品详情
+                            </a> -->
+	</div>
+	<div id="item1" class="mui-control-content mui-active">
+		<div id="detail-slider" class="mui-slider">
+			<!-- 产品轮播图 -->
+			<div class="mui-slider-group mui-slider-loop" id="group-images-div"></div>
+			<!-- 轮播图数量 -->
+			<div class="mui-slider-indicator" id="active-div"></div>
 		</div>
-		<div class="mui-content">
-				<div id="tabbar-chanpin-details" class="mui-segmented-control">
-					<a class="mui-control-item mui-active" href="#item1">
-						商品信息
-					</a>
-<!-- 					<a class="mui-control-item" id="click-product-desc" href="#item2">
-						商品详情
-					</a> -->
-				</div>	
-			<div id="item1" class="mui-control-content mui-active">
-			<div id="detail-slider" class="mui-slider">
-				<!-- 产品轮播图 -->
-				<div class="mui-slider-group mui-slider-loop" id="group-images-div"></div>
-				<!-- 轮播图数量 -->
-				<div class="mui-slider-indicator" id="active-div"></div>
-			</div>
 
-			<div class="food-tt">
-				<div><font id="product-name-font">加载中...</font><span class="iconfont icon-baoyou cl-baoyou"></span>
-				</div>
-				<div class="share_wechat">
-					<span class="iconfont icon-fenxiang ft-18"></span>
-					<div class="ft-12">分享</div>
-				</div>
-			</div>
-			<div class="price-box">
-				<div class="shop-price"><span class="price-sp" id="product-price-span">¥0.0</span><s id="product-price-s">¥0.0</s><span class="del-s" id="product-access-span">1W人已购买</span></div>
-			</div>
-			
-				<div class="chanpin-ditails-dic">
-					<ul>
-						<!-- 产品参数图 -->
-						<li id="product-param-img"></li>    
-					</ul>
-				</div>
-			</div>
-			<!-- 产品图文简介 -->	
-			<div id="item2" class="mui-control-content">
-				<div class="mui-loading">
-						<div class="mui-spinner">
-						</div>
-						&nbsp;&nbsp;加载中...
-				</div>
+		<div class="food-tt">
+			<div><font id="product-name-font">加载中...</font><span class="iconfont icon-baoyou cl-baoyou"></span>
 			</div>
-					
-				
-		<div class="buy-footer" id="add_cart_div_back">
-			<div class="go_index">
-				<img id="add_cart_logo_div" src="/watero/wateroimages/shop/logo.png" />
+			<div class="share_wechat">
+				<span class="iconfont icon-fenxiang ft-18"></span>
+				<div class="ft-12">分享</div>
 			</div>
-			<div id="add-cart-div" >加入购物车</div>
-			<div id="shopp-div" >立即购买</div>
 		</div>
+		<div class="price-box">
+			<div class="shop-price"><span class="price-sp" id="product-price-span">¥0.0</span><s id="product-price-s">¥0.0</s><span class="del-s" id="product-access-span">1W人已购买</span></div>
 		</div>
-		<div class="cart_fixed go_gwc">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">1</span></div>
+
+		<div class="chanpin-ditails-dic">
+			<ul>
+				<!-- 产品参数图 -->
+				<li id="product-param-img"></li>
+			</ul>
+		</div>
+	</div>
+	<!-- 产品图文简介 -->
+	<div id="item2" class="mui-control-content">
+		<div class="mui-loading">
+			<div class="mui-spinner">
+			</div>
+			&nbsp;&nbsp;加载中...
+		</div>
+	</div>
+
+
+	<div class="buy-footer" id="add_cart_div_back">
+		<div class="go_index">
+			<img id="add_cart_logo_div" src="//s.iamberry.com/watero/images/shop/logo.png" />
 		</div>
-		<div class="return">
-        	<span onClick="gotoTop();return false;" class="mui-icon-extra mui-icon-extra-top"></span>
-        </div>
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/chanpin_details.js"></script>
-		<script type="text/javascript">
-			var url = window.location.href;
-			if (url.indexOf("isDisplay") != -1)
-			{
-				$("#product-price-span").hide();
-				$("#product-price-s").hide();
-				$("#add-cart-div").hide();
-				$("#shopp-div").hide();
-				$("#add_cart_logo_div").css("width", "30%");
-			}
-		</script>
-	</body>
+		<div id="add-cart-div" >加入购物车</div>
+		<div id="shopp-div" >立即购买</div>
+	</div>
+</div>
+<div class="cart_fixed go_gwc">
+	<div class="iconfont icon-gouwuche"><span class="mui-badge">1</span></div>
+</div>
+<div class="return">
+	<span onClick="gotoTop();return false;" class="mui-icon-extra mui-icon-extra-top"></span>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/chanpin_details.js?v=2016111701"></script>
+<script type="text/javascript">
+    var url = window.location.href;
+    if (url.indexOf("isDisplay") != -1)
+    {
+        $("#product-price-span").hide();
+        $("#product-price-s").hide();
+        $("#add-cart-div").hide();
+        $("#shopp-div").hide();
+        $("#add_cart_logo_div").css("width", "30%");
+    }
+</script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/chanpin_list.html

@@ -1,85 +1,85 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<script type="text/javascript">
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2017042701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<header class="mui-bar mui-bar-nav header">
-			<div class="go-index go_index">
-				<img src="/watero/wateroimages/shop/logo.png" />
-			</div>
-			<div class="mui-input-row mui-search my-search">
-				<input id="chanpin-search" type="search" class="mui-input-clear" placeholder="">
-			</div>
-			<div class="box-list-card">
-				<span class="iconfont icon-list"></span>
-			</div>
-		</header>
-		<div class="mui-segmented-control tab-with-chanpin-list">
-			<a class="mui-control-item mui-active">
-				<span class="iconfont icon-machine"></span>
-				<span class="mui-tab-label">水机</span>
-			</a>
-			<a class="mui-control-item">
-				<span class="iconfont icon-dingzhi"></span>
-				<span class="mui-tab-label">定制</span>
-			</a>
-			<a class="mui-control-item">
-				<span class="iconfont icon-filter"></span>
-				<span class="mui-tab-label">滤芯</span>
-			</a>
-		</div>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh_chanpin_list" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<header class="mui-bar mui-bar-nav header">
+	<div class="go-index go_index">
+		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
+	</div>
+	<div class="mui-input-row mui-search my-search">
+		<input id="chanpin-search" type="search" class="mui-input-clear" placeholder="">
+	</div>
+	<div class="box-list-card">
+		<span class="iconfont icon-list"></span>
+	</div>
+</header>
+<div class="mui-segmented-control tab-with-chanpin-list">
+	<a class="mui-control-item mui-active">
+		<span class="iconfont icon-machine"></span>
+		<span class="mui-tab-label">水机</span>
+	</a>
+	<a class="mui-control-item">
+		<span class="iconfont icon-dingzhi"></span>
+		<span class="mui-tab-label">定制</span>
+	</a>
+	<a class="mui-control-item">
+		<span class="iconfont icon-filter"></span>
+		<span class="mui-tab-label">配件</span>
+	</a>
+</div>
+<!--下拉刷新容器-->
+<div id="pullrefresh_chanpin_list" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
 
-				</ul>
-			</div>
-		</div>
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/validate.js"></script>
-		<script src="/watero/waterojs/shop/chanpin_list.js"></script>
-	</body>
+		</ul>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2017030601"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/validate.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/shop/chanpin_list.js?v=2017042701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/clearing.html

@@ -1,97 +1,97 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-		<meta name="Expires" content="0">
-		<meta name="Cache-Control" content="no-store, no-cache, must-revalidate">
-		<meta name="Cache-Control" content="post-check=0, pre-check=0">
-		<meta name="Pragma" content="no-cache">
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/clearing.css" />
-		<script type="text/javascript">
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="utf-8">
+	<title></title>
+	<meta name="Expires" content="0">
+	<meta name="Cache-Control" content="no-store, no-cache, must-revalidate">
+	<meta name="Cache-Control" content="post-check=0, pre-check=0">
+	<meta name="Pragma" content="no-cache">
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/clearing.css?v=2016111701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<div class="mui-content">
-			<ul class="mui-table-view more">
-				<li class="mui-table-view-cell line-color" style="padding:20px 10px;">
-					<div style="display: none;" id="user-address-div"></div>
-					<a class="check_address" id="open-wechat-addres-a">
-						<span>请选择收货地址！</span><span class="mui-icon mui-icon-forward icon-r-c"></span>
-					</a>
-				</li>
-			</ul>
-			<ul class="mui-table-view mui-table-view-chevron" id="products-list-ul">
-				<li class="mui-table-view-cell mui-media" id="load-li">
-					&nbsp;&nbsp;加载产品信息中...
-				</li>
-			</ul>
-			<ul class="mui-table-view my-yhq-tab">
-				<li class="mui-table-view-cell forward">
-					<a href="#forward" class="mui-navigate-right">
-						<div class="mui-media-body">
-							我的优惠券<span class="yhq-right"><span class="cl-red" id="yhq_count">0</span>张可使用</span>
-						</div>
-					</a>
-				</li>
-				<div style="padding: 10px 15px 0 15px;">可用余额：<span class="cl-red" id="used_balance">¥0.00</span></div>
-				<li class="mui-table-view-cell pay_ipt_box" style="padding: 0;">
-					<div class="mui-input-group">
-						<div class="mui-input-row">
-							<label>输入使用金额：</label>
-							<input id="pay_ipt" type="number" placeholder="（如699）">
-						</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell" style="padding: 0;">
-					<div class="mui-input-group">
-						<div class="mui-input-row">
-							<label>订单备注：</label>
-							<input type="text" placeholder="（可选填）" id="textarea">
-						</div>
-					</div>
-				</li>
-				<li class="mui-table-view-cell" id="accSub">
-					<div>优惠券：<span class="mui-pull-right cl-red">- ¥<span id="yhq_price">0</span></span></div>
-					<div>账户余额：<span class="mui-pull-right cl-red">- ¥<span id="used_buy">0</span></span></div>
-				</li>
-			</ul>
-			<div class="clearing-count">还需支付：<font class="cl-red">¥</font><span class="cl-red" id="user-pay-money-span">加载中...</span></div>
-			<div class="pay_weixin">
-				<button type="button" class="mui-btn mui-btn-success mui-btn-block btn-weixin-pay" id="btn-weixin-pay">微信支付</button>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<ul class="mui-table-view more">
+		<li class="mui-table-view-cell line-color" style="padding:20px 10px;">
+			<div style="display: none;" id="user-address-div"></div>
+			<a class="check_address" id="open-wechat-addres-a">
+				<span>请选择收货地址！</span><span class="mui-icon mui-icon-forward icon-r-c"></span>
+			</a>
+		</li>
+	</ul>
+	<ul class="mui-table-view mui-table-view-chevron" id="products-list-ul">
+		<li class="mui-table-view-cell mui-media" id="load-li">
+			&nbsp;&nbsp;加载产品信息中...
+		</li>
+	</ul>
+	<ul class="mui-table-view my-yhq-tab">
+		<li class="mui-table-view-cell forward">
+			<a href="#forward" class="mui-navigate-right">
+				<div class="mui-media-body">
+					我的优惠券<span class="yhq-right"><span class="cl-red" id="yhq_count">0</span>张可使用</span>
+				</div>
+			</a>
+		</li>
+		<div style="padding: 10px 15px 0 15px;">可用余额：<span class="cl-red" id="used_balance">¥0.00</span></div>
+		<li class="mui-table-view-cell pay_ipt_box" style="padding: 0;">
+			<div class="mui-input-group">
+				<div class="mui-input-row">
+					<label>输入使用金额：</label>
+					<input id="pay_ipt" type="number" placeholder="（如699）">
+				</div>
 			</div>
-		</div>
-		<div id="forward" class="mui-popover mui-popover-action mui-popover-bottom">
-			<div class="mui-input-group mui-table-view-radio my-popover ">
-				
+		</li>
+		<li class="mui-table-view-cell" style="padding: 0;">
+			<div class="mui-input-group">
+				<div class="mui-input-row">
+					<label>订单备注：</label>
+					<input type="text" placeholder="（可选填）" id="textarea">
+				</div>
 			</div>
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell">
-					<a href="#forward"><b>确定</b></a>
-				</li>
-			</ul>
-		</div>
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/layer.js"></script>
-		<script src="/watero/waterojs/shop/clearing.js"></script>
-	</body>
+		</li>
+		<li class="mui-table-view-cell" id="accSub">
+			<div>优惠券：<span class="mui-pull-right cl-red">- ¥<span id="yhq_price">0</span></span></div>
+			<div>账户余额：<span class="mui-pull-right cl-red">- ¥<span id="used_buy">0</span></span></div>
+		</li>
+	</ul>
+	<div class="clearing-count">还需支付：<font class="cl-red">¥</font><span class="cl-red" id="user-pay-money-span">加载中...</span></div>
+	<div class="pay_weixin">
+		<button type="button" class="mui-btn mui-btn-success mui-btn-block btn-weixin-pay" id="btn-weixin-pay">微信支付</button>
+	</div>
+</div>
+<div id="forward" class="mui-popover mui-popover-action mui-popover-bottom">
+	<div class="mui-input-group mui-table-view-radio my-popover ">
+
+	</div>
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<a href="#forward"><b>确定</b></a>
+		</li>
+	</ul>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=20170622"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js?v=201706001"></script>
+<script src="//s.iamberry.com/watero/js/shop/layer.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/clearing.js?v=201706001"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/coupon.html

@@ -1,56 +1,56 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/coupon.css" />
-		<script type="text/javascript">
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/coupon.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-	<div class="mui-content">
-		<ul class="mui-table-view my-yhq">
-			
-		</ul>
-		<div class="no_yhq"><img src="/watero/wateroimages/shop/no_yhq.png" /></div>
+		&nbsp;&nbsp;加载中...
 	</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/coupon.js"></script>
-	</body>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content">
+	<ul class="mui-table-view my-yhq">
+
+	</ul>
+	<div class="no_yhq"><img src="//s.iamberry.com/watero/images/shop/no_yhq.png" /></div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/coupon.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/coupon_list.html

@@ -1,79 +1,79 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/coupon_list.css" />
-		<script type="text/javascript">
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/coupon_list.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content">
+	<div class="mui-segmented-control tab-yhq-list">
+		<a class="mui-control-item icon-all mui-active" tabindex="1">
+			<span class="mui-icon"></span>
+			<span class="mui-tab-label">全部</span>
 		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
+		<a class="mui-control-item icon-noused" tabindex="2">
+			<span class="mui-icon"></span>
+			<span class="mui-tab-label">未使用</span>
 		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
+		<a class="mui-control-item icon-used" tabindex="3">
+			<span class="mui-icon"></span>
+			<span class="mui-tab-label">已使用</span>
 		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
+		<a class="mui-control-item icon-overdue" tabindex="4">
+			<span class="mui-icon"></span>
+			<span class="mui-tab-label">过期</span>
 		</a>
-	</nav>
-	<div class="mui-content">
-		<div class="mui-segmented-control tab-yhq-list">
-				<a class="mui-control-item icon-all mui-active" tabindex="1">
-							<span class="mui-icon"></span>
-							<span class="mui-tab-label">全部</span>
-				</a>
-				<a class="mui-control-item icon-noused" tabindex="2">
-							<span class="mui-icon"></span>
-							<span class="mui-tab-label">未使用</span>
-				</a>
-				<a class="mui-control-item icon-used" tabindex="3">
-							<span class="mui-icon"></span>
-							<span class="mui-tab-label">已使用</span>
-				</a>
-				<a class="mui-control-item icon-overdue" tabindex="4">
-							<span class="mui-icon"></span>
-							<span class="mui-tab-label">过期</span>
-				</a>
-		</div>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh_yhq_list" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="my-yhq-list">
-						
-				</ul>
-			</div>
+	</div>
+	<!--下拉刷新容器-->
+	<div id="pullrefresh_yhq_list" class="mui-content mui-scroll-wrapper">
+		<div class="mui-scroll">
+			<!--数据列表-->
+			<ul class="my-yhq-list">
+
+			</ul>
 		</div>
 	</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/coupon_list.js"></script>
-	</body>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/coupon_list.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/daili_2wm.html

@@ -1,52 +1,52 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/daili_2wm.css" />
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/daili_2wm.css?v=2016101701" />
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<div class="mui-content">
-			<div class="user-head-box">
-				<img width="100%" src="/watero/wateroimages/shop/member_photo-bg_3.jpg" />
-				<div id="user-head" class="user-head">
-					<img src="/watero/wateroimages/shop/image-12.jpg" />
-				</div>
-			</div>
-			<div class="mui-content-padded mui-text-center">
-				<span id="user-nickname" class='ft-18'>加载中...</span>
-				<p>无论去哪，什么天气，记得带上自己的阳光</p>
-				
-				<div id="qrcode-div" class="qrcode-div">
-		
-				</div>
-				<ul class="mui-text-left my-ol">
-					<li class='mui-text-center'>
-						<div class='ft-18'>长按二维码关注"watero水时代"</div>
-						<p class="my-p">温馨提醒：该二维码有效期为30天，过期会自动重新生成！</p>
-					</li>
-				</ul>
-				
-				<div class="btn-share-box"><button type="button" class="mui-btn my-btn-danger my-btn-block share_wechat">立即分享</button> </div>
-			</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div class="user-head-box">
+		<img width="100%" src="//s.iamberry.com/watero/images/shop/member_photo-bg_3.jpg" />
+		<div id="user-head" class="user-head">
+			<img src="//s.iamberry.com/watero/images/shop/image-12.jpg" />
 		</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/daili_2wm.js"></script>
-	</body>
+	</div>
+	<div class="mui-content-padded mui-text-center">
+		<span id="user-nickname" class='ft-18'>加载中...</span>
+		<p>无论去哪，什么天气，记得带上自己的阳光</p>
+
+		<div id="qrcode-div" class="qrcode-div">
+
+		</div>
+		<ul class="mui-text-left my-ol">
+			<li class='mui-text-center'>
+				<div class='ft-18'>长按二维码关注"watero水时代"</div>
+				<p class="my-p">温馨提醒：该二维码有效期为30天，过期会自动重新生成！</p>
+			</li>
+		</ul>
+
+		<div class="btn-share-box"><button type="button" class="mui-btn my-btn-danger my-btn-block share_wechat">立即分享</button> </div>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/daili_2wm.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/daili_order_list.html

@@ -1,66 +1,66 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/daili_order_list.css" />
-		<script type="text/javascript">
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/daili_order_list.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-		<div class="cash-header">
-			<div>
-				<div class="box-child">
-					<div>用户返利记录详情<span class="go_daili_rebackOrder_list my-btn-tx">已返利记录</span></div>
-				</div>
-			</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="cash-header">
+	<div>
+		<div class="box-child">
+			<div>用户返利记录详情<span class="go_daili_rebackOrder_list my-btn-tx">已返利记录</span></div>
 		</div>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
-					
-				</ul>
-			</div>
-		</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/daili_order_list.js"></script>
-	</body>
+	</div>
+</div>
+<!--下拉刷新容器-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+
+		</ul>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/daili_order_list.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/daili_rebackOrder_list.html

@@ -1,66 +1,66 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/daili_order_list.css" />
-		<script type="text/javascript">
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/daili_order_list.css?v=2016101701" />
+	<script type="text/javascript">
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-		<div class="cash-header">
-			<div>
-				<div class="box-child">
-					<div>用户待返利记录详情</div>
-				</div>
-			</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="cash-header">
+	<div>
+		<div class="box-child">
+			<div>用户待返利记录详情</div>
 		</div>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
-					
-				</ul>
-			</div>
-		</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/daili_rebackOrder_list.js"></script>
-	</body>
+	</div>
+</div>
+<!--下拉刷新容器-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+
+		</ul>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/daili_rebackOrder_list.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_2wm.html

@@ -1,81 +1,81 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style type="text/css">
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style type="text/css">
 		html,body{height: 100%;background: #fff;}
-			.mui-content{min-height: 100%;background: #fff;padding-bottom: 50px;}
-			.btn-share-box {width: 55%;}
-			.btn-share-box .my-btn-danger{padding: 10px 0;}
-			#qrcode-div img{width: 60%;}
-			.user-head{position: absolute;left: 50%;bottom:0 ;width:28%;overflow: hidden;border:2px solid #fff;border-radius: 50%;font-size:0px;line-height: 0; -webkit-transform: translateX(-50%);}
-			.mui-backdrop {
-				position: fixed;
-				z-index: 998;
-				top: 0;
-				right: 0;
-				bottom: 0;
-				left: 0;
-				background: url(/watero/images/shop/share.png) top center no-repeat rgba(0, 0, 0, .4);
-				background-size: 100%;
-			}
-		</style>
-		<script type="text/javascript">
-			// 屏蔽分享
-			//window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+		.mui-content{min-height: 100%;background: #fff;padding-bottom: 50px;}
+		.btn-share-box {width: 55%;}
+		.btn-share-box .my-btn-danger{padding: 10px 0;}
+		#qrcode-div img{width: 60%;}
+		.user-head{position: absolute;left: 50%;bottom:0 ;width:28%;overflow: hidden;border:2px solid #fff;border-radius: 50%;font-size:0px;line-height: 0; -webkit-transform: translateX(-50%);}
+		.mui-backdrop {
+			position: fixed;
+			z-index: 998;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			background: url(//s.iamberry.com/watero/images/shop/share.png) top center no-repeat rgba(0, 0, 0, .4);
+			background-size: 100%;
+		}
+	</style>
+	<script type="text/javascript">
+        // 屏蔽分享
+        //window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<header class="mui-bar mui-bar-nav header">
-					<div class="go-index go_index">
-						<img src="/watero/wateroimages/shop/logo.png" />
-					</div>
-			</header>
-			<div class="mui-content">
-				<div style="position: relative;padding-bottom:6%;">
-					<img width="100%" src="/watero/wateroimages/shop/member_photo-bg_3.jpg" />
-					<div id="user-head" class="user-head">
-						<img width="100%" style="border-radius: 50%;" src="/watero/wateroimages/shop/image-12.jpg" />
-					</div>
-				</div>
-				<div class="mui-content-padded mui-text-center">
-					<span id="user-nickname">加载中...</span>
-					<p>无论去哪，什么天气，记得带上自己的阳光</p>
-					
-					<div style="padding: 20px 0;" id="qrcode-div">
-						<!-- <img width="40%" src="images/daili-2wm.png" /> -->
-					</div>
-					<ul class="mui-text-left my-ol">
-						<li>
-							<div class="mui-text-center">关注美国watero:
-							<p>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<header class="mui-bar mui-bar-nav header">
+	<div class="go-index go_index">
+		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
+	</div>
+</header>
+<div class="mui-content">
+	<div style="position: relative;padding-bottom:6%;">
+		<img width="100%" src="//s.iamberry.com/watero/images/shop/member_photo-bg_3.jpg" />
+		<div id="user-head" class="user-head">
+			<img width="100%" style="border-radius: 50%;" src="//s.iamberry.com/watero/images/shop/image-12.jpg" />
+		</div>
+	</div>
+	<div class="mui-content-padded mui-text-center">
+		<span id="user-nickname">加载中...</span>
+		<p>无论去哪，什么天气，记得带上自己的阳光</p>
+
+		<div style="padding: 20px 0;" id="qrcode-div">
+			<!-- <img width="40%" src="images/daili-2wm.png" /> -->
+		</div>
+		<ul class="mui-text-left my-ol">
+			<li>
+				<div class="mui-text-center">关注美国watero:
+					<p>
 						小伙伴，扫我扫我！
-						</p>
-							</div>
-						</li>
-					</ul>
-					
-					<div class="btn-share-box"><button type="button" class="mui-btn my-btn-danger mui-btn-block share_wechat">分享页面</button> </div>
+					</p>
 				</div>
-			</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_2wm.js"></script>
-	</body>
+			</li>
+		</ul>
+
+		<div class="btn-share-box"><button type="button" class="mui-btn my-btn-danger mui-btn-block share_wechat">分享页面</button> </div>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_2wm.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_apply_submitSuccess.html

@@ -1,69 +1,69 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<header class="mui-bar mui-bar-nav header">
+	<div class="go-index go_index">
+		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
+	</div>
+</header>
+<div class="mui-content" style="background: #fff;">
+	<div class="pl-win-tt">
+		<img style="width: 1.5em;" src="//s.iamberry.com/watero/images/shop/pay-win.jpg"><span class="sp"> 分销提现已提交，请等待处理！</span>
+		<div>
+			<button type="button" class="mui-btn my-btn-green" onclick="returnAgency();">返回代理中心</button>
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-	</nav>
-			<header class="mui-bar mui-bar-nav header">
-					<div class="go-index go_index">
-						<img src="/watero/wateroimages/shop/logo.png" />
-					</div>
-			</header>
-			<div class="mui-content" style="background: #fff;">
-				<div class="pl-win-tt">
-				<img style="width: 1.5em;" src="/watero/wateroimages/shop/pay-win.jpg"><span class="sp"> 分销提现已提交，请等待处理！</span>
-				<div>
-					<button type="button" class="mui-btn my-btn-green" onclick="returnAgency();">返回代理中心</button>
-				</div>
-			</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
+	</div>
+	<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+	<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+	<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+	<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js?v=2016101701"></script>
 	<script>
-		window.onload=function(){
-			getCartNum();
-			document.querySelector('.loading-bg').style.display='none';
-		}
-		function returnAgency() {
-			window.location.href = "/watero/wechat/drp/indexPage";
-		}
+        window.onload=function(){
+            getCartNum();
+            document.querySelector('.loading-bg').style.display='none';
+        }
+        function returnAgency() {
+            window.location.href = "/watero/wechat/drp/indexPage";
+        }
 	</script>
-	</body>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_center.html

@@ -1,121 +1,121 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/fenxiao_center.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-		<div class="mui-loading">
-			<div class="mui-spinner"></div>
-				&nbsp;&nbsp;加载中...
-		</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/fenxiao_center.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner"></div>
+		&nbsp;&nbsp;加载中...
 	</div>
-	<div class="mui-content">
-		<div class="vip-tt fenxiao_info">
-			<img src="/watero/wateroimages/shop/member_photo-bg_3.jpg">
-			<div class="tx bg-orange">
-				<img class="wechat_tx" src="/watero/wateroimages/shop/image-12.jpg">
-			</div>
-			<div class="nikname">
-				<div class="wechat_name" style="position: relative;"></div>
-				<div>姓名：<span class="user_name"></span></div>
-				<div>身份：<span class="role_name"></span> 
-				</div>
-			</div>
-			<span style="position: absolute;top: 50%;right:0;-webkit-transform: translateY(-50%);"><span class="mui-icon mui-icon-arrowright" style="color:#fff;font-size:35px;"></span></span>
+</div>
+<div class="mui-content">
+	<div class="vip-tt fenxiao_info">
+		<img src="//s.iamberry.com/watero/images/shop/member_photo-bg_3.jpg">
+		<div class="tx bg-orange">
+			<img class="wechat_tx" src="//s.iamberry.com/watero/images/shop/image-12.jpg">
 		</div>
-		
-		<ul class="mui-table-view mui-grid-view mui-grid-9">
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_wm2" onclick="fenxiao_wm2()">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_qrcode.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">分销二维码</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share" onclick="shareH5();">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_share.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">我要分享</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="tixian()" id="balanceLi">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_balance.png" />
-					<div class="mui-media-body">
-						<div style="margin-top:3px;">可用余额&nbsp;&nbsp;&nbsp;</div>
-						<div class="ft-14 total_money">0元</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="weiruzhang()" id="waitAccounts">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_bill.png" />
-					<div class="mui-media-body">
-						<div style="margin-top:3px;">待入账&nbsp;&nbsp;&nbsp;</div>
-						<div class="ft-14" id="to_accounts">0元</div>
-					</div>
-				</a>
-			</li>
-		</ul>
-		<ul class="mui-table-view" id="guanli">
-		<li class="mui-table-view-cell mui-media line-blue-left"><a class="mui-navigate-right" style="text-indent:1.3em;"><img style="width:34px;height:34px;" src="/watero/wateroimages/shop/total-icon.png"><span class="left-middle">销售管理中心</span></a></li>
-		</ul>
-		<div id="tabbar-chart-bar" class="mui-segmented-control my-chart-bar">
-			<a class="mui-control-item mui-active">
-					最近7天
-				</a>
-			<a class="mui-control-item">
-					最近半年
-				</a>
-			<a class="mui-control-item">
-					最近1年
-				</a>
-		</div>
-		<div id="item1" class="mui-control-content mui-active more">
-			<div class="chart" id="barChart"></div>
+		<div class="nikname">
+			<div class="wechat_name" style="position: relative;"></div>
+			<div>姓名：<span class="user_name"></span></div>
+			<div>身份：<span class="role_name"></span>
+			</div>
 		</div>
-		
-		<ul class="mui-table-view mui-grid-view mui-grid-9" id="my_type">
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6" id="hz_shang" onclick="xialianlist()">
-				<a id="user_Management">
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_cooperativebusiness.png" />
-					<div class="mui-media-body">
-						<div class="hz_cell my-cell" id = "salesName" value="">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" id="video">
-				<a class="go_publicity"  userType="2" isDrp="true">
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_video.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">水机视频</div>
-					</div>
-				</a>
-			</li>
-		</ul>
-		<br>
+		<span style="position: absolute;top: 50%;right:0;-webkit-transform: translateY(-50%);"><span class="mui-icon mui-icon-arrowright" style="color:#fff;font-size:35px;"></span></span>
+	</div>
+
+	<ul class="mui-table-view mui-grid-view mui-grid-9">
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_wm2" onclick="fenxiao_wm2()">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_qrcode.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">分销二维码</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share" onclick="shareH5();">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_share.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">我要分享</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="tixian()" id="balanceLi">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_balance.png" />
+				<div class="mui-media-body">
+					<div style="margin-top:3px;">可用余额&nbsp;&nbsp;&nbsp;</div>
+					<div class="ft-14 total_money">0元</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="weiruzhang()" id="waitAccounts">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_bill.png" />
+				<div class="mui-media-body">
+					<div style="margin-top:3px;">待入账&nbsp;&nbsp;&nbsp;</div>
+					<div class="ft-14" id="to_accounts">0元</div>
+				</div>
+			</a>
+		</li>
+	</ul>
+	<ul class="mui-table-view" id="guanli">
+		<li class="mui-table-view-cell mui-media line-blue-left"><a class="mui-navigate-right" style="text-indent:1.3em;"><img style="width:34px;height:34px;" src="//s.iamberry.com/watero/images/shop/total-icon.png"><span class="left-middle">销售管理中心</span></a></li>
+	</ul>
+	<div id="tabbar-chart-bar" class="mui-segmented-control my-chart-bar">
+		<a class="mui-control-item mui-active">
+			最近7天
+		</a>
+		<a class="mui-control-item">
+			最近半年
+		</a>
+		<a class="mui-control-item">
+			最近1年
+		</a>
 	</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/echarts.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_center.js"></script>
-	</body>
+	<div id="item1" class="mui-control-content mui-active more">
+		<div class="chart" id="barChart"></div>
+	</div>
+
+	<ul class="mui-table-view mui-grid-view mui-grid-9" id="my_type">
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6" id="hz_shang" onclick="xialianlist()">
+			<a id="user_Management">
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_cooperativebusiness.png" />
+				<div class="mui-media-body">
+					<div class="hz_cell my-cell" id = "salesName" value="">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" id="video">
+			<a class="go_publicity"  userType="2" isDrp="true">
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_video.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">水机视频</div>
+				</div>
+			</a>
+		</li>
+	</ul>
+	<br>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/echarts.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_center.js?v=2016102701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_center2.html

@@ -1,131 +1,131 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/fenxiao_center.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-		<div class="mui-loading">
-			<div class="mui-spinner"></div>
-				&nbsp;&nbsp;加载中...
-		</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/fenxiao_center.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner"></div>
+		&nbsp;&nbsp;加载中...
 	</div>
-	<div class="mui-content">
-		<div class="vip-tt fenxiao_info">
-			<img src="/watero/wateroimages/shop/member_photo-bg_3.jpg">
-			<div class="tx bg-orange">
-				<img class="wechat_tx" src="/watero/wateroimages/shop/image-12.jpg">
-			</div>
-			<div class="nikname">
-				<div class="wechat_name" style="position: relative;"></div>
-				<div>姓名：<span class="user_name"></span></div>
-				<div>身份：<span class="role_name"></span> 
-				</div>
-			</div>
-			<span style="position: absolute;top: 50%;right:0;-webkit-transform: translateY(-50%);"><span class="mui-icon mui-icon-arrowright" style="color:#fff;font-size:35px;"></span></span>
-		</div>
-		
-		<ul class="mui-table-view mui-grid-view mui-grid-9">
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_wm2" onclick="fenxiao_wm2()">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_qrcode.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">分销二维码</div>
-					</div>
-				</a>
-			</li>
-			
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share" onclick="salesNumbers()">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_share.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">已销售台数</div>
-					</div>
-				</a>
-			</li> 
-			
-			<!-- <li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_share.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">我要分享</div>
-					</div>
-				</a>
-			</li> 
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="tixian()" >
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_balance.png" />
-					<div class="mui-media-body">
-						<div style="margin-top:3px;">可用余额&nbsp;&nbsp;&nbsp;</div>
-						<div class="ft-14 total_money">0元</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="weiruzhang()">
-				<a>
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_bill.png" />
-					<div class="mui-media-body">
-						<div style="margin-top:3px;">待入账&nbsp;&nbsp;&nbsp;</div>
-						<div class="ft-14" id="to_accounts">0元</div>
-					</div>
-				</a>
-			</li>-->
-		</ul>
-		<ul class="mui-table-view" id="guanli">
-		<li class="mui-table-view-cell mui-media line-blue-left"><a class="mui-navigate-right" style="text-indent:1.3em;"><img style="width:34px;height:34px;" src="/watero/wateroimages/shop/total-icon.png"><span class="left-middle">销售管理中心</span></a></li>
-		</ul>
-		<div id="tabbar-chart-bar" class="mui-segmented-control my-chart-bar">
-			<a class="mui-control-item mui-active">
-					最近7天
-				</a>
-			<a class="mui-control-item">
-					最近半年
-				</a>
-			<a class="mui-control-item">
-					最近1年
-				</a>
+</div>
+<div class="mui-content">
+	<div class="vip-tt fenxiao_info">
+		<img src="//s.iamberry.com/watero/images/shop/member_photo-bg_3.jpg">
+		<div class="tx bg-orange">
+			<img class="wechat_tx" src="//s.iamberry.com/watero/images/shop/image-12.jpg">
 		</div>
-		<div id="item1" class="mui-control-content mui-active more">
-			<div class="chart" id="barChart"></div>
+		<div class="nikname">
+			<div class="wechat_name" style="position: relative;"></div>
+			<div>姓名：<span class="user_name"></span></div>
+			<div>身份：<span class="role_name"></span>
+			</div>
 		</div>
-		
-		<ul class="mui-table-view mui-grid-view mui-grid-9" id="my_type">
-			<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6" id="hz_shang" onclick="xialianlist()">
-				<a id="user_Management">
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_cooperativebusiness.png" />
-					<div class="mui-media-body">
-						<div class="hz_cell my-cell">下线 · 销量&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-					</div>
-				</a>
-			</li>
-			<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" id="video">
-				<a class="go_publicity"  userType="2" isDrp="true">
-					<img width="34px" src="/watero/wateroimages/shop/shouye_icon_video.png" />
-					<div class="mui-media-body">
-						<div class="my-cell">水机视频</div>
-					</div>
-				</a>
-			</li>
-		</ul>
-		<br>
+		<span style="position: absolute;top: 50%;right:0;-webkit-transform: translateY(-50%);"><span class="mui-icon mui-icon-arrowright" style="color:#fff;font-size:35px;"></span></span>
 	</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/echarts.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_center2.js"></script>
-	</body>
+
+	<ul class="mui-table-view mui-grid-view mui-grid-9">
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_wm2" onclick="fenxiao_wm2()">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_qrcode.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">分销二维码</div>
+				</div>
+			</a>
+		</li>
+
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share" onclick="salesNumbers()">
+			<a>
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_share.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">已销售台数</div>
+				</div>
+			</a>
+		</li>
+
+		<!-- <li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6 fenxiao_share">
+            <a>
+                <img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_share.png" />
+                <div class="mui-media-body">
+                    <div class="my-cell">我要分享</div>
+                </div>
+            </a>
+        </li> 
+        <li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="tixian()" >
+            <a>
+                <img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_balance.png" />
+                <div class="mui-media-body">
+                    <div style="margin-top:3px;">可用余额&nbsp;&nbsp;&nbsp;</div>
+                    <div class="ft-14 total_money">0元</div>
+                </div>
+            </a>
+        </li>
+        <li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" onclick="weiruzhang()">
+            <a>
+                <img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_bill.png" />
+                <div class="mui-media-body">
+                    <div style="margin-top:3px;">待入账&nbsp;&nbsp;&nbsp;</div>
+                    <div class="ft-14" id="to_accounts">0元</div>
+                </div>
+            </a>
+        </li>-->
+	</ul>
+	<ul class="mui-table-view" id="guanli">
+		<li class="mui-table-view-cell mui-media line-blue-left"><a class="mui-navigate-right" style="text-indent:1.3em;"><img style="width:34px;height:34px;" src="//s.iamberry.com/watero/images/shop/total-icon.png"><span class="left-middle">销售管理中心</span></a></li>
+	</ul>
+	<div id="tabbar-chart-bar" class="mui-segmented-control my-chart-bar">
+		<a class="mui-control-item mui-active">
+			最近7天
+		</a>
+		<a class="mui-control-item">
+			最近半年
+		</a>
+		<a class="mui-control-item">
+			最近1年
+		</a>
+	</div>
+	<div id="item1" class="mui-control-content mui-active more">
+		<div class="chart" id="barChart"></div>
+	</div>
+
+	<ul class="mui-table-view mui-grid-view mui-grid-9" id="my_type">
+		<li class="mui-table-view-cell mui-media  mui-col-sm-3 grid-6" id="hz_shang" onclick="xialianlist()">
+			<a id="user_Management">
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_cooperativebusiness.png" />
+				<div class="mui-media-body">
+					<div class="hz_cell my-cell">下线 · 销量&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
+				</div>
+			</a>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-sm-3 grid-6" id="video">
+			<a class="go_publicity"  userType="2" isDrp="true">
+				<img width="34px" src="//s.iamberry.com/watero/images/shop/shouye_icon_video.png" />
+				<div class="mui-media-body">
+					<div class="my-cell">水机视频</div>
+				</div>
+			</a>
+		</li>
+	</ul>
+	<br>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/echarts.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_center2.js?v=2016102702"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_mendian_next_user_list.html

@@ -1,67 +1,67 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-			<ul class="mui-table-view more">
-				<li class="mui-table-view-cell">合作商 <span class="cl-red" id="b_accounts">0</span>个
-				<!-- <span class="mui-pull-right" >总贡献：<span id="accounts">0</span>元</span> -->
-				</li>
-			</ul>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
-					
-				</ul>
-			</div>
-		</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_mendian_next_user_list.js"></script>
-	</body>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell">合作商 <span class="cl-red" id="b_accounts">0</span>个
+		<!-- <span class="mui-pull-right" >总贡献：<span id="accounts">0</span>元</span> -->
+	</li>
+</ul>
+<!--下拉刷新容器-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+
+		</ul>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_mendian_next_user_list.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_next_user_list.html

@@ -1,55 +1,55 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
-			.mui-bar-tab~.mui-content {margin-top:88px;}
-			.tab-with-user{border-radius: 0; border: 1px solid #e4004d;background-color: #fff;}
-			.mui-segmented-control .mui-control-item.mui-active {color: #fff;background-color: #e4004d;}
-			.tab-with-user .mui-control-item{    color: #e4004d;border-color: #e4004d;border-left: 1px solid #e4004d;}
-			.mui-scroll-wrapper{top:85px;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
+		.mui-bar-tab~.mui-content {margin-top:88px;}
+		.tab-with-user{border-radius: 0; border: 1px solid #e4004d;background-color: #fff;}
+		.mui-segmented-control .mui-control-item.mui-active {color: #fff;background-color: #e4004d;}
+		.tab-with-user .mui-control-item{    color: #e4004d;border-color: #e4004d;border-left: 1px solid #e4004d;}
+		.mui-scroll-wrapper{top:85px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<ul class="mui-table-view">
-				<li class="mui-table-view-cell">合作商 <span class="cl-red" id="b_accounts">0</span>个
-				</li>
-		</ul>
-		<div class="mui-segmented-control tab-with-user">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<ul class="mui-table-view">
+	<li class="mui-table-view-cell">合作商 <span class="cl-red" id="b_accounts">0</span>个
+	</li>
+</ul>
+<div class="mui-segmented-control tab-with-user">
 
-		</div>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
-					
-				</ul>
-			</div>
-		</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_next_user_list.js"></script>
-	</body>
+</div>
+<!--下拉刷新容器-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+
+		</ul>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_next_user_list.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_next_user_list2.html

@@ -1,68 +1,68 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-			<ul class="mui-table-view more">
-				<li class="mui-table-view-cell">客户 <span class="cl-red" id="b_accounts">0</span>个
-				<span class="mui-pull-right" id="itemLi">总销售量<span class="cl-red" id="itemSum"></span>台</span>
-				</li>
-				
-			</ul>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
-					
-				</ul>
-			</div>
-		</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_next_user_list2.js"></script>
-	</body>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell">客户 <span class="cl-red" id="b_accounts">0</span>个
+		<span class="mui-pull-right" id="itemLi">总销售量<span class="cl-red" id="itemSum"></span>台</span>
+	</li>
+
+</ul>
+<!--下拉刷新容器-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+
+		</ul>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_next_user_list2.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_order_list.html

@@ -1,69 +1,69 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="format-detection" content="telphone=no, email=no" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell {padding-right: 10px;}
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telphone=no, email=no" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell {padding-right: 10px;}
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<ul class="mui-table-view more">
-			<li class="mui-table-view-cell ft-14">订单列表 <span class="text-center">可提金额：<span class="cl-red">¥<span class="price_to"></span></span>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell ft-14">订单列表 <span class="text-center">可提金额：<span class="cl-red">¥<span class="price_to"></span></span>
 				</span><span class="mui-badge mui-badge-inverted go_fenxiao_tixian_apply">提现>></span></li>
-		</ul>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+</ul>
+<!--下拉刷新容器-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
 
-				</ul>
-			</div>
-		</div>
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/fenxiao_order_list.js"></script>
-	</body>
+		</ul>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_order_list.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_pay_win.html

@@ -1,73 +1,73 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
-	</div>
-			<header class="mui-bar mui-bar-nav header">
-					<div class="go-index go_index">
-						<img src="/watero/wateroimages/shop/logo.png" />
-					</div>
-			</header>
-			<div class="mui-content" style="background: #fff;">
-				<div class="pl-win-tt">
-				<img style="width: 1.5em;" src="/watero/wateroimages/shop/pay-win.jpg"><span class="sp"> 恭喜您，支付成功！</span>
-				<div>已支付：<span class="cl-red" id="payMoney">¥0.00元+0.0积分</span></div>
-				</div>
-				<ul class="pay_win_list">
-					<li>订单编号：<span class="cl-0" id="orderId"></span></li>
-					<li>收货人：<span id="userName"></span></li>
-					<li>手机号码：<span id="tel"></span></li>
-					<li>订单金额：<span class="cl-0" id="amount"></span></li>
-					<li>支付方式：在线支付</li>
-					<li>订单时间:<span id="createDate"></span></li>
-				</ul>
-			</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
 	<script>
-	mui.ready(function(){
-		var orderId=getParam("orderId")==""?"1":getParam("orderId");
-		 $.ajax({
-			 "type":"post",
-           "url":base_path+"/placeOrder/successOrder",
-           "dataType":"json",
-           "data" :{
-          	   "openid":"",//"openid":"230"
-          	   "id":orderId
-           },
-           "success" : function(res) {
-               $("#payMoney").text(res.data.yetAmount);
-               $("#orderId").text(res.data.id);
-               $("#userName").text(res.data.contactName);
-               $("#payMoney").text("¥"+accDiv(res.data.yetAmount,100));
-               $("#tel").html(res.data.tel);
-               $("#amount").text("¥"+accDiv(res.data.yetAmount,100));
-               $("#createDate").text(res.data.createDate);
-       		document.querySelector('.loading-bg').style.display='none';
-           }
-		});	
-	});
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
 	</script>
-	</body>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<header class="mui-bar mui-bar-nav header">
+	<div class="go-index go_index">
+		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
+	</div>
+</header>
+<div class="mui-content" style="background: #fff;">
+	<div class="pl-win-tt">
+		<img style="width: 1.5em;" src="//s.iamberry.com/watero/images/shop/pay-win.jpg"><span class="sp"> 恭喜您，支付成功！</span>
+		<div>已支付：<span class="cl-red" id="payMoney">¥0.00元+0.0积分</span></div>
+	</div>
+	<ul class="pay_win_list">
+		<li>订单编号：<span class="cl-0" id="orderId"></span></li>
+		<li>收货人：<span id="userName"></span></li>
+		<li>手机号码：<span id="tel"></span></li>
+		<li>订单金额：<span class="cl-0" id="amount"></span></li>
+		<li>支付方式：在线支付</li>
+		<li>订单时间:<span id="createDate"></span></li>
+	</ul>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script>
+    mui.ready(function(){
+        var orderId=getParam("orderId")==""?"1":getParam("orderId");
+        $.ajax({
+            "type":"post",
+            "url":base_path+"/placeOrder/successOrder",
+            "dataType":"json",
+            "data" :{
+                "openid":"",//"openid":"230"
+                "id":orderId
+            },
+            "success" : function(res) {
+                $("#payMoney").text(res.data.yetAmount);
+                $("#orderId").text(res.data.id);
+                $("#userName").text(res.data.contactName);
+                $("#payMoney").text("¥"+accDiv(res.data.yetAmount,100));
+                $("#tel").html(res.data.tel);
+                $("#amount").text("¥"+accDiv(res.data.yetAmount,100));
+                $("#createDate").text(res.data.createDate);
+                document.querySelector('.loading-bg').style.display='none';
+            }
+        });
+    });
+</script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_tixian_apply.html

@@ -1,80 +1,80 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
+<head>
+	<meta charset="utf-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
 		.mui-table-view-cell:after,.mui-table-view:after{display:none;}
 		.mui-segmented-control .mui-control-item{line-height: 50px;border:0;border-bottom: 2px solid transparent;background-color:#fff;color:#b5b5b5;}
 		.mui-segmented-control{border:0;}
 		.mui-segmented-control .mui-control-item.mui-active{color:#f64e78;background-color:#fff;border-bottom: 2px solid #f64e78;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<div class="mui-content">
-			<div id="sliderSegmentedControl" class="mui-segmented-control">
-						<a class="mui-control-item mui-active" tabindex="0" href="#item1mobile">
-							<span class="mui-tab-label">提现申请</span>
-						</a>
-						<a class="mui-control-item go_fenxiao_tixian_log" tabindex="1" >
-							<span class="mui-tab-label">提现记录</span>
-						</a>
-				</div>
-			<ul class="mui-table-view" style="background-color: transparent;">
-				<li class="mui-table-view-cell ft-12"><span class="my-btn-link"><span class='cl-red'>温馨提示：</span>提现金额每次不能低于<span class="cl-red" id="lessMoney">100</span>元！每月允许提现<span class="cl-red" id="withdrawalsCount">2</span>次。以每月15日为分界线，在15日之前申请提现的，将会于15-20日到账；若当月15日后申请提现的，将会于下月的15日-20日到账，如遇法定假期将顺延。</span></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">姓名</span><input type="text" id="userName" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实姓名"></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">电话</span><input type="tel" id="tel"  class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实电话"></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">金额</span><input type="tel" id="amount" class="my-input mui-input-clear mui-pull-right" placeholder="小于您可用金额的数量"></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link">当前可提现金额：<span class="cl-red" id="allowMoney">0</span>&nbsp;元</span></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">银行</span><input type="tel" id="bankCount" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实银行账号"></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">支行</span><input type="text" id="bankLocal" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的开户支行"></li>
-				<li class="mui-table-view-cell ft-12"><span class="my-btn-link cl-red">本次提现结果，将在提现记录里查看。</span></li>
-				<li style="text-align: center;padding: 10px 0;"><button type="button" class="mui-btn my-btn-green" onclick="submitOrder()"  style="width: 50%;">立即提现</button></li>
-			</ul>
-		</div>
-		
-	</body>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/validate.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_tixian_apply.js"></script>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content">
+	<div id="sliderSegmentedControl" class="mui-segmented-control">
+		<a class="mui-control-item mui-active" tabindex="0" href="#item1mobile">
+			<span class="mui-tab-label">提现申请</span>
+		</a>
+		<a class="mui-control-item go_fenxiao_tixian_log" tabindex="1" >
+			<span class="mui-tab-label">提现记录</span>
+		</a>
+	</div>
+	<ul class="mui-table-view" style="background-color: transparent;">
+		<li class="mui-table-view-cell ft-12"><span class="my-btn-link"><span class='cl-red'>温馨提示：</span>提现金额每次不能低于<span class="cl-red" id="lessMoney">100</span>元！每月允许提现<span class="cl-red" id="withdrawalsCount">2</span>次。以每月15日为分界线，在15日之前申请提现的，将会于15-20日到账；若当月15日后申请提现的，将会于下月的15日-20日到账，如遇法定假期将顺延。</span></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">姓名</span><input type="text" id="userName" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实姓名"></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">电话</span><input type="tel" id="tel"  class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实电话"></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">金额</span><input type="tel" id="amount" class="my-input mui-input-clear mui-pull-right" placeholder="小于您可用金额的数量"></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link">当前可提现金额：<span class="cl-red" id="allowMoney">0</span>&nbsp;元</span></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">银行</span><input type="tel" id="bankCount" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实银行账号"></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">支行</span><input type="text" id="bankLocal" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的开户支行"></li>
+		<li class="mui-table-view-cell ft-12"><span class="my-btn-link cl-red">本次提现结果，将在提现记录里查看。</span></li>
+		<li style="text-align: center;padding: 10px 0;"><button type="button" class="mui-btn my-btn-green" onclick="submitOrder()"  style="width: 50%;">立即提现</button></li>
+	</ul>
+</div>
+
+</body>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/validate.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_tixian_apply.js?v=2016101901"></script>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_tixian_log.html

@@ -1,70 +1,70 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<title>提现记录</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell {padding-right: 35px;}
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-			.mui-btn-link {position: absolute;left: 50%;top: 5px;-webkit-transform: translateX(-50%);transform: translateX(-50%);}
-		</style>
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title>提现记录</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell {padding-right: 35px;}
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+		.mui-btn-link {position: absolute;left: 50%;top: 5px;-webkit-transform: translateX(-50%);transform: translateX(-50%);}
+	</style>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar" style="visibility: hidden;">
-			<a class="mui-tab-item">
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav> 
-		<ul class="mui-table-view more">
-			<li class="mui-table-view-cell ft-14">账户余额:<span class="cl-red" id="amount">¥0</span>元<button type="button" class="mui-btn mui-btn-success go_fenxiao_tixian_apply" onclick="getMoney()">我要提现</button></li>
-		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar" style="visibility: hidden;">
+	<a class="mui-tab-item">
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell ft-14">账户余额:<span class="cl-red" id="amount">¥0</span>元<button type="button" class="mui-btn mui-btn-success go_fenxiao_tixian_apply" onclick="getMoney()">我要提现</button></li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
 
-				</ul>
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/fenxiao_tixian_log.js"></script>
-	</body>
+		</ul>
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_tixian_log.js?v=2016101701"></script>
+</body>
 
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_to_accounts_list.html

@@ -1,66 +1,67 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-			.my-dl-tb-order {white-space: pre-wrap;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+		.my-dl-tb-order {white-space: pre-wrap;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-		<ul class="mui-table-view more">
-				<li class="mui-table-view-cell">待入账金额:<span class="cl-red" id="accounts">0</span>元 </li>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell">待入账金额:<span class="cl-red" id="accounts">0</span>元 </li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view my-tab-view-pull">
+
 		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view my-tab-view-pull">
-					
-				</ul>
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_to_accounts_list.js"></script>
-	</body>
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_to_accounts_list.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_to_accounts_list2.html

@@ -1,66 +1,66 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-			.my-dl-tb-order {white-space: pre-wrap;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+		.my-dl-tb-order {white-space: pre-wrap;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-		<ul class="mui-table-view more">
-				<li class="mui-table-view-cell">已销售台数:<span class="cl-red" id="accounts">0</span>台 </li>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell">已销售台数:<span class="cl-red" id="accounts">0</span>台 </li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view my-tab-view-pull">
+
 		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view my-tab-view-pull">
-					
-				</ul>
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_to_accounts_list2.js"></script>
-	</body>
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_to_accounts_list2.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_to_transfer_accounts_list.html

@@ -1,66 +1,66 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-			.my-dl-tb-order {white-space: pre-wrap;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+		.my-dl-tb-order {white-space: pre-wrap;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-		<ul class="mui-table-view more">
-				<li class="mui-table-view-cell">待入账金额:<span class="cl-red" id="accounts">0</span>元 </li>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell">待入账金额:<span class="cl-red" id="accounts">0</span>元 </li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view my-tab-view-pull">
+
 		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view my-tab-view-pull">
-					
-				</ul>
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_to_transfer_accounts_list.js"></script>
-	</body>
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_to_transfer_accounts_list.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/fenxiao_up.html

@@ -1,68 +1,68 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/fenxiao_up.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/fenxiao_up.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
 <body>
-	<div class="mui-content">
- 		<form id="uploadForm" action="/watero/wechat/placeInfo/sendImg2Share" method="post" enctype="multipart/form-data">
-                    <div class="upload_box">
-                        <div class="upload_main">
-                            <div class="upload_choose">   
-                            </div>
-                            <div id="preview" class="upload_preview">
-                            	 
-                            </div>
-                            <input id="fileImage" type="file" size="30" name="fileselect[]" />
-                        </div>
-                    
-                    <div class="mui-content-padded">
-                    <div class="mui-input-row mui-radio mui-left">
-						<label>选项1</label>
-						<input name="radio1" type="radio" checked="checked">
-					</div>
-					<div class="mui-input-row mui-radio mui-left">
-						<label>选项2</label>
-						<input name="radio1" type="radio">
-					</div>
-					<div class="mui-input-row mui-radio mui-left">
-						<label>选项3</label>
-						<input name="radio1" type="radio">
-					</div>
-					<div class="mui-input-row mui-radio mui-left">
-						<label>选项4</label>
-						<input name="radio1" type="radio">
-					</div>
-					<div class="mui-input-row mui-radio mui-left">
-						<label>选项5</label>
-						<input name="radio1" type="radio">
-					</div>
-					</div>
-                        <div class="upload_submit">
-                            <button type="button" id="fileSubmit" class="mui-btn upload_submit_btn mui-btn-warning">上传到服务器</button>&nbsp;&nbsp;&nbsp;&nbsp;<button id="i_want_share" type="button" class="mui-btn mui-btn-grey" >我要分享</button>
-                        </div>
-                        <div id="uploadInf" class="upload_inf"></div>
-                    </div>
-	 	</form>
-	 </div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/zxxFile.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/fenxiao_up.js"></script>
+<div class="mui-content">
+	<form id="uploadForm" action="/watero/wechat/placeInfo/sendImg2Share" method="post" enctype="multipart/form-data">
+		<div class="upload_box">
+			<div class="upload_main">
+				<div class="upload_choose">
+				</div>
+				<div id="preview" class="upload_preview">
+
+				</div>
+				<input id="fileImage" type="file" size="30" name="fileselect[]" />
+			</div>
+
+			<div class="mui-content-padded">
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项1</label>
+					<input name="radio1" type="radio" checked="checked">
+				</div>
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项2</label>
+					<input name="radio1" type="radio">
+				</div>
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项3</label>
+					<input name="radio1" type="radio">
+				</div>
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项4</label>
+					<input name="radio1" type="radio">
+				</div>
+				<div class="mui-input-row mui-radio mui-left">
+					<label>选项5</label>
+					<input name="radio1" type="radio">
+				</div>
+			</div>
+			<div class="upload_submit">
+				<button type="button" id="fileSubmit" class="mui-btn upload_submit_btn mui-btn-warning">上传到服务器</button>&nbsp;&nbsp;&nbsp;&nbsp;<button id="i_want_share" type="button" class="mui-btn mui-btn-grey" >我要分享</button>
+			</div>
+			<div id="uploadInf" class="upload_inf"></div>
+		</div>
+	</form>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/zxxFile.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/fenxiao_up.js?v=2016101701"></script>
 </body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/gift_card_agent_center.html

@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title>代理中心</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-		.vip-tt {position: relative;width:100%;height:150px;background:url(/watero/images/shop/gift-card-tit-bg3.png) center center /100% 100% no-repeat;}
+<head>
+	<meta charset="UTF-8">
+	<title>代理中心</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
+	<style>
+		.vip-tt {position: relative;width:100%;height:150px;background:url(//s.iamberry.com/watero/images/shop/gift-card-tit-bg3.png) center center /100% 100% no-repeat;}
 		.vip-tt>img {width: 100%;}
 		.tx {position: absolute;left:1em;top: 50%;width: 4.5em;height: 4.5em;display: inline-block;-webkit-transform: translateY(-50%);transform: translateY(-50%);border-radius: 50%;background-color: #88d9eb;padding: 3px;}
 		.tx>img {width: 100%;border-radius: 50%;}
@@ -19,284 +19,278 @@
 		.nikname>div:first-child{position: relative;width: 100%;overflow: hidden;text-overflow: ellipsis;}
 		.mui-table-view-chevron .mui-badge{display:none;}
 		.btn_share{background: #fff;border-radius:6px;padding:3px 10px;float: right;margin-right: 10px;color: #e9004c;font-size: 13px;}
- .center-middle{font-size: 12px;    position: absolute;
-    left: 90px;
-    top: 50%;
-    -webkit-transform: translateY(-50%);}
-    .my-btn-line{border: 1px solid #fff; background: transparent;color: #fff;padding: 3px 10px;margin-right:8px;}
-    .icon-daifahuo{font-size: 15px;padding-left:30px;}
-    .icon-daifahuo:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
-    .my-div{padding: 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom: 5px;}
-    .mui-table-view.mui-grid-view .mui-table-view-cell {
-    font-size: 17px;
-    display: inline-block;
-    margin-right: -3px;
-    padding: 0 0 0 8px;
-    text-align: center;
-    vertical-align: middle;
-    background: 0 0;
-}
-.mui-table-view.mui-grid-view {
-    font-size: 0;
-    display: block;
-    width: 100%;
-    padding: 0 8px 8px 0;
-    white-space: normal;
-}
-.mui-card-link{color: #70d8eb;}
-.mui-card-link.active{color: #e2e2e2;}
-.mui-card-footer:after{content: '';position: absolute;left: 50%;top: 20%;width: 1px;height: 60%;background: #70D8EB;-webkit-transform: scaleX(.5);}
-.mui-card-footer, .mui-card-header {min-height: 30px;padding: 6px 6px;}
-.mui-card {
-    box-shadow: 0 0 0 rgba(1,1,1,0);
-    border: 1px solid rgba(110,214,235,.5);
-}
-.mui-card{font-size: 12px;}
-.mui-card-footer .mui-card-link, .mui-card-header .mui-card-link {
-    line-height: 34px;
-    height: 34px;
-    }
-.bgcolor-1{height:32vw;background:url(/watero/images/shop/gift-card-list-1.jpg) top center no-repeat;background-size: 100% 100%;}
-.bgcolor-2{height:32vw;background:url(/watero/images/shop/gift-card-list-2.jpg) top center no-repeat;background-size: 100% 100%;}
-.h6-vip{font-size: 12px;color: #F0F0F0;text-align: left;}
-.mui-btn-link{font-size: 12px;color: #fff;position: absolute;right: 10px;bottom: 0;}
-.card-password{padding: 5px 0;
-    font-size: 26px;
-    -webkit-user-select: text;
-    position: absolute;
-    left: 0;
-    width: 100%;
-    top: 50%;-webkit-transform: translateY(-50%);}
-.mui-col-xs-6 .mui-card-header{-webkit-user-select:text !important;}
-.ul-desc{padding:10px 10px 10px 15px;background: #fff;color: #666;font-size: 12px;}
-.icon-gift.active:before{content: '\e71e';}
-.my-card-list{padding:8px 8px 8px 0 !important;}
-.more-view{padding: 0 0 10px 0;}
-.more-view:before,.my-card-list:after{display:none;}
-.mui-icon-info{font-size:20px;}
-.my-select {border: 1px solid #6fd7eb !important;
-    color: #6fd7eb;
-    width: auto;
-    margin-bottom: 0;
-    padding: 3px 4px;
-    text-align: center;
-    position: absolute;
-    -webkit-appearance: menulist;
-    right: 10px;
-    top: 8px;}
-    .time-card{position:absolute;left:10px;bottom:5px;font-size: 14px;}
-    .cl-gray{color:#8794a7;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+		.center-middle{font-size: 12px;    position: absolute;
+			left: 90px;
+			top: 50%;
+			-webkit-transform: translateY(-50%);}
+		.my-btn-line{border: 1px solid #fff; background: transparent;color: #fff;padding: 3px 10px;margin-right:8px;}
+		.icon-daifahuo{font-size: 15px;padding-left:30px;}
+		.icon-daifahuo:before{font-size: 19px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
+		.my-div{padding: 5px 0;border-bottom: 1px solid rgba(0,0,0,.1);margin-bottom: 5px;}
+		.mui-table-view.mui-grid-view .mui-table-view-cell {
+			font-size: 17px;
+			display: inline-block;
+			margin-right: -3px;
+			padding: 0 0 0 8px;
+			text-align: center;
+			vertical-align: middle;
+			background: 0 0;
+		}
+		.mui-table-view.mui-grid-view {
+			font-size: 0;
+			display: block;
+			width: 100%;
+			padding: 0 8px 8px 0;
+			white-space: normal;
+		}
+		.mui-card-link{color: #70d8eb;}
+		.mui-card-link.active{color: #e2e2e2;}
+		.mui-card-footer:after{content: '';position: absolute;left: 50%;top: 20%;width: 1px;height: 60%;background: #70D8EB;-webkit-transform: scaleX(.5);}
+		.mui-card-footer, .mui-card-header {min-height: 30px;padding: 6px 6px;}
+		.mui-card {
+			box-shadow: 0 0 0 rgba(1,1,1,0);
+			border: 1px solid rgba(110,214,235,.5);
+		}
+		.mui-card{font-size: 12px;}
+		.mui-card-footer .mui-card-link, .mui-card-header .mui-card-link {
+			line-height: 34px;
+			height: 34px;
+		}
+		.bgcolor-1{height:32vw;background:url(//s.iamberry.com/watero/images/shop/gift-card-list-1.jpg) top center no-repeat;background-size: 100% 100%;}
+		.bgcolor-2{height:32vw;background:url(//s.iamberry.com/watero/images/shop/gift-card-list-2.jpg) top center no-repeat;background-size: 100% 100%;}
+		.h6-vip{font-size: 12px;color: #F0F0F0;text-align: left;}
+		.mui-btn-link{font-size: 12px;color: #fff;position: absolute;right: 10px;bottom: 0;}
+		.card-password{padding: 5px 0;
+			font-size: 26px;
+			-webkit-user-select: text;
+			position: absolute;
+			left: 0;
+			width: 100%;
+			top: 50%;-webkit-transform: translateY(-50%);}
+		.mui-col-xs-6 .mui-card-header{-webkit-user-select:text !important;}
+		.ul-desc{padding:10px 10px 10px 15px;background: #fff;color: #666;font-size: 12px;}
+		.icon-gift.active:before{content: '\e71e';}
+		.my-card-list{padding:8px 8px 8px 0 !important;}
+		.more-view{padding: 0 0 10px 0;}
+		.more-view:before,.my-card-list:after{display:none;}
+		.mui-icon-info{font-size:20px;}
+		.my-select {border: 1px solid #6fd7eb !important;
+			color: #6fd7eb;
+			width: auto;
+			margin-bottom: 0;
+			padding: 3px 4px;
+			text-align: center;
+			position: absolute;
+			-webkit-appearance: menulist;
+			right: 10px;
+			top: 8px;}
+		.time-card{position:absolute;left:10px;bottom:5px;font-size: 14px;}
+		.cl-gray{color:#8794a7;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
 	</div>
-			<div class="mui-content">
-				<div class="vip-tt">
-				<div class="tx bg-orange" id="headDiv">
-					<img src="/watero/wateroimages/image-12.jpg" id="userHead">
-				</div>
-				<div class="nikname">
-					<div>
-						<span id="userNickname">水时代watero</span>&nbsp;&nbsp;&nbsp;&nbsp;<span>代理商<span class="mui-icon mui-icon-info" id="btn_go_explain"></span></span>
-					</div>
-					<div>
-						<button type="button" class="my-btn-line" id="my-zeng">我的赠品</button><button type="button" class="my-btn-line" id="my-xiaxian">继续代理</button>
-					</div>
-				</div>
+</div>
+<div class="mui-content">
+	<div class="vip-tt">
+		<div class="tx bg-orange" id="headDiv">
+			<img src="//s.iamberry.com/watero/images/image-12.jpg" id="userHead">
+		</div>
+		<div class="nikname">
+			<div>
+				<span id="userNickname">水时代watero</span>&nbsp;&nbsp;&nbsp;&nbsp;<span>代理商<span class="mui-icon mui-icon-info" id="btn_go_explain"></span></span>
 			</div>
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell">
-					<span class="iconfont icon-daifahuo">提货卡</span><select class="my-select">
-					<option value="4" id="btn-all">全部</option>
-					<option value="1" id="btn-sales">待提货</option>
-					<option value="2" id="btn-waitExchange">已提货</option>
-					<option value="3" id="btn-exchange">已兑现</option>
-				</select>
-				</li>
-			</ul>
-			<ul class="mui-table-view mui-grid-view my-card-list">	
-			</ul>
-			<div class="mui-content-padded">
-				<ul class="mui-pager">
-					<li class="mui-disabled">
-						<!-- <span class="my_prev">上一页 </span> -->
-					</li>
-					<li>
-						<a class="my_next">
-							下一页
-						</a>
-					</li>
-				</ul>
+			<div>
+				<button type="button" class="my-btn-line" id="my-zeng">我的赠品</button><button type="button" class="my-btn-line" id="my-xiaxian">继续代理</button>
 			</div>
-<!-- 			<ul class="mui-table-view more-view">
-			<li class="mui-text-center">
-					<span class="iconfont icon-gift" id="gift-more" style="padding: 3px 15px;"></span>
-				</li>
-			</ul> -->
-			<ul class="ul-desc">
-				<li>使用说明：</li>
-				<li>1、提货卡在获取一年后方可兑现，每张提货卡兑现1250元；</li>
-				<li>2、每次销售完8张提货卡以后，系统自动赠送一台净水机。</li>
-			</ul>
 		</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script type="text/javascript">
-	 var pageNumber = 0,pageSize=10;
-	 mui.ready(function(){
-		$.ajax(base_path + '/agent_pay/agent_info?dates=' + new Date().getTime(), {
-			data: {},
-            xhrFields: {
-                withCredentials: true
+	</div>
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<span class="iconfont icon-daifahuo">提货卡</span><select class="my-select">
+			<option value="4" id="btn-all">全部</option>
+			<option value="1" id="btn-sales">待提货</option>
+			<option value="2" id="btn-waitExchange">已提货</option>
+			<option value="3" id="btn-exchange">已兑现</option>
+		</select>
+		</li>
+	</ul>
+	<ul class="mui-table-view mui-grid-view my-card-list">
+	</ul>
+	<div class="mui-content-padded">
+		<ul class="mui-pager">
+			<li class="mui-disabled">
+				<!-- <span class="my_prev">上一页 </span> -->
+			</li>
+			<li>
+				<a class="my_next">
+					下一页
+				</a>
+			</li>
+		</ul>
+	</div>
+	<!-- 			<ul class="mui-table-view more-view">
+                <li class="mui-text-center">
+                        <span class="iconfont icon-gift" id="gift-more" style="padding: 3px 15px;"></span>
+                    </li>
+                </ul> -->
+	<ul class="ul-desc">
+		<li>使用说明：</li>
+		<li>1、提货卡在获取一年后方可兑现，每张提货卡兑现1250元；</li>
+		<li>2、每次销售完8张提货卡以后，系统自动赠送一台净水机。</li>
+	</ul>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script type="text/javascript">
+    var pageNumber = 0,pageSize=10;
+    mui.ready(function(){
+        mui.ajax(base_path + '/agent_pay/agent_info?dates=' + new Date().getTime(), {
+            data: {},
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.status){
+                        if(dt.data.agentHead != null && typeof(dt.data.agentHead) != "undefined" && dt.data.agentHead != '') {
+                            $("#userHead").prop('src',dt.data.agentHead);
+                        }
+                        if(dt.data.agentNickname != null && typeof(dt.data.agentNickname) != "undefined" && dt.data.agentNickname != '') {
+                            var name=decodeURI(dt.data.agentNickname);
+                            if(name.length>9){
+                                name=name.substring(0,8)+"..."
+                            }
+                            $("#userNickname").html(name);
+                        }
+                        document.querySelector('.loading-bg').style.display='none';
+                    }else{
+                        mui.alert(dt.message,'',function(){
+                            mui.openWindow({url:'/watero/view/gift_card_to_agent.html'});
+                        });
+                    }
+                }
             },
-			dataType: 'json',
-			type: 'post',
-			timeout: 15000,
-			success: function(dt) {
-				if(dt.isRedirect) {
-					location.href = dt.redirectURL;
-				} else {
-					if(dt.status){
-						if(dt.data.agentHead != null && typeof(dt.data.agentHead) != "undefined" && dt.data.agentHead != '') {
-							$("#userHead").prop('src',dt.data.agentHead);
-						}
-						if(dt.data.agentNickname != null && typeof(dt.data.agentNickname) != "undefined" && dt.data.agentNickname != '') {
-							var name=decodeURI(dt.data.agentNickname);
-							if(name.length>9){
-								name=name.substring(0,8)+"..."
-							}
-							$("#userNickname").html(name);
-						}
-						document.querySelector('.loading-bg').style.display='none';
-					}else{
-						mui.alert(dt.message,'',function(){
-							mui.openWindow({url:'/watero/view/gift_card_to_agent.html'});
-						});
-					}
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理；
-				console.log(xhr);
-			}
-		});
-		getGiftList(4);
-		//$(".hide").addClass('mui-hidden');
-	});
-	function getGiftList(obj){
-		
-		++pageNumber;
-		$.ajax(base_path + '/giftCard/card/selectCardList?dates=' + new Date().getTime(), {
-			data: {
-				"status":obj,"pageNO":pageNumber,"pageSize":pageSize
-			},
-            xhrFields: {
-                withCredentials: true
+            error: function(xhr, type, errorThrown) {
+                //异常处理；
+                console.log(xhr);
+            }
+        });
+        getGiftList(4);
+        //$(".hide").addClass('mui-hidden');
+    });
+    function getGiftList(obj){
+
+        ++pageNumber;
+        mui.ajax(base_path + '/giftCard/card/selectCardList?dates=' + new Date().getTime(), {
+            data: {
+                "status":obj,"pageNO":pageNumber,"pageSize":pageSize
             },
-			dataType: 'json',
-			type: 'post',
-			timeout: 15000,
-			success: function(dt) {
-				console.log(dt)
-				if(dt.isRedirect) {
-					location.href = dt.redirectURL;
-				} else {
-					if(dt.status) {
-						var table = document.body.querySelector('.my-card-list');
-						//table.innerHTML='';
-						var gift_data = [];
-						gift_data = dt.data.list;
-						$("#btn-all").text("全部"+dt.data.count+"张");
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                console.log(dt)
+                if(dt.isRedirect) {
+                    location.href = dt.redirectURL;
+                } else {
+                    if(dt.status) {
+                        var table = document.body.querySelector('.my-card-list');
+                        //table.innerHTML='';
+                        var gift_data = [];
+                        gift_data = dt.data.list;
+                        $("#btn-all").text("全部"+dt.data.count+"张");
                         $("#btn-sales").text("待提货"+dt.data.salesNum+"张");
                         $("#btn-waitExchange").text("已提货"+dt.data.waitExchangeNum+"张");
                         $("#btn-exchange").text("已兑现"+dt.data.exchangeNum+"张");
 
-						mui(gift_data).each(function(index) {
-							var status='',salesStatus='',cl='',ft_cl='';
-							if (this.cardStatus == 2) {
-								status='已提货';cl='bgcolor-2';ft_cl='cl-gray';
-							} else if (this.cardStatus == 1) {
-								status='待提货';cl='bgcolor-1';
-							} else if (this.cardStatus == 3){
-								status='已兑';cl='bgcolor-2';ft_cl='cl-gray';
-							}
-						/* if(this.cardSalesStatus==1 || (this.cardSalesStatus==2 && this.cardStatus == 3)){
-							salesStatus='<a class="mui-card-link btn-details" name="'+this.cardPassword+'" id="'+this.cardId+'">查看详情</a>';
-						} else if (this.cardSalesStatus==2 && this.cardStatus == 1) {
-							salesStatus='<a class="mui-card-link myactive"  name="'+this.cardPassword+'" id="'+this.cardId+'">待售/赠</a>';
-						} */
-						var li = document.createElement('li');
-						li.className = 'mui-table-view-cell mui-media mui-col-xs-12 btn-details';
-						li.setAttribute('name',this.cardPassword);
-						li.setAttribute('id',this.cardId);
-						li.innerHTML = '<div class="mui-card"><div class="mui-card-header mui-card-media '+cl+'"><div class="ft-12 mui-text-left"></div><div class="card-password '+ft_cl+'" name="'+this.cardPassword+'">'+this.cardPassword+'</div><span class="time-card">'+formatDate(this.cardCreateDate)+'</span><a class="mui-btn-link my-link">'+status+'</a></div></div>';
-						table.appendChild(li);
-						});
-					} else {
-						mui.alert(dt.message);
-					}
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理；
-				console.log(xhr);
-			}
-		});
-	}
-	$(document).on('tap', '.my_next', function() {
-		getGiftList($(".my-select").find("option:selected").val());
-	});
-	mui('body').on('tap', '#btn_go_explain', function() {
-		mui.openWindow({
-			url: '/watero/view/gift_card_agent_explain.html'
-		});
-	});
-	mui('body').on('tap', '#my-zeng', function() {
-		mui.openWindow({
-			url: '/watero/view/gift_card_give_order_list.html'
-		});
-	});
-	mui('body').on('tap', '#my-xiaxian', function() {
-		mui.openWindow({
-			url: '/watero/view/gift_card_renew_agent.html'
-		});
-	});
-	mui('body').on('tap', '#gift-more', function() {
-		getGiftList();
-	});
-/* 	$(document).on('tap', '.see', function() {
-		if($(this).hasClass('icon-biyan')){
-			$(this).parent().next().text($(this).parent().next().attr('name'));
-			$(this).removeClass('icon-biyan').addClass('icon-yanjing');
-		}else{
-			$(this).removeClass('icon-yanjing').addClass('icon-biyan');
-			$(this).parent().next().prop('name',$(this).parent().next().text());
-			$(this).parent().next().text("*******");
-		}
-	}); */
-	$(document).on('change', '.my-select', function() {
-		$(".my-card-list").empty();
-		pageNumber=0;
-		getGiftList($(this).val());
-	});
-	mui('body').on('tap', '.btn-details', function() {
-		var th=this;
-		mui.openWindow({
-			url: '/watero/view/gift_card_exchange_details.html?name='+th.getAttribute("id")+'&psw='+th.getAttribute("name")
-		});
-	});
-	</script>
-	</body>
+                        mui(gift_data).each(function(index) {
+                            var status='',salesStatus='',cl='',ft_cl='';
+                            if (this.cardStatus == 2) {
+                                status='已提货';cl='bgcolor-2';ft_cl='cl-gray';
+                            } else if (this.cardStatus == 1) {
+                                status='待提货';cl='bgcolor-1';
+                            } else if (this.cardStatus == 3){
+                                status='已兑';cl='bgcolor-2';ft_cl='cl-gray';
+                            }
+							/* if(this.cardSalesStatus==1 || (this.cardSalesStatus==2 && this.cardStatus == 3)){
+							 salesStatus='<a class="mui-card-link btn-details" name="'+this.cardPassword+'" id="'+this.cardId+'">查看详情</a>';
+							 } else if (this.cardSalesStatus==2 && this.cardStatus == 1) {
+							 salesStatus='<a class="mui-card-link myactive"  name="'+this.cardPassword+'" id="'+this.cardId+'">待售/赠</a>';
+							 } */
+                            var li = document.createElement('li');
+                            li.className = 'mui-table-view-cell mui-media mui-col-xs-12 btn-details';
+                            li.setAttribute('name',this.cardPassword);
+                            li.setAttribute('id',this.cardId);
+                            li.innerHTML = '<div class="mui-card"><div class="mui-card-header mui-card-media '+cl+'"><div class="ft-12 mui-text-left"></div><div class="card-password '+ft_cl+'" name="'+this.cardPassword+'">'+this.cardPassword+'</div><span class="time-card">'+formatDate(this.cardCreateDate)+'</span><a class="mui-btn-link my-link">'+status+'</a></div></div>';
+                            table.appendChild(li);
+                        });
+                    } else {
+                        mui.alert(dt.message);
+                    }
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                //异常处理；
+                console.log(xhr);
+            }
+        });
+    }
+    $(document).on('tap', '.my_next', function() {
+        getGiftList($(".my-select").find("option:selected").val());
+    });
+    mui('body').on('tap', '#btn_go_explain', function() {
+        mui.openWindow({
+            url: '/watero/view/gift_card_agent_explain.html'
+        });
+    });
+    mui('body').on('tap', '#my-zeng', function() {
+        mui.openWindow({
+            url: '/watero/view/gift_card_give_order_list.html'
+        });
+    });
+    mui('body').on('tap', '#my-xiaxian', function() {
+        mui.openWindow({
+            url: '/watero/view/gift_card_renew_agent.html'
+        });
+    });
+    mui('body').on('tap', '#gift-more', function() {
+        getGiftList();
+    });
+	/* 	$(document).on('tap', '.see', function() {
+	 if($(this).hasClass('icon-biyan')){
+	 $(this).parent().next().text($(this).parent().next().attr('name'));
+	 $(this).removeClass('icon-biyan').addClass('icon-yanjing');
+	 }else{
+	 $(this).removeClass('icon-yanjing').addClass('icon-biyan');
+	 $(this).parent().next().prop('name',$(this).parent().next().text());
+	 $(this).parent().next().text("*******");
+	 }
+	 }); */
+    $(document).on('change', '.my-select', function() {
+        $(".my-card-list").empty();
+        pageNumber=0;
+        getGiftList($(this).val());
+    });
+    mui('body').on('tap', '.btn-details', function() {
+        var th=this;
+        mui.openWindow({
+            url: '/watero/view/gift_card_exchange_details.html?name='+th.getAttribute("id")+'&psw='+th.getAttribute("name")
+        });
+    });
+</script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video.html

@@ -1,66 +1,66 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style type="text/css">
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style type="text/css">
 		.my_iframe{width:100%;min-height: 250px;}
-		</style>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
-		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-	<div class="mui-content">
-		<iframe class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=o0344c2okps&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		<div class="mui-content-padded">
-			<ul>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;迄今，现有水源被检测出有2221种有机污染物，其中自来水中发现65种，20种能致癌，56种能致突变。我们每喝一口的自来水，氯气净化下，烧开后残留的余氯会生成致癌物三氯甲烷，长期饮用对人体造成非常大的危害。所以直接饮用自来水烧开后的水也不是健康的选择，对自来水进行再净化已是普遍健康共识。</li><br/>
-				<li><b>Watero，美国标准 高端净水专家</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;通过美国NSF协会认证／美国FDA资质认证／美国美国密歇根州指定签约品牌在全球最大的科技博客，有“美国互联网产业风向标”之称的科技创意项目TechCrunch大赛上，荣获亚军。<br /></li>
-				<li><b>4级净化 至真至纯</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;采用美国进口4级滤芯，RO反渗透膜， 3秒即热即饮滤除99%的各种重金属污染物，10秒完成净化<br /></li>
-				<li><b>5档水温 好生活DNA</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;25°C-直饮，40°C-奶粉、60°C-蜂蜜、85°C-咖啡、100°C-泡茶让品茶更品水，让咖啡浪漫续杯，让一汤好水煨出一盅靓汤，让清粥成珍酿...<br /></li>
-				<li><b>废水比3:1 航空科技净水</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;运用航天科技净水理念，高效节水，减少66%的废水纯废水比3：1，过滤4杯水，只有1杯是废水，实现水的高效环保<br /></li>
-				<li><b>免除安装 TDS智能显示</b><br /></li>
-				<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;创新一体式设计，告别繁琐安装，卧室、客厅、厨房均可自由移动放置控制面板TDS智能显示，进出水质值一目了然，纯净度看的见，喝的放心<br /></li>
-			</ul>
+	</style>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content">
+	<iframe class="my_iframe" src="//v.qq.com/iframe/player.html?vid=o0344c2okps&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+	<div class="mui-content-padded">
+		<ul>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;迄今，现有水源被检测出有2221种有机污染物，其中自来水中发现65种，20种能致癌，56种能致突变。我们每喝一口的自来水，氯气净化下，烧开后残留的余氯会生成致癌物三氯甲烷，长期饮用对人体造成非常大的危害。所以直接饮用自来水烧开后的水也不是健康的选择，对自来水进行再净化已是普遍健康共识。</li><br/>
+			<li><b>Watero，美国标准 高端净水专家</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;通过美国NSF协会认证／美国FDA资质认证／美国美国密歇根州指定签约品牌在全球最大的科技博客，有“美国互联网产业风向标”之称的科技创意项目TechCrunch大赛上，荣获亚军。<br /></li>
+			<li><b>4级净化 至真至纯</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;采用美国进口4级滤芯，RO反渗透膜， 3秒即热即饮滤除99%的各种重金属污染物，10秒完成净化<br /></li>
+			<li><b>5档水温 好生活DNA</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;25°C-直饮，40°C-奶粉、60°C-蜂蜜、85°C-咖啡、100°C-泡茶让品茶更品水，让咖啡浪漫续杯，让一汤好水煨出一盅靓汤，让清粥成珍酿...<br /></li>
+			<li><b>废水比3:1 航空科技净水</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;运用航天科技净水理念，高效节水，减少66%的废水纯废水比3：1，过滤4杯水，只有1杯是废水，实现水的高效环保<br /></li>
+			<li><b>免除安装 TDS智能显示</b><br /></li>
+			<li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;创新一体式设计，告别繁琐安装，卧室、客厅、厨房均可自由移动放置控制面板TDS智能显示，进出水质值一目了然，纯净度看的见，喝的放心<br /></li>
+		</ul>
 	</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/iamberry_video.js"></script>
-	</body>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/iamberry_video.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/iamberry_video_list.html

@@ -1,65 +1,65 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="css/mui.min.css">
-		<link rel="stylesheet" type="text/css" href="css/shop/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="css/shop/style.css" />
-		<style>
-			.mui-grid-view:before,.mui-grid-view:after{display: none;}
-			.icon-hot{color: #e90b54;font-size: 20px;}
-		</style>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/mui.min.css">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/shop/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/shop/style.css" />
+	<style>
+		.mui-grid-view:before,.mui-grid-view:after{display: none;}
+		.icon-hot{color: #e90b54;font-size: 20px;}
+	</style>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
 
-		<div class="mui-content" style="background: #fff;">
-			<iframe class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=z0318vtrn4c&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-			<div style="margin: 0 10px;">
-				<ul>
-					<li>爱贝源智能冲奶机</li>
-					<li><p class="cl-9">正确操作篇</p></li>
-					<li></li>
-					<li><span class="iconfont icon-hot"></span>热门视频</li>
-				</ul>
-			</div>
-			<ul class="mui-table-view mui-grid-view">
-				
-		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=t0313illa3u&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——如何连接APP篇</div>
-		        </li>
-		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=p0312bl06ak&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——温度测试篇</div>
-		        </li>
-		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=y0315x9b86z&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶量测试篇</div>
-		        </li>
-		        <li class="mui-table-view-cell mui-media mui-col-xs-6">
-		            <iframe class="my_iframe1" src="https://v.qq.com/iframe/player.html?vid=g0317oa3yu3&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
-		            <div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶机的日常清洁 </div>
-		        </li>
-		    </ul>  
-		</div>
-	<script type="text/javascript" src="js/mui.min.js"></script>
-	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
-	<script type="text/javascript" src="js/shop/main.js"></script>
-	<script type="text/javascript">
-	mui.ready(function(){
-		document.querySelector('.loading-bg').style.display='none';
-	});	
-		</script>
-	</body>
+<div class="mui-content" style="background: #fff;">
+	<iframe class="my_iframe" src="//v.qq.com/iframe/player.html?vid=z0318vtrn4c&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+	<div style="margin: 0 10px;">
+		<ul>
+			<li>爱贝源智能冲奶机</li>
+			<li><p class="cl-9">正确操作篇</p></li>
+			<li></li>
+			<li><span class="iconfont icon-hot"></span>热门视频</li>
+		</ul>
+	</div>
+	<ul class="mui-table-view mui-grid-view">
+
+		<li class="mui-table-view-cell mui-media mui-col-xs-6">
+			<iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=t0313illa3u&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——如何连接APP篇</div>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-xs-6">
+			<iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=p0312bl06ak&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——温度测试篇</div>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-xs-6">
+			<iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=y0315x9b86z&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶量测试篇</div>
+		</li>
+		<li class="mui-table-view-cell mui-media mui-col-xs-6">
+			<iframe class="my_iframe1" src="//v.qq.com/iframe/player.html?vid=g0317oa3yu3&tiny=0&auto=0" frameborder=0 allowfullscreen></iframe>
+			<div class="mui-text-left ft-12 cl-9">爱贝源智能冲奶机——奶机的日常清洁 </div>
+		</li>
+	</ul>
+</div>
+<script type="text/javascript" src="//s.iamberry.com/js/mui.min.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/js/jquery-2.1.1.min.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/js/shop/main.js"></script>
+<script type="text/javascript">
+    mui.ready(function(){
+        document.querySelector('.loading-bg').style.display='none';
+    });
+</script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html

@@ -1,112 +1,112 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta http-equiv="pragma" content="no-cache">
-		<meta http-equiv="cache-control" content="no-cache">
-		<meta http-equiv="expires" content="0"> 
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="format-detection" content="telphone=no, email=no" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telphone=no, email=no" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item mui-active">
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item go_gwc">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<div class="mui-content">
-			<!--商城首页begin-->
-			<div id="banner-slider" class="mui-slider">
-				<div class="mui-slider-group mui-slider-loop" id="mui-slider-loop">
-				   
-				</div>
-				<div id="my-slider-indicator" class="mui-slider-indicator my-slider-indicator">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item mui-active">
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item go_gwc">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content">
+	<!--商城首页begin-->
+	<div id="banner-slider" class="mui-slider">
+		<div class="mui-slider-group mui-slider-loop" id="mui-slider-loop">
 
-				</div>
-			</div>
-
-	
-<!--			 <ul class="mui-table-view mui-grid-view mui-grid-9 chanpin-box" id="chanpin-box">
- 		            <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
-		                   <div class="mui-table-view-cell mui-col-xs-6 bg-blue">
-		                    <img width="100%" src="/iamberry/common/shop/images/chanpin-3.png" />
-		                    </div>
-		                     <div class="mui-table-view-cell mui-col-xs-6">
-		                    <div class="chanpin-text cl-blue">
-		                    <div>Watero</div>
-		                    <div class="ft-12">蓝色非常纯净让人联想到海洋、天空、水、宇宙。</div>
-		                    </div>
-		                    </div>
-		            </li>
-		            <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
-		                    <div class="mui-table-view-cell mui-col-xs-6">
-		                    <div class="chanpin-text cl-black">
-		                    <div>Watero</div>
-		                    <div class="ft-12">黑色非常深沉，庄重，神秘，和重心感。</div>
-		                    </div>
-		                    </div>
-		                    <div class="mui-table-view-cell mui-col-xs-6 bg-black">
-		                    <img width="100%" src="/iamberry/common/shop/images/chanpin-4.png" />
-		                    </div>
-		            </li>
-		             <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
-		                   <div class="mui-table-view-cell mui-col-xs-6 bg-green">
-		                    <img width="100%" src="/iamberry/common/shop/images/chanpin-5.png" />
-		                    </div>
-		                     <div class="mui-table-view-cell mui-col-xs-6">
-		                    <div class="chanpin-text cl-green">
-		                    <div>Watero</div>
-		                    <div class="ft-12">绿色最为平和、安稳。是一种柔顺、恬静、满足、优美的色。</div>
-		                    </div>
-		                    </div>
-		            </li>
-		             <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
-		                    <div class="mui-table-view-cell mui-col-xs-6">
-		                    <div class="chanpin-text cl-red">
-		                    <div>Watero</div>
-		                    <div class="ft-12">红色容易引起注意，也容易使人兴奋、激动、紧张、冲动。</div>
-		                    </div>
-		                    </div><div class="mui-table-view-cell mui-col-xs-6 bg-red">
-		                    <img width="100%" src="/watero/common/shop/images/chanpin-6.png" />
-		                    </div>
-		            </li> 
-		       </ul> 	-->	
+		</div>
+		<div id="my-slider-indicator" class="mui-slider-indicator my-slider-indicator">
 
-			<div class="mui-content-padded my-content-padded" id="advs_banner">
-			</div>
-			<!--商城首页end-->
 		</div>
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js?v22323=32232"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js?v11311111211"></script>
-		<script src="/watero/waterojs/shop/index.js?1=1"></script>
-	</body>
+	</div>
+
+
+	<!--			 <ul class="mui-table-view mui-grid-view mui-grid-9 chanpin-box" id="chanpin-box">
+                         <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
+                               <div class="mui-table-view-cell mui-col-xs-6 bg-blue">
+                                <img width="100%" src="/iamberry/common/shop/images/chanpin-3.png" />
+                                </div>
+                                 <div class="mui-table-view-cell mui-col-xs-6">
+                                <div class="chanpin-text cl-blue">
+                                <div>Watero</div>
+                                <div class="ft-12">蓝色非常纯净让人联想到海洋、天空、水、宇宙。</div>
+                                </div>
+                                </div>
+                        </li>
+                        <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
+                                <div class="mui-table-view-cell mui-col-xs-6">
+                                <div class="chanpin-text cl-black">
+                                <div>Watero</div>
+                                <div class="ft-12">黑色非常深沉，庄重，神秘，和重心感。</div>
+                                </div>
+                                </div>
+                                <div class="mui-table-view-cell mui-col-xs-6 bg-black">
+                                <img width="100%" src="/iamberry/common/shop/images/chanpin-4.png" />
+                                </div>
+                        </li>
+                         <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
+                               <div class="mui-table-view-cell mui-col-xs-6 bg-green">
+                                <img width="100%" src="/iamberry/common/shop/images/chanpin-5.png" />
+                                </div>
+                                 <div class="mui-table-view-cell mui-col-xs-6">
+                                <div class="chanpin-text cl-green">
+                                <div>Watero</div>
+                                <div class="ft-12">绿色最为平和、安稳。是一种柔顺、恬静、满足、优美的色。</div>
+                                </div>
+                                </div>
+                        </li>
+                         <li class="mui-table-view-cell mui-col-xs-12 mui-col-sm-12">
+                                <div class="mui-table-view-cell mui-col-xs-6">
+                                <div class="chanpin-text cl-red">
+                                <div>Watero</div>
+                                <div class="ft-12">红色容易引起注意，也容易使人兴奋、激动、紧张、冲动。</div>
+                                </div>
+                                </div><div class="mui-table-view-cell mui-col-xs-6 bg-red">
+                                <img width="100%" src="/watero/common/shop/images/chanpin-6.png" />
+                                </div>
+                        </li>
+                   </ul> 	-->
+
+	<div class="mui-content-padded my-content-padded" id="advs_banner">
+	</div>
+	<!--商城首页end-->
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=20170622"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/index.js?v=2016111701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/order_details.html

@@ -1,105 +1,105 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="format-detection" content="telphone=no, email=no" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-		<div class="mui-loading">
-			<div class="mui-spinner">
-			</div>
-			&nbsp;&nbsp;加载中...
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telphone=no, email=no" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
+		&nbsp;&nbsp;加载中...
 	</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-	<div class="mui-content" >
-		<ul class="mui-table-view my-order-list more">
-			<!--<li class="mui-table-view-cell" style="color:red"><div>若在万圣节活动中抽中奖品，将与此订单一起发出</div></li>-->
-			<li class="mui-table-view-cell">订单状态：<span  style="color:#007aff;" id="salesStatus" class="ft-14"></span></li>
-			<li class="mui-table-view-cell">订单编号：<span id="salesOrderid" class="ft-14"></span></li>
-			<li class="mui-table-view-cell">下单时间：<span id="salesCreateDate" class="ft-14"></span></li>
-			<!-- <li class="mui-table-view-cell" id="choujiang" style="display:none"><div><button class="mui-btn mui-btn-red go_luck_draw" id="check-luck-draw" value="">立即前往抽奖</button></div></li> -->
-			<li style="text-align: center;padding: 10px 0;"><button type="button" id="orderPay" onclick="goOrderPay();" class="mui-btn mui-btn-green" style="width: 40%; display: none;">微信支付</button></li>
-		</ul>
-		<ul class="mui-table-view more">
-			<li class="mui-table-view-cell">商品金额：<span class="cl-red ft-14" id="salesAmount"></span> <span class="mui-pull-right">支付金额：<span class="cl-red ft-14" id="salesYetAmount"></span></span> </li>
-			<li id="couponMoney" class="mui-table-view-cell"><span class="mui-pull-left">优惠券抵扣金额：</span><span class="cl-red ft-14" id="couponReduce"></span></li>
-			<li class="mui-table-view-cell"><span class="mui-pull-left">收货地址：</span><span class="line-clamp-3 ft-14" id="salesAddressInfo"></span></li>
-			<li class="mui-table-view-cell">收货人：<span id="salesAddressName" class="ft-14"></span>      <span id="salesAddressTel" class="ft-14"></span></li>
-			<li class="mui-table-view-cell"><span class="mui-pull-left">备&nbsp;&nbsp;&nbsp;&nbsp;注：</span><span class="line-clamp-3 ft-14" id="salesUserRemark"></span></li>
-			<li class="mui-table-view-cell" id="showLogistics">
-				<span class="mui-pull-left">物流信息：</span>
-				<span class="mui-pull-left ft-14 show_post_info" id="logistics" postfirm="" postnum="" gourl="">
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content" >
+	<ul class="mui-table-view my-order-list more">
+		<!--<li class="mui-table-view-cell" style="color:red"><div>若在万圣节活动中抽中奖品，将与此订单一起发出</div></li>-->
+		<li class="mui-table-view-cell">订单状态：<span  style="color:#007aff;" id="salesStatus" class="ft-14"></span></li>
+		<li class="mui-table-view-cell">订单编号：<span id="salesOrderid" class="ft-14"></span></li>
+		<li class="mui-table-view-cell">下单时间：<span id="salesCreateDate" class="ft-14"></span></li>
+		<!-- <li class="mui-table-view-cell" id="choujiang" style="display:none"><div><button class="mui-btn mui-btn-red go_luck_draw" id="check-luck-draw" value="">立即前往抽奖</button></div></li> -->
+		<li style="text-align: center;padding: 10px 0;"><button type="button" id="orderPay" onclick="goOrderPay();" class="mui-btn mui-btn-green" style="width: 40%; display: none;">微信支付</button></li>
+	</ul>
+	<ul class="mui-table-view more">
+		<li class="mui-table-view-cell">商品金额：<span class="cl-red ft-14" id="salesAmount"></span> <span class="mui-pull-right">支付金额：<span class="cl-red ft-14" id="salesYetAmount"></span></span> </li>
+		<li id="couponMoney" class="mui-table-view-cell"><span class="mui-pull-left">优惠券抵扣金额：</span><span class="cl-red ft-14" id="couponReduce"></span></li>
+		<li class="mui-table-view-cell"><span class="mui-pull-left">收货地址：</span><span class="line-clamp-3 ft-14" id="salesAddressInfo"></span></li>
+		<li class="mui-table-view-cell">收货人：<span id="salesAddressName" class="ft-14"></span>      <span id="salesAddressTel" class="ft-14"></span></li>
+		<li class="mui-table-view-cell"><span class="mui-pull-left">备&nbsp;&nbsp;&nbsp;&nbsp;注：</span><span class="line-clamp-3 ft-14" id="salesUserRemark"></span></li>
+		<li class="mui-table-view-cell" id="showLogistics">
+			<span class="mui-pull-left">物流信息：</span>
+			<span class="mui-pull-left ft-14 show_post_info" id="logistics" postfirm="" postnum="" gourl="">
 					<span id="salesPostFirm"></span>  
 					<span id="salesPostNum"></span><br>
-					<!-- <span ><a>查看物流>></a></span> -->
+				<!-- <span ><a>查看物流>></a></span> -->
 				</span>
-			</li>
+		</li>
+	</ul>
+	<div id="orderDiv">
+		<ul class="mui-table-view my-order-list shopping-cart-list">
 		</ul>
-		<div id="orderDiv">
-			<ul class="mui-table-view my-order-list shopping-cart-list">
-			</ul>
+	</div>
+	<div style="background: #fff;padding: 0 10px;">
+		<div><input type="hidden" id="salesLockType" value=""></div>
+		<div><input type="hidden" id="oldStatus" value=""></div>
+		<div style="text-align: center;padding: 10px 0; display: none" id="cancelOrder"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">取消订单</button></div>
+		<!-- <input name="" id="changeOrderId"/>-->
+		<div style="text-align: center;padding: 10px 0; display: none" id="exchangeOrder">
+			<button type="button" class="mui-btn mui-btn-grey" onclick="operation('1');">申请换货</button>
 		</div>
-		<div style="background: #fff;padding: 0 10px;">
-			<div><input type="hidden" id="salesLockType" value=""></div>
-			<div><input type="hidden" id="oldStatus" value=""></div>
-			<div style="text-align: center;padding: 10px 0; display: none" id="cancelOrder"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">取消订单</button></div>
-			<!-- <input name="" id="changeOrderId"/>-->
-			<div style="text-align: center;padding: 10px 0; display: none" id="exchangeOrder">
-				<button type="button" class="mui-btn mui-btn-grey" onclick="operation('1');">申请换货</button>
-			</div>
-			<div id="refund" style="display: none">
+		<div id="refund" style="display: none">
 			<br>
-				<textarea placeholder="退款备注，必填" id="return-money-id"></textarea>
-				<div>
-					<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">申请退款</button></div>
-				</div>
+			<textarea placeholder="退款备注，必填" id="return-money-id"></textarea>
+			<div>
+				<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation();">申请退款</button></div>
 			</div>
-			<div id="salesReturn" style="display: none">
+		</div>
+		<div id="salesReturn" style="display: none">
 			<br>
-				<textarea placeholder="退货备注，必填" id="return-pay-id"></textarea>
-				<div>
-					<!-- <input name="" id="returnOrderId"/>-->
-					<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation('2');">申请退货</button></div>
-				</div>
+			<textarea placeholder="退货备注，必填" id="return-pay-id"></textarea>
+			<div>
+				<!-- <input name="" id="returnOrderId"/>-->
+				<div style="text-align: center;padding:0 0 10px 0;"><button type="button" class="mui-btn mui-btn-grey" onclick="operation('2');">申请退货</button></div>
 			</div>
 		</div>
 	</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wap-alert/layer.js"></script>
-	<script src="/watero/waterojs/shop/validate.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/order_details.js"></script>
-	</body>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2017062201"></script>
+<script src="//s.iamberry.com/watero/js/shop/wap-alert/layer.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/validate.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/order_details.js?v=2017062201"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/order_list.html

@@ -1,101 +1,101 @@
-	<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="format-detection" content="telephone=no" />
-		<meta name="apple-mobile-web-app-capable" content="yes" />
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="format-detection" content="telphone=no, email=no" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.picker.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/order_list.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="format-detection" content="telephone=no" />
+	<meta name="apple-mobile-web-app-capable" content="yes" />
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telphone=no, email=no" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.picker.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/order_list.css?v=2017030802" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item">
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item mui-active">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<header class="mui-bar mui-bar-nav header">
-			<div class="go-index go_index">
-				<img src="/watero/wateroimages/shop/logo.png" />
-			</div>
-			<button type="button" class="mui-btn mui-icon mui-icon-search my-right"></button>
-			<div class="search-box">
-				<div class="mui-input-row mui-search my-search">
-				<input id="order-list-search" type="search" class="mui-input-clear" placeholder="搜索产品名、订单号">
-				</div>
-				<div class="mui-input-row">
-				<input id='mydate' type="text" class="mui-text-center" placeholder="选择日期">
-				</div>
-			</div>
-		</header>
-		<div class="mui-segmented-control tab-with-orderlist">
-			<a class="mui-control-item icon-topay mui-active" tabindex="0">
-				<span class="iconfont icon-daifukuan"></span>
-				<span class="mui-tab-label">待支付</span>
-			</a>
-			<a class="mui-control-item icon-todelivery" tabindex="1">
-				<span class="iconfont icon-daifahuo"></span>
-				<span class="mui-tab-label">待发货</span>
-			</a>
-			<a class="mui-control-item icon-delivery" tabindex="2">
-				<span class="iconfont icon-yifahuo"></span>
-				<span class="mui-tab-label">已发货</span>
-			</a>
-			<a class="mui-control-item icon-allorder" tabindex="3">
-				<span class="iconfont icon-alldingdan"></span>
-				<span class="mui-tab-label">全部订单</span>
-			</a>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item">
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item mui-active">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<header class="mui-bar mui-bar-nav header">
+	<div class="go-index go_index">
+		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
+	</div>
+	<button type="button" class="mui-btn mui-icon mui-icon-search my-right"></button>
+	<div class="search-box">
+		<div class="mui-input-row mui-search my-search">
+			<input id="order-list-search" type="search" class="mui-input-clear" placeholder="搜索产品名、订单号">
 		</div>
-		<!--下拉刷新容器-->
-		<div id="pullrefresh_order_list" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-scroll-order">
-
-				</ul>
-			</div>
+		<div class="mui-input-row">
+			<input id='mydate' type="text" class="mui-text-center" placeholder="选择日期">
 		</div>
-		
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/mui.picker.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/layer.js"></script>
-		<script src="/watero/waterojs/validate.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/order_list.js"></script>
-	</body>
+	</div>
+</header>
+<div class="mui-segmented-control tab-with-orderlist">
+	<a class="mui-control-item icon-topay mui-active" tabindex="0">
+		<span class="iconfont icon-daifukuan"></span>
+		<span class="mui-tab-label">待支付</span>
+	</a>
+	<a class="mui-control-item icon-todelivery" tabindex="1">
+		<span class="iconfont icon-daifahuo"></span>
+		<span class="mui-tab-label">待发货</span>
+	</a>
+	<a class="mui-control-item icon-delivery" tabindex="2">
+		<span class="iconfont icon-yifahuo"></span>
+		<span class="mui-tab-label">已发货</span>
+	</a>
+	<a class="mui-control-item icon-allorder" tabindex="3">
+		<span class="iconfont icon-alldingdan"></span>
+		<span class="mui-tab-label">全部订单</span>
+	</a>
+</div>
+<!--下拉刷新容器-->
+<div id="pullrefresh_order_list" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-scroll-order">
+
+		</ul>
+	</div>
+</div>
+
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/mui.picker.min.js"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2017062201"></script>
+<script src="//s.iamberry.com/watero/js/shop/layer.js"></script>
+<script src="//s.iamberry.com/watero/js/validate.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/order_list.js?v=2017062201"></script>
+</body>
 
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/pay_win.html

@@ -1,74 +1,74 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<header class="mui-bar mui-bar-nav header">
-				<div class="go-index go_index">
-					<img src="/watero/wateroimages/shop/logo.png" />
-				</div>
-		</header>
-		<div class="mui-content" style="background: #fff;display: none;" id="show-div-data">
-			<div class="pl-win-tt">
-			<img style="width: 1.5em;" src="/watero/wateroimages/shop/pay-win.jpg"><span class="sp"> 恭喜您，支付成功！</span>
-			<div>已支付：<span class="cl-red">¥<font id="pay-money-total">0.0</font>元</span></div>
-			</div>
-			<ul class="pay_win_list">
-				<li>订单编号：<span class="cl-0" id="orderid-span">加载中...</span></li>
-				<li>支付时间：<span class="cl-0" id="pay-date-span">加载中...</span></li>
-				<li><a class="go_order_details" href="#" id="check-order-desc" value="">查看订单详情&gt;&gt;</a> </li>
-				<!-- <li><a class="go_luck_draw" href="#"  id="check-luck-draw"  value="">去抽奖&gt;&gt;</a></li> -->
-			</ul>
-		</div>
-		<!-- <div class="mui-content-padded">
-				<a href="#" class="go_luck_draw" id="check-luck-draw" value=""><img width="100%" src="/iamberry/common/shop/images/wheel-buy-yes.jpg" /></a>
-			</div> -->
-		<div class="mui-content" style="background: #fff;" id="now-load-data-div-bg">
-			<ul class="pay_win_list">
-				<li><span class="cl-0">正在加载数据...</span></li>
-			</ul>
-		</div>
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/pay_win.js"></script>
-	</body>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<header class="mui-bar mui-bar-nav header">
+	<div class="go-index go_index">
+		<img src="//s.iamberry.com/watero/images/shop/logo.png" />
+	</div>
+</header>
+<div class="mui-content" style="background: #fff;display: none;" id="show-div-data">
+	<div class="pl-win-tt">
+		<img style="width: 1.5em;" src="//s.iamberry.com/watero/images/shop/pay-win.jpg"><span class="sp"> 恭喜您，支付成功！</span>
+		<div>已支付：<span class="cl-red">¥<font id="pay-money-total">0.0</font>元</span></div>
+	</div>
+	<ul class="pay_win_list">
+		<li>订单编号：<span class="cl-0" id="orderid-span">加载中...</span></li>
+		<li>支付时间：<span class="cl-0" id="pay-date-span">加载中...</span></li>
+		<li><a class="go_order_details" href="#" id="check-order-desc" value="">查看订单详情&gt;&gt;</a> </li>
+		<!-- <li><a class="go_luck_draw" href="#"  id="check-luck-draw"  value="">去抽奖&gt;&gt;</a></li> -->
+	</ul>
+</div>
+<!-- <div class="mui-content-padded">
+        <a href="#" class="go_luck_draw" id="check-luck-draw" value=""><img width="100%" src="/iamberry/common/shop/images/wheel-buy-yes.jpg" /></a>
+    </div> -->
+<div class="mui-content" style="background: #fff;" id="now-load-data-div-bg">
+	<ul class="pay_win_list">
+		<li><span class="cl-0">正在加载数据...</span></li>
+	</ul>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/pay_win.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/personal_information.html

@@ -1,70 +1,70 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.picker.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.poppicker.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/personal_information.css" />
-	</head>
-	<body style="background: #fff;">
-		<div class="loading-bg">
-				<div class="mui-loading">
-					<div class="mui-spinner">
-					</div>
-					&nbsp;&nbsp;加载中...
-				</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.picker.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.poppicker.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/personal_information.css?v=2016101701" />
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<div class="mui-content" style="background: #fff;">
-			<ul class="mui-table-view more">
-				<li class="mui-table-view-cell">
-					<a id="head" >我的头像
-					<span class="mui-pull-right head">
-						<img class="head-img mui-action-preview" id="userhead" src="/watero/wateroimages/shop/image-12.jpg"/>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content" style="background: #fff;">
+	<ul class="mui-table-view more">
+		<li class="mui-table-view-cell">
+			<a id="head" >我的头像
+				<span class="mui-pull-right head">
+						<img class="head-img mui-action-preview" id="userhead" src="//s.iamberry.com/watero/images/shop/image-12.jpg"/>
 					</span>
-				</a>
-				</li>
-				<li class="mui-table-view-cell">
-					<a>我的昵称<span class="mui-pull-right" id="nickname">爱贝源</span></a>
-				</li>
-				<li class="mui-table-view-cell">
-					<a>我的身份<span class="mui-pull-right" id="userRoleName">商户</span></a>
-				</li>
-			</ul>
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell">
-					<a>真实姓名<span class="mui-pull-right" id="ipt-name"></span></a>
-				</li>
-				<li class="mui-table-view-cell">
-					<a>手机号码<span class="mui-pull-right" id="ipt-phone"></span></a>
-				</li>
-				<li class="mui-table-view-cell">
-					<a>店铺名称<span class="mui-pull-right" id="ipt-shop-name"></span></a>
-				</li>
-				</li><li class="mui-table-view-cell">
-					<a id='showCityPicker3'>店铺区域<span class="mui-pull-right" id="city"></span></a>
-				</li>
-				</li><li class="mui-table-view-cell">
-					<a>详细地址<span class="mui-pull-right" id="ipt-address"></span></a>
-				</li>
-			</ul>
-			<br />
-			<div class="mui-content-padded" style="display:none" id="updateBtn">
-				<button type="button" class="mui-btn mui-btn-block mui-btn-outlined mui-active" disabled="disabled" id="btn_submit">信息正在审核中</button>
-			</div>
-			<div class="mui-content-padded" onclick="toDrpCenter()">
-				<button type="button" class="mui-btn mui-btn-block mui-btn-red" id="to_drp_center">返回代理中心</button>
-			</div>
-		</div>
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/personal_information.js"></script>
-	</body>
+			</a>
+		</li>
+		<li class="mui-table-view-cell">
+			<a>我的昵称<span class="mui-pull-right" id="nickname">爱贝源</span></a>
+		</li>
+		<li class="mui-table-view-cell">
+			<a>我的身份<span class="mui-pull-right" id="userRoleName">商户</span></a>
+		</li>
+	</ul>
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			<a>真实姓名<span class="mui-pull-right" id="ipt-name"></span></a>
+		</li>
+		<li class="mui-table-view-cell">
+			<a>手机号码<span class="mui-pull-right" id="ipt-phone"></span></a>
+		</li>
+		<li class="mui-table-view-cell">
+			<a>店铺名称<span class="mui-pull-right" id="ipt-shop-name"></span></a>
+		</li>
+		</li><li class="mui-table-view-cell">
+		<a id='showCityPicker3'>店铺区域<span class="mui-pull-right" id="city"></span></a>
+	</li>
+		</li><li class="mui-table-view-cell">
+		<a>详细地址<span class="mui-pull-right" id="ipt-address"></span></a>
+	</li>
+	</ul>
+	<br />
+	<div class="mui-content-padded" style="display:none" id="updateBtn">
+		<button type="button" class="mui-btn mui-btn-block mui-btn-outlined mui-active" disabled="disabled" id="btn_submit">信息正在审核中</button>
+	</div>
+	<div class="mui-content-padded" onclick="toDrpCenter()">
+		<button type="button" class="mui-btn mui-btn-block mui-btn-red" id="to_drp_center">返回代理中心</button>
+	</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/personal_information.js?v=2016101801"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/share_zhuanpan.html

@@ -1,221 +1,218 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/shop/style.css" />
-		<style>
-			.clear{clear:both;}
-			/* 大转盘样式 */
-			.drawbanner{display:block;width:85%;margin:0 auto;}
-			.drawbanner .turnplate{display:block;width:100%;position:relative;}
-			.drawbanner .turnplate canvas.item{width:100%;}
-			.drawbanner .turnplate img.pointer{ 
-				position: absolute;
-			    width: 25%;
-			    height: 30%;
-			    left: 37.5%;
-			    top: 32%;
-			}
-			#img-box{display:none;}		
-		</style>
-	</head>
-
-	<body style="background: #fff3f4;">
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
-		</div>
-		
-		<div class="mui-content" style="background: #fff3f4;">
-			<div style="margin-bottom: 10px;">
-				<img width="100%" src="/watero/common/shop/images/wheel-title1.png" />
-			</div>
-	<div style="position: relative;">
-<div id="img-box">
+<head>
+	<meta charset="utf-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/shop/style.css?v=2016101701" />
+	<style>
+		.clear{clear:both;}
+		/* 大转盘样式 */
+		.drawbanner{display:block;width:85%;margin:0 auto;}
+		.drawbanner .turnplate{display:block;width:100%;position:relative;}
+		.drawbanner .turnplate canvas.item{width:100%;}
+		.drawbanner .turnplate img.pointer{
+			position: absolute;
+			width: 25%;
+			height: 30%;
+			left: 37.5%;
+			top: 32%;
+		}
+		#img-box{display:none;}
+	</style>
+</head>
 
-  </div>
-	<div class="drawbanner">
-		<div class="turnplate" style="background-image:url(/watero/common/shop/images/turnplate-bg.png);background-size:100% 98%;background-repeat: no-repeat;">
-			<canvas class="item" id="wheelcanvas" width="422px" height="422px"></canvas>
-			<img class="pointer" src="/watero/common/shop/images/turnplate-pointer.png"/>
+<body style="background: #fff3f4;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
+		&nbsp;&nbsp;加载中...
 	</div>
-	<div style="text-align: center;">
-		<button class="pointer" type="button" style="background: #e9004c;color: #fff;border: 0;border-radius: 5px;display: block;width:70%;margin:20px 15%;padding:11px 0;">立即抽奖</button>
-	</div>
+</div>
+
+<div class="mui-content" style="background: #fff3f4;">
+	<div style="margin-bottom: 10px;">
+		<img width="100%" src="/iamberry/common/shop/images/wheel-title1.png" />
 	</div>
-				
+	<div style="position: relative;">
+		<div id="img-box">
+
+		</div>
+		<div class="drawbanner">
+			<div class="turnplate" style="background-image:url(/iamberry/common/shop/images/turnplate-bg.png);background-size:100% 98%;background-repeat: no-repeat;">
+				<canvas class="item" id="wheelcanvas" width="422px" height="422px"></canvas>
+				<img class="pointer" src="/iamberry/common/shop/images/turnplate-pointer.png"/>
+			</div>
+		</div>
+		<div style="text-align: center;">
+			<button class="pointer" type="button" style="background: #e9004c;color: #fff;border: 0;border-radius: 5px;display: block;width:70%;margin:20px 15%;padding:11px 0;">立即抽奖</button>
+		</div>
 	</div>
 
-	</div>	
-		<script src="/watero/common/shop/js/mui.min.js"></script>
-		<script src="/watero/common/shop/js/jquery-2.1.1.min.js"></script>
-		<script src="/watero/common/shop/js/awardRotate.js"></script>
-		<script src="/watero/common/shop/js/main.js"></script>
-		<script type="text/javascript" src="/watero/common/js/utils/wechat-utils-1.0.js"></script>
-		<script type="text/javascript">
-		var turnplate={
-				restaraunts:[],				//大转盘奖品名称
-				colors:[],					//大转盘奖品区块对应背景颜色
-				outsideRadius:166,			//大转盘外圆的半径
-				textRadius:140,				//大转盘奖品位置距离圆心的距离
-				insideRadius:40,			//大转盘内圆的半径
-				startAngle:0,				//开始角度
-				bRotate:false				//false:停止;ture:旋转
-		};
-		
-		var prizeList = null;
-		
-		$(document).ready(function(){
-			window.repleFlag = false;
-			window.wxFriend = {
-				    "appId": "",
-				    "imgUrl":domanUrl + '/watero/common/shop/images/1.png',
-				    "link":domanUrl+"/watero/wechat/activity/share_luck_draw",
-				    "desc":"哎呀！我差一点就抽到iPhone7了！亮黑版，32G啊！小伙伴你也来试试吧！",//描述
-				    "title":"我离iPhone7亮黑版 32G仅一步之遥，小伙伴你快来一起抽吧！",			//标题
-				    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
-				    "shareTimeSuccess":"分享成功",		//这里是分享朋友圈后调用的文字
-				    "shareTimeCancel":"已取消分享",	//这里是取消分享给朋友圈后调用的文字
-				    "shareAppSuccess":"分享成功",		    //这里是分享好友后调用的文字
-				    "shareAppCancel":"已取消分享"	//这里是取消分享给好友后调用的文字
-			};
-			getConfig();
-			
-			//动态添加大转盘的奖品与奖品区域背景颜色
-			$.ajax('/watero/wechat/game/get_prize_info',{
-				data: {
-					prizeGameId:1
-				},
-                xhrFields: {
-                    withCredentials: true
-                },
-				dataType:'json',
-				async:true,
-				type:'post',
-				timeout:15000,
-				success:function(dt){
-					if (dt.status) {
-						prizeList = dt.data;
-						//console.log(prizeList);
-						
-						mui(prizeList).each(function(index){
-							turnplate.restaraunts[index] = this.prizeName;
-							if ((index + 1) % 2 == 0) {
-								turnplate.colors[index] = "#ff9c9d";
-							} else {
-								if (index == (prizeList.length - 1)) {
-									turnplate.colors[index] = "#f99eaa";
-								} else {
-									turnplate.colors[index] = "#f76f7d";
-								}
-							}
-							//先把图片加载出来
-							$("#img-box").append('<img src="'+this.prizeImage+'" id="'+this.prizeId+'"/>');
-						});
-						//防止图片没加载完设置1秒后再绘制canvas
-						setTimeout(function(){
-							drawRouletteWheel()
-							document.querySelector('.loading-bg').style.display = 'none';
-						},1000);
-					} else {
-						
-					}
-				},
-				error:function(xhr,type,errorThrown){
-					
-				}
-			});
-		
-			//旋转转盘 item:奖品位置; txt：提示语;
-			var rotateFn = function (item, txt, to){
-				var angles = item * (360 / turnplate.restaraunts.length) - (360 / (turnplate.restaraunts.length*2));
-				if(angles<270){
-					angles = 270 - angles; 
-				}else{
-					angles = 360 - angles + 270;
-				}
-				$('#wheelcanvas').stopRotate();
-				$('#wheelcanvas').rotate({
-					angle:0,
-					animateTo:(to == null ? (angles+1800) : to),
-					duration:3000,
-					callback:function (){
-						turnplate.bRotate = !turnplate.bRotate;
-					}
-				});
-			};
-		
-		$(".pointer").on("click",function(){
-			//去产品列表
-			mui.openWindow({
-				url: base_path + '/index' //index.html
-			});
-		});		
-			
-		});
-
-		
-		function drawRouletteWheel() { 
-		  var canvas = dc("wheelcanvas");    
-		  if (canvas.getContext) {
-			  //根据奖品个数计算圆周角度
-			  var arc = Math.PI / (turnplate.restaraunts.length/2);
-			  var ctx = canvas.getContext("2d");
-			  //在给定矩形内清空一个矩形
-			  ctx.clearRect(0,0,422,422);
-			  //strokeStyle 属性设置或返回用于笔触的颜色、渐变或模式  
-			  ctx.strokeStyle = "rgba(0,0,0,0)";//边框颜色
-			  //font 属性设置或返回画布上文本内容的当前字体属性
-			  ctx.font = '17px Arial';      
-			  for(var i = 0; i < turnplate.restaraunts.length; i++) {       
-				  //添加对应图标
-				  if (prizeList != null) {
-					  var angle = turnplate.startAngle + i * arc;
-					  ctx.fillStyle = turnplate.colors[i];
-					  ctx.beginPath();
-					  //arc(x,y,r,起始角,结束角,绘制方向) 方法创建弧/曲线（用于创建圆或部分圆）    
-					  ctx.arc(211, 211, turnplate.outsideRadius, angle, angle + arc, false);    
-					  ctx.arc(211, 211, turnplate.insideRadius, angle + arc, angle, true);
-					  ctx.stroke();  
-					  ctx.fill();
-					  //锁画布(为了保存之前的画布状态)
-					  ctx.save();   
-					  
-					  //----绘制奖品开始----
-					  ctx.fillStyle = "#fff";
-					  var text = turnplate.restaraunts[i];
-					  var line_height = 17;
-					  //translate方法重新映射画布上的 (0,0) 位置
-					  ctx.translate(211 + Math.cos(angle + arc / 2) * turnplate.textRadius, 211 + Math.sin(angle + arc / 2) * turnplate.textRadius);
-					  
-					  //rotate方法旋转当前的绘图
-					  ctx.rotate(angle + arc / 2 + Math.PI / 2);
-					  
-					  /** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
-						 //在画布上绘制填色的文本。文本的默认颜色是黑色
-						  //measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
-					  ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
-					  var img= dc(prizeList[i].prizeId);
-					  ctx.drawImage(img,-25,10);
-					 
-					  //把当前画布返回（调整）到上一个save()状态之前 
-				  }
-				  //----绘制奖品结束----
-				  ctx.restore();
-			  }     
-		  } 
-		}
+</div>
+
+</div>
+<script src="/iamberry/common/shop/js/mui.min.js"></script>
+<script src="/iamberry/common/shop/js/jquery-2.1.1.min.js"></script>
+<script src="/iamberry/common/shop/js/awardRotate.js"></script>
+<script src="/iamberry/common/shop/js/main.js"></script>
+<script type="text/javascript" src="/iamberry/common/js/utils/wechat-utils-1.0.js"></script>
+<script type="text/javascript">
+    var turnplate={
+        restaraunts:[],				//大转盘奖品名称
+        colors:[],					//大转盘奖品区块对应背景颜色
+        outsideRadius:166,			//大转盘外圆的半径
+        textRadius:140,				//大转盘奖品位置距离圆心的距离
+        insideRadius:40,			//大转盘内圆的半径
+        startAngle:0,				//开始角度
+        bRotate:false				//false:停止;ture:旋转
+    };
+
+    var prizeList = null;
+
+    $(document).ready(function(){
+        window.repleFlag = false;
+        window.wxFriend = {
+            "appId": "",
+            "imgUrl":domanUrl + '/iamberry/common/shop/images/1.png',
+            "link":domanUrl+"/iamberry/wechat/activity/share_luck_draw",
+            "desc":"哎呀！我差一点就抽到iPhone7了！亮黑版，32G啊！小伙伴你也来试试吧！",//描述
+            "title":"我离iPhone7亮黑版 32G仅一步之遥，小伙伴你快来一起抽吧！",			//标题
+            "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
+            "shareTimeSuccess":"分享成功",		//这里是分享朋友圈后调用的文字
+            "shareTimeCancel":"已取消分享",	//这里是取消分享给朋友圈后调用的文字
+            "shareAppSuccess":"分享成功",		    //这里是分享好友后调用的文字
+            "shareAppCancel":"已取消分享"	//这里是取消分享给好友后调用的文字
+        };
+        getConfig();
+
+        //动态添加大转盘的奖品与奖品区域背景颜色
+        mui.ajax('/iamberry/wechat/game/get_prize_info',{
+            data: {
+                prizeGameId:1
+            },
+            dataType:'json',
+            async:true,
+            type:'post',
+            timeout:15000,
+            success:function(dt){
+                if (dt.status) {
+                    prizeList = dt.data;
+                    //console.log(prizeList);
+
+                    mui(prizeList).each(function(index){
+                        turnplate.restaraunts[index] = this.prizeName;
+                        if ((index + 1) % 2 == 0) {
+                            turnplate.colors[index] = "#ff9c9d";
+                        } else {
+                            if (index == (prizeList.length - 1)) {
+                                turnplate.colors[index] = "#f99eaa";
+                            } else {
+                                turnplate.colors[index] = "#f76f7d";
+                            }
+                        }
+                        //先把图片加载出来
+                        $("#img-box").append('<img src="'+this.prizeImage+'" id="'+this.prizeId+'"/>');
+                    });
+                    //防止图片没加载完设置1秒后再绘制canvas
+                    setTimeout(function(){
+                        drawRouletteWheel()
+                        document.querySelector('.loading-bg').style.display = 'none';
+                    },1000);
+                } else {
+
+                }
+            },
+            error:function(xhr,type,errorThrown){
+
+            }
+        });
+
+        //旋转转盘 item:奖品位置; txt：提示语;
+        var rotateFn = function (item, txt, to){
+            var angles = item * (360 / turnplate.restaraunts.length) - (360 / (turnplate.restaraunts.length*2));
+            if(angles<270){
+                angles = 270 - angles;
+            }else{
+                angles = 360 - angles + 270;
+            }
+            $('#wheelcanvas').stopRotate();
+            $('#wheelcanvas').rotate({
+                angle:0,
+                animateTo:(to == null ? (angles+1800) : to),
+                duration:3000,
+                callback:function (){
+                    turnplate.bRotate = !turnplate.bRotate;
+                }
+            });
+        };
+
+        $(".pointer").on("click",function(){
+            //去产品列表
+            mui.openWindow({
+                url: base_path + '/index' //index.html
+            });
+        });
+
+    });
+
+
+    function drawRouletteWheel() {
+        var canvas = dc("wheelcanvas");
+        if (canvas.getContext) {
+            //根据奖品个数计算圆周角度
+            var arc = Math.PI / (turnplate.restaraunts.length/2);
+            var ctx = canvas.getContext("2d");
+            //在给定矩形内清空一个矩形
+            ctx.clearRect(0,0,422,422);
+            //strokeStyle 属性设置或返回用于笔触的颜色、渐变或模式
+            ctx.strokeStyle = "rgba(0,0,0,0)";//边框颜色
+            //font 属性设置或返回画布上文本内容的当前字体属性
+            ctx.font = '17px Arial';
+            for(var i = 0; i < turnplate.restaraunts.length; i++) {
+                //添加对应图标
+                if (prizeList != null) {
+                    var angle = turnplate.startAngle + i * arc;
+                    ctx.fillStyle = turnplate.colors[i];
+                    ctx.beginPath();
+                    //arc(x,y,r,起始角,结束角,绘制方向) 方法创建弧/曲线（用于创建圆或部分圆）
+                    ctx.arc(211, 211, turnplate.outsideRadius, angle, angle + arc, false);
+                    ctx.arc(211, 211, turnplate.insideRadius, angle + arc, angle, true);
+                    ctx.stroke();
+                    ctx.fill();
+                    //锁画布(为了保存之前的画布状态)
+                    ctx.save();
+
+                    //----绘制奖品开始----
+                    ctx.fillStyle = "#fff";
+                    var text = turnplate.restaraunts[i];
+                    var line_height = 17;
+                    //translate方法重新映射画布上的 (0,0) 位置
+                    ctx.translate(211 + Math.cos(angle + arc / 2) * turnplate.textRadius, 211 + Math.sin(angle + arc / 2) * turnplate.textRadius);
+
+                    //rotate方法旋转当前的绘图
+                    ctx.rotate(angle + arc / 2 + Math.PI / 2);
+
+                    /** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
+                    //在画布上绘制填色的文本。文本的默认颜色是黑色
+                    //measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
+                    ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
+                    var img= dc(prizeList[i].prizeId);
+                    ctx.drawImage(img,-25,10);
+
+                    //把当前画布返回（调整）到上一个save()状态之前
+                }
+                //----绘制奖品结束----
+                ctx.restore();
+            }
+        }
+    }
 </script>
-	</body>
+</body>
 
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/shopping_cart.html

@@ -1,52 +1,52 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-		<meta name="Expires" content="0">
-		<meta name="Cache-Control" content="no-store, no-cache, must-revalidate">
-		<meta name="Cache-Control" content="post-check=0, pre-check=0">
-		<meta name="Pragma" content="no-cache">
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			input[name=checkbox] { width: 18px;height: 18px;-webkit-appearance: none;appearance: none;cursor: pointer;vertical-align: top;background: url(/watero/images/shop/c_checkbox_off.png) center center no-repeat;-webkit-box-sizing: border-box;-moz-box-sizing: border-box;box-sizing: border-box;position: relative;border: 0;background-size: 100%;}
-			input[name=checkbox]:checked {background: url(/watero/images/shop/c_checkbox_on.png) center center no-repeat;background-size: 100%;}
-			.delete-cart-style{font-size: 20px;margin-top: 30px;color: red;margin-left: 20px;}
-			.btn-box {padding-left: 100px;}
-			#pullrefresh_chanpin_list .mui-table-view .mui-media-object.mui-pull-left {margin-right: 20px;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="utf-8">
+	<title></title>
+	<meta name="Expires" content="0">
+	<meta name="Cache-Control" content="no-store, no-cache, must-revalidate">
+	<meta name="Cache-Control" content="post-check=0, pre-check=0">
+	<meta name="Pragma" content="no-cache">
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
+	<style>
+		input[name=checkbox] { width: 18px;height: 18px;-webkit-appearance: none;appearance: none;cursor: pointer;vertical-align: top;background: url(//s.iamberry.com/watero/images/shop/c_checkbox_off.png) center center no-repeat;-webkit-box-sizing: border-box;-moz-box-sizing: border-box;box-sizing: border-box;position: relative;border: 0;background-size: 100%;}
+		input[name=checkbox]:checked {background: url(//s.iamberry.com/watero/images/shop/c_checkbox_on.png) center center no-repeat;background-size: 100%;}
+		.delete-cart-style{font-size: 20px;margin-top: 30px;color: red;margin-left: 20px;}
+		.btn-box {padding-left: 100px;}
+		#pullrefresh_chanpin_list .mui-table-view .mui-media-object.mui-pull-left {margin-right: 20px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<div class="mui-content">
-			<div class="gwc_null">
-				<img src="/watero/wateroimages/shop/empty_cart.png">
-				<h3>购物车还是空的</h3>
-				<a href="/iamberry/wechat/wxCart/goProductList" class="mui-btn my-btn-danger go_web_shop" style="width: 65%;padding: 10px 10px;">马上逛逛</a>
-				<nav class="mui-bar mui-bar-tab" id="footer-bar">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div class="gwc_null">
+		<img src="//s.iamberry.com/watero/images/shop/empty_cart.png">
+		<h3>购物车还是空的</h3>
+		<a href="/iamberry/wechat/wxCart/goProductList" class="mui-btn my-btn-danger go_web_shop" style="width: 65%;padding: 10px 10px;">马上逛逛</a>
+		<nav class="mui-bar mui-bar-tab" id="footer-bar">
 			<a class="mui-tab-item" >
 				<div class="iconfont icon-home"></div>
 				<span class="mui-tab-label">首页</span>
 			</a>
 			<a class="mui-tab-item mui-active">
 				<div class="iconfont icon-gouwuche">
-				<!-- <span class="mui-badge">0</span> -->
+					<!-- <span class="mui-badge">0</span> -->
 				</div>
 				<span class="mui-tab-label">购物车</span>
 			</a>
@@ -58,46 +58,46 @@
 				<div class="iconfont icon-vip"></div>
 				<span class="mui-tab-label">会员中心</span>
 			</a>
-	</nav>
-			</div>
-			<div class="shopping-box">
-			<div class="tt-yf">
-					<label class="click-all-btn"><input name="checkbox" checked="checked" type="checkbox" class="all_check" />全选</label>
-					<a href="#" class="mui-btn my-btn-danger go_web_shop">再挑一下</a>
-			</div>
-						
-			</div>
-			<div class="shoping-tt">
-				<span class="left"><img src="/watero/wateroimages/shop/jiao1.png" /></span>
-				<span class="right"><img src="/watero/wateroimages/shop/jiao2.png" /></span>
-				<!-- 购物车项 -->
-				<ul class="mui-table-view shopping-cart-list" id="cart-list-ul"></ul>
-			</div>
-			<div class="buy-footer1">
-				<table class="tb-clearing">
-					<tr>
-						<td rowspan="2" class="quanxuan">
-							<label class="click-all-btn">
-								<input type="checkbox" name="checkbox" checked="checked" class="all_check"/><br>全选
-							</label>
-						</td>
-						<td rowspan="2" class="t-r">总计:</td>
-						<td class="count_price_box">¥<span class="count_price" id="pay-total">0</span>元</td>
-						<td rowspan="2">
-							<a id="go-clearing" class="mui-btn mui-pull-right add_gwc">去结算(0)</a>
-						</td>
-					</tr>
-					<tr>
-					</tr>
-				</table>
-			</div>
-		</div>
+		</nav>
+	</div>
+	<div class="shopping-box">
+		<div class="tt-yf">
+			<label class="click-all-btn"><input name="checkbox" checked="checked" type="checkbox" class="all_check" />全选</label>
+			<a href="#" class="mui-btn my-btn-danger go_web_shop">再挑一下</a>
 		</div>
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/shopping_cart.js?v334=323"></script>
-	</body>
+
+	</div>
+	<div class="shoping-tt">
+		<span class="left"><img src="//s.iamberry.com/watero/images/shop/jiao1.png" /></span>
+		<span class="right"><img src="//s.iamberry.com/watero/images/shop/jiao2.png" /></span>
+		<!-- 购物车项 -->
+		<ul class="mui-table-view shopping-cart-list" id="cart-list-ul"></ul>
+	</div>
+	<div class="buy-footer1">
+		<table class="tb-clearing">
+			<tr>
+				<td rowspan="2" class="quanxuan">
+					<label class="click-all-btn">
+						<input type="checkbox" name="checkbox" checked="checked" class="all_check"/><br>全选
+					</label>
+				</td>
+				<td rowspan="2" class="t-r">总计:</td>
+				<td class="count_price_box">¥<span class="count_price" id="pay-total">0</span>元</td>
+				<td rowspan="2">
+					<a id="go-clearing" class="mui-btn mui-pull-right add_gwc">去结算(0)</a>
+				</td>
+			</tr>
+			<tr>
+			</tr>
+		</table>
+	</div>
+</div>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2017030101"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2017030101"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/shopping_cart.js?v=2017030801"></script>
+</body>
 
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_apply_cash.html

@@ -1,82 +1,82 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="utf-8">
-		<title>提现申请</title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
+<head>
+	<meta charset="utf-8">
+	<title>提现申请</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
 		.mui-table-view-cell:after,.mui-table-view:after{display:none;}
 		.mui-segmented-control .mui-control-item{line-height: 50px;border:0;border-bottom: 2px solid transparent;background-color:#fff;color:#b5b5b5;}
 		.mui-segmented-control{border:0;}
 		.mui-segmented-control .mui-control-item.mui-active{color:#f64e78;background-color:#fff;border-bottom: 2px solid #f64e78;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<div class="mui-content">
-<!-- 			<div style="background: #fff;padding: 10px;">
-				<button type="button" onclick="window.location.href='/iamberry/wechat/integralWechat/withdrawLog'" class="mui-btn my-btn-link ft-18 go_tixian_log">我的积分提现记录</button>
-				<button type="button" class="mui-btn my-btn-link go_tixian_cash_log">我的现金提现记录</button>
-			</div> -->
-			<div id="sliderSegmentedControl" class="mui-segmented-control">
-						<a class="mui-control-item mui-active" tabindex="0" href="#item1mobile">
-							<span class="mui-tab-label">提现申请</span>
-						</a>
-						<a class="mui-control-item go_tixian_cash_log" tabindex="1" >
-							<span class="mui-tab-label">提现记录</span>
-						</a>
-				</div>
-			<ul class="mui-table-view" style="background-color: transparent;">
-				<li class="mui-table-view-cell ft-12"><span class="my-btn-link" id="show-title-span">加载中...</span></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">姓名</span><input type="text" id="username" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实姓名"></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">电话</span><input type="tel" id="user-tel" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实电话" onkeyup="value=value.replace(/[^\d\.]/g,'')"></li>
-				<li class="mui-table-view-cell ft-12"><span class="my-btn-link" id="user-info-span">加载中...</span></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">金额</span><input type="tel" value="0" onchange="cashChange()" id="user-cash-num" class="my-input mui-input-clear mui-pull-right" placeholder="小于您可用金额的数量" onkeyup="value=value.replace(/[^\d\.]/g,'')"><span id="apply-num-money"></span></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">银行</span><input type="text" id="bank-name" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实银行账号" onkeyup="value=value.replace(/[^\d\.]/g,'')"></li>
-				<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">支行</span><input type="text" id="bankch-name" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的开户支行"></li>
-				<li style="text-align: center;padding: 10px 0;"><button type="button" id="submit-apply-btn" class="mui-btn my-btn-green" style="width: 50%;">立即提现</button></li>
-			</ul>
-		</div>
-		
-	</body>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/tixian_apply_cash.js"></script>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content">
+	<!-- 			<div style="background: #fff;padding: 10px;">
+                    <button type="button" onclick="window.location.href='/iamberry/wechat/integralWechat/withdrawLog'" class="mui-btn my-btn-link ft-18 go_tixian_log">我的积分提现记录</button>
+                    <button type="button" class="mui-btn my-btn-link go_tixian_cash_log">我的现金提现记录</button>
+                </div> -->
+	<div id="sliderSegmentedControl" class="mui-segmented-control">
+		<a class="mui-control-item mui-active" tabindex="0" href="#item1mobile">
+			<span class="mui-tab-label">提现申请</span>
+		</a>
+		<a class="mui-control-item go_tixian_cash_log" tabindex="1" >
+			<span class="mui-tab-label">提现记录</span>
+		</a>
+	</div>
+	<ul class="mui-table-view" style="background-color: transparent;">
+		<li class="mui-table-view-cell ft-12"><span class="my-btn-link" id="show-title-span">加载中...</span></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">姓名</span><input type="text" id="username" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实姓名"></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">电话</span><input type="tel" id="user-tel" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实电话" onkeyup="value=value.replace(/[^\d\.]/g,'')"></li>
+		<li class="mui-table-view-cell ft-12"><span class="my-btn-link" id="user-info-span">加载中...</span></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">金额</span><input type="tel" value="0" onchange="cashChange()" id="user-cash-num" class="my-input mui-input-clear mui-pull-right" placeholder="小于您可用金额的数量" onkeyup="value=value.replace(/[^\d\.]/g,'')"><span id="apply-num-money"></span></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">银行</span><input type="text" id="bank-name" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的真实银行账号" onkeyup="value=value.replace(/[^\d\.]/g,'')"></li>
+		<li class="mui-table-view-cell"><span class="my-btn-link2 mui-pull-left">支行</span><input type="text" id="bankch-name" class="my-input mui-input-clear mui-pull-right" placeholder="请输入您的开户支行"></li>
+		<li style="text-align: center;padding: 10px 0;"><button type="button" id="submit-apply-btn" class="mui-btn my-btn-green" style="width: 50%;">立即提现</button></li>
+	</ul>
+</div>
+
+</body>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/tixian_apply_cash.js?v=2016101701"></script>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_cash_success.html

@@ -1,75 +1,75 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-			<header class="mui-bar mui-bar-nav header">
-					<div class="go-index go_index">
-						<img src="/images/shop/logo.png" />
-					</div>
-			</header>
-			<div class="mui-content" style="background: #fff;">
-				<div class="pl-win-tt">
-				<img style="width: 1.5em;" src="/watero/wateroimages/shop/pay-win.jpg"><span class="sp"> 恭喜您，您的提现申请已提交，<br/> &nbsp; &nbsp;请等待审核！</span>
-				<!--<div>已支付：<span class="cl-red">¥520.00元+0.0积分</span></div>
-				</div>
-				<ul class="pay_win_list">
-					<li>订单编号：<span class="cl-0">4564654654654654</span></li>
-					<li>收货人：王大鹏</li>
-					<li>手机号码：13800138000</li>
-					<li>订单金额：<span class="cl-0">￥521</span></li>
-					<li>支付方式：在线支付</li>
-					<li>订单时间:2015-12-12 15:000</li>
-					<li><a class="go_order_details">点击查看订单详情&gt;&gt;</a> </li>
-				</ul>-->
-			</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<header class="mui-bar mui-bar-nav header">
+	<div class="go-index go_index">
+		<img src="//s.iamberry.com/images/shop/logo.png" />
+	</div>
+</header>
+<div class="mui-content" style="background: #fff;">
+	<div class="pl-win-tt">
+		<img style="width: 1.5em;" src="//s.iamberry.com/watero/images/shop/pay-win.jpg"><span class="sp"> 恭喜您，您的提现申请已提交，<br/> &nbsp; &nbsp;请等待审核！</span>
+		<!--<div>已支付：<span class="cl-red">¥520.00元+0.0积分</span></div>
+        </div>
+        <ul class="pay_win_list">
+            <li>订单编号：<span class="cl-0">4564654654654654</span></li>
+            <li>收货人：王大鹏</li>
+            <li>手机号码：13800138000</li>
+            <li>订单金额：<span class="cl-0">￥521</span></li>
+            <li>支付方式：在线支付</li>
+            <li>订单时间:2015-12-12 15:000</li>
+            <li><a class="go_order_details">点击查看订单详情&gt;&gt;</a> </li>
+        </ul>-->
+	</div>
+	<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+	<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+	<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+	<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
 	<script>
-	mui.ready(function(){
-		//console.log("页面加载完毕")
-		getCartNum();
-		document.querySelector('.loading-bg').style.display='none';
-	});
+        mui.ready(function(){
+            //console.log("页面加载完毕")
+            getCartNum();
+            document.querySelector('.loading-bg').style.display='none';
+        });
 	</script>
-	</body>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_log.html

@@ -1,70 +1,70 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view {font-size: 12px;}
-			.mui-table-view li>span {margin-right: 10px;}
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-		</style>
-		<script >
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-table-view {font-size: 12px;}
+		.mui-table-view li>span {margin-right: 10px;}
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+	</style>
+	<script >
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<ul class="mui-table-view more">
-			<li class="mui-table-view-cell ft-14"><a class="mui-navigate-right">提现记录<span class="mui-badge mui-badge-inverted ft-14 go_tixian_apply">继续兑换</span></a></li>
-		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表开始-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell ft-14"><a class="mui-navigate-right">提现记录<span class="mui-badge mui-badge-inverted ft-14 go_tixian_apply">继续兑换</span></a></li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表开始-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
 
-				</ul>
-				<!--数据列表结束-->
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/tixian_log.js"></script>
-	</body>
+		</ul>
+		<!--数据列表结束-->
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/tixian_log.js?v=2016101701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/tixian_log_cash.html

@@ -1,75 +1,75 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view {font-size: 12px;}
-			.mui-table-view li>span {margin-right: 10px;}
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-table-view {font-size: 12px;}
+		.mui-table-view li>span {margin-right: 10px;}
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<ul class="mui-table-view more">
-			<li class="mui-table-view-cell ft-14">
-				<a class="mui-navigate-right">提现记录
-						<span class="mui-badge mui-badge-inverted ft-14 go_tixian_cash">继续提现</span>
-					</a>
-			</li>
-		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表开始-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell ft-14">
+		<a class="mui-navigate-right">提现记录
+			<span class="mui-badge mui-badge-inverted ft-14 go_tixian_cash">继续提现</span>
+		</a>
+	</li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表开始-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
 
-				</ul>
-				<!--数据列表结束-->
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/tixian_log_cash.js"></script>
-	</body>
+		</ul>
+		<!--数据列表结束-->
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/tixian_log_cash.js?v=2016101701"></script>
+</body>
 
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/try_agreement.html

@@ -1,116 +1,116 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
-			.try_price{color: #f1436c;}
-			.my-table{width: 100%;text-align: center;border-collapse:collapse;}
-			.my-table td,.my-table th{border:1px solid #999; /* 设置边框属性；样式(solid=实线)、颜色(#999=灰) */}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
-	</div>
-				<div class="mui-content-padded">
-					<ul class="mui-table-view mui-text-left ft-12">
-					<li>
-						<h4>Watero水时代净饮水一体机试用协议</h4>
-					</li>
-					<li class="mui-table-view-cell"></li>
-					<li>
-						根据中华人民共和国合同法和有关法规，甲乙双方就试用爱贝源科技有限公司产品，经友好协商达成共识，并签订本协议。
-					</li>
-					<li class="mui-table-view-cell"></li>
-					<li>
-						一、试用产品清单及价格
-					</li>
-					<li>
-						<table class="my-table">
-							<tr>
-								<th>产品名称</th><th>型号</th><th>数量</th><th>单位</th><th>单价</th><th>总价</th>
-							</tr>
-							<tr>
-								<td>Watero水时代净饮一体机</td><td>WA-1X</td><td>1</td><td>台</td><td>3680</td><td>3680</td>
-							</tr>
-							<tr>
-								<td>4级RO滤芯</td><td></td><td>4</td><td>个</td><td>275</td><td>1098</td>
-							</tr>
-							<tr>
-								<td>水桶</td><td></td><td>1</td><td>个</td><td>169</td><td>169</td>
-							</tr>
-							<tr>
-								<td>接水台</td><td></td><td>1</td><td>个</td><td>69</td><td>69</td>
-							</tr>
-							<tr>
-								<td>总价</td><td></td><td></td><td></td><td></td><td>3680</td>
-							</tr>
-						</table>
-					</li>
-					<li class="mui-table-view-cell"></li>
-					<li>
-						二、交货时间及方法<br/> 甲方于申请报名试用3日内将送货到乙方收货地址。
-					</li>
-					<li class="mui-table-view-cell"></li>
-					<li>
-						三、试用期限<br/> 乙方收到产品之日起计算，试用时间为20天。
-					</li>
-					<li class="mui-table-view-cell"></li>
-					<li>
-						四、安装<br/> 甲方负责送货，本产品无须安装。
-					</li>
-					<li class="mui-table-view-cell"></li>
-					<li>
-						五、甲方的权利与义务<br/>1、甲方在指定期限内免费提供一台价值3680元watero水时代净饮水机一台试用，甲方保证所提供试用产品为合格产品，并负责免费送货安装。
-						<br/>2、试用期间甲方有权向乙方询问产品试用相关问题。
-						<br/>3、试用期间，甲方负责对试用产品修理，如因乙方人为因素损坏，维修费用由乙方承担，且根据损坏程度甲方有权依其合理的判断决定是否由乙方按本合同第一条约定之零售价款购买该被损坏的机器。如在乙方试用期内因第三方原因损坏，乙方可在向甲方承担损失后向第三方追偿。
-						<br/>4、在乙方试用产品期间，甲方拥有该产品的合法所有权，试用截止日期后乙方不得无故或寻找任何借口留置试用产品，否则，甲方有权追一切相关费用，包括但不限于该设备价款、设备装拆劳务费、设备运输费、设备折旧费等。
-						<br/>5、试用结束后甲方可将乙方提供的试用报告及试用过程中拍摄的图片、录像用于甲方后期宣传，并可在相关宣传资料中使用乙方姓名、形象及图片、录像。乙方认可甲方在实施上述行为前需获得乙方授权及认可，甲方的上述行为并未侵犯乙方的著作权、表演者权、肖像权、姓名权及其他正当权利。
-					</li>
-					<li class="mui-table-view-cell"></li>
-					<li>
-						六、乙方的权利与义务<br/>1、乙方自愿申请试用甲方产品，试用过程中不得损坏样品、配件、原包装箱遗失或将产品打开拆卸；
-						<br/>2、若乙方在试用过程中人为原因造成产品的破损，配件不全等，以及因外界不可抗因素所造成的产品或其零部件损坏，乙方按第一条中的价格全额购买该样品。若产品本身出现质量问题则与乙方无关。
-						<br/>3、试用期间，乙方承担妥善保管、合理使用产品职责，保证产品外表无划痕、标签完整无破损、零配件和说明书完整等责任和义务。未经甲方书面同意，不得将试用产品转移、拆卸、转借、出租或赠予他人，更不可用做其他商业用途。
-						<br/>4、本样品在乙方确认购买前的所有权属于甲方，乙方无处置权。
-						<br/>5、试用期后，若乙方不接受该产品，甲方在确认样品无损坏后，自行收回该样品，合同亦终止。试用截止日期后乙方不得无故或寻找任何借口留置试用产品，否则，甲方有权追一切相关费用，包括但不限于该设备价款、设备装拆劳务费、设备运输费、设备折旧费等。
-						<br/>6、在以下情况下认为乙方自动购买该设备：
-						<br/>（1）将设备转移、拆卸，转借、出租或赠予任何第三方使用，用做其他商业用途。
-						<br/>（2）损坏设备外观。
-						<br/>（3）撕毁设备相关资料和保修标签、保修服务卡。
-						<br/>（4）超过试用期未将设备归还给甲方。
-					</li>
-					<li class="mui-table-view-cell"></li>
-					<li>
-						七、备注
-						<br/>1、本协议为电子协议，勾选同意后即时生效，甲乙双方需履行协议。
-						<br/><span class="try_price">如乙方不按照协议规定在试用结束后未按时归还产品，甲方将追究其法律责任。</span>
-					</li>
-				</ul>
-				</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script type="text/javascript">
-	mui.ready(function(){
-		document.querySelector('.loading-bg').style.display='none';
-	});
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
+	<style>
+		.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
+		.try_price{color: #f1436c;}
+		.my-table{width: 100%;text-align: center;border-collapse:collapse;}
+		.my-table td,.my-table th{border:1px solid #999; /* 设置边框属性；样式(solid=实线)、颜色(#999=灰) */}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
 	</script>
-	</body>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content-padded">
+	<ul class="mui-table-view mui-text-left ft-12">
+		<li>
+			<h4>Watero水时代净饮水一体机试用协议</h4>
+		</li>
+		<li class="mui-table-view-cell"></li>
+		<li>
+			根据中华人民共和国合同法和有关法规，甲乙双方就试用爱贝源科技有限公司产品，经友好协商达成共识，并签订本协议。
+		</li>
+		<li class="mui-table-view-cell"></li>
+		<li>
+			一、试用产品清单及价格
+		</li>
+		<li>
+			<table class="my-table">
+				<tr>
+					<th>产品名称</th><th>型号</th><th>数量</th><th>单位</th><th>单价</th><th>总价</th>
+				</tr>
+				<tr>
+					<td>Watero水时代净饮一体机</td><td>WA-1X</td><td>1</td><td>台</td><td>3680</td><td>3680</td>
+				</tr>
+				<tr>
+					<td>4级RO滤芯</td><td></td><td>4</td><td>个</td><td>275</td><td>1098</td>
+				</tr>
+				<tr>
+					<td>水桶</td><td></td><td>1</td><td>个</td><td>169</td><td>169</td>
+				</tr>
+				<tr>
+					<td>接水台</td><td></td><td>1</td><td>个</td><td>69</td><td>69</td>
+				</tr>
+				<tr>
+					<td>总价</td><td></td><td></td><td></td><td></td><td>3680</td>
+				</tr>
+			</table>
+		</li>
+		<li class="mui-table-view-cell"></li>
+		<li>
+			二、交货时间及方法<br/> 甲方于申请报名试用3日内将送货到乙方收货地址。
+		</li>
+		<li class="mui-table-view-cell"></li>
+		<li>
+			三、试用期限<br/> 乙方收到产品之日起计算，试用时间为20天。
+		</li>
+		<li class="mui-table-view-cell"></li>
+		<li>
+			四、安装<br/> 甲方负责送货，本产品无须安装。
+		</li>
+		<li class="mui-table-view-cell"></li>
+		<li>
+			五、甲方的权利与义务<br/>1、甲方在指定期限内免费提供一台价值3680元watero水时代净饮水机一台试用，甲方保证所提供试用产品为合格产品，并负责免费送货安装。
+			<br/>2、试用期间甲方有权向乙方询问产品试用相关问题。
+			<br/>3、试用期间，甲方负责对试用产品修理，如因乙方人为因素损坏，维修费用由乙方承担，且根据损坏程度甲方有权依其合理的判断决定是否由乙方按本合同第一条约定之零售价款购买该被损坏的机器。如在乙方试用期内因第三方原因损坏，乙方可在向甲方承担损失后向第三方追偿。
+			<br/>4、在乙方试用产品期间，甲方拥有该产品的合法所有权，试用截止日期后乙方不得无故或寻找任何借口留置试用产品，否则，甲方有权追一切相关费用，包括但不限于该设备价款、设备装拆劳务费、设备运输费、设备折旧费等。
+			<br/>5、试用结束后甲方可将乙方提供的试用报告及试用过程中拍摄的图片、录像用于甲方后期宣传，并可在相关宣传资料中使用乙方姓名、形象及图片、录像。乙方认可甲方在实施上述行为前需获得乙方授权及认可，甲方的上述行为并未侵犯乙方的著作权、表演者权、肖像权、姓名权及其他正当权利。
+		</li>
+		<li class="mui-table-view-cell"></li>
+		<li>
+			六、乙方的权利与义务<br/>1、乙方自愿申请试用甲方产品，试用过程中不得损坏样品、配件、原包装箱遗失或将产品打开拆卸；
+			<br/>2、若乙方在试用过程中人为原因造成产品的破损，配件不全等，以及因外界不可抗因素所造成的产品或其零部件损坏，乙方按第一条中的价格全额购买该样品。若产品本身出现质量问题则与乙方无关。
+			<br/>3、试用期间，乙方承担妥善保管、合理使用产品职责，保证产品外表无划痕、标签完整无破损、零配件和说明书完整等责任和义务。未经甲方书面同意，不得将试用产品转移、拆卸、转借、出租或赠予他人，更不可用做其他商业用途。
+			<br/>4、本样品在乙方确认购买前的所有权属于甲方，乙方无处置权。
+			<br/>5、试用期后，若乙方不接受该产品，甲方在确认样品无损坏后，自行收回该样品，合同亦终止。试用截止日期后乙方不得无故或寻找任何借口留置试用产品，否则，甲方有权追一切相关费用，包括但不限于该设备价款、设备装拆劳务费、设备运输费、设备折旧费等。
+			<br/>6、在以下情况下认为乙方自动购买该设备：
+			<br/>（1）将设备转移、拆卸，转借、出租或赠予任何第三方使用，用做其他商业用途。
+			<br/>（2）损坏设备外观。
+			<br/>（3）撕毁设备相关资料和保修标签、保修服务卡。
+			<br/>（4）超过试用期未将设备归还给甲方。
+		</li>
+		<li class="mui-table-view-cell"></li>
+		<li>
+			七、备注
+			<br/>1、本协议为电子协议，勾选同意后即时生效，甲乙双方需履行协议。
+			<br/><span class="try_price">如乙方不按照协议规定在试用结束后未按时归还产品，甲方将追究其法律责任。</span>
+		</li>
+	</ul>
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script type="text/javascript">
+    mui.ready(function(){
+        document.querySelector('.loading-bg').style.display='none';
+    });
+</script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/try_apply.html

@@ -1,463 +1,463 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.head {height: 60px;}
-			#head {line-height: 60px;}
-			h3{margin-top:5px;margin-bottom: 0;}
-			.btn-pull-code{position: absolute;right: 10px;top:7px;height:34px;padding:0 6px;border-radius: 5px; line-height: 34px;font-size: 12px; color: #fff; background: #24cae9;}
-			.btn-pull-code .active{background: #c8c8c8;}
-			.icon-fuxuankuang a{color: #24cae9;}
-			.icon-yanse,.icon-youhui,.icon-fuxuankuang,.icon-jiage,.icon-songhuo{font-size: 15px;padding-left: 22px;}
-			.icon-yanse:before,.icon-fuxuankuang:before,.icon-youhui:before,.icon-jiage:before,.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
-			.try_price{color: #f1436c;}
-			.ul_radio{width: 100%;}
-			.ul_radio li{width:21%;height: 55px;margin: 0 1%;border: 1px solid rgba(0,0,0,.1);border-radius: 5px; display: inline-block;position: relative;font-family:"iconfont" !important;font-style:normal;-webkit-font-smoothing: antialiased;}
-			.ul_radio .active:after{position: absolute;right: 0;bottom: 0;content: "\e66f";color: #f1436c;line-height: 1;font-size: 20px;}
-			.radio1{background: url(/watero/images/cp-1.jpg) center center /auto 85% no-repeat;}
-			.radio2{background: url(/watero/images/cp-2.jpg) center center /auto 85% no-repeat;}
-			.radio3{background: url(/watero/images/cp-3.jpg) center center /auto 85% no-repeat;}
-			.radio4{background: url(/watero/images/cp-4.jpg) center center /auto 85% no-repeat;}
-			.head-img {position: absolute;bottom: 15px;right: 13px;width: 60px;height: 60px;border-radius: 30px;border: 3px solid #E5E5E5;}
-			.mui-table-view .mui-media .mui-media-body{height: 41px;line-height: 41px;color: #333;}
-			.mui-table-view .mui-media .mui-media-body>span{color: #f1436c;}
-			.my-table-view-try{border-top:1px solid rgba(0,0,0,.1);padding-bottom: 10px;}
-			.my-table-view-try .mui-table-view-cell{padding:10px 13px 10px 30px !important;font-size: 12px;}
-			.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
-			.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
-			#btn_submit{color: #fff;padding: 10px 0;font-size: 18px;background: #24cae9;border:0;}
-			.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #c8c8c8 !important;}
-			.icon-fuxuankuang.mui-active:before{color: #c8c8c8;}
-			.mui-content-padded{margin: 10px 13px;}
-			.tips{padding: 20px 10px;background: #24cae9;text-align: center;color: #fff;}
-			.mui-input-group .mui-input-row {height: 50px;padding: 5px 0;border: 1px solid rgba(0,0,0,.1); margin:10px 0;}
-			.mui-input-row label{color: #666;width:27%;font-size: 15px;}
-			.mui-input-row label~input{width:73%;}
-			.mui-input-row label~input::-webkit-input-placeholder{font-size: 15px;}
-			.triangle-down {width:0;height:0;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;}
-			.my-arrowright{position: absolute;right: 18px;top: 28px;color: #666;pointer-events:none;}
-			.mui-btn-red{background-color: #e9004c;}
-			.ul-addres{padding-left: 24px;color: #333;font-size:12px;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111701">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111701" />
+	<style>
+		.head {height: 60px;}
+		#head {line-height: 60px;}
+		h3{margin-top:5px;margin-bottom: 0;}
+		.btn-pull-code{position: absolute;right: 10px;top:7px;height:34px;padding:0 6px;border-radius: 5px; line-height: 34px;font-size: 12px; color: #fff; background: #24cae9;}
+		.btn-pull-code .active{background: #c8c8c8;}
+		.icon-fuxuankuang a{color: #24cae9;}
+		.icon-yanse,.icon-youhui,.icon-fuxuankuang,.icon-jiage,.icon-songhuo{font-size: 15px;padding-left: 22px;}
+		.icon-yanse:before,.icon-fuxuankuang:before,.icon-youhui:before,.icon-jiage:before,.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
+		.try_price{color: #f1436c;}
+		.ul_radio{width: 100%;}
+		.ul_radio li{width:21%;height: 55px;margin: 0 1%;border: 1px solid rgba(0,0,0,.1);border-radius: 5px; display: inline-block;position: relative;font-family:"iconfont" !important;font-style:normal;-webkit-font-smoothing: antialiased;}
+		.ul_radio .active:after{position: absolute;right: 0;bottom: 0;content: "\e66f";color: #f1436c;line-height: 1;font-size: 20px;}
+		.radio1{background: url(//s.iamberry.com/watero/images/cp-1.jpg) center center /auto 85% no-repeat;}
+		.radio2{background: url(//s.iamberry.com/watero/images/cp-2.jpg) center center /auto 85% no-repeat;}
+		.radio3{background: url(//s.iamberry.com/watero/images/cp-3.jpg) center center /auto 85% no-repeat;}
+		.radio4{background: url(//s.iamberry.com/watero/images/cp-4.jpg) center center /auto 85% no-repeat;}
+		.head-img {position: absolute;bottom: 15px;right: 13px;width: 60px;height: 60px;border-radius: 30px;border: 3px solid #E5E5E5;}
+		.mui-table-view .mui-media .mui-media-body{height: 41px;line-height: 41px;color: #333;}
+		.mui-table-view .mui-media .mui-media-body>span{color: #f1436c;}
+		.my-table-view-try{border-top:1px solid rgba(0,0,0,.1);padding-bottom: 10px;}
+		.my-table-view-try .mui-table-view-cell{padding:10px 13px 10px 30px !important;font-size: 12px;}
+		.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
+		.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
+		#btn_submit{color: #fff;padding: 10px 0;font-size: 18px;background: #24cae9;border:0;}
+		.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #c8c8c8 !important;}
+		.icon-fuxuankuang.mui-active:before{color: #c8c8c8;}
+		.mui-content-padded{margin: 10px 13px;}
+		.tips{padding: 20px 10px;background: #24cae9;text-align: center;color: #fff;}
+		.mui-input-group .mui-input-row {height: 50px;padding: 5px 0;border: 1px solid rgba(0,0,0,.1); margin:10px 0;}
+		.mui-input-row label{color: #666;width:27%;font-size: 15px;}
+		.mui-input-row label~input{width:73%;}
+		.mui-input-row label~input::-webkit-input-placeholder{font-size: 15px;}
+		.triangle-down {width:0;height:0;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;}
+		.my-arrowright{position: absolute;right: 18px;top: 28px;color: #666;pointer-events:none;}
+		.mui-btn-red{background-color: #e9004c;}
+		.ul-addres{padding-left: 24px;color: #333;font-size:12px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
 	</div>
+</div>
 
-					<div class="mui-content" style="background: #fff;">
-				<div class="tips more">
-					<h3>申请试用</h3>
-					<span>（仅限山西省）</span>
-				</div>
-				<div class="mui-content-padded">
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label>姓　名</label>
-						<input type="text" maxlength="12" class="mui-input-clear" placeholder="请输入姓名" id="ipt-name">
-					</div>
-					<div class="mui-input-row">
-						<label>手机号</label>
-						<input type="tel" maxlength="11" class="mui-input-clear" placeholder="请输入手机号" id="ipt-phone">
-					</div>
-					<div class="mui-input-row">
-						<label>验证码</label>
-						<input type="text" maxlength="4" placeholder="请输入验证码" id="ipt-code">
-						<span class="btn-pull-code" id="pull-code">获取验证码</span>
-					</div>
-					<div style="display: table;width: 100%;padding: 10px 0;">
-						<div style="display: table-cell;width: 30%;vertical-align: top;"><span class="iconfont icon-yanse">选择颜色</span></div><div style="display:table-cell;width:70%;text-align: right;">
-							<ul class="ul_radio">
-<!-- 							<li class="radio1 active"></li>
-								<li class="radio2"></li>
-								<li class="radio3"></li>
-								<li class="radio4"></li> -->
-							</ul>
-						</div>
-					</div>
-					<div>
-						<span class="iconfont icon-jiage">商品价格</span><span class="mui-pull-right ft-12"><!-- <s class="mui-h6">原价：¥<span id="productPrice">0</span></s> --><span>试用期内体验价：<span class="try_price">0元</span></span>&nbsp;&nbsp;<span>，<span id="productDiscount" class="try_price">0</span></span></span>
-					</div>
-				</form>
-				</div>
-				<ul class="mui-table-view" style="border-top:1px solid rgba(0,0,0,.1);">
-					<li class="mui-table-view-cell" style="padding:12px 15px;">
-						<a class="mui-navigate-right" id="open-wechat-addres-a">
-							<span class="iconfont icon-songhuo">收货信息</span>
-						<ul class="ul-addres">
-							<!-- <li>收  货  人：林林</li>
-							<li>手 机 号：15999999999</li>
-							<li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li> -->
-						</ul>
-						</a>	
-					</li>
-				</ul>
-				<ul class="mui-table-view my-table-view-try">
-					<li style="padding: 10px 0 0 10px;" style="display:none">
-						<span class="iconfont icon-youhui" style="display:none">支付优惠</span>
-					</li>
-					<li class="mui-table-view-cell" style="display:none">
-						<img width="100%" src="../../images/cp-zeng.jpg" />
-					</li>
-					<li style="padding: 20px 10px;text-align: center;">
-						<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">已阅,并同意<a id="xieyi-dalog">《用户试用协议》</a></span>
-						<br /><span>请务必阅读</span>
-					</li>
+<div class="mui-content" style="background: #fff;">
+	<div class="tips more">
+		<h3>申请试用</h3>
+		<span>（仅限山西省）</span>
+	</div>
+	<div class="mui-content-padded">
+		<form class="mui-input-group">
+			<div class="mui-input-row">
+				<label>姓　名</label>
+				<input type="text" maxlength="12" class="mui-input-clear" placeholder="请输入姓名" id="ipt-name">
+			</div>
+			<div class="mui-input-row">
+				<label>手机号</label>
+				<input type="tel" maxlength="11" class="mui-input-clear" placeholder="请输入手机号" id="ipt-phone">
+			</div>
+			<div class="mui-input-row">
+				<label>验证码</label>
+				<input type="text" maxlength="4" placeholder="请输入验证码" id="ipt-code">
+				<span class="btn-pull-code" id="pull-code">获取验证码</span>
+			</div>
+			<div style="display: table;width: 100%;padding: 10px 0;">
+				<div style="display: table-cell;width: 30%;vertical-align: top;"><span class="iconfont icon-yanse">选择颜色</span></div><div style="display:table-cell;width:70%;text-align: right;">
+				<ul class="ul_radio">
+					<!-- 							<li class="radio1 active"></li>
+                                                    <li class="radio2"></li>
+                                                    <li class="radio3"></li>
+                                                    <li class="radio4"></li> -->
 				</ul>
-				
-				<div class="mui-content-padded">
-					<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="提交中" class="mui-btn mui-btn-block mui-btn-outlined mui-active" id="btn_submit" >申请试用</button>
-				</div>
 			</div>
+			</div>
+			<div>
+				<span class="iconfont icon-jiage">商品价格</span><span class="mui-pull-right ft-12"><!-- <s class="mui-h6">原价：¥<span id="productPrice">0</span></s> --><span>试用期内体验价：<span class="try_price">0元</span></span>&nbsp;&nbsp;<span>，<span id="productDiscount" class="try_price">0</span></span></span>
+			</div>
+		</form>
+	</div>
+	<ul class="mui-table-view" style="border-top:1px solid rgba(0,0,0,.1);">
+		<li class="mui-table-view-cell" style="padding:12px 15px;">
+			<a class="mui-navigate-right" id="open-wechat-addres-a">
+				<span class="iconfont icon-songhuo">收货信息</span>
+				<ul class="ul-addres">
+					<!-- <li>收  货  人：林林</li>
+                    <li>手 机 号：15999999999</li>
+                    <li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li> -->
+				</ul>
+			</a>
+		</li>
+	</ul>
+	<ul class="mui-table-view my-table-view-try">
+		<li style="padding: 10px 0 0 10px;" style="display:none">
+			<span class="iconfont icon-youhui" style="display:none">支付优惠</span>
+		</li>
+		<li class="mui-table-view-cell" style="display:none">
+			<img width="100%" src="//s.iamberry.com/watero/images/cp-zeng.jpg" />
+		</li>
+		<li style="padding: 20px 10px;text-align: center;">
+			<span class="iconfont icon-fuxuankuang mui-active" id="btn-tongyi">已阅,并同意<a id="xieyi-dalog">《用户试用协议》</a></span>
+			<br /><span>请务必阅读</span>
+		</li>
+	</ul>
+
+	<div class="mui-content-padded">
+		<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="提交中" class="mui-btn mui-btn-block mui-btn-outlined mui-active" id="btn_submit" >申请试用</button>
+	</div>
+</div>
 
-<script src="/watero/waterojs/mui.min.js"></script>
-<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-<script src="/watero/waterojs/shop/main.js"></script>
+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2017021501"></script>
 <script type="text/javascript">
-	var check = false,alert_msg='';
-	var mobile=/^(13|14|15|18)[0-9]{9}$/; //手机号码
-	var uname = /^[\u4e00-\u9fa5]{1,12}$/; //中文英文
-	var code = /^[0-9]{4}$/; //数字
-	mui.ready(function(){
-		$.ajax({
-			type: 'post',
-			url: base_path+'/probation/getUserInfo',
-			data: {},
-			dataType: 'json',
-			timeout: 15000,
-			success: function(dt) {
-				//console.log(dt);
-					if(dt==2){
-						$.ajax({
-							type: 'post',
-							url: base_path+'/probation/getProductList',
-							data: {},
-							dataType: 'json',
-							timeout: 15000,
-							success: function(dt) {
-								if(dt.status) {
-									//console.log(dt.data[0]);
-									var str='';
-									mui(dt.data[0].colorList).each(function(index) {
-										if(index==0){
-											//$("#productPrice").text(accDiv(this.productPrice, 100));
-											//console.log(this.colorList[0].colorDiscount)
-											$("#productDiscount").text("试用价¥"+accDiv(this.colorDiscount, 100));
-											str+='<li id="'+this.colorProductId+'" productPrice="'+accDiv(this.colorPrice, 100)+'" productDiscount="'+accDiv(this.colorDiscount, 100)+'" class="radio'+(index+1)+' active" colorid="'+(index+1)+'"></li>'
-										}else{
-											str+='<li id="'+this.colorProductId+'" productPrice="'+accDiv(this.colorPrice, 100)+'" productDiscount="'+accDiv(this.colorDiscount, 100)+'" class="radio'+(index+1)+'" colorid="'+(index+1)+'"></li>'
-										}
-									});
-									$(".ul_radio").html(str);
-									$(".ul_radio li").each(function() {
-										$(this).on("click", function() {
-											$(this).addClass("active");
-											//$("#productPrice").text($(this).attr("productPrice"));
-											$("#productDiscount").text("试用价¥"+$(this).attr("productDiscount"));
-											$(this).siblings().removeClass("active");
-										});
-									});
-									//console.log("页面加载完毕")
-									document.querySelector('.loading-bg').style.display='none';
-								} else {
-									mui.alert(dt.message);
-								}
-							},
-							error: function(xhr, type, errorThrown) {
-								//异常处理；
-								console.log(xhr);
-								mui.alert("请检查网络或刷新页面重试！");								
-							}
-						});	
-					}else if(dt==0){
-						mui.alert("请先关注\"watero\"水时代", '', function() {
-							 mui.openWindow({url: base_path+'/index'});
-						}); 
-					}else{
-						mui.alert("您暂时还不能参与本次活动，详情请咨询watero微信商城客服", '', function() {
-							 mui.openWindow({url: base_path+'/index'});
-						});
-					}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理；
-				console.log(xhr);
-				mui.alert("请检查网络或刷新页面重试！");
-			}
-		});	
-	});
-	mui('body').on('tap', '#btn_submit', function() {
-		//console.log($(".ul_radio .active").attr("colorid"));
-		var th=this;
-		change_input();
-		if(check){
-			mui(th).button('loading');
-			var param = {
-					"puserName": $("#ipt-name").val(),
-					"puserTel": $("#ipt-phone").val(),
-					"puserProductid": $(".ul_radio .active").attr("id"),
-					"puserNickName":nickname ,
-					"puser": ads_tel,
-					"puserAddress": address,
-					"colorId":$(".ul_radio .active").attr("colorid"),
-				};
-			
-			$.ajax({
-				type: 'get',
-				url: base_path+'/probationOrder/validation_code',
-				data: {"phone":$("#ipt-phone").val().trim(),"code":$("#ipt-code").val().trim(),"colorId":$(".ul_radio .active").attr("colorid")},
-				dataType: 'json',
-				timeout: 15000,
-				success: function(dt) {
-					//console.log(dt);
-					if(dt.returnCode==200) {						 
-						$.ajax({
-							type: 'post',
-							url: base_path+'/probationOrder/addProbationOrder',
-							data: param,
-							dataType: 'json',
-							timeout: 15000,
-							success: function(dt) {
-								//console.log(dt);
-								if(dt.status) {						 
-									 mui.alert("本批watero试用机为新机，请您在试用过程中足够爱惜，切勿刮划机身及损坏包装，感谢您的配合！", '', function() {
-										 mui.openWindow({url: '/watero/html/wechat/vip_center.html'})
-									}); 
-								} else {
-									mui(th).button('reset');
-									mui.alert(dt.message);
-								}
-							},
-							error: function(xhr, type, errorThrown) {
-								//异常处理；
-								console.log(xhr);
-								mui.alert("请检查网络或刷新页面重试！");
-								mui(th).button('reset');
-							}
-						});	
-					}else{
-						mui(th).button('reset');
-						mui.alert(dt.returnMsg.returnMsg);
-					}
-				},
-				error: function(xhr, type, errorThrown) {
-					//异常处理；
-					mui(th).button('reset');
-					console.log(xhr);
-					mui.alert("请检查网络或刷新页面重试！");
-				}
-			});				
-		}else{
-			//console.log("未通过");
-			mui.alert(alert_msg);
-		}
-	});
-	mui('body').on('tap', '#xieyi-dalog', function() {
-		mui.openWindow({
-			url:base_path+ '/probation/try_agreement'
-		});
-	});
-$(document).on('tap', '#btn-tongyi', function() {
-	var btn_submit=$("#btn_submit");
-	//console.log($(this).hasClass("mui-active"));
-	if($(this).hasClass("mui-active")){
-		$(this).removeClass("mui-active");
-		btn_submit.removeClass("mui-active");
-	}else{
-		$(this).addClass("mui-active");
-		btn_submit.addClass("mui-active");
-	}
-});
-$(document).on('tap', '#pull-code', function() {
-	if($("#ipt-phone").val().trim()=="" &&(!$("#pull-code").hasClass("mui-active"))){
-		mui.alert("请填写手机号码");
-		return;
-	}else{
-		if(!mobile.test($("#ipt-phone").val().trim())){
-			mui.alert("手机号码不正确，请重新填写");
-			return;
-		}else{
-			if($(this).hasClass("mui-active")){
-				return;
-			}else{
-				$(this).addClass("mui-active");
-				settime("pull-code");
-				getConfig();
-				$.ajax({
-					type: 'get',
-					url: base_path+'/probationOrder/send_code',
-					data: {"phone":$("#ipt-phone").val().trim()},
-					dataType: 'json',
-					timeout: 15000,
-					success: function(dt) {
-						//console.log(dt);
-						if(dt.returnCode==1) {		
-							countdown=1;
-							 mui.alert("该手机号码已经申请过，请勿重复提交！");
-						}else if(dt.returnCode==2){
-							countdown=1;
-							 mui.alert("您使用的手机号码是空号");
-						}else if(dt.returnCode==500){
-							mui.alert(dt.returnMsg.returnMsg);
-						}
-					},
-					error: function(xhr, type, errorThrown) {
-						//异常处理；
-						console.log(xhr);
-						mui.alert("请检查网络或刷新页面重试！");
-					}
-				});	
-			}
-		}
-	}
-});
-var countdown=60; 
-function settime(val) { 
-pullid=dc(val);
-if (countdown == 0) { 
-pullid.removeAttribute("disabled");
-pullid.className='btn-pull-code';
-pullid.innerText="获取验证码"; 
-countdown = 60; 
-return false;
-} else { 
-pullid.setAttribute("disabled", true); 
-pullid.className='btn-pull-code mui-active';
-pullid.innerText="重新发送(" + countdown + ")"; 
-countdown--; 
-} 
-setTimeout(function() { 
-settime(val) 
-},1000) 
-} 
-function change_input() {
-	$(".mui-input-group input").each(function(index) {
-		switch ($(this).attr("id")){
-			case "ipt-name":
-			if($(this).val().trim()==""){
-				alert_msg="请填写姓名";
-				check=false;
-				return false;
-			}else{
-				if(uname.test($(this).val())) {
-					check=true;
-				}else{
-					alert_msg="姓名格式不正确，请重新填写";
-					check=false;
-					return false;
-				}
-			}
-				break;
-			case "ipt-phone":
-			if($(this).val().trim()==""){
-				alert_msg="请填写手机号";
-				check=false;
-				return false;
-			}else{
-				if(mobile.test($(this).val().trim())) {
-					check=true;
-				}else{
-					alert_msg="手机号码不正确，请重新填写";
-					check=false;
-					return false;
-				}
-			}
-				break;
-			case "ipt-code":
-			if($(this).val().trim()==""){
-				alert_msg="请填写验证码";
-				check=false;
-				return false;
-			}else{
-				if(code.test($(this).val().trim())) {
-					check=true;
-				}else{
-					alert_msg="验证码格式不正确，请重新填写";
-					check=false;
-					return false;
-				}
-			}
-				break;
-			default:
-				break;
-		}
-	});
-	if(check) {
-	if(address==''){
-		alert_msg="请选择送货信息";
-		check=false;
-		return false;
-	}else{
-		check=true;
-	}
-	if($("#btn-tongyi").hasClass("mui-active")){
-		alert_msg="请勾选同意试用协议";
-		check=false;
-		return false;
-	}else{
-		check=true;
-	}
-	}
-	
-/* 	if(check) {
-		console.log("通过")
-	} else {
-		console.log(alert_msg);
-	} */
-}
+    var check = false,alert_msg='';
+    var mobile=/^(13|14|15|18)[0-9]{9}$/; //手机号码
+    var uname = /^[\u4e00-\u9fa5]{1,12}$/; //中文英文
+    var code = /^[0-9]{4}$/; //数字
+    mui.ready(function(){
+        $.ajax({
+            type: 'post',
+            url: base_path+'/probation/getUserInfo',
+            data: {},
+            dataType: 'json',
+            timeout: 15000,
+            success: function(dt) {
+                //console.log(dt);
+                if(dt==2){
+                    $.ajax({
+                        type: 'post',
+                        url: base_path+'/probation/getProductList',
+                        data: {},
+                        dataType: 'json',
+                        timeout: 15000,
+                        success: function(dt) {
+                            if(dt.status) {
+                                //console.log(dt.data[0]);
+                                var str='';
+                                mui(dt.data[0].colorList).each(function(index) {
+                                    if(index==0){
+                                        //$("#productPrice").text(accDiv(this.productPrice, 100));
+                                        //console.log(this.colorList[0].colorDiscount)
+                                        $("#productDiscount").text("试用价¥"+accDiv(this.colorDiscount, 100));
+                                        str+='<li id="'+this.colorProductId+'" productPrice="'+accDiv(this.colorPrice, 100)+'" productDiscount="'+accDiv(this.colorDiscount, 100)+'" class="radio'+(index+1)+' active" colorid="'+(index+1)+'"></li>'
+                                    }else{
+                                        str+='<li id="'+this.colorProductId+'" productPrice="'+accDiv(this.colorPrice, 100)+'" productDiscount="'+accDiv(this.colorDiscount, 100)+'" class="radio'+(index+1)+'" colorid="'+(index+1)+'"></li>'
+                                    }
+                                });
+                                $(".ul_radio").html(str);
+                                $(".ul_radio li").each(function() {
+                                    $(this).on("click", function() {
+                                        $(this).addClass("active");
+                                        //$("#productPrice").text($(this).attr("productPrice"));
+                                        $("#productDiscount").text("试用价¥"+$(this).attr("productDiscount"));
+                                        $(this).siblings().removeClass("active");
+                                    });
+                                });
+                                //console.log("页面加载完毕")
+                                document.querySelector('.loading-bg').style.display='none';
+                            } else {
+                                mui.alert(dt.message);
+                            }
+                        },
+                        error: function(xhr, type, errorThrown) {
+                            //异常处理；
+                            console.log(xhr);
+                            mui.alert("请检查网络或刷新页面重试！");
+                        }
+                    });
+                }else if(dt==0){
+                    mui.alert("请先关注\"watero\"水时代", '', function() {
+                        mui.openWindow({url: base_path+'/index'});
+                    });
+                }else{
+                    mui.alert("您暂时还不能参与本次活动，详情请咨询watero微信商城客服", '', function() {
+                        mui.openWindow({url: base_path+'/index'});
+                    });
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                //异常处理；
+                console.log(xhr);
+                mui.alert("请检查网络或刷新页面重试！");
+            }
+        });
+    });
+    mui('body').on('tap', '#btn_submit', function() {
+        //console.log($(".ul_radio .active").attr("colorid"));
+        var th=this;
+        change_input();
+        if(check){
+            mui(th).button('loading');
+            var param = {
+                "puserName": $("#ipt-name").val(),
+                "puserTel": $("#ipt-phone").val(),
+                "puserProductid": $(".ul_radio .active").attr("id"),
+                "puserNickName":nickname ,
+                "puser": ads_tel,
+                "puserAddress": address,
+                "colorId":$(".ul_radio .active").attr("colorid"),
+            };
 
-var address='',nickname='',ads_tel='';
-// 获取微信共享地址
-mui('body').on('tap', '#open-wechat-addres-a', function() {
-	editAddrV1(
-		function(res) {
-			if(res.provinceName!="山西省"){
-				address='';
-				$(".ul-addres").empty();
-				mui.alert("本活动仅限山西省用户");
-			}else{
-				// 用户成功拉出地址 
-				address = res.provinceName + "-" + res.cityName + "-" + res.countryName + "-" + res.detailInfo;
-				wechatAddr.status = true;
-				wechatAddr.detailInfo = address;
-				wechatAddr.postalCode = res.postalCode;
-				wechatAddr.userName = res.userName;
-				wechatAddr.userTel = res.telNumber;
-				wechatAddr.nationalCode = res.nationalCode;
-				nickname=res.userName;
-				ads_tel=res.telNumber;
-				$(".ul-addres").empty().append("<li>收货人：" + wechatAddr.userName + "</li><li>手 机 号：" + wechatAddr.userTel + "</li>" +"<li>详细地址：" + address + "</li>");
-			}
-		},
-		function() {
-			if(address != '') {
-				wechatAddr.status = true;
-			} else {
-				wechatAddr.status = false;
-				// 用户取消拉出地址
-				mui.alert("您没有选择收货地址!");
-			}
-		}
-	);
+            $.ajax({
+                type: 'get',
+                url: base_path+'/probationOrder/validation_code',
+                data: {"phone":$("#ipt-phone").val().trim(),"code":$("#ipt-code").val().trim(),"colorId":$(".ul_radio .active").attr("colorid")},
+                dataType: 'json',
+                timeout: 15000,
+                success: function(dt) {
+                    //console.log(dt);
+                    if(dt.returnCode==200) {
+                        $.ajax({
+                            type: 'post',
+                            url: base_path+'/probationOrder/addProbationOrder',
+                            data: param,
+                            dataType: 'json',
+                            timeout: 15000,
+                            success: function(dt) {
+                                //console.log(dt);
+                                if(dt.status) {
+                                    mui.alert("本批watero试用机为新机，请您在试用过程中足够爱惜，切勿刮划机身及损坏包装，感谢您的配合！", '', function() {
+                                        mui.openWindow({url: base_path+'/agentWechat/member'})
+                                    });
+                                } else {
+                                    mui(th).button('reset');
+                                    mui.alert(dt.message);
+                                }
+                            },
+                            error: function(xhr, type, errorThrown) {
+                                //异常处理；
+                                console.log(xhr);
+                                mui.alert("请检查网络或刷新页面重试！");
+                                mui(th).button('reset');
+                            }
+                        });
+                    }else{
+                        mui(th).button('reset');
+                        mui.alert(dt.returnMsg.returnMsg);
+                    }
+                },
+                error: function(xhr, type, errorThrown) {
+                    //异常处理；
+                    mui(th).button('reset');
+                    console.log(xhr);
+                    mui.alert("请检查网络或刷新页面重试！");
+                }
+            });
+        }else{
+            //console.log("未通过");
+            mui.alert(alert_msg);
+        }
+    });
+    mui('body').on('tap', '#xieyi-dalog', function() {
+        mui.openWindow({
+            url:base_path+ '/probation/try_agreement'
+        });
+    });
+    $(document).on('tap', '#btn-tongyi', function() {
+        var btn_submit=$("#btn_submit");
+        //console.log($(this).hasClass("mui-active"));
+        if($(this).hasClass("mui-active")){
+            $(this).removeClass("mui-active");
+            btn_submit.removeClass("mui-active");
+        }else{
+            $(this).addClass("mui-active");
+            btn_submit.addClass("mui-active");
+        }
+    });
+    $(document).on('tap', '#pull-code', function() {
+        if($("#ipt-phone").val().trim()=="" &&(!$("#pull-code").hasClass("mui-active"))){
+            mui.alert("请填写手机号码");
+            return;
+        }else{
+            if(!mobile.test($("#ipt-phone").val().trim())){
+                mui.alert("手机号码不正确，请重新填写");
+                return;
+            }else{
+                if($(this).hasClass("mui-active")){
+                    return;
+                }else{
+                    $(this).addClass("mui-active");
+                    settime("pull-code");
+                    getConfig();
+                    $.ajax({
+                        type: 'get',
+                        url: base_path+'/probationOrder/send_code',
+                        data: {"phone":$("#ipt-phone").val().trim()},
+                        dataType: 'json',
+                        timeout: 15000,
+                        success: function(dt) {
+                            //console.log(dt);
+                            if(dt.returnCode==1) {
+                                countdown=1;
+                                mui.alert("该手机号码已经申请过，请勿重复提交！");
+                            }else if(dt.returnCode==2){
+                                countdown=1;
+                                mui.alert("您使用的手机号码是空号");
+                            }else if(dt.returnCode==500){
+                                mui.alert(dt.returnMsg.returnMsg);
+                            }
+                        },
+                        error: function(xhr, type, errorThrown) {
+                            //异常处理；
+                            console.log(xhr);
+                            mui.alert("请检查网络或刷新页面重试！");
+                        }
+                    });
+                }
+            }
+        }
+    });
+    var countdown=60;
+    function settime(val) {
+        pullid=dc(val);
+        if (countdown == 0) {
+            pullid.removeAttribute("disabled");
+            pullid.className='btn-pull-code';
+            pullid.innerText="获取验证码";
+            countdown = 60;
+            return false;
+        } else {
+            pullid.setAttribute("disabled", true);
+            pullid.className='btn-pull-code mui-active';
+            pullid.innerText="重新发送(" + countdown + ")";
+            countdown--;
+        }
+        setTimeout(function() {
+            settime(val)
+        },1000)
+    }
+    function change_input() {
+        $(".mui-input-group input").each(function(index) {
+            switch ($(this).attr("id")){
+                case "ipt-name":
+                    if($(this).val().trim()==""){
+                        alert_msg="请填写姓名";
+                        check=false;
+                        return false;
+                    }else{
+                        if(uname.test($(this).val())) {
+                            check=true;
+                        }else{
+                            alert_msg="姓名格式不正确，请重新填写";
+                            check=false;
+                            return false;
+                        }
+                    }
+                    break;
+                case "ipt-phone":
+                    if($(this).val().trim()==""){
+                        alert_msg="请填写手机号";
+                        check=false;
+                        return false;
+                    }else{
+                        if(mobile.test($(this).val().trim())) {
+                            check=true;
+                        }else{
+                            alert_msg="手机号码不正确，请重新填写";
+                            check=false;
+                            return false;
+                        }
+                    }
+                    break;
+                case "ipt-code":
+                    if($(this).val().trim()==""){
+                        alert_msg="请填写验证码";
+                        check=false;
+                        return false;
+                    }else{
+                        if(code.test($(this).val().trim())) {
+                            check=true;
+                        }else{
+                            alert_msg="验证码格式不正确，请重新填写";
+                            check=false;
+                            return false;
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+        });
+        if(check) {
+            if(address==''){
+                alert_msg="请选择送货信息";
+                check=false;
+                return false;
+            }else{
+                check=true;
+            }
+            if($("#btn-tongyi").hasClass("mui-active")){
+                alert_msg="请勾选同意试用协议";
+                check=false;
+                return false;
+            }else{
+                check=true;
+            }
+        }
 
-});
-	</script>
-	</body>
+		/* 	if(check) {
+		 console.log("通过")
+		 } else {
+		 console.log(alert_msg);
+		 } */
+    }
+
+    var address='',nickname='',ads_tel='';
+    // 获取微信共享地址
+    mui('body').on('tap', '#open-wechat-addres-a', function() {
+        editAddrV1(
+            function(res) {
+                if(res.provinceName!="山西省"){
+                    address='';
+                    $(".ul-addres").empty();
+                    mui.alert("本活动仅限山西省用户");
+                }else{
+                    // 用户成功拉出地址
+                    address = res.provinceName + "-" + res.cityName + "-" + res.countryName + "-" + res.detailInfo;
+                    wechatAddr.status = true;
+                    wechatAddr.detailInfo = address;
+                    wechatAddr.postalCode = res.postalCode;
+                    wechatAddr.userName = res.userName;
+                    wechatAddr.userTel = res.telNumber;
+                    wechatAddr.nationalCode = res.nationalCode;
+                    nickname=res.userName;
+                    ads_tel=res.telNumber;
+                    $(".ul-addres").empty().append("<li>收货人：" + wechatAddr.userName + "</li><li>手 机 号：" + wechatAddr.userTel + "</li>" +"<li>详细地址：" + address + "</li>");
+                }
+            },
+            function() {
+                if(address != '') {
+                    wechatAddr.status = true;
+                } else {
+                    wechatAddr.status = false;
+                    // 用户取消拉出地址
+                    mui.alert("您没有选择收货地址!");
+                }
+            }
+        );
+
+    });
+</script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/try_order.html

@@ -1,368 +1,368 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-<style>
-.head {height: 60px;}
-#head {line-height: 60px;}
-.icon-songhuo{font-size: 15px;padding-left: 22px;}
-.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
-.try_price{color: #f1436c;}
-.mui-table-view .mui-media .mui-media-body{height: 41px;line-height: 41px;color: #333;}
-.mui-table-view .mui-media .mui-media-body>span{color: #f1436c;}
-.my-table-view-try{border-top: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;padding: 10px 0;}
-.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
-.mui-table-view-cell>a:not(.mui-btn){margin: -15px -15px;}
-.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
-#btn_pay{color: #fff;padding: 10px 0;font-size: 18px;background: #24cae9;}
-.mui-content-padded{margin: 10px 13px;}
-.tips{padding: 20px 10px;background: #24cae9;text-align: center;color: #fff;}
-.icon-yanse,.icon-youhui,.icon-fuxuankuang,.icon-jiage,.icon-songhuo{font-size: 15px;padding-left: 22px;}
-.icon-yanse:before,.icon-fuxuankuang:before,.icon-youhui:before,.icon-jiage:before,.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
-			
-.point-time {content: "";position: absolute;width: 12px;height: 12px;top: 3px;left: 22px;background: #ccc;margin-left: -4px;border-radius: 50%;}
-.point-blue{color: #ccc;}
-.my-active .point-time {background-color:#01c0b5;}
-.my-active .point-blue{color:#fff;position: relative;background: #01c0b5;padding: 3px 10px;border-radius:25px;}
-.my-active .point-blue:before {position: absolute;content: "\00a0";width: 0px;height: 0px;border-width: 3px 6px 3px 0;border-style: solid;border-color: transparent #01c0b5 transparent transparent;top: 6px;left:-5px;}
-.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #c8c8c8 !important;}
-.content {width: 100%;margin:0 auto;}
-.content article {position: relative;}
-.content article section {padding: 0 0 20px 0;position: relative;}
-.content article section:before {content: "";width: 1px;top: 17px;bottom:0;left: 23px;background: #ccc;position: absolute;}
-.content article section:last-child:before {bottom:0;}
-.content article section time {display: block;}
-.content article section time > span {display: block;margin-left: 45px;color:#ccc;font-size: 12px;}
-.content article section aside {color: #3a3a38;margin-left:45px;margin-right: 5px;}
-.content article section aside p{margin-bottom: 0;font-size:13px;}
-.content article section aside .things{color:#222;margin-top: 5px;}
-.content article section:last-child:before {display: none;}
-.content article .my-active time > span{color: #333;}
-.ul-addres{padding-left: 24px;color: #333;font-size:12px;}
-</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css" />
+	<style>
+		.head {height: 60px;}
+		#head {line-height: 60px;}
+		.icon-songhuo{font-size: 15px;padding-left: 22px;}
+		.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
+		.try_price{color: #f1436c;}
+		.mui-table-view .mui-media .mui-media-body{height: 41px;line-height: 41px;color: #333;}
+		.mui-table-view .mui-media .mui-media-body>span{color: #f1436c;}
+		.my-table-view-try{border-top: .6em solid #f0f0f0;border-bottom: .6em solid #f0f0f0;padding: 10px 0;}
+		.mui-table-view-cell:after,.mui-table-view:before,.mui-table-view:after,.mui-input-group .mui-input-row:after,.mui-input-group:before,.mui-input-group:after{display: none;}
+		.mui-table-view-cell>a:not(.mui-btn){margin: -15px -15px;}
+		.mui-table-view-cell>a .mui-pull-right{color: #999;font-size: 14px;}
+		#btn_pay{color: #fff;padding: 10px 0;font-size: 18px;background: #24cae9;}
+		.mui-content-padded{margin: 10px 13px;}
+		.tips{padding: 20px 10px;background: #24cae9;text-align: center;color: #fff;}
+		.icon-yanse,.icon-youhui,.icon-fuxuankuang,.icon-jiage,.icon-songhuo{font-size: 15px;padding-left: 22px;}
+		.icon-yanse:before,.icon-fuxuankuang:before,.icon-youhui:before,.icon-jiage:before,.icon-songhuo:before{font-size: 18px;color: #24cae9;position: absolute;left: 0;width: 20px;height: 18px;}
+
+		.point-time {content: "";position: absolute;width: 12px;height: 12px;top: 3px;left: 22px;background: #ccc;margin-left: -4px;border-radius: 50%;}
+		.point-blue{color: #ccc;}
+		.my-active .point-time {background-color:#01c0b5;}
+		.my-active .point-blue{color:#fff;position: relative;background: #01c0b5;padding: 3px 10px;border-radius:25px;}
+		.my-active .point-blue:before {position: absolute;content: "\00a0";width: 0px;height: 0px;border-width: 3px 6px 3px 0;border-style: solid;border-color: transparent #01c0b5 transparent transparent;top: 6px;left:-5px;}
+		.mui-btn-block.mui-active,.btn-pull-code.mui-active{background-color: #c8c8c8 !important;}
+		.content {width: 100%;margin:0 auto;}
+		.content article {position: relative;}
+		.content article section {padding: 0 0 20px 0;position: relative;}
+		.content article section:before {content: "";width: 1px;top: 17px;bottom:0;left: 23px;background: #ccc;position: absolute;}
+		.content article section:last-child:before {bottom:0;}
+		.content article section time {display: block;}
+		.content article section time > span {display: block;margin-left: 45px;color:#ccc;font-size: 12px;}
+		.content article section aside {color: #3a3a38;margin-left:45px;margin-right: 5px;}
+		.content article section aside p{margin-bottom: 0;font-size:13px;}
+		.content article section aside .things{color:#222;margin-top: 5px;}
+		.content article section:last-child:before {display: none;}
+		.content article .my-active time > span{color: #333;}
+		.ul-addres{padding-left: 24px;color: #333;font-size:12px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content" style="background: #fff;">
+	<div class="tips more">
+		<h3>试用订单详情</h3>
 	</div>
-			<div class="mui-content" style="background: #fff;">
-				<div class="tips more">
-					<h3>试用订单详情</h3>
-				</div>
-					<ul class="mui-table-view">
-						<li class="mui-table-view-cell">
-							试用订单号<span class="mui-pull-right" id="postNum"></span>
-						</li>
-						<li class="mui-table-view-cell">
-							试用商品<span class="mui-pull-right" id="proName"></span>
-						</li>
-						<li class="mui-table-view-cell">
-							商品价格<span class="mui-pull-right ft-12">试用期内体验价<span class="try_price">0元</span>，<!-- <s class="mui-h6" id="cost_price"></s> -->&nbsp;&nbsp;<span class="try_price" id="try_price"></span></span>
-						</li>
-						<li style="padding: 10px 0 0 10px;">
-						<span class="iconfont icon-youhui">支付优惠</span>
-					</li>
-					<li class="mui-table-view-cell" style="display:none">
-					<span>试用价格：<span class="try_price">0元</span></span><br/>
-						<img width="100%" src="/watero/wateroimages/cp-zeng.jpg" />
-						<br/><span class="try_price">产品试用未购买，不给予开发票</span>
-					</li>
-					</ul>
+	<ul class="mui-table-view">
+		<li class="mui-table-view-cell">
+			试用订单号<span class="mui-pull-right" id="postNum"></span>
+		</li>
+		<li class="mui-table-view-cell">
+			试用商品<span class="mui-pull-right" id="proName"></span>
+		</li>
+		<li class="mui-table-view-cell">
+			商品价格<span class="mui-pull-right ft-12">试用期内体验价<span class="try_price">0元</span>，<!-- <s class="mui-h6" id="cost_price"></s> -->&nbsp;&nbsp;<span class="try_price" id="try_price"></span></span>
+		</li>
+		<li style="padding: 10px 0 0 10px;">
+			<span class="iconfont icon-youhui">支付优惠</span>
+		</li>
+		<li class="mui-table-view-cell" style="display:none">
+			<span>试用价格：<span class="try_price">0元</span></span><br/>
+			<img width="100%" src="//s.iamberry.com/watero/images/cp-zeng.jpg" />
+			<br/><span class="try_price">产品试用未购买，不给予开发票</span>
+		</li>
+	</ul>
 
-				<ul class="mui-table-view my-table-view-try">
-					<li class="mui-table-view-cell">
-						<a>
-							<span class="iconfont icon-songhuo">送货信息</span>
-						<ul class="ul-addres">
-							<!-- <li>收  货  人：林林</li>
-							<li>手 机 号：15999999999</li>
-							<li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li> -->
-						</ul>
-						</a>	
-					</li>
-				</ul>
-				<ul class="mui-table-view" id="ul-status">
-					<li class="mui-table-view-cell">
-						订单状态
-					</li>
-					<li style="padding: 0;">
-					<div class="content">
-					<article>
-						<section id="statu1">
-							<span class="point-time"></span>
-							<time>
-								<span><span class="point-blue">待派送</span></span>
-							</time>
-						</section>
-						<section id="statu2">
-							<span class="point-time"></span>
-							<time>
-								<span><span class="point-blue">派送中</span><span id="sendName"></span></span>
-							</time>
-						</section>
-						<section id="statu3">
-							<span class="point-time"></span>
-							<time>
-								<span><span class="point-blue">待支付</span></span>
-							</time>
-						</section>
-						<section id="statu4">
-							<span class="point-time"></span>
-							<time>
-								<span><span class="point-blue">试用暂停</span></span>
-							</time>
-						</section>
-						<section id="statu5">
-							<span class="point-time"></span>
-							<time>
-								<span><span class="point-blue">支付完成</span></span>
-							</time>
-						</section>
-					</article>
-					</div>
-					</li>
-					<li class="mui-table-view-cell">
-						试用时间：剩余<span class="try_price" id="time_out"></span> 
-					</li>
+	<ul class="mui-table-view my-table-view-try">
+		<li class="mui-table-view-cell">
+			<a>
+				<span class="iconfont icon-songhuo">送货信息</span>
+				<ul class="ul-addres">
+					<!-- <li>收  货  人：林林</li>
+                    <li>手 机 号：15999999999</li>
+                    <li>详细地址：广东省深圳市福田区莲花街道特区报业大厦12B</li> -->
 				</ul>
-				<div class="mui-content-padded">
-					<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="正在请求数据，请稍后" class="mui-btn mui-btn-block mui-btn-outlined mui-active" id="btn_pay" disabled="disabled">立即支付</button>
-				</div>
-		</div>
-	<script type="text/javascript" src="/watero/waterojs/mui.min.js"></script>
-	<script type="text/javascript" src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script type="text/javascript" src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script type="text/javascript" src="/watero/waterojs/shop/main.js"></script>
-	<script type="text/javascript">
-	var postNum='';
-	var isPay = true; // 是否在请求支付，false表示正在请求,true可以请求
-	var istry=true;
-	mui.ready(function(){
-		$.ajax({
-			type: 'post',
-			url: base_path+'/probation/getProbationOrderDetail',
-			data: {"orderId":getParam("orderId")},
-			dataType: 'json',
-			timeout: 15000,
-			success: function(dt) {
-				//console.log(dt);
-				if(dt.status) {
-					postNum=dt.data.probationOrderid;
-					 $("#postNum").text(dt.data.probationOrderid);
-					 $("#try_price").text("试用价¥"+accDiv(dt.data.probationYetAmount, 100));
-					 //$("#cost_price").text("原价¥"+accDiv(dt.data.probationAmount, 100));
-					 if (dt.data.probationPostNum != "" && dt.data.probationPostFirm != "") {
-						 $(".ul-addres").html('<li>收  件  人：'+dt.data.probationReceiveName+'</li><li>手 机 号：'+dt.data.probationReceiveTel+'</li><li>详细地址：'+dt.data.probationAddressInfo+'</li><li>快递单号：' + dt.data.probationPostNum + '</li><li>快递公司：上门送货</li>');
-					 } else {
-						 $(".ul-addres").html('<li>收  件  人：'+dt.data.probationReceiveName+'</li><li>手 机 号：'+dt.data.probationReceiveTel+'</li><li>详细地址：'+dt.data.probationAddressInfo+'</li>');
-					 }
-					 if(dt.data.probationSendName!=""){
-						 $("#sendName").html('（派送员：'+dt.data.probationSendName+'  手机:<a href="tel:'+dt.data.probationSendTel+'">'+dt.data.probationSendTel+'</a>）');
-					 }
-					 var proColor='';
-					 switch (dt.data.probationColorType){
-						case 1:
-							proColor="品蓝";
-							break;
-						case 2:
-							proColor="品黑";
-							break;
-						case 3:
-							proColor="苹果绿";
-							break;
-						case 4:
-							proColor="西瓜红";
-							break;
-						default:
-							break;
-					}
-					 $("#proName").html(dt.data.probationProductName+'('+proColor+')');
-					 //console.log(new Date().getTime())
-					 $(".content #statu"+dt.data.probationStatus).addClass("my-active");
-					 if(dt.data.probationStatus==3){
-						 addTimer('time_out', dt.data.probationRemainingTime/ 1000);
-						 $("#btn_pay").removeAttr("disabled").removeClass("mui-active");
-							mui('body').on('tap', '#btn_pay', function() {
-								var th=this;
-								//console.log("立即支付");
-								mui(this).button('loading');
-								if(isPay){
-									isPay = false; //锁定请求	
-								$.ajax({
-									type: 'post',
-									url: base_path+'/probation/pay',
-									data: {"orderId":postNum},
-									dataType: 'json',
-									timeout: 15000,
-									success: function(dt) {
-										//console.log(dt);
-										if(dt.status) {
-											var obj = JSON.parse("{" + dt.data.info + "}");
-											WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
-												if(res.err_msg == 'get_brand_wcpay_request:ok') {
-													$.ajax({
-														type: 'post',
-														url: base_path+'/probation/check_probation_pay_success',
-														data: {"orderId":postNum},
-														dataType: 'json',
-														timeout: 15000,
-														success: function(data) {
-															//console.log(data);
-															if(data.status) {
-																if(data.data==5){
-																	mui.alert("支付成功", '', function() {
-																		 mui.openWindow({url: base_path+'/probation/try_order?orderId='+postNum});
-																	});
-																}else{
-																	mui.alert(data.message, '', function() {
-																		mui(th).button('reset');
-																	});
-																}
-															} else {
-																mui(th).button('reset');
-																mui.alert(data.message);
-															}
-														},
-														error: function(xhr, type, errorThrown) {
-															//异常处理；
-															console.log(xhr);
-															mui(th).button('reset');
-															mui.alert("请检查网络或刷新页面重试！");
-														}
-													});
-												} else {
-													isPay = true;
-													mui(th).button('reset');
-													mui.alert("对不起，支付失败!请稍后重试!");
-												}
-											});
-										} else {
-											mui(th).button('reset');
-											mui.alert(dt.message);
-										}
-									},
-									error: function(xhr, type, errorThrown) {
-										//异常处理；
-										console.log(xhr);
-										mui(th).button('reset');
-										mui.alert("请检查网络或刷新页面重试！");
-									}
-								});	
-								}else{
-									mui.alert("正在请求支付中~~请稍后!");
-									return;
-								}
-							});
-					 }else if(dt.data.probationStatus==1){
-						 $("#time_out").parent().hide();
-						 $("#btn_pay").removeAttr("disabled").removeClass("mui-active").text("取消订单");
-						 mui('body').on('tap', '#btn_pay', function() {
-								var th=this;
-								//console.log("取消订单");
-								var btnArray = ['否', '是'];
-								mui.confirm('确认取消试用订单？', '温馨提示', btnArray, function(e) {
-									if (e.index == 1) {
-										mui(th).button('loading');
-										if(istry){
-											istry = false; //锁定请求	
-										$.ajax({
-											type: 'post',
-											url: base_path+'/probation/userCancelOrder',
-											data: {"orderId":postNum},
-											dataType: 'json',
-											timeout: 15000,
-											success: function(dt) {
-												//console.log(dt);
-												if(dt.resultCode=="200") {
-													location.reload(true);
-												} else {
-													mui(th).button('reset');
-													mui.alert(dt.returnMsg.returnMsg);
-												}
-											},
-											error: function(xhr, type, errorThrown) {
-												//异常处理；
-												console.log(xhr);
-												mui(th).button('reset');
-												mui.alert("请检查网络或刷新页面重试！");
-											}
-										});	
-										}else{
-											mui.alert("正在请求取消订单中~~请稍后!");
-											return;
-										}
-									} else {
-										mui(th).button('reset');
-									}
-								});
-							});
-					 }else if(dt.data.probationStatus==0){
-						 $("#time_out").parent().hide();
-						 $("#ul-status").hide();
-						 $("#btn_pay").text("订单已取消");
-					 }else{
-						 $("#time_out").parent().hide();
-					 }
-				} else {
-					mui.alert(dt.message);
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理；
-				console.log(xhr);
-				mui.alert("请检查网络或刷新页面重试！");
-			}
-		});	
-		//console.log("页面加载完毕")
-		document.querySelector('.loading-bg').style.display='none';
-	});
-	
-	var addTimer = function() {
-		var list = [],
-			interval;
+			</a>
+		</li>
+	</ul>
+	<ul class="mui-table-view" id="ul-status">
+		<li class="mui-table-view-cell">
+			订单状态
+		</li>
+		<li style="padding: 0;">
+			<div class="content">
+				<article>
+					<section id="statu1">
+						<span class="point-time"></span>
+						<time>
+							<span><span class="point-blue">待派送</span></span>
+						</time>
+					</section>
+					<section id="statu2">
+						<span class="point-time"></span>
+						<time>
+							<span><span class="point-blue">派送中</span><span id="sendName"></span></span>
+						</time>
+					</section>
+					<section id="statu3">
+						<span class="point-time"></span>
+						<time>
+							<span><span class="point-blue">待支付</span></span>
+						</time>
+					</section>
+					<section id="statu4">
+						<span class="point-time"></span>
+						<time>
+							<span><span class="point-blue">试用暂停</span></span>
+						</time>
+					</section>
+					<section id="statu5">
+						<span class="point-time"></span>
+						<time>
+							<span><span class="point-blue">支付完成</span></span>
+						</time>
+					</section>
+				</article>
+			</div>
+		</li>
+		<li class="mui-table-view-cell">
+			试用时间：剩余<span class="try_price" id="time_out"></span>
+		</li>
+	</ul>
+	<div class="mui-content-padded">
+		<button type="button" data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="正在请求数据，请稍后" class="mui-btn mui-btn-block mui-btn-outlined mui-active" id="btn_pay" disabled="disabled">立即支付</button>
+	</div>
+</div>
+<script type="text/javascript" src="//s.iamberry.com/watero/js/mui.min.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script type="text/javascript" src="//s.iamberry.com/watero/js/shop/main.js"></script>
+<script type="text/javascript">
+    var postNum='';
+    var isPay = true; // 是否在请求支付，false表示正在请求,true可以请求
+    var istry=true;
+    mui.ready(function(){
+        $.ajax({
+            type: 'post',
+            url: base_path+'/probation/getProbationOrderDetail',
+            data: {"orderId":getParam("orderId")},
+            dataType: 'json',
+            timeout: 15000,
+            success: function(dt) {
+                //console.log(dt);
+                if(dt.status) {
+                    postNum=dt.data.probationOrderid;
+                    $("#postNum").text(dt.data.probationOrderid);
+                    $("#try_price").text("试用价¥"+accDiv(dt.data.probationYetAmount, 100));
+                    //$("#cost_price").text("原价¥"+accDiv(dt.data.probationAmount, 100));
+                    if (dt.data.probationPostNum != "" && dt.data.probationPostFirm != "") {
+                        $(".ul-addres").html('<li>收  件  人：'+dt.data.probationReceiveName+'</li><li>手 机 号：'+dt.data.probationReceiveTel+'</li><li>详细地址：'+dt.data.probationAddressInfo+'</li><li>快递单号：' + dt.data.probationPostNum + '</li><li>快递公司：上门送货</li>');
+                    } else {
+                        $(".ul-addres").html('<li>收  件  人：'+dt.data.probationReceiveName+'</li><li>手 机 号：'+dt.data.probationReceiveTel+'</li><li>详细地址：'+dt.data.probationAddressInfo+'</li>');
+                    }
+                    if(dt.data.probationSendName!=""){
+                        $("#sendName").html('（派送员：'+dt.data.probationSendName+'  手机:<a href="tel:'+dt.data.probationSendTel+'">'+dt.data.probationSendTel+'</a>）');
+                    }
+                    var proColor='';
+                    switch (dt.data.probationColorType){
+                        case 1:
+                            proColor="品蓝";
+                            break;
+                        case 2:
+                            proColor="品黑";
+                            break;
+                        case 3:
+                            proColor="苹果绿";
+                            break;
+                        case 4:
+                            proColor="西瓜红";
+                            break;
+                        default:
+                            break;
+                    }
+                    $("#proName").html(dt.data.probationProductName+'('+proColor+')');
+                    //console.log(new Date().getTime())
+                    $(".content #statu"+dt.data.probationStatus).addClass("my-active");
+                    if(dt.data.probationStatus==3){
+                        addTimer('time_out', dt.data.probationRemainingTime/ 1000);
+                        $("#btn_pay").removeAttr("disabled").removeClass("mui-active");
+                        mui('body').on('tap', '#btn_pay', function() {
+                            var th=this;
+                            //console.log("立即支付");
+                            mui(this).button('loading');
+                            if(isPay){
+                                isPay = false; //锁定请求
+                                $.ajax({
+                                    type: 'post',
+                                    url: base_path+'/probation/pay',
+                                    data: {"orderId":postNum},
+                                    dataType: 'json',
+                                    timeout: 15000,
+                                    success: function(dt) {
+                                        //console.log(dt);
+                                        if(dt.status) {
+                                            var obj = JSON.parse("{" + dt.data.info + "}");
+                                            WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
+                                                if(res.err_msg == 'get_brand_wcpay_request:ok') {
+                                                    $.ajax({
+                                                        type: 'post',
+                                                        url: base_path+'/probation/check_probation_pay_success',
+                                                        data: {"orderId":postNum},
+                                                        dataType: 'json',
+                                                        timeout: 15000,
+                                                        success: function(data) {
+                                                            //console.log(data);
+                                                            if(data.status) {
+                                                                if(data.data==5){
+                                                                    mui.alert("支付成功", '', function() {
+                                                                        mui.openWindow({url: base_path+'/probation/try_order?orderId='+postNum});
+                                                                    });
+                                                                }else{
+                                                                    mui.alert(data.message, '', function() {
+                                                                        mui(th).button('reset');
+                                                                    });
+                                                                }
+                                                            } else {
+                                                                mui(th).button('reset');
+                                                                mui.alert(data.message);
+                                                            }
+                                                        },
+                                                        error: function(xhr, type, errorThrown) {
+                                                            //异常处理；
+                                                            console.log(xhr);
+                                                            mui(th).button('reset');
+                                                            mui.alert("请检查网络或刷新页面重试！");
+                                                        }
+                                                    });
+                                                } else {
+                                                    isPay = true;
+                                                    mui(th).button('reset');
+                                                    mui.alert("对不起，支付失败!请稍后重试!");
+                                                }
+                                            });
+                                        } else {
+                                            mui(th).button('reset');
+                                            mui.alert(dt.message);
+                                        }
+                                    },
+                                    error: function(xhr, type, errorThrown) {
+                                        //异常处理；
+                                        console.log(xhr);
+                                        mui(th).button('reset');
+                                        mui.alert("请检查网络或刷新页面重试！");
+                                    }
+                                });
+                            }else{
+                                mui.alert("正在请求支付中~~请稍后!");
+                                return;
+                            }
+                        });
+                    }else if(dt.data.probationStatus==1){
+                        $("#time_out").parent().hide();
+                        $("#btn_pay").removeAttr("disabled").removeClass("mui-active").text("取消订单");
+                        mui('body').on('tap', '#btn_pay', function() {
+                            var th=this;
+                            //console.log("取消订单");
+                            var btnArray = ['否', '是'];
+                            mui.confirm('确认取消试用订单？', '温馨提示', btnArray, function(e) {
+                                if (e.index == 1) {
+                                    mui(th).button('loading');
+                                    if(istry){
+                                        istry = false; //锁定请求
+                                        $.ajax({
+                                            type: 'post',
+                                            url: base_path+'/probation/userCancelOrder',
+                                            data: {"orderId":postNum},
+                                            dataType: 'json',
+                                            timeout: 15000,
+                                            success: function(dt) {
+                                                //console.log(dt);
+                                                if(dt.resultCode=="200") {
+                                                    location.reload(true);
+                                                } else {
+                                                    mui(th).button('reset');
+                                                    mui.alert(dt.returnMsg.returnMsg);
+                                                }
+                                            },
+                                            error: function(xhr, type, errorThrown) {
+                                                //异常处理；
+                                                console.log(xhr);
+                                                mui(th).button('reset');
+                                                mui.alert("请检查网络或刷新页面重试！");
+                                            }
+                                        });
+                                    }else{
+                                        mui.alert("正在请求取消订单中~~请稍后!");
+                                        return;
+                                    }
+                                } else {
+                                    mui(th).button('reset');
+                                }
+                            });
+                        });
+                    }else if(dt.data.probationStatus==0){
+                        $("#time_out").parent().hide();
+                        $("#ul-status").hide();
+                        $("#btn_pay").text("订单已取消");
+                    }else{
+                        $("#time_out").parent().hide();
+                    }
+                } else {
+                    mui.alert(dt.message);
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                //异常处理；
+                console.log(xhr);
+                mui.alert("请检查网络或刷新页面重试！");
+            }
+        });
+        //console.log("页面加载完毕")
+        document.querySelector('.loading-bg').style.display='none';
+    });
 
-		return function(id, time) {
-			if(!interval)
-				interval = setInterval(go, 1000);
-			list.push({
-				ele: document.getElementById(id),
-				time: time
-			});
-		}
+    var addTimer = function() {
+        var list = [],
+            interval;
 
-		function go() {
-			for(var i = 0; i < list.length; i++) {
-				list[i].ele.innerHTML = getTimerString(list[i].time ? list[i].time -= 1 : 0);
-				if(!list[i].time)
-					list.splice(i--, 1);
-			}
-		}
+        return function(id, time) {
+            if(!interval)
+                interval = setInterval(go, 1000);
+            list.push({
+                ele: document.getElementById(id),
+                time: time
+            });
+        }
 
-		function getTimerString(time) {
-			d = Math.floor(time / 86400),
-				h = Math.floor((time % 86400) / 3600),
-				m = Math.floor(((time % 86400) % 3600) / 60),
-				s = Math.floor(((time % 86400) % 3600) % 60);
-			if(time > 0)
-				return  d + "天" + h + "时" + m + "分" + s+"秒";
-			else return "试用已结束";
-		}
-	}();
-	</script>
-	</body>
+        function go() {
+            for(var i = 0; i < list.length; i++) {
+                list[i].ele.innerHTML = getTimerString(list[i].time ? list[i].time -= 1 : 0);
+                if(!list[i].time)
+                    list.splice(i--, 1);
+            }
+        }
+
+        function getTimerString(time) {
+            d = Math.floor(time / 86400),
+                h = Math.floor((time % 86400) / 3600),
+                m = Math.floor(((time % 86400) % 3600) / 60),
+                s = Math.floor(((time % 86400) % 3600) % 60);
+            if(time > 0)
+                return  d + "天" + h + "时" + m + "分" + s+"秒";
+            else return "试用已结束";
+        }
+    }();
+</script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/vip_center.html

@@ -1,36 +1,36 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/vip_center.css" />
-		<style>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016111001" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016111001" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016111001" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/vip_center.css?v=2016111001" />
+	<style>
 		.my-view-order .mui-media-body {
-     padding-top: 0;
-}
-		 .center-middle{font-size: 12px;    position: absolute;
-    left: 90px;
-    top: 50%;
-    -webkit-transform: translateY(-50%);}
-.wh-80 {
-    width: 70px !important;
-    max-width: 70px !important;
-    height: 70px !important;
-    margin: 0 5px 0 0 !important;
-    overflow: hidden;
-    display: inline-block;
-    text-align: center;
-}
-.wh-80 img {
-    height: 70px;
-}
-.btn-box{bottom:auto;top:12px;}
+			padding-top: 0;
+		}
+		.center-middle{font-size: 12px;    position: absolute;
+			left: 90px;
+			top: 50%;
+			-webkit-transform: translateY(-50%);}
+		.wh-80 {
+			width: 70px !important;
+			max-width: 70px !important;
+			height: 70px !important;
+			margin: 0 5px 0 0 !important;
+			overflow: hidden;
+			display: inline-block;
+			text-align: center;
+		}
+		.wh-80 img {
+			height: 70px;
+		}
+		.btn-box{bottom:auto;top:12px;}
 		.icon-orderyue{font-size: 35px;}
 		#menu-nav .mui-control-item {line-height: 1;color: #333;border-color: #fff;border:0;padding: 10px 0 15px 0;font-size: 12px;}
 		#menu-nav {border: 0;border-radius: 3px;}
@@ -49,229 +49,229 @@
 		.icon-renwu,.icon-naifen{color: #f88c43;}
 		.icon-shouhou,.icon-order{color: #31c27c;}
 		.mui-table-view.mui-grid-view .mui-table-view-cell .mui-media-body{font-size: 12px;}
-#menu-lease-order,#menu-lease-other{border: 0;border-radius: 3px;}
-#menu-lease-order .mui-control-item,#menu-lease-other .mui-control-item{line-height: 1;color: #333;border-color: #fff;border:0;padding: 6px 0 10px 0;font-size: 12px;}
-#menu-lease-order .mui-control-item.mui-active,#menu-lease-other .mui-control-item.mui-active{color: #333;background-color:rgba(0,0,0,.1);}
-#menu-lease-order .iconfont,#menu-lease-other .iconfont{padding: 5px 0;}
-.icon-daifahuo1,.icon-shebeiliebiao{color: #1bcba8;}
-.icon-yifahuo,.icon-zulinxieyi{color: #55c0dc;}
+		#menu-lease-order,#menu-lease-other{border: 0;border-radius: 3px;}
+		#menu-lease-order .mui-control-item,#menu-lease-other .mui-control-item{line-height: 1;color: #333;border-color: #fff;border:0;padding: 6px 0 10px 0;font-size: 12px;}
+		#menu-lease-order .mui-control-item.mui-active,#menu-lease-other .mui-control-item.mui-active{color: #333;background-color:rgba(0,0,0,.1);}
+		#menu-lease-order .iconfont,#menu-lease-other .iconfont{padding: 5px 0;}
+		.icon-daifahuo1,.icon-shebeiliebiao{color: #1bcba8;}
+		.icon-yifahuo,.icon-zulinxieyi{color: #55c0dc;}
 
-.wh-80 {
-    width: 60px !important;
-    max-width: 60px !important;
-    height: 80px !important;
-    margin: 0 5px 0 0 !important;
-    overflow: hidden;
-    display: inline-block;
-    text-align: center;
-}
-.try-btn-pay{    background: #55c0dc;
-    border: 1px solid transparent;
-    border-radius: 4px;
-    color: #fff;
-    padding: 3px 8px;}
- .center-middle{font-size: 12px;    position: absolute;
-    left: 90px;
-    top: 50%;
-    -webkit-transform: translateY(-50%);}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
+		.wh-80 {
+			width: 60px !important;
+			max-width: 60px !important;
+			height: 80px !important;
+			margin: 0 5px 0 0 !important;
+			overflow: hidden;
+			display: inline-block;
+			text-align: center;
+		}
+		.try-btn-pay{    background: #55c0dc;
+			border: 1px solid transparent;
+			border-radius: 4px;
+			color: #fff;
+			padding: 3px 8px;}
+		.center-middle{font-size: 12px;    position: absolute;
+			left: 90px;
+			top: 50%;
+			-webkit-transform: translateY(-50%);}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item mui-active">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<div class="mui-content">
+	<div class="vip-tt">
+		<!-- <img src="/iamberry/common/shop/images/member_photo-bg_2.png"> -->
+		<div class="tx bg-orange" id="headDiv">
+			<img src="//s.iamberry.com/watero/images/shop/logo_head.png" id="userHead">
+		</div>
+		<div class="nikname">
+			<div>
+				<span id="userNickname">水时代</span>
+			</div>
+			<div>
+				<span class="go_daili_2wm"  id="2WM"  style="display:none">立即分享二维码 ></span>
+				<!-- <span class="btn_share to-up-img" id="toShare"  style="display:none">我要分享</span> -->
 			</div>
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item" >
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
+	</div>
+	<!-- 			<div style="padding:0;background: #fff;margin-bottom: 8px;">
+                    <div id="menu-nav" class="mui-segmented-control">
+                        <a class="mui-control-item go_cash_log">
+                            <div class="iconfont icon-orderyue"></div>
+                            余额
+                        </a>
+                        <a class="mui-control-item go_daili_order_list">
+                            <div class="iconfont icon-orderjiangli"></div>
+                            待奖励
+                        </a>
+                        <a class="mui-control-item go_couponList">
+                            <div class="iconfont icon-orderyouhui"></div>
+                            优惠券
+                        </a>
+                        <a class="mui-control-item go_gwc">
+                            <div class="iconfont icon-ordercart"></div>
+                            购物车
+                        </a>
+                    </div>
+                </div> -->
+	<div style="padding:0;background: #fff;margin-bottom: 8px;">
+		<div id="menu-nav" class="mui-segmented-control">
+			<a class="mui-control-item go_cash_log">
+				<div class="iconfont icon-orderjiangli"></div>
+				奖励记录
 			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
+			<a class="mui-control-item">
+				<div class="iconfont icon-orderyue"></div>
+				余额  <span class="cl-red">0.00</span>
 			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
+			<a class="mui-control-item" href="/watero/view/coupon_bag.html">
+				<div class="iconfont icon-wodequanbao"></div>
+				我的券包
 			</a>
-			<a class="mui-tab-item mui-active">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
+		</div>
+	</div>
+	<ul class="mui-table-view my-view-order">
+		<li class="mui-table-view-cell">
+			<a class="mui-navigate-right go_pay_count">
+				我的订单
 			</a>
-	</nav>
-	<div class="mui-content">
-				<div class="vip-tt">
-				<!-- <img src="/iamberry/common/shop/images/member_photo-bg_2.png"> -->
-				<div class="tx bg-orange" id="headDiv">
-					<img src="/watero/wateroimages/shop/logo_head.png" id="userHead">
-				</div>
-				<div class="nikname">
-					<div>
-						<span id="userNickname">水时代</span>
-					</div>
-					<div>
-						<span class="go_daili_2wm"  id="2WM"  style="display:none">立即分享二维码 ></span> 
-						<!-- <span class="btn_share to-up-img" id="toShare"  style="display:none">我要分享</span> -->
-					</div>
-				</div>
-			</div>
-<!-- 			<div style="padding:0;background: #fff;margin-bottom: 8px;">
-				<div id="menu-nav" class="mui-segmented-control">
-					<a class="mui-control-item go_cash_log">
-						<div class="iconfont icon-orderyue"></div>
-						余额
-					</a>
-					<a class="mui-control-item go_daili_order_list">
-						<div class="iconfont icon-orderjiangli"></div>
-						待奖励
-					</a>
-					<a class="mui-control-item go_couponList">
-						<div class="iconfont icon-orderyouhui"></div>
-						优惠券
-					</a>
-					<a class="mui-control-item go_gwc">
-						<div class="iconfont icon-ordercart"></div>
-						购物车
-					</a>
-				</div>
-			</div> -->
-			<div style="padding:0;background: #fff;margin-bottom: 8px;">
-				<div id="menu-nav" class="mui-segmented-control">
-					<a class="mui-control-item go_cash_log">
-						<div class="iconfont icon-orderjiangli"></div>
-						奖励记录
-					</a>
-					<a class="mui-control-item">
-						<div class="iconfont icon-orderyue"></div>
-						余额  <span class="cl-red">0.00</span>
-					</a>
-					<a class="mui-control-item" href="/watero/view/coupon_bag.html">
-						<div class="iconfont icon-wodequanbao"></div>
-						我的券包
-					</a>
-				</div>
-			</div>
-			<ul class="mui-table-view my-view-order">
-				<li class="mui-table-view-cell">
-					<a class="mui-navigate-right go_pay_count">
-						我的订单
-					</a>
-				</li>
-			</ul>
-			<div style="padding:0;background: #fff;margin-bottom: 8px;">
-				<div id="menu-order" class="mui-segmented-control">
-					<a class="mui-control-item go_pay_count">
-						<div class="iconfont icon-daifukuan"></div>
-						待付款
-					</a>
-					<a class="mui-control-item go_deliver_count">
-						<div class="iconfont icon-daifahuo"></div>
-						待发货
-					</a>
-					<a class="mui-control-item go_delivered_count">
-						<div class="iconfont icon-yifahuo"></div>
-						已发货
-					</a>
-					<a class="mui-control-item go_all_count">
-						<div class="iconfont icon-alldingdan"></div>
-						全部订单
-					</a>
-				</div>
-			</div>
-			<ul class="mui-table-view my-view-order">
-				<li class="mui-table-view-cell">
-					设备租赁
-				</li>
-			</ul>
-			<div style="padding:0;background: #fff;margin-bottom: 8px;">
-				<div id="menu-lease-order" class="mui-segmented-control">
-					<a class="mui-control-item">
-						<div class="iconfont icon-daifahuo1" id="rent_wait_deliver"></div>
-						全部订单
-					</a>
-					<a class="mui-control-item">
-						<div class="iconfont icon-yifahuo" id="rent_already_deliver"></div>
-						已发货
-					</a>
-					<a class="mui-control-item">
-						<div class="iconfont icon-shebeiliebiao"></div>
-						设备列表
-					</a>
-					<a class="mui-control-item">
-						<div class="iconfont icon-zulinxieyi" id="xieyi-dalog"></div>
-						租赁协议
-					</a>
-				</div>
-			</div>
-			<ul class="mui-table-view my-view-order">
-				<li class="mui-table-view-cell">
-					服务
-				</li>
-			</ul>
-			<div style="padding:0;background: #fff;margin-bottom: 8px;">
-				<div id="menu-lease-other" class="mui-segmented-control">
-					<a class="mui-control-item">
-						<div class="iconfont icon-xiaxian"></div>
-						我的好友
-					</a>
-					<a class="mui-control-item">
-						<div class="iconfont icon-shouhou"></div>
-						售后服务
-					</a>
-					<a class="mui-control-item">
-						<div class="iconfont icon-kefu"></div>
-						客服电话
-					</a>
-					<a class="mui-control-item">
-						<div class="iconfont icon-order"></div>
-						常见问答
-					</a>
-				</div>
-			</div>
-			<!-- <ul class="mui-table-view mui-grid-view mui-grid-9" id="my-grid-8">
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
-		                    <span class="iconfont icon-xiaxian"></span>
-		                    <div class="mui-media-body">我的好友</div></a></li>
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
-		                    <span class="iconfont icon-shouhou"></span>
-		                    <div class="mui-media-body">售后服务</div></a></li>
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
-		                    <span class="iconfont icon-kefu"></span>
-		                    <div class="mui-media-body">客服电话</div></a></li>
-		            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
-		                    <span class="iconfont icon-order"></span>
-		                    <div class="mui-media-body">常见问答</div></a></li>
-		    </ul>
- 		     <ul class="mui-table-view my-view-order" id="try_order_list">
-				<li class="mui-table-view-cell">
-						试用订单
-				</li>
-				<li class="mui-table-view-cell mui-media">
-					<a proid="32" style="margin-left: -20px;">
-						<span class="mui-media-object mui-pull-left wh-80">
-							<img src="http://h5.iamberry.com/iamberry/common/images/uploadimages/image/20160930/8D648B0F3CFDD6342D41_20160930142724_6071.jpg">
-						</span>
-						<div class="mui-media-body ft-12">
-							<div>待派送</div>
-							<div>watero水时代净水机<small>(品黑)</small></div>
-							<div>订单号1548265444951449</div>
-						</div>
-					</a>
-					<div class="btn-box"><a proid="32" class="go_chanpin_details"></a><a class="mui-btn try-btn-pay mui-pull-right" style="margin-right: 12px;" proid="32">立即支付</a></div>
-				</li>
-			</ul>	 -->
+		</li>
+	</ul>
+	<div style="padding:0;background: #fff;margin-bottom: 8px;">
+		<div id="menu-order" class="mui-segmented-control">
+			<a class="mui-control-item go_pay_count">
+				<div class="iconfont icon-daifukuan"></div>
+				待付款
+			</a>
+			<a class="mui-control-item go_deliver_count">
+				<div class="iconfont icon-daifahuo"></div>
+				待发货
+			</a>
+			<a class="mui-control-item go_delivered_count">
+				<div class="iconfont icon-yifahuo"></div>
+				已发货
+			</a>
+			<a class="mui-control-item go_all_count">
+				<div class="iconfont icon-alldingdan"></div>
+				全部订单
+			</a>
+		</div>
+	</div>
+	<ul class="mui-table-view my-view-order">
+		<li class="mui-table-view-cell">
+			设备租赁
+		</li>
+	</ul>
+	<div style="padding:0;background: #fff;margin-bottom: 8px;">
+		<div id="menu-lease-order" class="mui-segmented-control">
+			<a class="mui-control-item">
+				<div class="iconfont icon-daifahuo1" id="rent_wait_deliver"></div>
+				全部订单
+			</a>
+			<a class="mui-control-item">
+				<div class="iconfont icon-yifahuo" id="rent_already_deliver"></div>
+				已发货
+			</a>
+			<a class="mui-control-item">
+				<div class="iconfont icon-shebeiliebiao"></div>
+				设备列表
+			</a>
+			<a class="mui-control-item">
+				<div class="iconfont icon-zulinxieyi" id="xieyi-dalog"></div>
+				租赁协议
+			</a>
+		</div>
+	</div>
+	<ul class="mui-table-view my-view-order">
+		<li class="mui-table-view-cell">
+			服务
+		</li>
+	</ul>
+	<div style="padding:0;background: #fff;margin-bottom: 8px;">
+		<div id="menu-lease-other" class="mui-segmented-control">
+			<a class="mui-control-item">
+				<div class="iconfont icon-xiaxian"></div>
+				我的好友
+			</a>
+			<a class="mui-control-item">
+				<div class="iconfont icon-shouhou"></div>
+				售后服务
+			</a>
+			<a class="mui-control-item">
+				<div class="iconfont icon-kefu"></div>
+				客服电话
+			</a>
+			<a class="mui-control-item">
+				<div class="iconfont icon-order"></div>
+				常见问答
+			</a>
+		</div>
 	</div>
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-	<script src="/watero/waterojs/shop/vip_center.js"></script>
-	</body>
+	<!-- <ul class="mui-table-view mui-grid-view mui-grid-9" id="my-grid-8">
+            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
+                    <span class="iconfont icon-xiaxian"></span>
+                    <div class="mui-media-body">我的好友</div></a></li>
+            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
+                    <span class="iconfont icon-shouhou"></span>
+                    <div class="mui-media-body">售后服务</div></a></li>
+            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
+                    <span class="iconfont icon-kefu"></span>
+                    <div class="mui-media-body">客服电话</div></a></li>
+            <li class="mui-table-view-cell mui-media mui-col-xs-3 mui-col-sm-3"><a>
+                    <span class="iconfont icon-order"></span>
+                    <div class="mui-media-body">常见问答</div></a></li>
+    </ul>
+      <ul class="mui-table-view my-view-order" id="try_order_list">
+        <li class="mui-table-view-cell">
+                试用订单
+        </li>
+        <li class="mui-table-view-cell mui-media">
+            <a proid="32" style="margin-left: -20px;">
+                <span class="mui-media-object mui-pull-left wh-80">
+                    <img src="//h5.iamberry.com/iamberry/common/images/uploadimages/image/20160930/8D648B0F3CFDD6342D41_20160930142724_6071.jpg">
+                </span>
+                <div class="mui-media-body ft-12">
+                    <div>待派送</div>
+                    <div>watero水时代净水机<small>(品黑)</small></div>
+                    <div>订单号1548265444951449</div>
+                </div>
+            </a>
+            <div class="btn-box"><a proid="32" class="go_chanpin_details"></a><a class="mui-btn try-btn-pay mui-pull-right" style="margin-right: 12px;" proid="32">立即支付</a></div>
+        </li>
+    </ul>	 -->
+</div>
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016111701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/vip_center.js?v=2017040701"></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/wheel_log.html

@@ -1,156 +1,153 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
-			.mui-table-view-chevron .mui-table-view-cell>a:not(.mui-btn) {margin-right: -10px;}
-			p{font-size:12px;}
-			.mui-pull-right{font-size: 12px;color:#d22c50;}
-			.mui-table-view .mui-media-body{margin-top: 5px;}
-			.mui-table-view .mui-media-object {line-height: 50px;max-width: 50px;height: 50px;}
-			#whell-bar{background-color: #fff;height: 60px;-webkit-box-shadow: 0 0 1px rgba(0,0,0,.35);box-shadow: 0 0 1px rgba(0,0,0,.35);display:none;}
-		</style>
-		<script type="text/javascript">
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body>
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
-	</div>
-		<nav class="mui-bar mui-bar-tab" id="whell-bar">
-			<a class="mui-tab-item mui-active">
-				<div class="my-tab-label" style="font-size: 12px;color: #d22c50;">立即去下单，把奖品抱回家吧！</div>
-				<button type="button" class="mui-btn my-btn-red" style="top: 0;width: 165px;background: #d22c50;">立即购买</button>
-			</a>
-		</nav>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
-					
-				</ul>
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-	<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell{padding-right:10px;}
+		.mui-table-view-chevron .mui-table-view-cell>a:not(.mui-btn) {margin-right: -10px;}
+		p{font-size:12px;}
+		.mui-pull-right{font-size: 12px;color:#d22c50;}
+		.mui-table-view .mui-media-body{margin-top: 5px;}
+		.mui-table-view .mui-media-object {line-height: 50px;max-width: 50px;height: 50px;}
+		#whell-bar{background-color: #fff;height: 60px;-webkit-box-shadow: 0 0 1px rgba(0,0,0,.35);box-shadow: 0 0 1px rgba(0,0,0,.35);display:none;}
+	</style>
 	<script type="text/javascript">
-	
-	var pageNumber = 0,pagesize = 10;
-	mui.init({
-				pullRefresh: {
-					container: '#pullrefresh',
-					down: {
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
+		</div>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="whell-bar">
+	<a class="mui-tab-item mui-active">
+		<div class="my-tab-label" style="font-size: 12px;color: #d22c50;">立即去下单，把奖品抱回家吧！</div>
+		<button type="button" class="mui-btn my-btn-red" style="top: 0;width: 165px;background: #d22c50;">立即购买</button>
+	</a>
+</nav>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+
+		</ul>
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script type="text/javascript">
+
+    var pageNumber = 0,pagesize = 10;
+    mui.init({
+        pullRefresh: {
+            container: '#pullrefresh',
+            down: {
 //						callback: pulldownRefresh
-					},
-					up: {
-						contentrefresh: '正在加载...',
-						callback: pullupRefresh
-					}
-				}
-	});
-			/**
-			 * 上拉加载具体业务实现
-			 */
-			function pullupRefresh() {
-				/* setTimeout(function() {
-					mui('#pullrefresh').pullRefresh().endPullupToRefresh((++count > 2)); //参数为true代表没有更多数据了。
-					var table = document.body.querySelector('.my-tab-view-pull');
-					var cells = document.body.querySelectorAll('.my-tab-view-pull .mui-table-view-cell');
-					for (var i = cells.length, len = i + 10; i < len; i++) {
-						var li = document.createElement('li');
-						li.className = 'mui-table-view-cell';
-						li.innerHTML = '<a href="javascript:;"><img class="mui-media-object mui-pull-left" src="images/image-12.jpg"><div class="mui-media-body">获得一等奖'+(i+1)+'<p class="mui-ellipsis">iPhone7 亮黑版 32G一台</p></div><span class="mui-btn mui-btn-link">2016.09.19 20:00</span></a>';
-						table.appendChild(li);
-					}
-				}, 1500); */
-				++pageNumber;
-				var btnArray = ['否', '是'];
-				var table = document.body.querySelector('.my-tab-view-pull');
-				$.ajax(base_path + '/game/get_prize_log?dates=' + new Date().getTime(), {
-					data: {
-						"pageSize": pagesize,
-						"pageNO": pageNumber
-					},
-                    xhrFields: {
-                        withCredentials: true
-                    },
-					dataType: 'json',
-					type: 'post',
-					timeout: 15000,
-					success: function(dt) {
-						console.log(dt);
-						if (dt.status) {
-							var data =dt.data;
-							var wheel_data =[];
-							if (null != data && data!="0") {
-								wheel_data = data.winningList;
-							}
-							mui('#pullrefresh').pullRefresh().endPullupToRefresh((wheel_data.length < pagesize)); //参数为true代表没有更多数据了。
-							mui(wheel_data).each(function(index) {
-								var li = document.createElement('li');
-								li.className = 'mui-table-view-cell';
-								li.innerHTML = '<a href="javascript:;"><img class="mui-media-object mui-pull-left" src="'+this.logsPrizeImage+'"><div class="mui-media-body">'+ this.logsPrizeName +'<span class="mui-pull-right">' + this.logsGameName + '</span><p class="mui-ellipsis">' + this.logsDate + '<span class="mui-pull-right">x' + this.logsSum + '</span></p></div></a>';
-								table.appendChild(li);
-						});
-					} else {
-						mui.confirm(dt.message, '爱贝源-提示', btnArray, function(e) {
-							if (e.index == 1) {
-								location.reload(true);
-							}
-						});
-					}
-				},
-				error: function(xhr, type, errorThrown) {
-					//异常处理；
-					errorfn(xhr);
-				}
-			});
-			}
-	mui.ready(function(){
-		console.log("页面加载完毕");
-		mui('#pullrefresh').pullRefresh().pullupLoading();
-		$.ajax({
-			type: 'post',
-			url: base_path + '/game/buyOrder',
-			data: {gameId:2},
-			dataType: 'json',
-			timeout: 15000,
-			context: $('body'),
-			success: function(data){
-				if(data.status){
-					if(!data.data){
-						$("#whell-bar").show();
-					}
-				}
-			},
-			error: function(xhr, type){
-				console.log('Ajax error!' + xhr)
-				}
-			});
-		document.querySelector('.loading-bg').style.display='none';
-	});	
-	mui('body').on('tap', '#whell-bar .mui-btn', function() {
-		mui.openWindow({
-		url:'http://w.iamberry.com/watero/wechat/index'
-		});
-	});
-		</script>
-	</body>
+            },
+            up: {
+                contentrefresh: '正在加载...',
+                callback: pullupRefresh
+            }
+        }
+    });
+    /**
+     * 上拉加载具体业务实现
+     */
+    function pullupRefresh() {
+		/* setTimeout(function() {
+		 mui('#pullrefresh').pullRefresh().endPullupToRefresh((++count > 2)); //参数为true代表没有更多数据了。
+		 var table = document.body.querySelector('.my-tab-view-pull');
+		 var cells = document.body.querySelectorAll('.my-tab-view-pull .mui-table-view-cell');
+		 for (var i = cells.length, len = i + 10; i < len; i++) {
+		 var li = document.createElement('li');
+		 li.className = 'mui-table-view-cell';
+		 li.innerHTML = '<a href="javascript:;"><img class="mui-media-object mui-pull-left" src="images/image-12.jpg"><div class="mui-media-body">获得一等奖'+(i+1)+'<p class="mui-ellipsis">iPhone7 亮黑版 32G一台</p></div><span class="mui-btn mui-btn-link">2016.09.19 20:00</span></a>';
+		 table.appendChild(li);
+		 }
+		 }, 1500); */
+        ++pageNumber;
+        var btnArray = ['否', '是'];
+        var table = document.body.querySelector('.my-tab-view-pull');
+        mui.ajax(base_path + '/game/get_prize_log?dates=' + new Date().getTime(), {
+            data: {
+                "pageSize": pagesize,
+                "pageNO": pageNumber
+            },
+            dataType: 'json',
+            type: 'post',
+            timeout: 15000,
+            success: function(dt) {
+                console.log(dt);
+                if (dt.status) {
+                    var data =dt.data;
+                    var wheel_data =[];
+                    if (null != data && data!="0") {
+                        wheel_data = data.winningList;
+                    }
+                    mui('#pullrefresh').pullRefresh().endPullupToRefresh((wheel_data.length < pagesize)); //参数为true代表没有更多数据了。
+                    mui(wheel_data).each(function(index) {
+                        var li = document.createElement('li');
+                        li.className = 'mui-table-view-cell';
+                        li.innerHTML = '<a href="javascript:;"><img class="mui-media-object mui-pull-left" src="'+this.logsPrizeImage+'"><div class="mui-media-body">'+ this.logsPrizeName +'<span class="mui-pull-right">' + this.logsGameName + '</span><p class="mui-ellipsis">' + this.logsDate + '<span class="mui-pull-right">x' + this.logsSum + '</span></p></div></a>';
+                        table.appendChild(li);
+                    });
+                } else {
+                    mui.confirm(dt.message, '爱贝源-提示', btnArray, function(e) {
+                        if (e.index == 1) {
+                            location.reload(true);
+                        }
+                    });
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                //异常处理；
+                errorfn(xhr);
+            }
+        });
+    }
+    mui.ready(function(){
+        console.log("页面加载完毕");
+        mui('#pullrefresh').pullRefresh().pullupLoading();
+        $.ajax({
+            type: 'post',
+            url: base_path + '/game/buyOrder',
+            data: {gameId:2},
+            dataType: 'json',
+            timeout: 15000,
+            context: $('body'),
+            success: function(data){
+                if(data.status){
+                    if(!data.data){
+                        $("#whell-bar").show();
+                    }
+                }
+            },
+            error: function(xhr, type){
+                console.log('Ajax error!' + xhr)
+            }
+        });
+        document.querySelector('.loading-bg').style.display='none';
+    });
+    mui('body').on('tap', '#whell-bar .mui-btn', function() {
+        mui.openWindow({
+            url:'//w.iamberry.com/watero/wechat/index'
+        });
+    });
+</script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/win.html

@@ -1,74 +1,74 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
-	<body style="background: #fff;">
-	<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
+<body style="background: #fff;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-	<nav class="mui-bar mui-bar-tab" id="footer-bar">
-		<a class="mui-tab-item" >
-			<div class="iconfont icon-home"></div>
-			<span class="mui-tab-label">首页</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-			<span class="mui-tab-label">购物车</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-dingdan"></div>
-			<span class="mui-tab-label">我的订单</span>
-		</a>
-		<a class="mui-tab-item">
-			<div class="iconfont icon-vip"></div>
-			<span class="mui-tab-label">会员中心</span>
-		</a>
-	</nav>
-			<header class="mui-bar mui-bar-nav header">
-					<div class="go-index go_index">
-						<img src="/watero/wateroimages/shop/images/logo.png" />
-					</div>
-			</header>
-			<div class="mui-content" style="background: #fff;">
-				<div class="pl-win-tt">
-				<img style="width: 1.5em;" src="/watero/wateroimages/shop/pay-win.jpg"><span class="sp"> 恭喜您，XX成功！</span>
-				<!--<div>已支付：<span class="cl-red">¥520.00元+0.0积分</span></div>
-				</div>
-				<ul class="pay_win_list">
-					<li>订单编号：<span class="cl-0">4564654654654654</span></li>
-					<li>收货人：王大鹏</li>
-					<li>手机号码：13800138000</li>
-					<li>订单金额：<span class="cl-0">￥521</span></li>
-					<li>支付方式：在线支付</li>
-					<li>订单时间:2015-12-12 15:000</li>
-					<li><a class="go_order_details">点击查看订单详情&gt;&gt;</a> </li>
-				</ul>-->
-			</div>
-				<script src="/watero/waterojs/mui.min.js"></script>
-	<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-	<script src="/watero/waterojs/shop/main.js"></script>
-	<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item" >
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<header class="mui-bar mui-bar-nav header">
+	<div class="go-index go_index">
+		<img src="//s.iamberry.com/watero/images/shop/images/logo.png" />
+	</div>
+</header>
+<div class="mui-content" style="background: #fff;">
+	<div class="pl-win-tt">
+		<img style="width: 1.5em;" src="//s.iamberry.com/watero/images/shop/pay-win.jpg"><span class="sp"> 恭喜您，XX成功！</span>
+		<!--<div>已支付：<span class="cl-red">¥520.00元+0.0积分</span></div>
+        </div>
+        <ul class="pay_win_list">
+            <li>订单编号：<span class="cl-0">4564654654654654</span></li>
+            <li>收货人：王大鹏</li>
+            <li>手机号码：13800138000</li>
+            <li>订单金额：<span class="cl-0">￥521</span></li>
+            <li>支付方式：在线支付</li>
+            <li>订单时间:2015-12-12 15:000</li>
+            <li><a class="go_order_details">点击查看订单详情&gt;&gt;</a> </li>
+        </ul>-->
+	</div>
+	<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+	<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+	<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+	<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
 	<script>
-	mui.ready(function(){
-		getCartNum();
-		document.querySelector('.loading-bg').style.display='none';
-	});
+        mui.ready(function(){
+            getCartNum();
+            document.querySelector('.loading-bg').style.display='none';
+        });
 	</script>
-	</body>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/xiaxian_list.html

@@ -1,69 +1,69 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/mui.min.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/iconfont.css" />
-		<link rel="stylesheet" type="text/css" href="/watero/waterocss/style.css" />
-		<style>
-			.mui-table-view-chevron .mui-table-view-cell {padding-right: 10px;}
-			.mui-bar-tab~.mui-content {margin-top: 50px;}
-		</style>
-		<script>
-			// 屏蔽分享
-			window.hiddenAllWechatMenu = true;
-		</script>
-	</head>
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/iconfont.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/watero/css/style.css?v=2016101701" />
+	<style>
+		.mui-table-view-chevron .mui-table-view-cell {padding-right: 10px;}
+		.mui-bar-tab~.mui-content {margin-top: 50px;}
+	</style>
+	<script>
+        // 屏蔽分享
+        window.hiddenAllWechatMenu = true;
+	</script>
+</head>
 
-	<body>
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
+<body>
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
-		<nav class="mui-bar mui-bar-tab" id="footer-bar">
-			<a class="mui-tab-item">
-				<div class="iconfont icon-home"></div>
-				<span class="mui-tab-label">首页</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
-				<span class="mui-tab-label">购物车</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-dingdan"></div>
-				<span class="mui-tab-label">我的订单</span>
-			</a>
-			<a class="mui-tab-item">
-				<div class="iconfont icon-vip"></div>
-				<span class="mui-tab-label">会员中心</span>
-			</a>
-		</nav>
-		<ul class="mui-table-view more">
-			<li class="mui-table-view-cell ft-14">我的好友人数<span class="cl-red downNum">0</span>人 <span class="mui-badge mui-badge-inverted">已购买人数：<span class="cl-red buyedNum">0</span>人</span>
-			</li>
-		</ul>
-		<!--下拉刷新容器开始-->
-		<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
-			<div class="mui-scroll">
-				<!--数据列表-->
-				<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<nav class="mui-bar mui-bar-tab" id="footer-bar">
+	<a class="mui-tab-item">
+		<div class="iconfont icon-home"></div>
+		<span class="mui-tab-label">首页</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-gouwuche"><span class="mui-badge">0</span></div>
+		<span class="mui-tab-label">购物车</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-dingdan"></div>
+		<span class="mui-tab-label">我的订单</span>
+	</a>
+	<a class="mui-tab-item">
+		<div class="iconfont icon-vip"></div>
+		<span class="mui-tab-label">会员中心</span>
+	</a>
+</nav>
+<ul class="mui-table-view more">
+	<li class="mui-table-view-cell ft-14">我的好友人数<span class="cl-red downNum">0</span>人 <span class="mui-badge mui-badge-inverted">已购买人数：<span class="cl-red buyedNum">0</span>人</span>
+	</li>
+</ul>
+<!--下拉刷新容器开始-->
+<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
+	<div class="mui-scroll">
+		<!--数据列表-->
+		<ul class="mui-table-view mui-table-view-chevron my-tab-view-pull">
 
-				</ul>
-			</div>
-		</div>
-		<!--下拉刷新容器结束-->
-		<script src="/watero/waterojs/mui.min.js"></script>
-		<script src="/watero/waterojs/jquery-2.1.1.min.js"></script>
-		<script src="/watero/waterojs/shop/main.js"></script>
-		<script src="/watero/waterojs/shop/wechat-utils-1.0.js"></script>
-		<script src="/watero/waterojs/shop/xiaxian.js">></script>
-	</body>
+		</ul>
+	</div>
+</div>
+<!--下拉刷新容器结束-->
+<script src="//s.iamberry.com/watero/js/mui.min.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/main.js?v=2016101701"></script>
+<script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/watero/js/shop/xiaxian.js">></script>
+</body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/zhuanpan.html

@@ -1,369 +1,360 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-		<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<link rel="stylesheet" type="text/css" href="/css/mui.min.css?v=2016101701" />
-		<link rel="stylesheet" type="text/css" href="/css/shop/style.css?v=2016101701" />
-		<style>
-.clear{clear:both;}
-/* 大转盘样式 */
-.drawbanner{display:block;width:95%;margin:0 auto;}
-.drawbanner .turnplate{display:block;width:100%;position:relative;}
-.drawbanner .turnplate canvas.item{width:100%;-webkit-transform: translateZ(0);transform: translateZ(0);}
-.drawbanner .turnplate img.pointer{ position: absolute;width: 25%;height: 30%;left: 37.5%;top: 33%;}	
-.mui-popup.mui-popup-in{height:370px;background: url(/images/shop/alert-bg2.png) center top /100% no-repeat;}
-.mui-popup-inner{background-color: transparent;margin-top:100px;padding: 15px 15px 5px 15px;position: static;}
-.mui-popup-title{color: #e23600;font-size: 13px;}
-.mui-popup-title+.mui-popup-text{margin-top: 10px;}
-.mui-popup-text img{width: 70px;}
-.mui-popup-text{font-size: 14px;color: #e23600;}
-.mui-popup-text strong{color: #fc5b8b;}
-.mui-popup-text span{color: #fc5b8b;font-size: 35px;}
-.mui-popup-button{background-color: transparent;}
-.mui-popup-button:after,.mui-popup-inner:after{display: none;}
-.mui-popup-button:first-child{    border-radius: 25px;
-    height: 38px;
-    line-height: 40px;
-    font-weight: 100;
-    color: #e23600;
-    width: 50%;
-    margin:10px auto 0 auto;}
-.mui-popup-button:last-child{border-radius:1px !important;background:url(/images/shop/btn-wheel-bg1.png) center center no-repeat ;background-size: 100%; height: 55px;line-height: 68px;font-weight: 100;color: #fff;width:40%;margin:0 auto;}
-.mui-popup-buttons{display: block;}
-.mui-popup.mui-popup-out{-webkit-transition-duration: 0ms;transition-duration: 0ms;}
-.mui-backdrop-action.mui-backdrop,.mui-popup-backdrop{
-    background-color: rgba(0,0,0,.7);
-}
-#img-box{display:none;}	
-.mui-popup.mui-popup-in {
-    -webkit-transition-duration: 0ms;
-    transition-duration: 0ms;
-}
-.mui-popup-buttons{height: 55px;}
-.mui-popup-text .x-close{width: 100px;
-    height: 50px;
-    bottom: 0;
-    left: 83px;
-    position: fixed;
-    margin-top: 310px;}
-</style>
-	</head>
+<head>
+	<meta charset="utf-8">
+	<title></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/mui.min.css?v=2016101701" />
+	<link rel="stylesheet" type="text/css" href="//css.iamberry.com/css/shop/style.css?v=2016101701" />
+	<style>
+		.clear{clear:both;}
+		/* 大转盘样式 */
+		.drawbanner{display:block;width:95%;margin:0 auto;}
+		.drawbanner .turnplate{display:block;width:100%;position:relative;}
+		.drawbanner .turnplate canvas.item{width:100%;-webkit-transform: translateZ(0);transform: translateZ(0);}
+		.drawbanner .turnplate img.pointer{ position: absolute;width: 25%;height: 30%;left: 37.5%;top: 33%;}
+		.mui-popup.mui-popup-in{height:370px;background: url(//s.iamberry.com/images/shop/alert-bg2.png) center top /100% no-repeat;}
+		.mui-popup-inner{background-color: transparent;margin-top:100px;padding: 15px 15px 5px 15px;position: static;}
+		.mui-popup-title{color: #e23600;font-size: 13px;}
+		.mui-popup-title+.mui-popup-text{margin-top: 10px;}
+		.mui-popup-text img{width: 70px;}
+		.mui-popup-text{font-size: 14px;color: #e23600;}
+		.mui-popup-text strong{color: #fc5b8b;}
+		.mui-popup-text span{color: #fc5b8b;font-size: 35px;}
+		.mui-popup-button{background-color: transparent;}
+		.mui-popup-button:after,.mui-popup-inner:after{display: none;}
+		.mui-popup-button:first-child{    border-radius: 25px;
+			height: 38px;
+			line-height: 40px;
+			font-weight: 100;
+			color: #e23600;
+			width: 50%;
+			margin:10px auto 0 auto;}
+		.mui-popup-button:last-child{border-radius:1px !important;background:url(//s.iamberry.com/images/shop/btn-wheel-bg1.png) center center no-repeat ;background-size: 100%; height: 55px;line-height: 68px;font-weight: 100;color: #fff;width:40%;margin:0 auto;}
+		.mui-popup-buttons{display: block;}
+		.mui-popup.mui-popup-out{-webkit-transition-duration: 0ms;transition-duration: 0ms;}
+		.mui-backdrop-action.mui-backdrop,.mui-popup-backdrop{
+			background-color: rgba(0,0,0,.7);
+		}
+		#img-box{display:none;}
+		.mui-popup.mui-popup-in {
+			-webkit-transition-duration: 0ms;
+			transition-duration: 0ms;
+		}
+		.mui-popup-buttons{height: 55px;}
+		.mui-popup-text .x-close{width: 100px;
+			height: 50px;
+			bottom: 0;
+			left: 83px;
+			position: fixed;
+			margin-top: 310px;}
+	</style>
+</head>
 
-	<body style="background: #000;">
-		<div class="loading-bg">
-			<div class="mui-loading">
-				<div class="mui-spinner">
-				</div>
-				&nbsp;&nbsp;加载中...
-			</div>
-		</div>
-		
-		<div class="mui-content" style="background: #000;">
-			<div style="padding:0">
-				<img width="100%" src="/images/shop/wheel-body-bg.jpg" />
-	<div style="position: absolute;top: 25%;left: 0;width: 100%;text-align: center;color: #f7630c;text-shadow: 1px 1px 1px #000;"><span id="gamecount">0</span>次免费抽 100%中奖</div>		
-	<div style="position: absolute;left: 0;top:28%;width: 100%;">
-	<div class="drawbanner">
-		<div class="turnplate" style="background-image:url(/images/shop/turnplate-bg1.png);background-size:100% 100%;background-repeat: no-repeat;background-position: center;">
-			<canvas class="item" id="wheelcanvas" width="422px" height="422px"></canvas>
-			<img class="pointer" src="/images/shop/turnplate-pointer1.png"/>
+<body style="background: #000;">
+<div class="loading-bg">
+	<div class="mui-loading">
+		<div class="mui-spinner">
 		</div>
+		&nbsp;&nbsp;加载中...
 	</div>
-	<div style="position: relative;line-height: 0;">
-		<div style="position: absolute;left:0;top:0;width: 50%;text-align: center;-webkit-transform: translateY(-25%);" class="go_prize_log" value="1">
-			<img width="60%" src="/images/shop/btn-jilu1.png" />
-		</div>
-		<div style="position: absolute;right:0;top:0;width: 50%;text-align: center;-webkit-transform: translateY(-25%);">
-			<a href="#guize-picture"><img width="60%" src="/images/shop/btn-guize1.png" /></a>
+</div>
+
+<div class="mui-content" style="background: #000;">
+	<div style="padding:0">
+		<img width="100%" src="//s.iamberry.com/images/shop/wheel-body-bg.jpg" />
+		<div style="position: absolute;top: 25%;left: 0;width: 100%;text-align: center;color: #f7630c;text-shadow: 1px 1px 1px #000;"><span id="gamecount">0</span>次免费抽 100%中奖</div>
+		<div style="position: absolute;left: 0;top:28%;width: 100%;">
+			<div class="drawbanner">
+				<div class="turnplate" style="background-image:url(//s.iamberry.com/images/shop/turnplate-bg1.png);background-size:100% 100%;background-repeat: no-repeat;background-position: center;">
+					<canvas class="item" id="wheelcanvas" width="422px" height="422px"></canvas>
+					<img class="pointer" src="//s.iamberry.com/images/shop/turnplate-pointer1.png"/>
+				</div>
+			</div>
+			<div style="position: relative;line-height: 0;">
+				<div style="position: absolute;left:0;top:0;width: 50%;text-align: center;-webkit-transform: translateY(-25%);" class="go_prize_log" value="1">
+					<img width="60%" src="//s.iamberry.com/images/shop/btn-jilu1.png" />
+				</div>
+				<div style="position: absolute;right:0;top:0;width: 50%;text-align: center;-webkit-transform: translateY(-25%);">
+					<a href="#guize-picture"><img width="60%" src="//s.iamberry.com/images/shop/btn-guize1.png" /></a>
+				</div>
+			</div>
 		</div>
 	</div>
-	</div>
-	</div>
 	<div id="img-box">
-		<img src="/images/shop/alert-bg2.png" />
+		<img src="//s.iamberry.com/images/shop/alert-bg2.png" />
 	</div>
-	</div>	
-		<div id="guize-picture" class="mui-popover mui-popover-action mui-popover-bottom" style="top:0">
-				<img style="margin-top:25%;margin-left: 5%;" width="90%" src="/images/shop/guize-bg1.png" />
-		</div>
-		<script src="/js/mui.min.js"></script>
-		<script src="/js/jquery-2.1.1.min.js"></script>
-		<script src="/js/shop/awardRotate.js"></script>
-		<script src="/js/shop/main.js"></script>
-		<script src="/js/shop/wechat-utils-1.0.js"></script>
-		<script type="text/javascript">
-		var turnplate={
-				restaraunts:[],				//大转盘奖品名称
-				colors:[],					//大转盘奖品区块对应背景颜色
-				outsideRadius:156,			//大转盘外圆的半径
-				textRadius:130,				//大转盘奖品位置距离圆心的距离
-				insideRadius:35,			//大转盘内圆的半径
-				startAngle:0,				//开始角度
-				bRotate:false				//false:停止;ture:旋转
-		};
-		
-		var prizeList = null;
-		var count=0,hide_dalog=true;
-		$(document).ready(function(){
-			window.repleFlag = false;
-			window.wxFriend = {
-				    "appId": "",
-				    "imgUrl":'/images/shop/8.png',
-				    "link":domanUrl+"/iamberry/wechat/activity/go_luck_draw",
-				    "desc":"万圣节8秒冲奶，一键搞定捣蛋宝宝，快来围观爱贝源智能冲奶机，有大奖品抽哦！",//描述
-				    "title":"3次免费抽，100%中奖，宝宝手推车抱回家，快来转转转！",			//标题
-				    "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
-				    "shareTimeSuccess":"分享成功",		//这里是分享朋友圈后调用的文字
-				    "shareTimeCancel":"已取消分享",	//这里是取消分享给朋友圈后调用的文字
-				    "shareAppSuccess":"分享成功",		    //这里是分享好友后调用的文字
-				    "shareAppCancel":"已取消分享"	//这里是取消分享给好友后调用的文字
-			};
-			getConfig();
-			
-			getwheelcount();//加载抽奖次数
-			//动态添加大转盘的奖品与奖品区域背景颜色
-			$.ajax(base_path +'/game/get_prize_info',{
-				data: {
-					prizeGameId:2
-				},
-                xhrFields: {
-                    withCredentials: true
+</div>
+<div id="guize-picture" class="mui-popover mui-popover-action mui-popover-bottom" style="top:0">
+	<img style="margin-top:25%;margin-left: 5%;" width="90%" src="//s.iamberry.com/images/shop/guize-bg1.png" />
+</div>
+<script src="//s.iamberry.com/js/mui.min.js"></script>
+<script src="//s.iamberry.com/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/js/shop/awardRotate.js"></script>
+<script src="//s.iamberry.com/js/shop/main.js"></script>
+<script src="//s.iamberry.com/js/shop/wechat-utils-1.0.js"></script>
+<script type="text/javascript">
+    var turnplate={
+        restaraunts:[],				//大转盘奖品名称
+        colors:[],					//大转盘奖品区块对应背景颜色
+        outsideRadius:156,			//大转盘外圆的半径
+        textRadius:130,				//大转盘奖品位置距离圆心的距离
+        insideRadius:35,			//大转盘内圆的半径
+        startAngle:0,				//开始角度
+        bRotate:false				//false:停止;ture:旋转
+    };
+
+    var prizeList = null;
+    var count=0,hide_dalog=true;
+    $(document).ready(function(){
+        window.repleFlag = false;
+        window.wxFriend = {
+            "appId": "",
+            "imgUrl":'//s.iamberry.com/images/shop/8.png',
+            "link":domanUrl+"/iamberry/wechat/activity/go_luck_draw",
+            "desc":"万圣节8秒冲奶，一键搞定捣蛋宝宝，快来围观爱贝源智能冲奶机，有大奖品抽哦！",//描述
+            "title":"3次免费抽，100%中奖，宝宝手推车抱回家，快来转转转！",			//标题
+            "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
+            "shareTimeSuccess":"分享成功",		//这里是分享朋友圈后调用的文字
+            "shareTimeCancel":"已取消分享",	//这里是取消分享给朋友圈后调用的文字
+            "shareAppSuccess":"分享成功",		    //这里是分享好友后调用的文字
+            "shareAppCancel":"已取消分享"	//这里是取消分享给好友后调用的文字
+        };
+        getConfig();
+
+        getwheelcount();//加载抽奖次数
+        //动态添加大转盘的奖品与奖品区域背景颜色
+        mui.ajax(base_path +'/game/get_prize_info',{
+            data: {
+                prizeGameId:2
+            },
+            dataType:'json',
+            async:true,
+            type:'post',
+            timeout:15000,
+            success:function(dt){
+                if (dt.status) {
+                    prizeList = dt.data;
+                    //console.log(prizeList);
+
+                    mui(prizeList).each(function(index){
+                        turnplate.restaraunts[index] = this.prizeName;
+                        if ((index + 1) % 2 == 0) {
+                            turnplate.colors[index] = "#694cb3";
+                        } else {
+                            turnplate.colors[index] = "#a282f5";
+                        }
+                        //先把图片加载出来
+                        $("#img-box").append('<img src="'+this.prizeImage+'" id="'+this.prizeId+'"/>');
+                    });
+                    //console.log(turnplate.restaraunts)
+                    //防止图片没加载完设置1秒后再绘制canvas
+                    setTimeout(function(){
+                        drawRouletteWheel();
+                        document.querySelector('.loading-bg').style.display = 'none';
+                    },1000);
+                } else {
+                    alert("获取奖品信息失败！")
+                }
+            },
+            error:function(xhr,type,errorThrown){
+                console.log(xhr)
+            }
+        });
+
+        //旋转转盘 item:奖品位置; txt：提示语;
+        var rotateFn = function (item, txt, to){
+            var angles = item * (360 / turnplate.restaraunts.length) - (360 / (turnplate.restaraunts.length*2));
+            if(angles<270){
+                angles = 270 - angles;
+            }else{
+                angles = 360 - angles + 270;
+            }
+            //console.log(angles)
+            $('#wheelcanvas').stopRotate();
+            $('#wheelcanvas').rotate({
+                angle:0,
+                animateTo:(to == null ? (angles+1800) : to),
+                duration:3000,
+                callback:function (){
+                    turnplate.bRotate = !turnplate.bRotate;
+                }
+            });
+        };
+
+        // 奖品是否抽光
+        var flag = true;
+
+        $(".pointer").on("click",function(){
+            wheel_ajax();
+        });
+        function wheel_ajax(){
+            if (!flag) {
+                // rotateFn(270, "");
+                turnplate.bRotate = !turnplate.bRotate;//重置转盘
+                //去产品列表
+                var r=confirm("您没有抽奖次数了，是否马上前往购买商品？");
+                if (r==true){
+                    mui.openWindow({
+                        url:'//h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
+                    });
+                }
+                return;
+            }
+            if(turnplate.bRotate)return;
+            rotateFn(0 , "", 90000000)
+            turnplate.bRotate = !turnplate.bRotate;//重置转盘
+            //获取随机数(奖品个数范围内)
+            //替换为后台代码
+            mui.ajax(base_path +'/game/luck_draw?gameId=2&orderId=',{
+                data: {},
+                dataType:'json',
+                type:'get',
+                timeout:15000,
+                success:function(dt){
+                    //console.log(dt.data);
+                    var img,msg;
+
+                    if (dt.status) {
+                        var num;
+                        mui.each(prizeList, function(index) {
+                            if(this.prizeId==dt.data){
+                                msg=this.prizeName;
+                                img=this.prizeImage;
+                                num=index;
+                            }
+                        });
+                        //console.log("num:"+(num+1))
+                        rotateFn(num+1, "SUCCESS");//重置转盘
+                        count--;
+                        $("#gamecount").text(count);//点一次抽奖次数-1
+                        if(count>0){
+                            setTimeout(function(){
+                                mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'继续抽奖',function(){
+                                    removeDalog();
+                                    wheel_ajax();
+                                });
+                            },3000);
+                        }else{
+                            flag = false;
+                            setTimeout(function(){
+                                mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'马上下单',function(){
+                                    mui.openWindow({
+                                        url:'//h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
+                                    });
+                                });
+                            },3000);
+                        }
+                    } else {
+                        flag = false;
+                    }
                 },
-				dataType:'json',
-				async:true,
-				type:'post',
-				timeout:15000,
-				success:function(dt){
-					if (dt.status) {
-						prizeList = dt.data;
-						//console.log(prizeList);
-						
-						mui(prizeList).each(function(index){
-							turnplate.restaraunts[index] = this.prizeName;
-							if ((index + 1) % 2 == 0) {
-								turnplate.colors[index] = "#694cb3";
-							} else {
-								turnplate.colors[index] = "#a282f5";
-							}
-							//先把图片加载出来
-							$("#img-box").append('<img src="'+this.prizeImage+'" id="'+this.prizeId+'"/>');
-						});
-						//console.log(turnplate.restaraunts)
-						//防止图片没加载完设置1秒后再绘制canvas
-						setTimeout(function(){
-							drawRouletteWheel();
-							document.querySelector('.loading-bg').style.display = 'none';
-						},1000);
-					} else {
-						alert("获取奖品信息失败！")
-					}
-				},
-				error:function(xhr,type,errorThrown){
-					console.log(xhr)
-				}
-			});
-		
-			//旋转转盘 item:奖品位置; txt：提示语;
-			var rotateFn = function (item, txt, to){
-				var angles = item * (360 / turnplate.restaraunts.length) - (360 / (turnplate.restaraunts.length*2));
-				if(angles<270){
-					angles = 270 - angles; 
-				}else{
-					angles = 360 - angles + 270;
-				}
-				//console.log(angles)
-				$('#wheelcanvas').stopRotate();
-				$('#wheelcanvas').rotate({
-					angle:0,
-					animateTo:(to == null ? (angles+1800) : to),
-					duration:3000,
-					callback:function (){
-						turnplate.bRotate = !turnplate.bRotate;
-					}
-				});
-			};
-			
-			// 奖品是否抽光
-			var flag = true;
-		
-		$(".pointer").on("click",function(){
-			wheel_ajax();
-		});
-		function wheel_ajax(){
-				if (!flag) {
-					// rotateFn(270, "");
-					turnplate.bRotate = !turnplate.bRotate;//重置转盘
-					//去产品列表
-					var r=confirm("您没有抽奖次数了，是否马上前往购买商品？");
-					if (r==true){
-						mui.openWindow({
-							url:'http://h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
-						});
-					}
-					return;
-				}
-				if(turnplate.bRotate)return;
-				rotateFn(0 , "", 90000000)
-				turnplate.bRotate = !turnplate.bRotate;//重置转盘
-				//获取随机数(奖品个数范围内)
-				//替换为后台代码
-				$.ajax(base_path +'/game/luck_draw?gameId=2&orderId=',{
-					data: {},
-                    xhrFields: {
-                        withCredentials: true
-                    },
-					dataType:'json',
-					type:'get',
-					timeout:15000,
-					success:function(dt){
-						//console.log(dt.data);
-						var img,msg;
-						
-						if (dt.status) {
-							var num;
-							mui.each(prizeList, function(index) {
-								if(this.prizeId==dt.data){
-									msg=this.prizeName;
-									img=this.prizeImage;
-									num=index;
-								}
-							});
-							//console.log("num:"+(num+1))
-							rotateFn(num+1, "SUCCESS");//重置转盘
-							count--;
-							$("#gamecount").text(count);//点一次抽奖次数-1
-							if(count>0){
-								setTimeout(function(){
-								mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'继续抽奖',function(){
-									removeDalog();
-									wheel_ajax();
-								});
-								},3000);
-							}else{
-								flag = false;
-								setTimeout(function(){
-								mui.alert('<img src="'+img+'" /><span class="x-close"></span>','获得'+msg,'马上下单',function(){
-									mui.openWindow({
-										url:'http://h5.iamberry.com/iamberry/wechat/product/desc?productId=26' //chanpin_details.html
-									});
-								});
-								},3000);
-							}
-						} else {
-							flag = false;
-						}
-					},
-					error:function(xhr,type,errorThrown){
-						console.log(xhr)
-					}
-				});
-			}
-		//剩余次数
-		function getwheelcount(){
-			$.ajax(base_path + '/game/selectHallowmasGameCount?dates=' + new Date().getTime(),{
-				data: {
-					gameId:2
-				},
-                xhrFields: {
-                    withCredentials: true
+                error:function(xhr,type,errorThrown){
+                    console.log(xhr)
+                }
+            });
+        }
+        //剩余次数
+        function getwheelcount(){
+            mui.ajax(base_path + '/game/selectHallowmasGameCount?dates=' + new Date().getTime(),{
+                data: {
+                    gameId:2
                 },
-				dataType:'json',
-				type:'post',
-				timeout:15000,
-				success:function(dt){
-					if (dt.status) {
-						count=dt.data;
-						$("#gamecount").text(dt.data);
-						if(dt.data<=0){
-							flag = false;
-						}
-					}
-				},
-				error:function(xhr,type,errorThrown){
-					console.log(xhr)
-				}
-			});
-		}			
-			
-		});
+                dataType:'json',
+                type:'post',
+                timeout:15000,
+                success:function(dt){
+                    if (dt.status) {
+                        count=dt.data;
+                        $("#gamecount").text(dt.data);
+                        if(dt.data<=0){
+                            flag = false;
+                        }
+                    }
+                },
+                error:function(xhr,type,errorThrown){
+                    console.log(xhr)
+                }
+            });
+        }
 
-		
-		//页面所有元素加载完毕后执行drawRouletteWheel()方法对转盘进行渲染
-		window.onload=function(){
-			//drawRouletteWheel();
-		};
-		
-		function drawRouletteWheel() { 
-		  var canvas = dc("wheelcanvas");    
-		  if (canvas.getContext) {
-			  //根据奖品个数计算圆周角度
-			  var arc = Math.PI / (turnplate.restaraunts.length/2);
-			  var ctx = canvas.getContext("2d");
-			  //在给定矩形内清空一个矩形
-			  ctx.clearRect(0,0,422,422);
-			  //strokeStyle 属性设置或返回用于笔触的颜色、渐变或模式  
-			  ctx.strokeStyle = "rgba(0,0,0,0)";//边框颜色
-			  //font 属性设置或返回画布上文本内容的当前字体属性
-			  ctx.font = '15px Arial';      
-			  for(var i = 0; i < turnplate.restaraunts.length; i++) {       
-				  //添加对应图标
-				  if (prizeList != null) {
-					  var angle = turnplate.startAngle + i * arc;
-					  ctx.fillStyle = turnplate.colors[i];
-					  ctx.beginPath();
-					  //arc(x,y,r,起始角,结束角,绘制方向) 方法创建弧/曲线（用于创建圆或部分圆）    
-					  ctx.arc(211, 211, turnplate.outsideRadius, angle, angle + arc, false);    
-					  ctx.arc(211, 211, turnplate.insideRadius, angle + arc, angle, true);
-					  ctx.stroke();  
-					  ctx.fill();
-					  //锁画布(为了保存之前的画布状态)
-					  ctx.save();   
-					  
-					  //----绘制奖品开始----
-					  ctx.fillStyle = "#fff";
-					  var text = turnplate.restaraunts[i];
-					  var line_height = 17;
-					  //translate方法重新映射画布上的 (0,0) 位置
-					  ctx.translate(211 + Math.cos(angle + arc / 2) * turnplate.textRadius, 211 + Math.sin(angle + arc / 2) * turnplate.textRadius);
-					  
-					  //rotate方法旋转当前的绘图
-					  ctx.rotate(angle + arc / 2 + Math.PI / 2);
-					  
-					  /** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
-						 //在画布上绘制填色的文本。文本的默认颜色是黑色
-						  //measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
-					  ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
-					  var img= dc(prizeList[i].prizeId);
-					  ctx.drawImage(img,-25,10);
-					 
-					  //把当前画布返回（调整）到上一个save()状态之前 
-				  }
-				  //----绘制奖品结束----
-				  ctx.restore();
-			  }     
-		  } 
-		}
-		var mask = mui.createMask(function() {	
-		}); //callback为用户点击蒙版时自动执行的回调；
-		mui('body').on('tap', '#guize-picture,#share-picture', function(e) {
-			mui(this).popover('toggle');
-		});
-		mui('body').on('tap', '.x-close', function(e) {
-			//console.log("关闭");
-			hide_dalog=false;
-			removeDalog();
-		});
-		function removeDalog(){
-			var dalog=$('.mui-popup');
-			dalog.remove();
-			$(".mui-popup-backdrop").removeClass("mui-active");
-		}
-		</script>
-	</body>
+    });
+
+
+    //页面所有元素加载完毕后执行drawRouletteWheel()方法对转盘进行渲染
+    window.onload=function(){
+        //drawRouletteWheel();
+    };
+
+    function drawRouletteWheel() {
+        var canvas = dc("wheelcanvas");
+        if (canvas.getContext) {
+            //根据奖品个数计算圆周角度
+            var arc = Math.PI / (turnplate.restaraunts.length/2);
+            var ctx = canvas.getContext("2d");
+            //在给定矩形内清空一个矩形
+            ctx.clearRect(0,0,422,422);
+            //strokeStyle 属性设置或返回用于笔触的颜色、渐变或模式
+            ctx.strokeStyle = "rgba(0,0,0,0)";//边框颜色
+            //font 属性设置或返回画布上文本内容的当前字体属性
+            ctx.font = '15px Arial';
+            for(var i = 0; i < turnplate.restaraunts.length; i++) {
+                //添加对应图标
+                if (prizeList != null) {
+                    var angle = turnplate.startAngle + i * arc;
+                    ctx.fillStyle = turnplate.colors[i];
+                    ctx.beginPath();
+                    //arc(x,y,r,起始角,结束角,绘制方向) 方法创建弧/曲线（用于创建圆或部分圆）
+                    ctx.arc(211, 211, turnplate.outsideRadius, angle, angle + arc, false);
+                    ctx.arc(211, 211, turnplate.insideRadius, angle + arc, angle, true);
+                    ctx.stroke();
+                    ctx.fill();
+                    //锁画布(为了保存之前的画布状态)
+                    ctx.save();
+
+                    //----绘制奖品开始----
+                    ctx.fillStyle = "#fff";
+                    var text = turnplate.restaraunts[i];
+                    var line_height = 17;
+                    //translate方法重新映射画布上的 (0,0) 位置
+                    ctx.translate(211 + Math.cos(angle + arc / 2) * turnplate.textRadius, 211 + Math.sin(angle + arc / 2) * turnplate.textRadius);
+
+                    //rotate方法旋转当前的绘图
+                    ctx.rotate(angle + arc / 2 + Math.PI / 2);
+
+                    /** 下面代码根据奖品类型、奖品名称长度渲染不同效果，如字体、颜色、图片效果。(具体根据实际情况改变) **/
+                    //在画布上绘制填色的文本。文本的默认颜色是黑色
+                    //measureText()方法返回包含一个对象，该对象包含以像素计的指定字体宽度
+                    ctx.fillText(text, -ctx.measureText(text).width / 2, 0);
+                    var img= dc(prizeList[i].prizeId);
+                    ctx.drawImage(img,-25,10);
+
+                    //把当前画布返回（调整）到上一个save()状态之前
+                }
+                //----绘制奖品结束----
+                ctx.restore();
+            }
+        }
+    }
+    var mask = mui.createMask(function() {
+    }); //callback为用户点击蒙版时自动执行的回调；
+    mui('body').on('tap', '#guize-picture,#share-picture', function(e) {
+        mui(this).popover('toggle');
+    });
+    mui('body').on('tap', '.x-close', function(e) {
+        //console.log("关闭");
+        hide_dalog=false;
+        removeDalog();
+    });
+    function removeDalog(){
+        var dalog=$('.mui-popup');
+        dalog.remove();
+        $(".mui-popup-backdrop").removeClass("mui-active");
+    }
+</script>
+</body>
 
 </html>

watero-wechat-web/src/main/webapp/common/js/admin/public/wxtree.js

@@ -464,8 +464,8 @@
 						return false;
 					}
 				}
-				if (url != null && url != "" && url.indexOf('http://') < 0) {
-					alert('链接必须以http://开头!');
+				if (url != null && url != "" && url.indexOf('http://') < 0 && url.indexOf('https://') < 0) {
+					alert('链接必须以http://或https://开头!');
 					return false;
 				}
 				if (url.indexOf("\"") > -1 || url.indexOf("\“") > -1

watero-wechat-web/src/main/webapp/common/shop/iamberry_video_list.html

@@ -29,7 +29,7 @@
 					<li style="color: #5FC6DB;">WaterO - 首次使用指南</li>
 				</ul>
 			</div>
-		    <iframe style="margin-left:9%;margin-top:5px;border: 0;" class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=t05318hcew4&tiny=0&auto=0" allowfullscreen></iframe>
+		    <iframe style="margin-left:9%;margin-top:5px;border: 0;" class="my_iframe" src="//v.qq.com/iframe/player.html?vid=t05318hcew4&tiny=0&auto=0" allowfullscreen></iframe>
 		</div>
 		<div class="mui-content" style="background: #fff;margin-top: 20px;">
 			<div style="margin: 0 10px;padding-top: 5px;">
@@ -37,7 +37,7 @@
 					<li style="color: #5FC6DB;">WaterO - 清洗指南</li>
 				</ul>
 			</div>
-		    <iframe style="margin-left:9%;margin-top:5px;border: 0;" class="my_iframe" src="https://v.qq.com/iframe/player.html?vid=m0531um9ev2&tiny=0&auto=0" allowfullscreen></iframe>
+		    <iframe style="margin-left:9%;margin-top:5px;border: 0;" class="my_iframe" src="//v.qq.com/iframe/player.html?vid=m0531um9ev2&tiny=0&auto=0" allowfullscreen></iframe>
 		</div>
 	<script type="text/javascript" src="js/mui.min.js"></script>
 	<script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>

watero-wechat-web/src/main/webapp/common/shop/js/page/add_information.js

@@ -1,4 +1,4 @@
-var domanUrl = "http://" + window.location.host, base_path = "http://test.iamberry.com/watero/wechat/watero/wechat", marquee = '';
+var domanUrl = "//" + window.location.host, base_path = "/watero/wechat", marquee = '';
 mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function (index, el) {
     el.addEventListener('tap', function () {
         switch (index) {
@@ -6,13 +6,13 @@ mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function (index
                 mui.openWindow({url: base_path + '/index'});
                 break;
             case 1:
-                mui.openWindow({url: '/watero/wechat/shopping_cart.html'});
+                mui.openWindow({url: base_path + '/wxCart/goCart'});
                 break;
             case 2:
-                mui.openWindow({url: '/watero/wechat/order_list.html'});
+                mui.openWindow({url: '/watero/pay/goOrderList'});
                 break;
             case 3:
-                mui.openWindow({url: '/watero/wechat/vip_center.html'});
+                mui.openWindow({url: base_path + '/agentWechat/member'});
                 break;
             default:
                 break
@@ -20,10 +20,7 @@ mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function (index
     }, false)
 });
 function getCartNum() {
-    $.ajax(base_path + '/cart/getCartNumByCartOpenId', {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/cart/getCartNumByCartOpenId', {
         data: {openid: '230'},
         dataType: 'json',
         type: 'post',
@@ -47,23 +44,20 @@ function getCartNum() {
     mui.openWindow({url: base_path + '/index'})
 });
 mui('body').on('tap', '.go_gwc', function () {
-    mui.openWindow({url: '/watero/wechat/shopping_cart.html'})
+    mui.openWindow({url: base_path + '/wxCart/goCart'})
 });
 mui('body').on('tap', '.go_web_shop', function () {
-    mui.openWindow({url: '/watero/wechat/chanpin_list.html'})
+    mui.openWindow({url: base_path + '/wxCart/goProductList'})
 });
 mui('body').on('tap', '.go_chanpin_details', function () {
     mui.openWindow({url: base_path + '/product/desc?productId=' + this.getAttribute("proid")})
 });
 mui('body').on('tap', '.go_couponList', function () {
-    mui.openWindow({url: '/watero/wechat/coupon_list.html'})
+    mui.openWindow({url: base_path + '/couponWechat/couponList'})
 });
 mui('body').on('tap', '.go-clearing', function () {
     var param = "productId=" + this.getAttribute("proid");
-    $.ajax(base_path + '/cart/addProductToCart?' + param, {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/cart/addProductToCart?' + param, {
         dataType: 'json',
         type: 'GET',
         timeout: 15000,
@@ -81,10 +75,7 @@ mui('body').on('tap', '.go-clearing', function () {
 });
 mui('body').on('tap', '.go_gwc_pro', function () {
     var param = "productId=" + this.getAttribute("proid");
-    $.ajax(base_path + '/cart/addProductToCart?' + param, {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/cart/addProductToCart?' + param, {
         dataType: 'json',
         type: 'GET',
         timeout: 15000,
@@ -101,10 +92,7 @@ mui('body').on('tap', '.go_gwc_pro', function () {
     })
 });
 function marquee_Show() {
-    $.ajax(base_path + '/coupon/checkCurrentPreferential', {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/coupon/checkCurrentPreferential', {
         dataType: 'json',
         type: 'POST',
         async: false,
@@ -121,89 +109,89 @@ function marquee_Show() {
         }
     })
 };mui('body').on('tap', '.go_order_details', function () {
-    mui.openWindow({url: '/watero/html/wechat/order_details.html?orderId=' + this.getAttribute("value")})
+    mui.openWindow({url: '/watero/pay/goOrderInfo?orderId=' + this.getAttribute("value")})
 });
 mui('body').on('tap', '.go_pay_count', function () {
-    mui.openWindow({url: '/watero/html/wechat/order_list.html?salesStatus=1'})
+    mui.openWindow({url: '/watero/pay/goOrderList?salesStatus=1'})
 });
 mui('body').on('tap', '.go_deliver_count', function () {
-    mui.openWindow({url: '/watero/html/wechat/order_list.html?salesStatus=2'})
+    mui.openWindow({url: '/watero/pay/goOrderList?salesStatus=2'})
 });
 mui('body').on('tap', '.go_delivered_count', function () {
-    mui.openWindow({url: '/watero/html/wechat/order_list.html?salesStatus=5'})
+    mui.openWindow({url: '/watero/pay/goOrderList?salesStatus=5'})
 });
 mui('body').on('tap', '.go_all_count', function () {
-    mui.openWindow({url: '/watero/html/wechat/order_list.html?salesStatus=-1'})
+    mui.openWindow({url: '/watero/pay/goOrderList?salesStatus=-1'})
 });
 mui('body').on('tap', '.go_tixian_guize', function () {
-    mui.openWindow({url: '/watero/html/wechat/tixian_guize.html'})
+    mui.openWindow({url: base_path + '/integralWechat/withdrawRule'})
 });
 mui('body').on('tap', '.go_agent_rule', function () {
-    mui.openWindow({url: '/watero/html/wechat/daili_guize.html'})
+    mui.openWindow({url: base_path + '/agentWechat/agentRule'})
 });
 mui('body').on('tap', '.go_publicity', function () {
     mui.openWindow({url: base_path + '/agentWechat/goPublicity?userType=' + this.getAttribute("userType") + "&isDrp=" + this.getAttribute("isDrp")})
 });
 mui('body').on('tap', '.go_daili_order_list', function () {
-    mui.openWindow({url: '/watero/html/wechat/daili_order_list.html'})
+    mui.openWindow({url: base_path + '/agentWechat/order'})
 });
 mui('body').on('tap', '.go_daili_rebackOrder_list', function () {
-    mui.openWindow({url: '/watero/html/wechat/daili_rebackOrder_list.html'})
+    mui.openWindow({url: base_path + '/agentWechat/reback'})
 });
 mui('body').on('tap', '.go_order_list', function () {
-    mui.openWindow({url: '/watero/html/wechat/order_list.html'})
+    mui.openWindow({url: '/watero/pay/goOrderList'})
 });
 mui('body').on('tap', '.go_xiaxian_list', function () {
-    mui.openWindow({url: '/watero/html/wechat/xiaxian_list.html'})
+    mui.openWindow({url: base_path + '/agentWechat/agentNext'})
 });
 mui('body').on('tap', '.go_tixian_apply', function () {
-    mui.openWindow({url: '/watero/html/wechat/tixian_apply.html'})
+    mui.openWindow({url: base_path + '/withdraw/index'})
 });
 mui('body').on('tap', '.go_tixian_cash', function () {
-    mui.openWindow({url: '/watero/html/wechat/tixian_apply_cash.html'})
+    mui.openWindow({url: base_path + '/withdraw/cash'})
 });
 mui('body').on('tap', '.go_daili_2wm', function () {
-    mui.openWindow({url: '/watero/html/wechat/daili_2wm.html'})
+    mui.openWindow({url: base_path + '/member/showQrcode'})
 });
 mui('body').on('tap', '.go_cash_log', function () {
-    mui.openWindow({url: '/watero/html/wechat/cash_log.html'})
+    mui.openWindow({url: base_path + '/cashWechat/log'})
 });
 mui('body').on('tap', '.go_jifen_log', function () {
-    mui.openWindow({url: '/watero/html/wechat/jifen_log.html'})
+    mui.openWindow({url: base_path + '/integralWechat/log'})
 });
 mui('body').on('tap', '.go_jifen_guize', function () {
-    mui.openWindow({url: '/watero/html/wechat/fenxiao_guize.html'})
+    mui.openWindow({url: base_path + '/integralWechat/integralRule'})
 });
 mui('body').on('tap', '.go_tixian_log', function () {
-    mui.openWindow({url: '/watero/html/wechat/tixian_log.html'})
+    mui.openWindow({url: base_path + '/integralWechat/withdrawLog'})
 });
 mui('body').on('tap', '.go_tixian_cash_log', function () {
-    mui.openWindow({url: '/watero/html/wechat/tixian_log_cash.html'})
+    mui.openWindow({url: base_path + '/agentWechat/withdrawCashLog'})
 });
 mui('body').on('tap', '.show_post_info', function () {
     var urlStr = document.domain;
-    mui.openWindow({url: 'http://m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=http://' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()})
+    mui.openWindow({url: '//m.kuaidi100.com/index_all.html?type=' + this.getAttribute("postFirm") + '&postid=' + this.getAttribute("postNum") + '&callbackurl=//' + urlStr + this.getAttribute("gourl") + "&tiemstamp=" + new Date().getTime()})
 });
 mui('body').on('tap', '.go_fenxiao_tixian_apply', function () {
-    mui.openWindow({url: '/watero/html/wechat/fenxiao_tixian_apply.html?openid='})
+    mui.openWindow({url: base_path + '/drp/withdrawalsPage?openid='})
 });
 mui('body').on('tap', '.go_fenxiao_tixian_log', function () {
-    mui.openWindow({url: '/watero/html/wechat/fenxiao_tixian_log.html'})
+    mui.openWindow({url: base_path + '/drp/withdrawalsList'})
 });
 mui('body').on('tap', '.fenxiao_vip', function () {
-    mui.openWindow({url: '/watero/html/wechat/fenxiao_guize.html'})
+    mui.openWindow({url: base_path + '/drp/rulePage'})
 });
 mui('body').on('tap', '.to-up-img', function () {
-    mui.openWindow({url: '/watero/html/wechat/up.html?userType=1'})
+    mui.openWindow({url: base_path + '/sharePage/upShare?userType=1'})
 });
 mui('body').on('tap', '.fenxiao_info', function () {
-    mui.openWindow({url: '/watero/html/wechat/personal_information.html'})
+    mui.openWindow({url: base_path + '/drp/placeInfo_detail'})
 });
 mui('body').on('tap', '.go_luck_draw', function () {
-    mui.openWindow({url: '/watero/html/wechat/share_zhuanpan.html?orderId=' + this.getAttribute("value")})
+    mui.openWindow({url: base_path + '/activity/go_luck_draw?orderId=' + this.getAttribute("value")})
 });
 mui('body').on('tap', '.go_prize_log', function () {
-    mui.openWindow({url: '/watero/html/wechat/wheel_log.html?gameId=' + this.getAttribute("value")})
+    mui.openWindow({url: base_path + '/activity/go_prize_log?gameId=' + this.getAttribute("value")})
 });
 function errorfn(xhr) {
     if (xhr.readyState == 4 && xhr.status == 200) {

watero-wechat-web/src/main/webapp/common/shop/js/page/awardRotate.js

@@ -1,22 +1,22 @@
 (function($) {
-var supportedCSS,styles=document.getElementsByTagName("head")[0].style,toCheck="transformProperty WebkitTransform OTransform msTransform MozTransform".split(" ");
-for (var a=0;a<toCheck.length;a++) if (styles[toCheck[a]] !== undefined) supportedCSS = toCheck[a];
+    var supportedCSS,styles=document.getElementsByTagName("head")[0].style,toCheck="transformProperty WebkitTransform OTransform msTransform MozTransform".split(" ");
+    for (var a=0;a<toCheck.length;a++) if (styles[toCheck[a]] !== undefined) supportedCSS = toCheck[a];
 // Bad eval to preven google closure to remove it from code o_O
 // After compresion replace it back to var IE = 'v' == '\v'
-var IE = eval('"v"=="\v"');
+    var IE = eval('"v"=="\v"');
 
-jQuery.fn.extend({
-    rotate:function(parameters)
-    {
-        if (this.length===0||typeof parameters=="undefined") return;
+    jQuery.fn.extend({
+        rotate:function(parameters)
+        {
+            if (this.length===0||typeof parameters=="undefined") return;
             if (typeof parameters=="number") parameters={angle:parameters};
-        var returned=[];
-        for (var i=0,i0=this.length;i<i0;i++)
+            var returned=[];
+            for (var i=0,i0=this.length;i<i0;i++)
             {
-                var element=this.get(i);	
+                var element=this.get(i);
                 if (!element.Wilq32 || !element.Wilq32.PhotoEffect) {
 
-                    var paramClone = $.extend(true, {}, parameters); 
+                    var paramClone = $.extend(true, {}, parameters);
                     var newRotObject = new Wilq32.PhotoEffect(element,paramClone)._rootObj;
 
                     returned.push($(newRotObject));
@@ -26,277 +26,277 @@ jQuery.fn.extend({
                 }
             }
             return returned;
-    },
-    getRotateAngle: function(){
-        var ret = [];
-        for (var i=0,i0=this.length;i<i0;i++)
+        },
+        getRotateAngle: function(){
+            var ret = [];
+            for (var i=0,i0=this.length;i<i0;i++)
             {
-                var element=this.get(i);	
+                var element=this.get(i);
                 if (element.Wilq32 && element.Wilq32.PhotoEffect) {
                     ret[i] = element.Wilq32.PhotoEffect._angle;
                 }
             }
             return ret;
-    },
-    stopRotate: function(){
-        for (var i=0,i0=this.length;i<i0;i++)
+        },
+        stopRotate: function(){
+            for (var i=0,i0=this.length;i<i0;i++)
             {
-                var element=this.get(i);	
+                var element=this.get(i);
                 if (element.Wilq32 && element.Wilq32.PhotoEffect) {
                     clearTimeout(element.Wilq32.PhotoEffect._timer);
                 }
             }
-    }
-});
+        }
+    });
 
 // Library agnostic interface
 
-Wilq32=window.Wilq32||{};
-Wilq32.PhotoEffect=(function(){
-
-	if (supportedCSS) {
-		return function(img,parameters){
-			img.Wilq32 = {
-				PhotoEffect: this
-			};
-            
-            this._img = this._rootObj = this._eventObj = img;
-            this._handleRotation(parameters);
-		}
-	} else {
-		return function(img,parameters) {
-			// Make sure that class and id are also copied - just in case you would like to refeer to an newly created object
-            this._img = img;
-
-			this._rootObj=document.createElement('span');
-			this._rootObj.style.display="inline-block";
-			this._rootObj.Wilq32 = 
-				{
-					PhotoEffect: this
-				};
-			img.parentNode.insertBefore(this._rootObj,img);
-			
-			if (img.complete) {
-				this._Loader(parameters);
-			} else {
-				var self=this;
-				// TODO: Remove jQuery dependency
-				jQuery(this._img).bind("load", function()
-				{
-					self._Loader(parameters);
-				});
-			}
-		}
-	}
-})();
-
-Wilq32.PhotoEffect.prototype={
-    _setupParameters : function (parameters){
-		this._parameters = this._parameters || {};
-        if (typeof this._angle !== "number") this._angle = 0 ;
-        if (typeof parameters.angle==="number") this._angle = parameters.angle;
-        this._parameters.animateTo = (typeof parameters.animateTo==="number") ? (parameters.animateTo) : (this._angle); 
-
-        this._parameters.step = parameters.step || this._parameters.step || null;
-		this._parameters.easing = parameters.easing || this._parameters.easing || function (x, t, b, c, d) { return -c * ((t=t/d-1)*t*t*t - 1) + b; }
-		this._parameters.duration = parameters.duration || this._parameters.duration || 1000;
-        this._parameters.callback = parameters.callback || this._parameters.callback || function(){};
-        if (parameters.bind && parameters.bind != this._parameters.bind) this._BindEvents(parameters.bind); 
-	},
-	_handleRotation : function(parameters){
-          this._setupParameters(parameters);
-          if (this._angle==this._parameters.animateTo) {
-              this._rotate(this._angle);
-          }
-          else { 
-              this._animateStart();          
-          }
-	},
-
-	_BindEvents:function(events){
-		if (events && this._eventObj) 
-		{
-            // Unbinding previous Events
-            if (this._parameters.bind){
-                var oldEvents = this._parameters.bind;
-                for (var a in oldEvents) if (oldEvents.hasOwnProperty(a)) 
-                        // TODO: Remove jQuery dependency
+    Wilq32=window.Wilq32||{};
+    Wilq32.PhotoEffect=(function(){
+
+        if (supportedCSS) {
+            return function(img,parameters){
+                img.Wilq32 = {
+                    PhotoEffect: this
+                };
+
+                this._img = this._rootObj = this._eventObj = img;
+                this._handleRotation(parameters);
+            }
+        } else {
+            return function(img,parameters) {
+                // Make sure that class and id are also copied - just in case you would like to refeer to an newly created object
+                this._img = img;
+
+                this._rootObj=document.createElement('span');
+                this._rootObj.style.display="inline-block";
+                this._rootObj.Wilq32 =
+                    {
+                        PhotoEffect: this
+                    };
+                img.parentNode.insertBefore(this._rootObj,img);
+
+                if (img.complete) {
+                    this._Loader(parameters);
+                } else {
+                    var self=this;
+                    // TODO: Remove jQuery dependency
+                    jQuery(this._img).bind("load", function()
+                    {
+                        self._Loader(parameters);
+                    });
+                }
+            }
+        }
+    })();
+
+    Wilq32.PhotoEffect.prototype={
+        _setupParameters : function (parameters){
+            this._parameters = this._parameters || {};
+            if (typeof this._angle !== "number") this._angle = 0 ;
+            if (typeof parameters.angle==="number") this._angle = parameters.angle;
+            this._parameters.animateTo = (typeof parameters.animateTo==="number") ? (parameters.animateTo) : (this._angle);
+
+            this._parameters.step = parameters.step || this._parameters.step || null;
+            this._parameters.easing = parameters.easing || this._parameters.easing || function (x, t, b, c, d) { return -c * ((t=t/d-1)*t*t*t - 1) + b; }
+            this._parameters.duration = parameters.duration || this._parameters.duration || 1000;
+            this._parameters.callback = parameters.callback || this._parameters.callback || function(){};
+            if (parameters.bind && parameters.bind != this._parameters.bind) this._BindEvents(parameters.bind);
+        },
+        _handleRotation : function(parameters){
+            this._setupParameters(parameters);
+            if (this._angle==this._parameters.animateTo) {
+                this._rotate(this._angle);
+            }
+            else {
+                this._animateStart();
+            }
+        },
+
+        _BindEvents:function(events){
+            if (events && this._eventObj)
+            {
+                // Unbinding previous Events
+                if (this._parameters.bind){
+                    var oldEvents = this._parameters.bind;
+                    for (var a in oldEvents) if (oldEvents.hasOwnProperty(a))
+                    // TODO: Remove jQuery dependency
                         jQuery(this._eventObj).unbind(a,oldEvents[a]);
+                }
+
+                this._parameters.bind = events;
+                for (var a in events) if (events.hasOwnProperty(a))
+                // TODO: Remove jQuery dependency
+                    jQuery(this._eventObj).bind(a,events[a]);
             }
+        },
+
+        _Loader:(function()
+        {
+            if (IE)
+                return function(parameters)
+                {
+                    var width=this._img.width;
+                    var height=this._img.height;
+                    this._img.parentNode.removeChild(this._img);
+
+                    this._vimage = this.createVMLNode('image');
+                    this._vimage.src=this._img.src;
+                    this._vimage.style.height=height+"px";
+                    this._vimage.style.width=width+"px";
+                    this._vimage.style.position="absolute"; // FIXES IE PROBLEM - its only rendered if its on absolute position!
+                    this._vimage.style.top = "0px";
+                    this._vimage.style.left = "0px";
+
+					/* Group minifying a small 1px precision problem when rotating object */
+                    this._container =  this.createVMLNode('group');
+                    this._container.style.width=width;
+                    this._container.style.height=height;
+                    this._container.style.position="absolute";
+                    this._container.setAttribute('coordsize',width-1+','+(height-1)); // This -1, -1 trying to fix ugly problem with small displacement on IE
+                    this._container.appendChild(this._vimage);
+
+                    this._rootObj.appendChild(this._container);
+                    this._rootObj.style.position="relative"; // FIXES IE PROBLEM
+                    this._rootObj.style.width=width+"px";
+                    this._rootObj.style.height=height+"px";
+                    this._rootObj.setAttribute('id',this._img.getAttribute('id'));
+                    this._rootObj.className=this._img.className;
+                    this._eventObj = this._rootObj;
+                    this._handleRotation(parameters);
+                }
+            else
+                return function (parameters)
+                {
+                    this._rootObj.setAttribute('id',this._img.getAttribute('id'));
+                    this._rootObj.className=this._img.className;
+
+                    this._width=this._img.width;
+                    this._height=this._img.height;
+                    this._widthHalf=this._width/2; // used for optimisation
+                    this._heightHalf=this._height/2;// used for optimisation
+
+                    var _widthMax=Math.sqrt((this._height)*(this._height) + (this._width) * (this._width));
+
+                    this._widthAdd = _widthMax - this._width;
+                    this._heightAdd = _widthMax - this._height;	// widthMax because maxWidth=maxHeight
+                    this._widthAddHalf=this._widthAdd/2; // used for optimisation
+                    this._heightAddHalf=this._heightAdd/2;// used for optimisation
+
+                    this._img.parentNode.removeChild(this._img);
 
-            this._parameters.bind = events;
-			for (var a in events) if (events.hasOwnProperty(a)) 
-				// TODO: Remove jQuery dependency
-					jQuery(this._eventObj).bind(a,events[a]);
-		}
-	},
-
-	_Loader:(function()
-	{
-		if (IE)
-		return function(parameters)
-		{
-			var width=this._img.width;
-			var height=this._img.height;
-			this._img.parentNode.removeChild(this._img);
-							
-			this._vimage = this.createVMLNode('image');
-			this._vimage.src=this._img.src;
-			this._vimage.style.height=height+"px";
-			this._vimage.style.width=width+"px";
-			this._vimage.style.position="absolute"; // FIXES IE PROBLEM - its only rendered if its on absolute position!
-			this._vimage.style.top = "0px";
-			this._vimage.style.left = "0px";
-
-			/* Group minifying a small 1px precision problem when rotating object */
-			this._container =  this.createVMLNode('group');
-			this._container.style.width=width;
-			this._container.style.height=height;
-			this._container.style.position="absolute";
-			this._container.setAttribute('coordsize',width-1+','+(height-1)); // This -1, -1 trying to fix ugly problem with small displacement on IE
-			this._container.appendChild(this._vimage);
-			
-			this._rootObj.appendChild(this._container);
-			this._rootObj.style.position="relative"; // FIXES IE PROBLEM
-			this._rootObj.style.width=width+"px";
-			this._rootObj.style.height=height+"px";
-			this._rootObj.setAttribute('id',this._img.getAttribute('id'));
-			this._rootObj.className=this._img.className;			
-		    this._eventObj = this._rootObj;	
-		    this._handleRotation(parameters);	
-		}
-		else
-		return function (parameters)
-		{
-			this._rootObj.setAttribute('id',this._img.getAttribute('id'));
-			this._rootObj.className=this._img.className;
-			
-			this._width=this._img.width;
-			this._height=this._img.height;
-			this._widthHalf=this._width/2; // used for optimisation
-			this._heightHalf=this._height/2;// used for optimisation
-			
-			var _widthMax=Math.sqrt((this._height)*(this._height) + (this._width) * (this._width));
-
-			this._widthAdd = _widthMax - this._width;
-			this._heightAdd = _widthMax - this._height;	// widthMax because maxWidth=maxHeight
-			this._widthAddHalf=this._widthAdd/2; // used for optimisation
-			this._heightAddHalf=this._heightAdd/2;// used for optimisation
-			
-			this._img.parentNode.removeChild(this._img);	
-			
-			this._aspectW = ((parseInt(this._img.style.width,10)) || this._width)/this._img.width;
-			this._aspectH = ((parseInt(this._img.style.height,10)) || this._height)/this._img.height;
-			
-			this._canvas=document.createElement('canvas');
-			this._canvas.setAttribute('width',this._width);
-			this._canvas.style.position="relative";
-			this._canvas.style.left = -this._widthAddHalf + "px";
-			this._canvas.style.top = -this._heightAddHalf + "px";
-			this._canvas.Wilq32 = this._rootObj.Wilq32;
-			
-			this._rootObj.appendChild(this._canvas);
-			this._rootObj.style.width=this._width+"px";
-			this._rootObj.style.height=this._height+"px";
-            this._eventObj = this._canvas;
-			
-			this._cnv=this._canvas.getContext('2d');
-            this._handleRotation(parameters);
-		}
-	})(),
-
-	_animateStart:function()
-	{	
-		if (this._timer) {
-			clearTimeout(this._timer);
-		}
-		this._animateStartTime = +new Date;
-		this._animateStartAngle = this._angle;
-		this._animate();
-	},
-    _animate:function()
+                    this._aspectW = ((parseInt(this._img.style.width,10)) || this._width)/this._img.width;
+                    this._aspectH = ((parseInt(this._img.style.height,10)) || this._height)/this._img.height;
+
+                    this._canvas=document.createElement('canvas');
+                    this._canvas.setAttribute('width',this._width);
+                    this._canvas.style.position="relative";
+                    this._canvas.style.left = -this._widthAddHalf + "px";
+                    this._canvas.style.top = -this._heightAddHalf + "px";
+                    this._canvas.Wilq32 = this._rootObj.Wilq32;
+
+                    this._rootObj.appendChild(this._canvas);
+                    this._rootObj.style.width=this._width+"px";
+                    this._rootObj.style.height=this._height+"px";
+                    this._eventObj = this._canvas;
+
+                    this._cnv=this._canvas.getContext('2d');
+                    this._handleRotation(parameters);
+                }
+        })(),
+
+        _animateStart:function()
+        {
+            if (this._timer) {
+                clearTimeout(this._timer);
+            }
+            this._animateStartTime = +new Date;
+            this._animateStartAngle = this._angle;
+            this._animate();
+        },
+        _animate:function()
+        {
+            var actualTime = +new Date;
+            var checkEnd = actualTime - this._animateStartTime > this._parameters.duration;
+
+            // TODO: Bug for animatedGif for static rotation ? (to test)
+            if (checkEnd && !this._parameters.animatedGif)
+            {
+                clearTimeout(this._timer);
+            }
+            else
+            {
+                if (this._canvas||this._vimage||this._img) {
+                    var angle = this._parameters.easing(0, actualTime - this._animateStartTime, this._animateStartAngle, this._parameters.animateTo - this._animateStartAngle, this._parameters.duration);
+                    this._rotate((~~(angle*10))/10);
+                }
+                if (this._parameters.step) {
+                    this._parameters.step(this._angle);
+                }
+                var self = this;
+                this._timer = setTimeout(function()
+                {
+                    self._animate.call(self);
+                }, 10);
+            }
+
+            // To fix Bug that prevents using recursive function in callback I moved this function to back
+            if (this._parameters.callback && checkEnd){
+                this._angle = this._parameters.animateTo;
+                this._rotate(this._angle);
+                this._parameters.callback.call(this._rootObj);
+            }
+        },
+
+        _rotate : (function()
+        {
+            var rad = Math.PI/180;
+            if (IE)
+                return function(angle)
+                {
+                    this._angle = angle;
+                    this._container.style.rotation=(angle%360)+"deg";
+                }
+            else if (supportedCSS)
+                return function(angle){
+                    this._angle = angle;
+                    this._img.style[supportedCSS]="rotate("+(angle%360)+"deg)";
+                }
+            else
+                return function(angle)
+                {
+                    this._angle = angle;
+                    angle=(angle%360)* rad;
+                    // clear canvas
+                    this._canvas.width = this._width+this._widthAdd;
+                    this._canvas.height = this._height+this._heightAdd;
+
+                    // REMEMBER: all drawings are read from backwards.. so first function is translate, then rotate, then translate, translate..
+                    this._cnv.translate(this._widthAddHalf,this._heightAddHalf);	// at least center image on screen
+                    this._cnv.translate(this._widthHalf,this._heightHalf);			// we move image back to its orginal
+                    this._cnv.rotate(angle);										// rotate image
+                    this._cnv.translate(-this._widthHalf,-this._heightHalf);		// move image to its center, so we can rotate around its center
+                    this._cnv.scale(this._aspectW,this._aspectH); // SCALE - if needed ;)
+                    this._cnv.drawImage(this._img, 0, 0);							// First - we draw image
+                }
+
+        })()
+    }
+
+    if (IE)
     {
-         var actualTime = +new Date;
-         var checkEnd = actualTime - this._animateStartTime > this._parameters.duration;
-
-         // TODO: Bug for animatedGif for static rotation ? (to test)
-         if (checkEnd && !this._parameters.animatedGif) 
-         {
-             clearTimeout(this._timer);
-         }
-         else 
-         {
-             if (this._canvas||this._vimage||this._img) {
-                 var angle = this._parameters.easing(0, actualTime - this._animateStartTime, this._animateStartAngle, this._parameters.animateTo - this._animateStartAngle, this._parameters.duration);
-                 this._rotate((~~(angle*10))/10);
-             }
-             if (this._parameters.step) {
-                this._parameters.step(this._angle);
-             }
-             var self = this;
-             this._timer = setTimeout(function()
-                     {
-                     self._animate.call(self);
-                     }, 10);
-         }
-
-         // To fix Bug that prevents using recursive function in callback I moved this function to back
-         if (this._parameters.callback && checkEnd){
-             this._angle = this._parameters.animateTo;
-             this._rotate(this._angle);
-             this._parameters.callback.call(this._rootObj);
-         }
-     },
-
-	_rotate : (function()
-	{
-		var rad = Math.PI/180;
-		if (IE)
-		return function(angle)
-		{
-            this._angle = angle;
-			this._container.style.rotation=(angle%360)+"deg";
-		}
-		else if (supportedCSS)
-		return function(angle){
-            this._angle = angle;
-			this._img.style[supportedCSS]="rotate("+(angle%360)+"deg)";
-		}
-		else 
-		return function(angle)
-		{
-            this._angle = angle;
-			angle=(angle%360)* rad;
-			// clear canvas	
-			this._canvas.width = this._width+this._widthAdd;
-			this._canvas.height = this._height+this._heightAdd;
-						
-			// REMEMBER: all drawings are read from backwards.. so first function is translate, then rotate, then translate, translate..
-			this._cnv.translate(this._widthAddHalf,this._heightAddHalf);	// at least center image on screen
-			this._cnv.translate(this._widthHalf,this._heightHalf);			// we move image back to its orginal 
-			this._cnv.rotate(angle);										// rotate image
-			this._cnv.translate(-this._widthHalf,-this._heightHalf);		// move image to its center, so we can rotate around its center
-			this._cnv.scale(this._aspectW,this._aspectH); // SCALE - if needed ;)
-			this._cnv.drawImage(this._img, 0, 0);							// First - we draw image
-		}
-
-	})()
-}
-
-if (IE)
-{
-Wilq32.PhotoEffect.prototype.createVMLNode=(function(){
-document.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
-		try {
-			!document.namespaces.rvml && document.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
-			return function (tagName) {
-				return document.createElement('<rvml:' + tagName + ' class="rvml">');
-			};
-		} catch (e) {
-			return function (tagName) {
-				return document.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
-			};
-		}		
-})();
-}
+        Wilq32.PhotoEffect.prototype.createVMLNode=(function(){
+            document.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
+            try {
+                !document.namespaces.rvml && document.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
+                return function (tagName) {
+                    return document.createElement('<rvml:' + tagName + ' class="rvml">');
+                };
+            } catch (e) {
+                return function (tagName) {
+                    return document.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
+                };
+            }
+        })();
+    }
 })(jQuery);

watero-wechat-web/src/main/webapp/common/shop/js/page/cash_log.js

@@ -8,14 +8,11 @@ mui.init({
 var count = 0, pageNumber = 0, pageSize = 15;
 function pullupRefresh() {
     pageNumber += 1;
-    $.ajax(base_path + '/cashLog/list?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/cashLog/list?dates=' + new Date().getTime(), {
         data: {
             "pageNO": pageNumber,
             "pageSize": pageSize
-        },
-        xhrFields: {
-            withCredentials: true
-        },dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             if (dt.status) {
                 var cash_log_list = [];
                 var dataObj = dt.data;

watero-wechat-web/src/main/webapp/common/shop/js/page/chanpin_details.js

@@ -1,224 +1,212 @@
 var flag = true,
-	param = null,
-	pStatus = true,
-	goodStatus = true,
-	colorId='',
-	shareOpenid = '';
+    param = null,
+    pStatus = true,
+    goodStatus = true,
+    colorId='',
+    shareOpenid = '';
 var yuanjia = '';
 mui.ready(function() {
-	var nowUrl = location.href;
-	var productId = getParam("productId");
-	colorId = getParam("colorId");
-	param = nowUrl.split("?")[1];
-	//springFestivalPop();
-	marquee_Show();
-	selectProductInfo(productId);
-	selectProductImageText(productId);
-	mui('body').on('tap', '#add-cart-div', function() {
-		if(!pStatus) {
-			mui.alert("只有在售商品才可以添加购物车!");
-			return false
-		}
-		if(!goodStatus) {
-			mui.alert("该商品暂时缺货,不能购买!");
-			return false
-		}
-		var btnArray = ['否', '是'];
-		$.ajax(base_path + '/cart/addProductToCart?' + param + '&dates=' + new Date().getTime(), {
-            xhrFields: {
-                withCredentials: true
+    var nowUrl = location.href;
+    var productId = getParam("productId");
+    colorId = getParam("colorId");
+    param = nowUrl.split("?")[1];
+    //springFestivalPop();
+    marquee_Show();
+    selectProductInfo(productId);
+    selectProductImageText(productId);
+    mui('body').on('tap', '#add-cart-div', function() {
+        if(!pStatus) {
+            mui.alert("只有在售商品才可以添加购物车!");
+            return false
+        }
+        if(!goodStatus) {
+            mui.alert("该商品暂时缺货,不能购买!");
+            return false
+        }
+        var btnArray = ['否', '是'];
+        mui.ajax(base_path + '/cart/addProductToCart?' + param + '&dates=' + new Date().getTime(), {
+            dataType: 'json',
+            type: 'GET',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.status) {
+                    getCartNum()
+                } else {
+                    mui.confirm(dt.message + '是否刷新页面？', '提示', btnArray, function(e) {
+                        if(e.index == 1) {
+                            location.reload(true)
+                        }
+                    })
+                }
             },
-			dataType: 'json',
-			type: 'GET',
-			timeout: 15000,
-			success: function(dt) {
-				if(dt.status) {
-					getCartNum()
-				} else {
-					mui.confirm(dt.message + '是否刷新页面？', '提示', btnArray, function(e) {
-						if(e.index == 1) {
-							location.reload(true)
-						}
-					})
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				console.log(xhr)
-			}
-		})
-	});
-	mui('body').on('tap', '#click-product-desc', function() {
-		if(flag) {
-			selectProductImageText(productId);
-			flag = false
-		}
-	});
-	mui('body').on('tap', '.video-right', function() {
-		mui.openWindow({
-			url: base_path + '/indexVideo'
-		})
-	});
-	mui('body').on('tap', '.icon-guanbi', function() {
-		document.querySelector('.go-video').style.display = 'none'
-	});
-	mui('body').on('tap', '.go_gwc', function() {
-		mui.openWindow({
-			url: '/watero/html/wechat/shopping_cart.html'
-		})
-	});
-	mui('body').on('tap', '#shopp-div', function() {
-		if(!pStatus) {
-			mui.alert("该商品已经下架,请重新挑选商品购买!");
-			return false
-		}
-		if(!goodStatus) {
-			mui.alert("该商品暂时缺货,不能购买!");
-			return false
-		}
-		var btnArray = ['否', '是'];
-		$.ajax(base_path + '/cart/addProductToCart?' + param + '&dates=' + new Date().getTime(), {
-            xhrFields: {
-                withCredentials: true
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        })
+    });
+    mui('body').on('tap', '#click-product-desc', function() {
+        if(flag) {
+            selectProductImageText(productId);
+            flag = false
+        }
+    });
+    mui('body').on('tap', '.video-right', function() {
+        mui.openWindow({
+            url: base_path + '/indexVideo'
+        })
+    });
+    mui('body').on('tap', '.icon-guanbi', function() {
+        document.querySelector('.go-video').style.display = 'none'
+    });
+    mui('body').on('tap', '.go_gwc', function() {
+        mui.openWindow({
+            url: base_path + '/wxCart/goCart'
+        })
+    });
+    mui('body').on('tap', '#shopp-div', function() {
+        if(!pStatus) {
+            mui.alert("该商品已经下架,请重新挑选商品购买!");
+            return false
+        }
+        if(!goodStatus) {
+            mui.alert("该商品暂时缺货,不能购买!");
+            return false
+        }
+        var btnArray = ['否', '是'];
+        mui.ajax(base_path + '/cart/addProductToCart?' + param + '&dates=' + new Date().getTime(), {
+            dataType: 'json',
+            type: 'GET',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.status) {
+                    window.location.href = '/watero/pay/settlement?cartId=' + dt.data + "&tiemstamp=" + new Date().getTime()
+                } else {
+                    mui.confirm(dt.message, '爱贝源-提示', btnArray, function(e) {
+                        if(e.index == 1) {}
+                    })
+                }
             },
-			dataType: 'json',
-			type: 'GET',
-			timeout: 15000,
-			success: function(dt) {
-				if(dt.status) {
-					window.location.href = '/watero/pay/settlement?cartId=' + dt.data + "&tiemstamp=" + new Date().getTime()
-				} else {
-					mui.confirm(dt.message, '爱贝源-提示', btnArray, function(e) {
-						if(e.index == 1) {}
-					})
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				console.log(xhr)
-			}
-		})
-	});
-	var url = domanUrl + base_path + "//product/desc?productId=" + productId +'&colorId='+colorId + "&shareOpenid=" + shareOpenid;
-	window.repleFlag = false;
-	window.wxFriend = {
-		"appId": "",
-		"imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
-		"link": url,
-		"desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
-		"title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",
-		"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
-		"shareTimeSuccess": "分享成功",
-		"shareTimeCancel": "已取消分享",
-		"shareAppSuccess": "分享成功!",
-		"shareAppCancel": "已取消分享"
-	};
-	getConfig();
-	getCartNum();
-	document.querySelector('.loading-bg').style.display = 'none'
+            error: function(xhr, type, errorThrown) {
+                console.log(xhr)
+            }
+        })
+    });
+    var url = domanUrl + base_path + "//product/desc?productId=" + productId +'&colorId='+colorId + "&shareOpenid=" + shareOpenid;
+    window.repleFlag = false;
+    window.wxFriend = {
+        "appId": "",
+        "imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
+        "link": url,
+        "desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
+        "title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",
+        "netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
+        "shareTimeSuccess": "分享成功",
+        "shareTimeCancel": "已取消分享",
+        "shareAppSuccess": "分享成功!",
+        "shareAppCancel": "已取消分享"
+    };
+    getConfig();
+    getCartNum();
+    document.querySelector('.loading-bg').style.display = 'none'
 });
 
 function selectProductInfo(productId) {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/product/getProductByProductId?productId=' + productId +'&colorId='+colorId+'&dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/product/getProductByProductId?productId=' + productId +'&colorId='+colorId+'&dates=' + new Date().getTime(), {
+        dataType: 'json',
+        async: false,
+        type: 'GET',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                console.log(dt.data.product);
+                if(dt.data.product.productId == 28) {
+                    goodStatus = false
+                }
+                shareOpenid = dt.data.shareOpenid;
+                var imageNote = "<div class='mui-slider-item mui-slider-item-duplicate'><a href='#'><img src='" + dt.data.product.pictureList[0].pictureUrl + "'></a></div>";
+                for(var i = 0; i < dt.data.product.pictureList.length; i += 1) {
+                    imageNote += "<div class='mui-slider-item'><a href='#'><img src='" + dt.data.product.pictureList[i].pictureUrl + "'></a></div>";
+                    if(i == 0) {
+                        $("#active-div").append("<div class='mui-indicator mui-active'></div>")
+                    } else {
+                        $("#active-div").append("<div class='mui-indicator'></div>")
+                    }
+                }
+                imageNote += "<div class='mui-slider-item mui-slider-item-duplicate'><a href='#'><img src='" + dt.data.product.pictureList[0].pictureUrl + "'></a></div>";
+                $("#group-images-div").append(imageNote);
+                var banner = mui('#detail-slider');
+                banner.slider({
+                    interval: 5000
+                });
+                $("#product-name-font").html(dt.data.product.productName);
+                if(marquee != '' && dt.data.product.productDiscount == '328000') {
+                    $('<span class="mui-h6">购买即赠3年滤芯</span>').insertAfter('.price-sp')
+                }
+                $("#product-price-span").html("¥" + accDiv(dt.data.product.productDiscount, 100));
+                if(yuanjia == '') {
+                    yuanjia = '<s>原价¥' + accDiv(dt.data.product.productPrice, 100) + '</s>'
+                }
+                $("#product-price-s").html(yuanjia);
+                $("#product-access-span").html(dt.data.product.productSalesnum + "人已购买");
+                if(dt.data.product.productStatus == 1) {
+                    pStatus = true
+                } else {
+                    pStatus = false
+                }
+            } else {
+                mui.confirm(dt.message + '是否重新加载页面？', '提示', btnArray, function(e) {
+                    if(e.index == 1) {
+                        location.reload(true)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		async: false,
-		type: 'GET',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				console.log(dt.data.product);
-				if(dt.data.product.productId == 28) {
-					goodStatus = false
-				}
-				shareOpenid = dt.data.shareOpenid;
-				var imageNote = "<div class='mui-slider-item mui-slider-item-duplicate'><a href='#'><img src='" + dt.data.product.pictureList[0].pictureUrl + "'></a></div>";
-				for(var i = 0; i < dt.data.product.pictureList.length; i += 1) {
-					imageNote += "<div class='mui-slider-item'><a href='#'><img src='" + dt.data.product.pictureList[i].pictureUrl + "'></a></div>";
-					if(i == 0) {
-						$("#active-div").append("<div class='mui-indicator mui-active'></div>")
-					} else {
-						$("#active-div").append("<div class='mui-indicator'></div>")
-					}
-				}
-				imageNote += "<div class='mui-slider-item mui-slider-item-duplicate'><a href='#'><img src='" + dt.data.product.pictureList[0].pictureUrl + "'></a></div>";
-				$("#group-images-div").append(imageNote);
-				var banner = mui('#detail-slider');
-				banner.slider({
-					interval: 5000
-				});
-				$("#product-name-font").html(dt.data.product.productName);
-				if(marquee != '' && dt.data.product.productDiscount == '328000') {
-					$('<span class="mui-h6">购买即赠3年滤芯</span>').insertAfter('.price-sp')
-				}
-				$("#product-price-span").html("¥" + accDiv(dt.data.product.productDiscount, 100));
-				if(yuanjia == '') {
-					yuanjia = '<s>原价¥' + accDiv(dt.data.product.productPrice, 100) + '</s>'
-				}
-				$("#product-price-s").html(yuanjia);
-				$("#product-access-span").html(dt.data.product.productSalesnum + "人已购买");
-				if(dt.data.product.productStatus == 1) {
-					pStatus = true
-				} else {
-					pStatus = false
-				}
-			} else {
-				mui.confirm(dt.message + '是否重新加载页面？', '提示', btnArray, function(e) {
-					if(e.index == 1) {
-						location.reload(true)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    })
 };
 
 function selectProductImageText(productId) {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/product/getPictureByProductId?productId=' + productId, {
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/product/getPictureByProductId?productId=' + productId, {
+        dataType: 'json',
+        type: 'POST',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                if(dt.data != null) {
+                    $("#product-param-img").html(dt.data.imagetextContext)
+                } else {
+                    $("#item2").empty();
+                    mui.alert('商品详情获取失败')
+                }
+            } else {
+                mui.confirm(dt.message + '是否刷新页面？', '提示', btnArray, function(e) {
+                    if(e.index == 1) {
+                        location.reload(true)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'POST',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				if(dt.data != null) {
-					$("#product-param-img").html(dt.data.imagetextContext)
-				} else {
-					$("#item2").empty();
-					mui.alert('商品详情获取失败')
-				}
-			} else {
-				mui.confirm(dt.message + '是否刷新页面？', '提示', btnArray, function(e) {
-					if(e.index == 1) {
-						location.reload(true)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			mui.confirm('您的网络开小差了，是否重新加载页面？', '提示', btnArray, function(e) {
-				if(e.index == 1) {
-					location.reload(true)
-				}
-			})
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            mui.confirm('您的网络开小差了，是否重新加载页面？', '提示', btnArray, function(e) {
+                if(e.index == 1) {
+                    location.reload(true)
+                }
+            })
+        }
+    })
 };
 var mask = mui.createMask(function() {});
 mui('body').on('tap', '.share_wechat', function() {
-	mask.show();
+    mask.show();
 });
 $(window).on("scroll", function() {
-	if($(window).scrollTop() > 120) {
-		$(".return").show()
-	} else {
-		$(".return").hide()
-	}
+    if($(window).scrollTop() > 120) {
+        $(".return").show()
+    } else {
+        $(".return").hide()
+    }
 });

watero-wechat-web/src/main/webapp/common/shop/js/page/coupon_list.js

@@ -9,16 +9,12 @@ mui.init({
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/coupon/couponItemList', {
+    mui.ajax(base_path + '/coupon/couponItemList', {
         data: {
             "pageSize": pagesize,
             "useStatus": tabindex,
             "pageNO": pageNumber
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             if (dt.status) {
                 var coupon_data = [];
                 coupon_data = dt.data.itemList;

watero-wechat-web/src/main/webapp/common/shop/js/page/daili_2wm.js

@@ -7,22 +7,19 @@ mui.ready(function () {
     document.querySelector('.loading-bg').style.display = 'none'
 });
 function shareProxyMemberUrl() {
-    $.ajax(base_path + '/member/shareProxyMemberUrl?' + param, {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/member/shareProxyMemberUrl?' + param, {
         dataType: 'json',
         type: 'POST',
         timeout: 15000,
         success: function (dt) {
             if (dt.status) {
                 if (dt.data.qrcodeUrl == null) {
-                    $("#qrcode-div").html("<img src='http://static.iamberry.com/watero/images/shop/bg_2wm.jpg'/>")
+                    $("#qrcode-div").html("<img src='//s.iamberry.com/watero/images/shop/bg_2wm.jpg'/>")
                 } else {
                     $("#qrcode-div").html("<img src='" + dt.data.qrcodeUrl + "'/>")
                 }
                 if (dt.data.data.userHead == null) {
-                    $("#user-head").empty().html("<img src='http://static.iamberry.com/watero/images/shop/logo_head.png' />")
+                    $("#user-head").empty().html("<img src='//s.iamberry.com/watero/images/shop/logo_head.png' />")
                 } else {
                     $("#user-head").empty().html("<img src='" + dt.data.data.userHead + "' />")
                 }
@@ -34,7 +31,7 @@ function shareProxyMemberUrl() {
                 window.repleFlag = true;
                 window.wxFriend = {
                     "appId": "",
-                    "imgUrl": 'http://static.iamberry.com/watero/images/shop/default_qrcode.png',
+                    "imgUrl": '//s.iamberry.com/watero/images/shop/default_qrcode.png',
                     "link": dt.data.shareUrl,
                     "desc": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",
                     "title": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",

watero-wechat-web/src/main/webapp/common/shop/js/page/daili_order_list.js

@@ -9,11 +9,8 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/agent/agentOrder', {
+    mui.ajax(base_path + '/agent/agentOrder', {
         data: {"pageSize": pagesize, "pageNO": pageNumber},
-        xhrFields: {
-            withCredentials: true
-        },
         dataType: 'json',
         type: 'post',
         timeout: 15000,

watero-wechat-web/src/main/webapp/common/shop/js/page/daili_rebackOrder_list.js

@@ -9,11 +9,8 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/agent/agentOrder', {
+    mui.ajax(base_path + '/agent/agentOrder', {
         data: {"pageSize": pagesize, "pageNO": pageNumber, "rebackStatus": 1},
-        xhrFields: {
-            withCredentials: true
-        },
         dataType: 'json',
         type: 'post',
         timeout: 15000,

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_2wm.js

@@ -7,10 +7,7 @@ mui.ready(function () {
     document.querySelector('.loading-bg').style.display = 'none'
 });
 function shareProxyMemberUrl() {
-    $.ajax(base_path + '/member/shareDrpUrl?dates=' + new Date().getTime() + '&' + param, {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/member/shareDrpUrl?dates=' + new Date().getTime() + '&' + param, {
         dataType: 'json',
         type: 'POST',
         data: {},
@@ -28,7 +25,7 @@ function shareProxyMemberUrl() {
             window.repleFlag = false;
             window.wxFriend = {
                 "appId": "",
-                "imgUrl": 'http://static.iamberry.com/watero/js/images/shop/default_qrcode.png',
+                "imgUrl": '//s.iamberry.com/watero/js/images/shop/default_qrcode.png',
                 "link": dt.data.shareUrl,
                 "desc": "秉承“关爱、极致、乐观”的企业精神，打造“中国最大的母婴平台”，通过“硬件+软件+平台”的业务模式，重构母婴人群、母婴店铺、品牌厂商三者之间的连接关系。爱贝源是母婴实体店“抱团转型O2O的助推器”；是母婴品牌商“营销渠道扁平化的最优解”；是母婴消费者“专属化购物方案的提供者”。",
                 "title": "深圳爱贝源科技，是一家互联网＋“母婴平台”的科技公司，2014年成立于深圳。",

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center.js

@@ -5,318 +5,309 @@ hz_shang.style.display = 'inline-block';
 var barChart = echarts.init(document.getElementById('barChart'));
 var types = "7Day";
 var getOption = function(chartType) {
-	var chartOption = {
-		title: {
-			subtext: '单位(元)'
-		},
-		tooltip: {
-			trigger: 'axis'
-		},
-		grid: {
-			x: 45,
-			x2: 10,
-			y: 60,
-			y2: 25
-		},
-		toolbox: {
-			show: false,
-			feature: {
-				saveAsImage: {
-					show: true
-				}
-			}
-		},
-		calculable: true,
-		xAxis: [{
-			type: 'category',
-			data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
-		}],
-		yAxis: [{
-			type: 'value'
-		}],
-		series: [{
-			name: '收入',
-			type: 'bar',
-			itemStyle: {
-				normal: {
-					color: function(params) {
-						var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
-						return colorList[params.dataIndex]
-					}
-				}
-			},
-			label: {
-				normal: {
-					show: true,
-					position: 'top'
-				}
-			},
-			data: [0, 0, 0, 0, 0, 0, 0]
-		}]
-	};
-	return chartOption
+    var chartOption = {
+        title: {
+            subtext: '单位(元)'
+        },
+        tooltip: {
+            trigger: 'axis'
+        },
+        grid: {
+            x: 45,
+            x2: 10,
+            y: 60,
+            y2: 25
+        },
+        toolbox: {
+            show: false,
+            feature: {
+                saveAsImage: {
+                    show: true
+                }
+            }
+        },
+        calculable: true,
+        xAxis: [{
+            type: 'category',
+            data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
+        }],
+        yAxis: [{
+            type: 'value'
+        }],
+        series: [{
+            name: '收入',
+            type: 'bar',
+            itemStyle: {
+                normal: {
+                    color: function(params) {
+                        var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
+                        return colorList[params.dataIndex]
+                    }
+                }
+            },
+            label: {
+                normal: {
+                    show: true,
+                    position: 'top'
+                }
+            },
+            data: [0, 0, 0, 0, 0, 0, 0]
+        }]
+    };
+    return chartOption
 };
 var getDiamondOption = function(chartType) {
-	var chartOption = {
-		title: {
-			subtext: '单位(台)'
-		},
-		tooltip: {
-			trigger: 'axis'
-		},
-		grid: {
-			x: 45,
-			x2: 10,
-			y: 60,
-			y2: 25
-		},
-		toolbox: {
-			show: false,
-			feature: {
-				saveAsImage: {
-					show: true
-				}
-			}
-		},
-		calculable: true,
-		xAxis: [{
-			type: 'category',
-			data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
-		}],
-		yAxis: [{
-			type: 'value'
-		}],
-		series: [{
-			name: '收入',
-			type: 'bar',
-			itemStyle: {
-				normal: {
-					color: function(params) {
-						var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
-						return colorList[params.dataIndex]
-					}
-				}
-			},
-			label: {
-				normal: {
-					show: true,
-					position: 'top'
-				}
-			},
-			data: [0, 0, 0, 0, 0, 0, 0]
-		}]
-	};
-	return chartOption
+    var chartOption = {
+        title: {
+            subtext: '单位(台)'
+        },
+        tooltip: {
+            trigger: 'axis'
+        },
+        grid: {
+            x: 45,
+            x2: 10,
+            y: 60,
+            y2: 25
+        },
+        toolbox: {
+            show: false,
+            feature: {
+                saveAsImage: {
+                    show: true
+                }
+            }
+        },
+        calculable: true,
+        xAxis: [{
+            type: 'category',
+            data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
+        }],
+        yAxis: [{
+            type: 'value'
+        }],
+        series: [{
+            name: '收入',
+            type: 'bar',
+            itemStyle: {
+                normal: {
+                    color: function(params) {
+                        var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
+                        return colorList[params.dataIndex]
+                    }
+                }
+            },
+            label: {
+                normal: {
+                    show: true,
+                    position: 'top'
+                }
+            },
+            data: [0, 0, 0, 0, 0, 0, 0]
+        }]
+    };
+    return chartOption
 };
 mui.ready(function() {
-		$.ajax(base_path+'/statistics/is_sales_man?dates=' + new Date().getTime(), {
-			data: {},
-            xhrFields: {
-                withCredentials: true
-            },
-			dataType: 'json',
-			type: 'get',
-			timeout: 15000,
-			success: function(dt) {
-				if (typeof(dt.isRedirect) == "undefined"){ 
-					if(dt.status) {
-						var src='';
-						if(dt.data.sRoleId==1){
-							$("#yewu").show();
-							src=base_path + "/statistics/sales_management.html";
-						}else if(dt.data.sRoleId==2){
-							$("#guanli").show();
-							src=base_path + "/statistics/total_management.html";
-						}
-						mui('body').on('tap', '#guanli .mui-table-view-cell', function() {
-							mui.openWindow({url: src});
-						});
-					}
-				}else if(dt.isRedirect){
-					mui.openWindow({url:dt.redirectURL});
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理；
-				console.log(xhr);
-			}
-	});
-	document.querySelector('.loading-bg').style.display = 'none';
-	fenxiao_center_data();
-	pulldata();
+    mui.ajax(base_path+'/statistics/is_sales_man?dates=' + new Date().getTime(), {
+        data: {},
+        dataType: 'json',
+        type: 'get',
+        timeout: 15000,
+        success: function(dt) {
+            if (typeof(dt.isRedirect) == "undefined"){
+                if(dt.status) {
+                    var src='';
+                    if(dt.data.sRoleId==1){
+                        $("#yewu").show();
+                        src=base_path + "/statistics/sales_management.html";
+                    }else if(dt.data.sRoleId==2){
+                        $("#guanli").show();
+                        src=base_path + "/statistics/total_management.html";
+                    }
+                    mui('body').on('tap', '#guanli .mui-table-view-cell', function() {
+                        mui.openWindow({url: src});
+                    });
+                }
+            }else if(dt.isRedirect){
+                mui.openWindow({url:dt.redirectURL});
+            }
+        },
+        error: function(xhr, type, errorThrown) {
+            //异常处理；
+            console.log(xhr);
+        }
+    });
+    document.querySelector('.loading-bg').style.display = 'none';
+    fenxiao_center_data();
+    pulldata();
 });
 mui.each(document.querySelectorAll('#tabbar-chart-bar .mui-control-item'), function(index, el) {
-	el.addEventListener('tap', function() {
-		switch(index) {
-			case 0:
-				types = "7Day";
-				pulldata();
-				break;
-			case 1:
-				types = "6Mon";
-				pulldata();
-				break;
-			case 2:
-				types = "Year";
-				pulldata();
-				break;
-			default:
-				break
-		}
-	}, false)
+    el.addEventListener('tap', function() {
+        switch(index) {
+            case 0:
+                types = "7Day";
+                pulldata();
+                break;
+            case 1:
+                types = "6Mon";
+                pulldata();
+                break;
+            case 2:
+                types = "Year";
+                pulldata();
+                break;
+            default:
+                break
+        }
+    }, false)
 });
 
 function pulldata() {
-	var btnArray = ['否', '是'];
-	var url = base_path + '/rebackStatic/statisInfo';
-	var count = 1;
-	if(isDiamond) {
-		url = base_path + '/rebackStatic/getDiamondStaticsInfo';
-		count = 2
-	}
-	$.ajax(url + '?dates=' + new Date().getTime(), {
-		data: {
-			"openid": "230",
-			"type": types
-		},
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    var url = base_path + '/rebackStatic/statisInfo';
+    var count = 1;
+    if(isDiamond) {
+        url = base_path + '/rebackStatic/getDiamondStaticsInfo';
+        count = 2
+    }
+    mui.ajax(url + '?dates=' + new Date().getTime(), {
+        data: {
+            "openid": "230",
+            "type": types
+        },
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                var counts = [];
+                var dates = [];
+                mui(dt.data).each(function(index) {
+                    if(count == 1) {
+                        counts[index] = accDiv(this.amount, 100)
+                    } else if(count == 2) {
+                        counts[index] = this.salesNumber
+                    }
+                    dates[index] = this.strDate
+                });
+                barChart.setOption({
+                    xAxis: {
+                        data: dates
+                    },
+                    series: [{
+                        name: '收入',
+                        data: counts
+                    }]
+                })
+            } else {
+                mui.confirm(dt.message, ' ', btnArray, function(e) {
+                    if(e.index == 1) {
+                        setTimeout(function() {
+                            location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
+                        }, 5000)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				var counts = [];
-				var dates = [];
-				mui(dt.data).each(function(index) {
-					if(count == 1) {
-						counts[index] = accDiv(this.amount, 100)
-					} else if(count == 2) {
-						counts[index] = this.salesNumber
-					}
-					dates[index] = this.strDate
-				});
-				barChart.setOption({
-					xAxis: {
-						data: dates
-					},
-					series: [{
-						name: '收入',
-						data: counts
-					}]
-				})
-			} else {
-				mui.confirm(dt.message, ' ', btnArray, function(e) {
-					if(e.index == 1) {
-						setTimeout(function() {
-							location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
-						}, 5000)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr);
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr);
+        }
+    })
 };
 
 function fenxiao_center_data() {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/placeInfo/showPlaceInfoCenter?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/placeInfo/showPlaceInfoCenter?dates=' + new Date().getTime(), {
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                $('#salesName').html("下线 · 销量");
+                if(dt.data.salesName) {
+                    isDiamond = true;
+                    barChart.setOption(getDiamondOption('bar'));
+                    $('#balanceLi').hide();
+                    $('#waitAccounts').hide()
+                } else {
+                    isDiamond = false;
+                    barChart.setOption(getOption('bar'));
+                    $('#balanceLi').show();
+                    $('#waitAccounts').show()
+                }
+                $('#salesName').val(dt.data.salesName);
+                document.querySelector('#to_accounts').innerHTML = accDiv(dt.data.unIncomeMoney, 100) + '元';
+                document.querySelector('.total_money').innerHTML = accDiv(dt.data.totalMoney, 100) + '元';
+                document.querySelector('.tx').innerHTML = '<img class="wechat_tx" src="' + dt.data.headImg + '">';
+                if(dt.data.wm2 == "true") {
+                    wm2 = true;
+                    document.querySelector(".fenxiao_wm2").style.display = 'inline-block';
+                    document.querySelector(".fenxiao_share").style.display = 'inline-block'
+                }
+                document.querySelector('.role_name').innerHTML = dt.data.role;
+                document.querySelector('.user_name').innerHTML = dt.data.userName;
+                document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
+                var shareOpenid = dt.data.shareOpenid;
+                var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
+                window.repleFlag = false;
+                window.wxFriend = {
+                    "appId": "",
+                    "imgUrl": '//s.iamberry.com/watero/images/shop/index.jpg',
+                    "link": link,
+                    "desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
+                    "title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",
+                    "netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
+                    "shareTimeSuccess": "分享成功",
+                    "shareTimeCancel": "已取消分享",
+                    "shareAppSuccess": "分享成功",
+                    "shareAppCancel": "已取消分享"
+                };
+                getConfig();
+                pulldata()
+            } else {
+                mui.confirm(dt.message, ' ', btnArray, function(e) {
+                    if(e.index == 1) {
+                        setTimeout(function() {
+                            location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
+                        }, 5000)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				$('#salesName').html("下线 · 销量");
-				if(dt.data.salesName) {
-					isDiamond = true;
-					barChart.setOption(getDiamondOption('bar'));
-					$('#balanceLi').hide();
-					$('#waitAccounts').hide()
-				} else {
-					isDiamond = false;
-					barChart.setOption(getOption('bar'));
-					$('#balanceLi').show();
-					$('#waitAccounts').show()
-				}
-				$('#salesName').val(dt.data.salesName);
-				document.querySelector('#to_accounts').innerHTML = accDiv(dt.data.unIncomeMoney, 100) + '元';
-				document.querySelector('.total_money').innerHTML = accDiv(dt.data.totalMoney, 100) + '元';
-				document.querySelector('.tx').innerHTML = '<img class="wechat_tx" src="' + dt.data.headImg + '">';
-				if(dt.data.wm2 == "true") {
-					wm2 = true;
-					document.querySelector(".fenxiao_wm2").style.display = 'inline-block';
-					document.querySelector(".fenxiao_share").style.display = 'inline-block'
-				}
-				document.querySelector('.role_name').innerHTML = dt.data.role;
-				document.querySelector('.user_name').innerHTML = dt.data.userName;
-				document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
-				var shareOpenid = dt.data.shareOpenid;
-				var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
-				window.repleFlag = false;
-				window.wxFriend = {
-					"appId": "",
-					"imgUrl": 'http://static.iamberry.com/watero/images/shop/index.jpg',
-					"link": link,
-					"desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
-					"title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",
-					"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
-					"shareTimeSuccess": "分享成功",
-					"shareTimeCancel": "已取消分享",
-					"shareAppSuccess": "分享成功",
-					"shareAppCancel": "已取消分享"
-				};
-				getConfig();
-				pulldata()
-			} else {
-				mui.confirm(dt.message, ' ', btnArray, function(e) {
-					if(e.index == 1) {
-						setTimeout(function() {
-							location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
-						}, 5000)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr);
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr);
+        }
+    })
 };
 function tixian() {
-	window.location.href = base_path + "/drp/withdrawalsList";
+    window.location.href = base_path + "/drp/withdrawalsList";
 };
 
 function getIncomeRecord() {
-	window.location.href = base_path + "/drp/UnIncomeOrderList";
+    window.location.href = base_path + "/drp/UnIncomeOrderList";
 };
 
 function shareH5() {
-	window.location.href = "http://www.watero.cn/watero_wap_app_1.2/index.html";
+    window.location.href = "http://www.watero.cn/watero_wap_app_1.2/index.html";
 };
 
 function xialianlist() {
-	if(wm2) {
-		window.location.href = base_path + "/drp/xialianUser2";
-	} else {
-		window.location.href = base_path + "/drp/xialianUser";
-	}
+    if(wm2) {
+        window.location.href = base_path + "/drp/xialianUser2";
+    } else {
+        window.location.href = base_path + "/drp/xialianUser";
+    }
 };
 
 function weiruzhang() {
-	if(wm2) {
-		window.location.href = base_path + "/drp/UnIncomeOrderList";
-	} else {
-		window.location.href = base_path + "/drp/UnIncomeOrderList2";
-	}
+    if(wm2) {
+        window.location.href = base_path + "/drp/UnIncomeOrderList";
+    } else {
+        window.location.href = base_path + "/drp/UnIncomeOrderList2";
+    }
 };
 
 function fenxiao_wm2() {
-	window.location.href = "/watero/wechat/drp/share2WM";
+    window.location.href = "/watero/wechat/drp/share2WM";
 };

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center2.js

@@ -4,241 +4,232 @@ hz_shang.style.display = 'inline-block';
 var barChart = echarts.init(document.getElementById('barChart'));
 var types = "7Day";
 var getOption = function(chartType) {
-	var chartOption = {
-		title: {
-			subtext: '单位(台)'
-		},
-		tooltip: {
-			trigger: 'axis'
-		},
-		grid: {
-			x: 45,
-			x2: 10,
-			y: 60,
-			y2: 25
-		},
-		toolbox: {
-			show: false,
-			feature: {
-				saveAsImage: {
-					show: true
-				}
-			}
-		},
-		calculable: true,
-		xAxis: [{
-			type: 'category',
-			data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
-		}],
-		yAxis: [{
-			type: 'value'
-		}],
-		series: [{
-			name: '收入',
-			type: 'bar',
-			itemStyle: {
-				normal: {
-					color: function(params) {
-						var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
-						return colorList[params.dataIndex]
-					}
-				}
-			},
-			label: {
-				normal: {
-					show: true,
-					position: 'top'
-				}
-			},
-			data: [0, 0, 0, 0, 0, 0, 0]
-		}]
-	};
-	return chartOption
+    var chartOption = {
+        title: {
+            subtext: '单位(台)'
+        },
+        tooltip: {
+            trigger: 'axis'
+        },
+        grid: {
+            x: 45,
+            x2: 10,
+            y: 60,
+            y2: 25
+        },
+        toolbox: {
+            show: false,
+            feature: {
+                saveAsImage: {
+                    show: true
+                }
+            }
+        },
+        calculable: true,
+        xAxis: [{
+            type: 'category',
+            data: ['1日', '2日', '3日', '4日', '5日', '6日', '7日']
+        }],
+        yAxis: [{
+            type: 'value'
+        }],
+        series: [{
+            name: '收入',
+            type: 'bar',
+            itemStyle: {
+                normal: {
+                    color: function(params) {
+                        var colorList = ['#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc', '#55c0dc'];
+                        return colorList[params.dataIndex]
+                    }
+                }
+            },
+            label: {
+                normal: {
+                    show: true,
+                    position: 'top'
+                }
+            },
+            data: [0, 0, 0, 0, 0, 0, 0]
+        }]
+    };
+    return chartOption
 };
 mui.ready(function() {
-	$.ajax(base_path+'/statistics/is_sales_man?dates=' + new Date().getTime(), {
-			data: {},
-			xhrFields: {
-				withCredentials: true
-			},
-			dataType: 'json',
-			type: 'get',
-			timeout: 15000,
-			success: function(dt) {
-				if (typeof(dt.isRedirect) == "undefined"){ 
-					if(dt.status) {
-						var src='';
-						if(dt.data.sRoleId==1){
-							$("#yewu").show();
-							src=base_path + "/statistics/sales_management.html";
-						}else if(dt.data.sRoleId==2){
-							$("#guanli").show();
-							src=base_path + "/statistics/total_management.html";
-						}
-						mui('body').on('tap', '#guanli .mui-table-view-cell', function() {
-							mui.openWindow({url: src});
-						});
-					}
-				}else if(dt.isRedirect){
-					mui.openWindow({url:dt.redirectURL});
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				//异常处理；
-				console.log(xhr);
-			}
-	});
-	document.querySelector('.loading-bg').style.display = 'none';
-	barChart.setOption(getOption('bar'));
-	fenxiao_center_data();
-	pulldata()
+    mui.ajax(base_path+'/statistics/is_sales_man?dates=' + new Date().getTime(), {
+        data: {},
+        dataType: 'json',
+        type: 'get',
+        timeout: 15000,
+        success: function(dt) {
+            if (typeof(dt.isRedirect) == "undefined"){
+                if(dt.status) {
+                    var src='';
+                    if(dt.data.sRoleId==1){
+                        $("#yewu").show();
+                        src=base_path + "/statistics/sales_management.html";
+                    }else if(dt.data.sRoleId==2){
+                        $("#guanli").show();
+                        src=base_path + "/statistics/total_management.html";
+                    }
+                    mui('body').on('tap', '#guanli .mui-table-view-cell', function() {
+                        mui.openWindow({url: src});
+                    });
+                }
+            }else if(dt.isRedirect){
+                mui.openWindow({url:dt.redirectURL});
+            }
+        },
+        error: function(xhr, type, errorThrown) {
+            //异常处理；
+            console.log(xhr);
+        }
+    });
+    document.querySelector('.loading-bg').style.display = 'none';
+    barChart.setOption(getOption('bar'));
+    fenxiao_center_data();
+    pulldata()
 });
 mui.each(document.querySelectorAll('#tabbar-chart-bar .mui-control-item'), function(index, el) {
-	el.addEventListener('tap', function() {
-		switch(index) {
-			case 0:
-				types = "7Day";
-				pulldata();
-				break;
-			case 1:
-				types = "6Mon";
-				pulldata();
-				break;
-			case 2:
-				types = "Year";
-				pulldata();
-				break;
-			default:
-				break
-		}
-	}, false)
+    el.addEventListener('tap', function() {
+        switch(index) {
+            case 0:
+                types = "7Day";
+                pulldata();
+                break;
+            case 1:
+                types = "6Mon";
+                pulldata();
+                break;
+            case 2:
+                types = "Year";
+                pulldata();
+                break;
+            default:
+                break
+        }
+    }, false)
 });
 
 function pulldata() {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/rebackStatic/statisInfo2?dates=' + new Date().getTime(), {
-		data: {
-			"openid": "230",
-			"type": types
-		},
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/rebackStatic/statisInfo2?dates=' + new Date().getTime(), {
+        data: {
+            "openid": "230",
+            "type": types
+        },
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                var counts = [];
+                var dates = [];
+                mui(dt.data).each(function(index) {
+                    counts[index] = this.salesNumber;
+                    dates[index] = this.strDate
+                });
+                barChart.setOption({
+                    xAxis: {
+                        data: dates
+                    },
+                    series: [{
+                        name: '收入',
+                        data: counts
+                    }]
+                })
+            } else {
+                mui.confirm(dt.message, ' ', btnArray, function(e) {
+                    if(e.index == 1) {
+                        setTimeout(function() {
+                            location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
+                        }, 5000)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				var counts = [];
-				var dates = [];
-				mui(dt.data).each(function(index) {
-					counts[index] = this.salesNumber;
-					dates[index] = this.strDate
-				});
-				barChart.setOption({
-					xAxis: {
-						data: dates
-					},
-					series: [{
-						name: '收入',
-						data: counts
-					}]
-				})
-			} else {
-				mui.confirm(dt.message, ' ', btnArray, function(e) {
-					if(e.index == 1) {
-						setTimeout(function() {
-							location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
-						}, 5000)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    })
 };
 
 function fenxiao_center_data() {
-	var btnArray = ['否', '是'];
-	$.ajax(base_path + '/placeInfo/showPlaceInfoCenter?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
+    var btnArray = ['否', '是'];
+    mui.ajax(base_path + '/placeInfo/showPlaceInfoCenter?dates=' + new Date().getTime(), {
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                document.querySelector('.tx').innerHTML = '<img class="wechat_tx" src="' + dt.data.headImg + '">';
+                if(dt.data.wm2 == "true") {
+                    wm2 = true;
+                    document.querySelector(".fenxiao_wm2").style.display = 'inline-block';
+                    document.querySelector(".fenxiao_share").style.display = 'inline-block'
+                }
+                document.querySelector('.role_name').innerHTML = dt.data.role;
+                document.querySelector('.user_name').innerHTML = dt.data.userName;
+                document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
+                var shareOpenid = dt.data.shareOpenid;
+                var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
+                window.repleFlag = false;
+                window.wxFriend = {
+                    "appId": "",
+                    "imgUrl": '//s.iamberry.com/watero/images/shop/index.jpg',
+                    "link": link,
+                    "desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
+                    "title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",
+                    "netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
+                    "shareTimeSuccess": "分享成功",
+                    "shareTimeCancel": "已取消分享",
+                    "shareAppSuccess": "分享成功",
+                    "shareAppCancel": "已取消分享"
+                };
+                getConfig()
+            } else {
+                mui.confirm(dt.message, ' ', btnArray, function(e) {
+                    if(e.index == 1) {
+                        setTimeout(function() {
+                            location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
+                        }, 5000)
+                    }
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				document.querySelector('.tx').innerHTML = '<img class="wechat_tx" src="' + dt.data.headImg + '">';
-				if(dt.data.wm2 == "true") {
-					wm2 = true;
-					document.querySelector(".fenxiao_wm2").style.display = 'inline-block';
-					document.querySelector(".fenxiao_share").style.display = 'inline-block'
-				}
-				document.querySelector('.role_name').innerHTML = dt.data.role;
-				document.querySelector('.user_name').innerHTML = dt.data.userName;
-				document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
-				var shareOpenid = dt.data.shareOpenid;
-				var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
-				window.repleFlag = false;
-				window.wxFriend = {
-					"appId": "",
-					"imgUrl": 'http://static.iamberry.com/watero/images/shop/index.jpg',
-					"link": link,
-					"desc": "美国标准，4级净化，5档水温，废水比3:1，水质TDS智能显示。",
-					"title": "Watero，美国高端净水专家，4级净化，5档水温，免安装饮水一体机。",
-					"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
-					"shareTimeSuccess": "分享成功",
-					"shareTimeCancel": "已取消分享",
-					"shareAppSuccess": "分享成功",
-					"shareAppCancel": "已取消分享"
-				};
-				getConfig()
-			} else {
-				mui.confirm(dt.message, ' ', btnArray, function(e) {
-					if(e.index == 1) {
-						setTimeout(function() {
-							location.href = domanUrl + base_path + "/drp/indexPage?dates=" + new Date().getTime()
-						}, 5000)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    })
 };
 function tixian() {
-	window.location.href = base_path + "/drp/withdrawalsList"
+    window.location.href = base_path + "/drp/withdrawalsList"
 };
 
 function getIncomeRecord() {
-	window.location.href = base_path + "/drp/UnIncomeOrderList2"
+    window.location.href = base_path + "/drp/UnIncomeOrderList2"
 };
 
 function xialianlist() {
-	if(wm2) {
-		window.location.href = base_path + "/drp/xialianUser2"
-	} else {
-		window.location.href = base_path + "/drp/xialianUser"
-	}
+    if(wm2) {
+        window.location.href = base_path + "/drp/xialianUser2"
+    } else {
+        window.location.href = base_path + "/drp/xialianUser"
+    }
 };
 
 function weiruzhang() {
-	if(wm2) {
-		window.location.href = base_path + "/drp/UnIncomeOrderList"
-	} else {
-		window.location.href = base_path + "/drp/UnIncomeOrderList2"
-	}
+    if(wm2) {
+        window.location.href = base_path + "/drp/UnIncomeOrderList"
+    } else {
+        window.location.href = base_path + "/drp/UnIncomeOrderList2"
+    }
 };
 
 function fenxiao_wm2() {
-	window.location.href = "/watero/wechat/drp/share2WM"
+    window.location.href = "/watero/wechat/drp/share2WM"
 };
 
 function salesNumbers() {
-	window.location.href = base_path + "/drp/salesNumbers"
+    window.location.href = base_path + "/drp/salesNumbers"
 };

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_mendian_next_user_list.js

@@ -9,17 +9,13 @@ var pageNumber = 0, pagesize = 10, endNo = 0;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/underUnderlingStatisc?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/underUnderlingStatisc?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "endNo": endNo,
             "openid": getParam("openid")
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             console.log(dt);
             if (dt.status) {
                 var chanpin_data = [];
@@ -34,7 +30,7 @@ function pullupRefresh() {
                     var li = document.createElement('li');
                     li.className = 'mui-table-view-cell';
                     if (this.img == null) {
-                        li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="http://static.iamberry.com/images/shop/logo_head.png"></td><td class="mui-text-left">' + decodeURI("未命名") + '</td><td style="color:blue;">' + this.roleName + '</td><td>' + this.strDate + '</td></tr></table>'
+                        li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="//s.iamberry.com/images/shop/logo_head.png"></td><td class="mui-text-left">' + decodeURI("未命名") + '</td><td style="color:blue;">' + this.roleName + '</td><td>' + this.strDate + '</td></tr></table>'
                     } else {
                         li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="' + this.img + '"></td><td class="mui-text-left">' + decodeURI(this.name) + '</td><td style="color:blue;">' + this.roleName + '</td><td>' + this.strDate + '</td></tr></table>'
                     }

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_next_user_list.js

@@ -9,10 +9,7 @@ var pageNumber = 0, pagesize = 10, tabindex = 1;
 mui.ready(function () {
     var btnArray = ['否', '是'];
     console.log("----------getParam('openid)-------------" + getParam("openid"));
-    $.ajax(base_path + '/rebackStatic/underDrpListInfoInit?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/rebackStatic/underDrpListInfoInit?dates=' + new Date().getTime(), {
         dataType: 'json',
         type: 'post',
         timeout: 15000,
@@ -62,17 +59,13 @@ mui.ready(function () {
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/underDrpListInfo?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/underDrpListInfo?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "roleId": tabindex,
             "openid": (getParam("openid") == null ? "" : getParam("openid"))
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             if (dt.status) {
                 var chanpin_data = [];
                 if (dt.data.list != null) {
@@ -94,12 +87,14 @@ function pullupRefresh() {
                 });
                 mui.each(document.querySelectorAll(".my-tab-view-pull .daili"), function (index, el) {
                     el.addEventListener('tap', function () {
-                        mui.openWindow({url: '/watero/html/wechat/fenxiao_mendian_next_user_list.html?openid=' + this.getAttribute('openid')})
+                        console.log("11111");
+                        mui.openWindow({url: base_path + '/drp/MendianTerminalUser?openid=' + this.getAttribute('openid')})
                     }, false)
                 });
                 mui.each(document.querySelectorAll(".my-tab-view-pull .qita"), function (index, el) {
                     el.addEventListener('tap', function () {
-                        mui.openWindow({url: '/watero/html/wechat/fenxiao_next_user_list.html?openid=' + this.getAttribute('openid')})
+                        console.log("2222");
+                        mui.openWindow({url: base_path + '/drp/xialianUser?openid=' + this.getAttribute('openid')})
                     }, false)
                 })
             } else {

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_next_user_list2.js

@@ -9,16 +9,12 @@ var pageNumber = 0, pagesize = 10, endNo = 0;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/underDrpListInfo?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/underDrpListInfo?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "endNo": endNo
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             if (dt.status) {
                 var itemSum = dt.data.itemNum;
                 var chanpin_data = [];
@@ -36,7 +32,7 @@ function pullupRefresh() {
                         var li = document.createElement('li');
                         li.className = 'mui-table-view-cell';
                         if (this.img == null) {
-                            li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="http://static.iamberry.com/images/shop/logo_head.png"></td><td></td><td style="color:blue;">' + this.num + '台</td></tr></table>'
+                            li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="//s.iamberry.com/images/shop/logo_head.png"></td><td></td><td style="color:blue;">' + this.num + '台</td></tr></table>'
                         } else if (typeof(this.num) == "undefined") {
                             li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="' + this.img + '"></td><td>' + decodeURI(this.name) + '</td><td style="color:blue;">0台</td></tr></table>'
                         } else {
@@ -54,7 +50,7 @@ function pullupRefresh() {
                         var li = document.createElement('li');
                         li.className = 'mui-table-view-cell';
                         if (this.img == null) {
-                            li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="http://static.iamberry.com/images/shop/logo_head.png"></td><td>' + this.strDate + '</td><td style="color:blue;">' + this.num + '</td></tr></table>'
+                            li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="//s.iamberry.com/images/shop/logo_head.png"></td><td>' + this.strDate + '</td><td style="color:blue;">' + this.num + '</td></tr></table>'
                         } else if (typeof(this.num) == "undefined") {
                             li.innerHTML = '<table class="my-dl-tb-order"><tr><td><img class="wh-50" src="' + this.img + '"></td><td>' + this.strDate + '</td><td style="color:blue;">0台</td></tr></table>'
                         } else {

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_order_list.js

@@ -9,16 +9,12 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/placeLogs/unIncomeOrderCastNext?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/placeLogs/unIncomeOrderCastNext?dates=' + new Date().getTime(), {
         data: {
             "openid": "",
             "pageSize": pagesize,
             "pageNumber": pageNumber
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             if (dt.status) {
                 var fenxiao_list = [];
                 if (fenxiao_list != null) {

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_tixian_apply.js

@@ -1,8 +1,5 @@
 mui.ready(function () {
     $.ajax({
-        "xhrFields": {
-            "withCredentials": true
-        },
         "type": "post",
         "url": base_path + "/WithDrawalsLogs/getWithdrawPage",
         "dataType": "json",
@@ -24,9 +21,6 @@ mui.ready(function () {
 });
 function ajaxSendApply(url, data) {
     $.ajax({
-        xhrFields: {
-            withCredentials: true
-        },
         url: url, data: data, dataType: "json", asyn: false, success: function (data) {
             var obj = eval("(" + data + ")");
             mui.alert(data.message)
@@ -77,9 +71,6 @@ function submitOrder() {
         "url": base_path + "/WithDrawalsLogs/submitWithdraw",
         "dataType": "json",
         "data": data,
-        "xhrFields": {
-            "withCredentials": true
-        },
         "success": function (res) {
             flag = true;
             if (res.status) {

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_tixian_log.js

@@ -8,15 +8,11 @@ mui.init({
 var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/WithDrawalsLogs/historyWithdrawNext?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/WithDrawalsLogs/historyWithdrawNext?dates=' + new Date().getTime(), {
         data: {
             "openid": "",
             "page": {"pageSize": pagesize, "pageNumber": pageNumber}
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             if (dt.status) {
                 var fenxiao_list = [];
                 fenxiao_list = dt.data.list;

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_to_accounts_list.js

@@ -9,16 +9,12 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/unIncomeOrderCast2?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/unIncomeOrderCast2?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "openid": getParam("openid")
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             console.log(dt);
             if (dt.status) {
                 var chanpin_data = [];

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_to_accounts_list2.js

@@ -9,19 +9,16 @@ mui.init({
     }
 });
 var pageNumber = 0,
-pagesize = 10;
+    pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/unIncomeOrderCast3?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/unIncomeOrderCast3?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber,
             "openid": getParam("openid")
         },
-        xhrFields: {
-            withCredentials: true
-        },
         dataType: 'json',
         type: 'post',
         timeout: 15000,
@@ -43,9 +40,9 @@ function pullupRefresh() {
                 })
             } else {
                 mui.confirm(dt.message, '提示', btnArray,
-                function(e) {
-                    if (e.index == 1) {}
-                })
+                    function(e) {
+                        if (e.index == 1) {}
+                    })
             }
         },
         error: function(xhr, type, errorThrown) {
@@ -60,7 +57,7 @@ mui.ready(function() {
 });
 var addTimer = function() {
     var list = [],
-    interval;
+        interval;
     return function(id, time) {
         if (!interval) {
             interval = setInterval(go, 1000)
@@ -80,9 +77,9 @@ var addTimer = function() {
     }
     function getTimerString(time) {
         d = Math.floor(time / 86400),
-        h = Math.floor((time % 86400) / 3600),
-        m = Math.floor(((time % 86400) % 3600) / 60),
-        s = Math.floor(((time % 86400) % 3600) % 60);
+            h = Math.floor((time % 86400) / 3600),
+            m = Math.floor(((time % 86400) % 3600) / 60),
+            s = Math.floor(((time % 86400) % 3600) % 60);
         if (time > 0) {
             return "剩余" + d + "天" + h + ":" + m + ":" + s
         } else {

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_to_transfer_accounts_list.js

@@ -9,15 +9,11 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/rebackStatic/unIncomeOrderCast?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/rebackStatic/unIncomeOrderCast?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNumber": pageNumber
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             if (dt.status) {
                 var chanpin_data = [];
                 if (dt.data.list != null) {

watero-wechat-web/src/main/webapp/common/shop/js/page/httphijack1.0.0.js

@@ -6,448 +6,449 @@
  * @description 使用Javascript实现前端防御http劫持及防御XSS攻击，并且对可疑攻击进行上报
  * -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
  *
-1、使用方法：调用 httphijack.init()
+ 1、使用方法：调用 httphijack.init()
 
-2、建立自己的黑白名单、上报系统及接收后端
+ 2、建立自己的黑白名单、上报系统及接收后端
 
-3、防范范围：
-   1）所有内联事件执行的代码
-   2）href 属性 javascript: 内嵌的代码
-   3）静态脚本文件内容
-   4）动态添加的脚本文件内容
-   5）document-write添加的内容
-   6）iframe嵌套
+ 3、防范范围：
+ 1）所有内联事件执行的代码
+ 2）href 属性 javascript: 内嵌的代码
+ 3）静态脚本文件内容
+ 4）动态添加的脚本文件内容
+ 5）document-write添加的内容
+ 6）iframe嵌套
  *
  */
 (function(window, undifined) {
 
-  var httphijack = function() {},
-    // 记录内联事件是否被扫描过的 hash map
-    mCheckMap = {},
-    // 记录内联事件是否被扫描过的id
-    mCheckID = 0;
-
-  // 建立白名单
-  var whiteList = [
-    'test.iamberry.com',
-    'w.iamberry.com',
-    'res.wx.qq.com',
-    'static.iamberry.com',
-    'h5.iamberry.com'
-  ];
-  // 建立黑名单
-  var blackList = [
-    '192.168.1.0'
-  ];
-
-  // 建立关键词黑名单
-  var keywordBlackList = [
-    'xss',
-    'embed_v3',
-    '_embed_v3',
-    '_embed_v3_dc',
-    '_embed_v3_hd_l',
-    '_embed_v3_hd_c',
-    '_embed_v3_hd_r',
-    '_embed_v3_frmc',
-    '_embed_v3_main',
-    '_embed_v3_ft',
-    'BAIDU_SSP__wrapper',
-    'BAIDU_DSPUI_FLOWBAR',
-    '_embed_v3_hd'
-  ];
-  
-  // 触发内联事件拦截
-  function triggerIIE() {
-    var i = 0,
-      obj = null;
-
-    for (obj in document) {
-      if (/^on./.test(obj)) {
-        interceptionInlineEvent(obj, i++);
-      }
+    var httphijack = function() {},
+        // 记录内联事件是否被扫描过的 hash map
+        mCheckMap = {},
+        // 记录内联事件是否被扫描过的id
+        mCheckID = 0;
+
+    // 建立白名单
+    var whiteList = [
+        'test.iamberry.com',
+        'w.iamberry.com',
+        'res.wx.qq.com',
+        'static.iamberry.com',
+        's.iamberry.com',
+        'h5.iamberry.com'
+    ];
+    // 建立黑名单
+    var blackList = [
+        '192.168.1.0'
+    ];
+
+    // 建立关键词黑名单
+    var keywordBlackList = [
+        'xss',
+        'embed_v3',
+        '_embed_v3',
+        '_embed_v3_dc',
+        '_embed_v3_hd_l',
+        '_embed_v3_hd_c',
+        '_embed_v3_hd_r',
+        '_embed_v3_frmc',
+        '_embed_v3_main',
+        '_embed_v3_ft',
+        'BAIDU_SSP__wrapper',
+        'BAIDU_DSPUI_FLOWBAR',
+        '_embed_v3_hd'
+    ];
+
+    // 触发内联事件拦截
+    function triggerIIE() {
+        var i = 0,
+            obj = null;
+
+        for (obj in document) {
+            if (/^on./.test(obj)) {
+                interceptionInlineEvent(obj, i++);
+            }
+        }
     }
-  }
-
-  /**
-   * 内联事件拦截
-   * @param  {[String]} eventName [内联事件名]
-   * @param  {[Number]} eventID   [内联事件id]
-   * @return {[type]}             [description]
-   */
-  function interceptionInlineEvent(eventName, eventID) {
-    var isClick = (eventName == 'onclick');
-
-    document.addEventListener(eventName.substr(2), function(e) {
-      scanElement(e.target, isClick, eventName, eventID);
-    }, true);
-  }
-
-  /**
-   * 扫描元素是否存在内联事件
-   * @param  {[DOM]} elem [DOM元素]
-   * @param  {[Boolean]} isClick [是否是内联点击事件]
-   * @param  {[String]} eventName [内联 on* 事件名]
-   * @param  {[Number]} eventID [给每个内联 on* 事件一个id]
-   */
-  function scanElement(elem, isClick, eventName, eventID) {
-    var
-      flag = elem['isScan'],
-      // 扫描内联代码
-      code = "",
-      hash = 0;
-
-    // 跳过已扫描的事件
-    if (!flag) {
-      flag = elem['isScan'] = ++mCheckID;
+
+    /**
+     * 内联事件拦截
+     * @param  {[String]} eventName [内联事件名]
+     * @param  {[Number]} eventID   [内联事件id]
+     * @return {[type]}             [description]
+     */
+    function interceptionInlineEvent(eventName, eventID) {
+        var isClick = (eventName == 'onclick');
+
+        document.addEventListener(eventName.substr(2), function(e) {
+            scanElement(e.target, isClick, eventName, eventID);
+        }, true);
     }
 
-    hash = (flag << 8) | eventID;
+    /**
+     * 扫描元素是否存在内联事件
+     * @param  {[DOM]} elem [DOM元素]
+     * @param  {[Boolean]} isClick [是否是内联点击事件]
+     * @param  {[String]} eventName [内联 on* 事件名]
+     * @param  {[Number]} eventID [给每个内联 on* 事件一个id]
+     */
+    function scanElement(elem, isClick, eventName, eventID) {
+        var
+            flag = elem['isScan'],
+            // 扫描内联代码
+            code = "",
+            hash = 0;
+
+        // 跳过已扫描的事件
+        if (!flag) {
+            flag = elem['isScan'] = ++mCheckID;
+        }
 
-    if (hash in mCheckMap) {
-      return;
-    }
+        hash = (flag << 8) | eventID;
+
+        if (hash in mCheckMap) {
+            return;
+        }
 
-    mCheckMap[hash] = true;
+        mCheckMap[hash] = true;
 
-    // 非元素节点
-    if (elem.nodeType != Node.ELEMENT_NODE) {
-      return;
-    }
+        // 非元素节点
+        if (elem.nodeType != Node.ELEMENT_NODE) {
+            return;
+        }
 
-    if (elem[eventName]) {
-      code = elem.getAttribute(eventName);
-      if (code && blackListMatch(keywordBlackList, code)) {
-        // 注销事件
-        elem[eventName] = null;
-        console.log('拦截可疑内联事件:' + code);
-        hijackReport('拦截可疑内联事件', code);
-      }
+        if (elem[eventName]) {
+            code = elem.getAttribute(eventName);
+            if (code && blackListMatch(keywordBlackList, code)) {
+                // 注销事件
+                elem[eventName] = null;
+                console.log('拦截可疑内联事件:' + code);
+                hijackReport('拦截可疑内联事件', code);
+            }
+        }
+
+        // 扫描 <a href="javascript:"> 的脚本
+        if (isClick && elem.tagName == 'A' && elem.protocol == 'javascript:') {
+            var code = elem.href.substr(11);
+            if (blackListMatch(keywordBlackList, string)) {
+                // 注销代码
+                elem.href = 'javascript:void(0)';
+                console.log('拦截可疑事件:' + code);
+                hijackReport('拦截可疑javascript:代码', code);
+            }
+        }
+
+        // 递归扫描上级元素
+        scanElement(elem.parentNode);
     }
 
-    // 扫描 <a href="javascript:"> 的脚本
-    if (isClick && elem.tagName == 'A' && elem.protocol == 'javascript:') {
-      var code = elem.href.substr(11);
-      if (blackListMatch(keywordBlackList, string)) {
-        // 注销代码
-        elem.href = 'javascript:void(0)';
-        console.log('拦截可疑事件:' + code);
-        hijackReport('拦截可疑javascript:代码', code);
-      }
+    // 主动防御 MutationEvent
+    /**
+     * 使用 MutationObserver 进行静态脚本拦截
+     * @return {[type]} [description]
+     */
+    function interceptionStaticScript() {
+        // MutationObserver 的不同兼容性写法
+        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
+
+        // 该构造函数用来实例化一个新的 Mutation 观察者对象
+        // Mutation 观察者对象能监听在某个范围内的 DOM 树变化
+        var observer = new MutationObserver(function(mutations) {
+            mutations.forEach(function(mutation) {
+                // 返回被添加的节点,或者为null.
+                var nodes = mutation.addedNodes;
+
+                // 逐个遍历
+                for (var i = 0; i < nodes.length; i++) {
+                    var node = nodes[i];
+
+                    // 扫描 script 与 iframe
+                    if (node.tagName === 'SCRIPT' || node.tagName === 'IFRAME') {
+                        // 拦截到可疑iframe
+                        if (node.tagName === 'IFRAME' && node.srcdoc) {
+                            node.parentNode.removeChild(node);
+                            console.log('拦截到可疑iframe', node.srcdoc);
+                            hijackReport('拦截可疑静态脚本', node.srcdoc);
+
+                        } else if (node.src) {
+                            // 只放行白名单
+                            if (!whileListMatch(whiteList, node.src)) {
+                                node.parentNode.removeChild(node);
+                                // 上报
+                                console.log('拦截可疑静态脚本:', node.src);
+                                hijackReport('拦截可疑静态脚本', node.src);
+                            }
+                        }
+                    }
+                }
+            });
+        });
+
+        // 传入目标节点和观察选项
+        // 如果 target 为 document 或者 document.documentElement
+        // 则当前文档中所有的节点添加与删除操作都会被观察到d
+        observer.observe(document, {
+            subtree: true,
+            childList: true
+        });
     }
 
-    // 递归扫描上级元素
-    scanElement(elem.parentNode);
-  }
-
-  // 主动防御 MutationEvent
-  /**
-   * 使用 MutationObserver 进行静态脚本拦截
-   * @return {[type]} [description]
-   */
-  function interceptionStaticScript() {
-    // MutationObserver 的不同兼容性写法
-    var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
-
-    // 该构造函数用来实例化一个新的 Mutation 观察者对象
-    // Mutation 观察者对象能监听在某个范围内的 DOM 树变化
-    var observer = new MutationObserver(function(mutations) {
-      mutations.forEach(function(mutation) {
-        // 返回被添加的节点,或者为null.
-        var nodes = mutation.addedNodes;
-
-        // 逐个遍历
-        for (var i = 0; i < nodes.length; i++) {
-          var node = nodes[i];
-
-          // 扫描 script 与 iframe
-          if (node.tagName === 'SCRIPT' || node.tagName === 'IFRAME') {
-            // 拦截到可疑iframe
-            if (node.tagName === 'IFRAME' && node.srcdoc) {
-              node.parentNode.removeChild(node);
-              console.log('拦截到可疑iframe', node.srcdoc);
-              hijackReport('拦截可疑静态脚本', node.srcdoc);
-
-            } else if (node.src) {
-              // 只放行白名单
-              if (!whileListMatch(whiteList, node.src)) {
+    /**
+     * 使用 DOMNodeInserted  进行动态脚本拦截监
+     * 此处无法拦截，只能监测
+     * @return {[type]} [description]
+     */
+    function interceptionDynamicScript() {
+        // DOMNodeInserted 的执行时机早于 MutationObserver
+        document.addEventListener('DOMNodeInserted', function(e) {
+            var node = e.target;
+            if (/xss/i.test(node.src) || /xss/i.test(node.innerHTML)) {
                 node.parentNode.removeChild(node);
-                // 上报
-                console.log('拦截可疑静态脚本:', node.src);
-                hijackReport('拦截可疑静态脚本', node.src);
-              }
+                console.log('拦截可疑动态脚本:', node);
+                hijackReport('拦截可疑动态脚本', node.src);
             }
-          }
-        }
-      });
-    });
-
-    // 传入目标节点和观察选项
-    // 如果 target 为 document 或者 document.documentElement
-    // 则当前文档中所有的节点添加与删除操作都会被观察到d
-    observer.observe(document, {
-      subtree: true,
-      childList: true
-    });
-  }
-
-  /**
-   * 使用 DOMNodeInserted  进行动态脚本拦截监
-   * 此处无法拦截，只能监测
-   * @return {[type]} [description]
-   */
-  function interceptionDynamicScript() {
-    // DOMNodeInserted 的执行时机早于 MutationObserver
-    document.addEventListener('DOMNodeInserted', function(e) {
-      var node = e.target;
-      if (/xss/i.test(node.src) || /xss/i.test(node.innerHTML)) {
-        node.parentNode.removeChild(node);
-        console.log('拦截可疑动态脚本:', node);
-        hijackReport('拦截可疑动态脚本', node.src);
-      }
-    }, true);
-  }
-
-  // 重写 createElement
-  function resetCreateElement() {}
-
-  /**
-   * 重写单个 window 窗口的 document.write 属性
-   * @param  {[BOM]} window [浏览器window对象]
-   * @return {[type]}       [description]
-   */
-  function resetDocumentWrite(window) {
-    var old_write = window.document.write;
-
-    window.document.write = function(string) {
-      if (blackListMatch(keywordBlackList, string)) {
-        console.log('拦截可疑模块:', string);
-        hijackReport('拦截可疑document-write', string);
-        return;
-      }
-
-      // 调用原始接口
-      old_write.apply(document, arguments);
+        }, true);
     }
-  }
-
-  /**
-   * 重写单个 window 窗口的 setAttribute 属性
-   * @param  {[BOM]} window [浏览器window对象]
-   * @return {[type]} [description]
-   */
-  function resetSetAttribute(window) {
-    // 保存原有接口
-    var old_setAttribute = window.Element.prototype.setAttribute;
-
-    // 重写 setAttribute 接口
-    window.Element.prototype.setAttribute = function(name, value) {
-
-      // 额外细节实现
-      if (this.tagName == 'SCRIPT' && /^src$/i.test(name)) {
-
-        if (!whileListMatch(whiteList, value)) {
-          console.log('拦截可疑模块:', value);
-          hijackReport('拦截可疑setAttribute', value);
-          return;
-        }
-      }
-
-      // 调用原始接口
-      old_setAttribute.apply(this, arguments);
-    };
-  }
-
-  /**
-   * 使用 MutationObserver 对生成的 iframe 页面进行监控，
-   * 防止调用内部原生 setAttribute 及 document.write
-   * @return {[type]} [description]
-   */
-  function defenseIframe() {
-    // 先保护当前页面
-    installHook(window);
-  }
-
-  /**
-   * 实现单个 window 窗口的 setAttribute保护
-   * @param  {[BOM]} window [浏览器window对象]
-   * @return {[type]}       [description]
-   */
-  function installHook(window) {
-    // 重写单个 window 窗口的 setAttribute 属性
-    resetSetAttribute(window);
-    // 重写单个 window 窗口的 document.Write 属性
-    resetDocumentWrite(window);
-
-    // MutationObserver 的不同兼容性写法
-    var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
-
-    // 该构造函数用来实例化一个新的 Mutation 观察者对象
-    // Mutation 观察者对象能监听在某个范围内的 DOM 树变化
-    var observer = new MutationObserver(function(mutations) {
-      mutations.forEach(function(mutation) {
-        // 返回被添加的节点,或者为null.
-        var nodes = mutation.addedNodes;
-
-        // 逐个遍历
-        for (var i = 0; i < nodes.length; i++) {
-          var node = nodes[i];
-
-          // 给生成的 iframe 里环境也装上重写的钩子
-          if (node.tagName == 'IFRAME') {
-            installHook(node.contentWindow);
-          }
+
+    // 重写 createElement
+    function resetCreateElement() {}
+
+    /**
+     * 重写单个 window 窗口的 document.write 属性
+     * @param  {[BOM]} window [浏览器window对象]
+     * @return {[type]}       [description]
+     */
+    function resetDocumentWrite(window) {
+        var old_write = window.document.write;
+
+        window.document.write = function(string) {
+            if (blackListMatch(keywordBlackList, string)) {
+                console.log('拦截可疑模块:', string);
+                hijackReport('拦截可疑document-write', string);
+                return;
+            }
+
+            // 调用原始接口
+            old_write.apply(document, arguments);
         }
-      });
-    });
-
-    observer.observe(document, {
-      subtree: true,
-      childList: true
-    });
-  }
-
-  /**
-   * 使用 Object.defineProperty，锁住call和apply，使之无法被重写
-   * @return {[type]} [description]
-   */
-  function lockCallAndApply() {
-    // 锁住 call
-    Object.defineProperty(Function.prototype, 'call', {
-      value: Function.prototype.call,
-      // 当且仅当仅当该属性的 writable 为 true 时，该属性才能被赋值运算符改变
-      writable: false,
-      // 当且仅当该属性的 configurable 为 true 时，该属性才能够被改变，也能够被删除
-      configurable: false,
-      enumerable: true
-    });
-    // 锁住 apply
-    Object.defineProperty(Function.prototype, 'apply', {
-      value: Function.prototype.apply,
-      writable: false,
-      configurable: false,
-      enumerable: true
-    });
-  }
-
-  /**
-   * 重定向iframe hijack（页面被iframe包裹）
-   */
-  function redirectionIframeHijack() {
-    var flag = 'iframe_hijack_redirected';
-    // 当前页面存在于一个 iframe 中
-    // 此处需要建立一个白名单匹配规则，白名单默认放行
-    if (self != top) {
-      var
-      // 使用 document.referrer 可以拿到跨域 iframe 父页面的 URL
-        parentUrl = document.referrer,
-        length = whiteList.length,
-        i = 0;
-
-      for (; i < length; i++) {
-        // 建立白名单正则
-        var reg = new RegExp(whiteList[i], 'i');
-
-        // 存在白名单中，放行
-        if (reg.test(parentUrl)) {
-          return;
+    }
+
+    /**
+     * 重写单个 window 窗口的 setAttribute 属性
+     * @param  {[BOM]} window [浏览器window对象]
+     * @return {[type]} [description]
+     */
+    function resetSetAttribute(window) {
+        // 保存原有接口
+        var old_setAttribute = window.Element.prototype.setAttribute;
+
+        // 重写 setAttribute 接口
+        window.Element.prototype.setAttribute = function(name, value) {
+
+            // 额外细节实现
+            if (this.tagName == 'SCRIPT' && /^src$/i.test(name)) {
+
+                if (!whileListMatch(whiteList, value)) {
+                    console.log('拦截可疑模块:', value);
+                    hijackReport('拦截可疑setAttribute', value);
+                    return;
+                }
+            }
+
+            // 调用原始接口
+            old_setAttribute.apply(this, arguments);
+        };
+    }
+
+    /**
+     * 使用 MutationObserver 对生成的 iframe 页面进行监控，
+     * 防止调用内部原生 setAttribute 及 document.write
+     * @return {[type]} [description]
+     */
+    function defenseIframe() {
+        // 先保护当前页面
+        installHook(window);
+    }
+
+    /**
+     * 实现单个 window 窗口的 setAttribute保护
+     * @param  {[BOM]} window [浏览器window对象]
+     * @return {[type]}       [description]
+     */
+    function installHook(window) {
+        // 重写单个 window 窗口的 setAttribute 属性
+        resetSetAttribute(window);
+        // 重写单个 window 窗口的 document.Write 属性
+        resetDocumentWrite(window);
+
+        // MutationObserver 的不同兼容性写法
+        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
+
+        // 该构造函数用来实例化一个新的 Mutation 观察者对象
+        // Mutation 观察者对象能监听在某个范围内的 DOM 树变化
+        var observer = new MutationObserver(function(mutations) {
+            mutations.forEach(function(mutation) {
+                // 返回被添加的节点,或者为null.
+                var nodes = mutation.addedNodes;
+
+                // 逐个遍历
+                for (var i = 0; i < nodes.length; i++) {
+                    var node = nodes[i];
+
+                    // 给生成的 iframe 里环境也装上重写的钩子
+                    if (node.tagName == 'IFRAME') {
+                        installHook(node.contentWindow);
+                    }
+                }
+            });
+        });
+
+        observer.observe(document, {
+            subtree: true,
+            childList: true
+        });
+    }
+
+    /**
+     * 使用 Object.defineProperty，锁住call和apply，使之无法被重写
+     * @return {[type]} [description]
+     */
+    function lockCallAndApply() {
+        // 锁住 call
+        Object.defineProperty(Function.prototype, 'call', {
+            value: Function.prototype.call,
+            // 当且仅当仅当该属性的 writable 为 true 时，该属性才能被赋值运算符改变
+            writable: false,
+            // 当且仅当该属性的 configurable 为 true 时，该属性才能够被改变，也能够被删除
+            configurable: false,
+            enumerable: true
+        });
+        // 锁住 apply
+        Object.defineProperty(Function.prototype, 'apply', {
+            value: Function.prototype.apply,
+            writable: false,
+            configurable: false,
+            enumerable: true
+        });
+    }
+
+    /**
+     * 重定向iframe hijack（页面被iframe包裹）
+     */
+    function redirectionIframeHijack() {
+        var flag = 'iframe_hijack_redirected';
+        // 当前页面存在于一个 iframe 中
+        // 此处需要建立一个白名单匹配规则，白名单默认放行
+        if (self != top) {
+            var
+                // 使用 document.referrer 可以拿到跨域 iframe 父页面的 URL
+                parentUrl = document.referrer,
+                length = whiteList.length,
+                i = 0;
+
+            for (; i < length; i++) {
+                // 建立白名单正则
+                var reg = new RegExp(whiteList[i], 'i');
+
+                // 存在白名单中，放行
+                if (reg.test(parentUrl)) {
+                    return;
+                }
+            }
+
+            var url = location.href;
+            var parts = url.split('#');
+            if (location.search) {
+                parts[0] += '&' + flag + '=1';
+            } else {
+                parts[0] += '?' + flag + '=1';
+            }
+            try {
+                console.log('页面被嵌入iframe中:', parentUrl);
+                hijackReport('页面被嵌入iframe中', parentUrl);
+                top.location.href = parts.join('#');
+            } catch (e) {}
         }
-      }
-
-      var url = location.href;
-      var parts = url.split('#');
-      if (location.search) {
-        parts[0] += '&' + flag + '=1';
-      } else {
-        parts[0] += '?' + flag + '=1';
-      }
-      try {
-        console.log('页面被嵌入iframe中:', parentUrl);
-        hijackReport('页面被嵌入iframe中', parentUrl);
-        top.location.href = parts.join('#');
-      } catch (e) {}
     }
-  }
-
-  /**
-   * 自定义上报 -- 替换页面中的 console.log()
-   * @param  {[String]} name  [拦截类型]
-   * @param  {[String]} value [拦截值]
-   * @return {[type]}   [description]
-   */
-  function hijackReport(name, value) {
-    var img = document.createElement('img'),
-      hijackName = name,
-      hijackValue = value.toString(),
-      curDate = new Date().getTime();
-
-    // 上报
-    img.src = 'http://www.reportServer.com/report/?msg=' + hijackName + '&value=' + hijackValue + '&time=' + curDate;
-  }
-
-  /**
-   * [白名单匹配]
-   * @param  {[Array]} whileList [白名单]
-   * @param  {[String]} value    [需要验证的字符串]
-   * @return {[Boolean]}         [false -- 验证不通过，true -- 验证通过]
-   */
-  function whileListMatch(whileList, value) {
-    var length = whileList.length,
-      i = 0;
-
-    for (; i < length; i++) {
-      // 建立白名单正则
-      var reg = new RegExp(whiteList[i], 'i');
-
-      // 存在白名单中，放行
-      if (reg.test(value)) {
-        return true;
-      }
+
+    /**
+     * 自定义上报 -- 替换页面中的 console.log()
+     * @param  {[String]} name  [拦截类型]
+     * @param  {[String]} value [拦截值]
+     * @return {[type]}   [description]
+     */
+    function hijackReport(name, value) {
+        var img = document.createElement('img'),
+            hijackName = name,
+            hijackValue = value.toString(),
+            curDate = new Date().getTime();
+
+        // 上报
+        img.src = 'http://www.reportServer.com/report/?msg=' + hijackName + '&value=' + hijackValue + '&time=' + curDate;
+    }
+
+    /**
+     * [白名单匹配]
+     * @param  {[Array]} whileList [白名单]
+     * @param  {[String]} value    [需要验证的字符串]
+     * @return {[Boolean]}         [false -- 验证不通过，true -- 验证通过]
+     */
+    function whileListMatch(whileList, value) {
+        var length = whileList.length,
+            i = 0;
+
+        for (; i < length; i++) {
+            // 建立白名单正则
+            var reg = new RegExp(whiteList[i], 'i');
+
+            // 存在白名单中，放行
+            if (reg.test(value)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
-
-  /**
-   * [黑名单匹配]
-   * @param  {[Array]} blackList [黑名单]
-   * @param  {[String]} value    [需要验证的字符串]
-   * @return {[Boolean]}         [false -- 验证不通过，true -- 验证通过]
-   */
-  function blackListMatch(blackList, value) {
-    var length = blackList.length,
-      i = 0;
-
-    for (; i < length; i++) {
-      // 建立黑名单正则
-      var reg = new RegExp(blackList[i], 'i');
-
-      // 存在黑名单中，拦截
-      if (reg.test(value)) {
-        return true;
-      }
+
+    /**
+     * [黑名单匹配]
+     * @param  {[Array]} blackList [黑名单]
+     * @param  {[String]} value    [需要验证的字符串]
+     * @return {[Boolean]}         [false -- 验证不通过，true -- 验证通过]
+     */
+    function blackListMatch(blackList, value) {
+        var length = blackList.length,
+            i = 0;
+
+        for (; i < length; i++) {
+            // 建立黑名单正则
+            var reg = new RegExp(blackList[i], 'i');
+
+            // 存在黑名单中，拦截
+            if (reg.test(value)) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
-  // 待完成：
-  // 建立黑白名单列表
-  // 对正则匹配精细化
+    // 待完成：
+    // 建立黑白名单列表
+    // 对正则匹配精细化
+
+    // 初始化方法
+    httphijack.init = function() {
+        // 触发内联事件拦截
+        triggerIIE();
+        // 进行静态脚本拦截
+        interceptionStaticScript();
+        // 进行动态脚本拦截
+        // interceptionDynamicScript();
+        // 锁住 apply 和 call
+        lockCallAndApply();
+        // 对当前窗口及多重内嵌 iframe 进行 setAttribute | document.write 重写
+        defenseIframe();
+        // 对iframe劫持进行重定向
+        redirectionIframeHijack();
+    }
 
-  // 初始化方法
-  httphijack.init = function() {
-    // 触发内联事件拦截
-    triggerIIE();
-    // 进行静态脚本拦截
-    interceptionStaticScript();
-    // 进行动态脚本拦截
-    // interceptionDynamicScript();
-    // 锁住 apply 和 call
-    lockCallAndApply();
-    // 对当前窗口及多重内嵌 iframe 进行 setAttribute | document.write 重写
-    defenseIframe();
-    // 对iframe劫持进行重定向
-    redirectionIframeHijack();
-  }
-
-  window.httphijack = httphijack;
+    window.httphijack = httphijack;
 })(window);

watero-wechat-web/src/main/webapp/common/shop/js/page/iamberry_video.js

@@ -7,10 +7,7 @@ mui.ready(function () {
     } else {
         userType = 1
     }
-    $.ajax(base_path + '/agent/memberInfo?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/agent/memberInfo?dates=' + new Date().getTime(), {
         dataType: 'json',
         type: 'post',
         timeout: 15000,
@@ -21,7 +18,7 @@ mui.ready(function () {
                 window.repleFlag = false;
                 window.wxFriend = {
                     "appId": "",
-                    "imgUrl": 'http://static.iamberry.com/images/shop/naiji_xuanchuan.jpg',
+                    "imgUrl": '//s.iamberry.com/images/shop/naiji_xuanchuan.jpg',
                     "link": link,
                     "desc": "Watero水时代商城，开启优雅生活",
                     "title": "Watero水时代商城，好水，好茶，生活不将就！",

watero-wechat-web/src/main/webapp/common/shop/js/page/index.js

@@ -1,103 +1,100 @@
 mui.ready(function() {
-	//springFestivalPop();
-	//marquee_Show();
-	getCartNum();
-	$.ajax(base_path + '/indexData?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
+    //springFestivalPop();
+    marquee_Show();
+    getCartNum();
+    mui.ajax(base_path + '/indexData?dates=' + new Date().getTime(), {
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            var bannerstr = "",
+                prostr = "",
+                dian = "",
+                advsstr = "";
+            if(dt.status) {
+                var banner_data = dt.data.banners;
+                mui(banner_data).each(function(index) {
+                    if(index == 0) {
+                        bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="' + banner_data[banner_data.length - 1].bannerImageCheckOutUrl + '"><img src="' + (banner_data[banner_data.length - 1].bannerImageUrl) + '"></a></div><div class="mui-slider-item mui-active"><a href="' + this.bannerImageCheckOutUrl + '"><img src="' + (this.bannerImageUrl) + '"></a></div>';
+                        dian += '<div class="mui-indicator mui-active"></div>'
+                    } else {
+                        bannerstr += '<div class="mui-slider-item"><a href="' + this.bannerImageCheckOutUrl + '"><img src="' + (this.bannerImageUrl) + '"></a></div>';
+                        dian += '<div class="mui-indicator"></div>'
+                    }
+                    if(index == (banner_data.length - 1) || (banner_data.length - 1) == 0) {
+                        bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="' + banner_data[0].bannerImageCheckOutUrl + '"><img src="' + (banner_data[0].bannerImageUrl) + '"></a></div>'
+                    }
+                });
+                dc('mui-slider-loop').innerHTML = bannerstr;
+                dc('my-slider-indicator').innerHTML = dian;
+                $("<div id='banner-slider' class='mui-slider'><div class='mui-slider-group mui-slider-loop' id='mui-slider-loop'>" + bannerstr + "</div><div id='my-slider-indicator' class='mui-slider-indicator my-slider-indicator'>" + dian + "</div></div>").insertBefore(".chanpin-box");
+                var advs_data = dt.data.advs;
+                mui(advs_data).each(function(index) {
+                    advsstr += '<a href="' + this.bannerImageCheckOutUrl + '"><img src="' + this.bannerImageUrl + '" /></a>'
+                });
+                dc('advs_banner').innerHTML = advsstr;
+                dc('advs_banner').style.display = 'block';
+                dc('banner-slider').style.display = 'block';
+                var banner = mui('#banner-slider');
+                banner.slider({
+                    interval: 5000
+                });
+                mui.each(document.querySelectorAll('#banner-slider a'), function(index, el) {
+                    el.addEventListener('tap', function() {
+                        //document.querySelector('.loading-bg').style.display = 'block';
+                        var str=this.getAttribute('href');
+                        console.log(this.getAttribute('href'));
+                        if(str!="#" && str!=''){
+                            location.href = this.getAttribute('href')
+                        }
+                    }, false)
+                });
+                mui.each(document.querySelectorAll('#advs_banner a'), function(index, el) {
+                    el.addEventListener('tap', function() {
+                        //document.querySelector('.loading-bg').style.display = 'block';
+                        location.href = this.getAttribute('href')
+                    }, false)
+                });
+                var shareOpenid = dt.data.memberOpenid;
+                var link = domanUrl + base_path + "/index?shareOpenid=" + shareOpenid;
+                window.repleFlag = false;
+                window.wxFriend = {
+                    "appId": "",
+                    "imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
+                    "link": link,
+                    "desc": "Watero水时代商城，开启优雅生活",
+                    "title": "Watero水时代商城，好水，好茶，生活不将就！",
+                    "netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
+                    "shareTimeSuccess": "分享成功",
+                    "shareTimeCancel": "已取消分享",
+                    "shareAppSuccess": "分享成功!",
+                    "shareAppCancel": "已取消分享"
+                };
+                document.querySelector('.loading-bg').style.display = 'none'
+            } else {
+                mui.alert(dt.message, ' ', '朕知道了', function() {
+                    mui.openWindow({
+                        url: domanUrl + base_path + "/index?dates=" + new Date().getTime()
+                    })
+                })
+            }
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			var bannerstr = "",
-				prostr = "",
-				dian = "",
-				advsstr = "";
-			if(dt.status) {
-				var banner_data = dt.data.banners;
-				mui(banner_data).each(function(index) {
-					if(index == 0) {
-						bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="' + banner_data[banner_data.length - 1].bannerImageCheckOutUrl + '"><img src="' + (banner_data[banner_data.length - 1].bannerImageUrl) + '"></a></div><div class="mui-slider-item mui-active"><a href="' + this.bannerImageCheckOutUrl + '"><img src="' + (this.bannerImageUrl) + '"></a></div>';
-						dian += '<div class="mui-indicator mui-active"></div>'
-					} else {
-						bannerstr += '<div class="mui-slider-item"><a href="' + this.bannerImageCheckOutUrl + '"><img src="' + (this.bannerImageUrl) + '"></a></div>';
-						dian += '<div class="mui-indicator"></div>'
-					}
-					if(index == (banner_data.length - 1) || (banner_data.length - 1) == 0) {
-						bannerstr += '<div class="mui-slider-item mui-slider-item-duplicate"><a href="' + banner_data[0].bannerImageCheckOutUrl + '"><img src="' + (banner_data[0].bannerImageUrl) + '"></a></div>'
-					}
-				});
-				dc('mui-slider-loop').innerHTML = bannerstr;
-				dc('my-slider-indicator').innerHTML = dian;
-				$("<div id='banner-slider' class='mui-slider'><div class='mui-slider-group mui-slider-loop' id='mui-slider-loop'>" + bannerstr + "</div><div id='my-slider-indicator' class='mui-slider-indicator my-slider-indicator'>" + dian + "</div></div>").insertBefore(".chanpin-box");
-				var advs_data = dt.data.advs;
-				mui(advs_data).each(function(index) {
-					advsstr += '<a href="' + this.bannerImageCheckOutUrl + '"><img src="' + this.bannerImageUrl + '" /></a>'
-				});
-				dc('advs_banner').innerHTML = advsstr;
-				dc('advs_banner').style.display = 'block';
-				dc('banner-slider').style.display = 'block';
-				var banner = mui('#banner-slider');
-				banner.slider({
-					interval: 5000
-				});
-				mui.each(document.querySelectorAll('#banner-slider a'), function(index, el) {
-					el.addEventListener('tap', function() {
-						//document.querySelector('.loading-bg').style.display = 'block';
-						var str=this.getAttribute('href');
-						console.log(this.getAttribute('href'));
-						if(str!="#" && str!=''){
-							location.href = this.getAttribute('href')
-						}
-					}, false)
-				});
-				mui.each(document.querySelectorAll('#advs_banner a'), function(index, el) {
-					el.addEventListener('tap', function() {
-						//document.querySelector('.loading-bg').style.display = 'block';
-						location.href = this.getAttribute('href')
-					}, false)
-				});
-				var shareOpenid = dt.data.memberOpenid;
-				var link = domanUrl + base_path + "/index?shareOpenid=" + shareOpenid;
-				window.repleFlag = false;
-				window.wxFriend = {
-					"appId": "",
-					"imgUrl": domanUrl + '/watero/common/shop/images/index.jpg',
-					"link": link,
-					"desc": "Watero水时代商城，开启优雅生活",
-					"title": "Watero水时代商城，好水，好茶，生活不将就！",
-					"netError": "您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",
-					"shareTimeSuccess": "分享成功",
-					"shareTimeCancel": "已取消分享",
-					"shareAppSuccess": "分享成功!",
-					"shareAppCancel": "已取消分享"
-				};
-				document.querySelector('.loading-bg').style.display = 'none'
-			} else {
-				mui.alert(dt.message, ' ', '朕知道了', function() {
-					mui.openWindow({
-						url: domanUrl + base_path + "/index?dates=" + new Date().getTime()
-					})
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	});
-	if(marquee != '') {
-		$('body').append('<div class="marquee-show"><div></div></div>')
-	}
-	mui('body').on('tap', '.go_jifen_shop', function() {
-		mui.alert('敬请期待', ' ', '朕知道了', function() {})
-	});
-	setTimeout(function() {
-		$("#chanpin-slider .mui-slider-item").each(function() {
-			if($(this).find('.opacity_0').length > 0) {
-				$(this).find('img').prop('src', $(this).find('img').attr('val'));
-				$(this).find('.opacity_0').removeClass('opacity_0')
-			}
-		})
-	}, 1500)
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    });
+    if(marquee != '') {
+        $('body').append('<div class="marquee-show"><div></div></div>')
+    }
+    mui('body').on('tap', '.go_jifen_shop', function() {
+        mui.alert('敬请期待', ' ', '朕知道了', function() {})
+    });
+    setTimeout(function() {
+        $("#chanpin-slider .mui-slider-item").each(function() {
+            if($(this).find('.opacity_0').length > 0) {
+                $(this).find('img').prop('src', $(this).find('img').attr('val'));
+                $(this).find('.opacity_0').removeClass('opacity_0')
+            }
+        })
+    }, 1500)
 });

watero-wechat-web/src/main/webapp/common/shop/js/page/main.js

@@ -1,559 +1,546 @@
-var domanUrl = "http://" + window.location.host,
-	base_path = "http://test.iamberry.com/watero/wechat",
-	url_path = "http://test.iamberry.com",
-	marquee = '';
+var domanUrl = "//" + window.location.host,
+    base_path = "/watero/wechat",
+    marquee = '';
 mui.each(document.querySelectorAll('#footer-bar .mui-tab-item'), function(index, el) {
-	el.addEventListener('tap', function() {
-		switch(index) {
-			case 0:
-				mui.openWindow({
-					url: base_path + '/index'
-				});
-				break;
-			case 1:
-				mui.openWindow({
-					url: '/watero/html/wechat/shopping_cart.html'
-				});
-				break;
-			case 2:
-				mui.openWindow({
-					url: '/watero/html/wechat/order_list.html'
-				});
-				break;
-			case 3:
-				mui.openWindow({
-					url: '/watero/html/wechat/vip_center.html'
-				});
-				break;
-			default:
-				break
-		}
-	}, false)
+    el.addEventListener('tap', function() {
+        switch(index) {
+            case 0:
+                mui.openWindow({
+                    url: base_path + '/index'
+                });
+                break;
+            case 1:
+                mui.openWindow({
+                    url: base_path + '/wxCart/goCart'
+                });
+                break;
+            case 2:
+                mui.openWindow({
+                    url: '/watero/pay/goOrderList'
+                });
+                break;
+            case 3:
+                mui.openWindow({
+                    url: base_path + '/agentWechat/member'
+                });
+                break;
+            default:
+                break
+        }
+    }, false)
 });
 
 function getCartNum() {
-	$.ajax(base_path + '/cart/getCartNumByCartOpenId', {
-		data: {
-			openid: '230'
-		},
-        xhrFields: {
-            withCredentials: true
+    mui.ajax(base_path + '/cart/getCartNumByCartOpenId', {
+        data: {
+            openid: '230'
         },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				if(dt.data == "0") {
-					$('.icon-gouwuche span').hide()
-				} else {
-					$('.icon-gouwuche span').text(dt.data).show()
-				}
-			} else {
-				console.log(dt)
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			errorfn(xhr)
-		}
-	})
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                if(dt.data == "0") {
+                    $('.icon-gouwuche span').hide()
+                } else {
+                    $('.icon-gouwuche span').text(dt.data).show()
+                }
+            } else {
+                console.log(dt)
+            }
+        },
+        error: function(xhr, type, errorThrown) {
+            errorfn(xhr)
+        }
+    })
 };
 mui('body').on('tap', '.go_index', function() {
-	mui.openWindow({
-		url: base_path + '/index'
-	})
+    mui.openWindow({
+        url: base_path + '/index'
+    })
 });
 mui('body').on('tap', '.go_gwc', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/shopping_cart.html'
-	})
+    mui.openWindow({
+        url: base_path + '/wxCart/goCart'
+    })
 });
 mui('body').on('tap', '.go_web_shop', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/chanpin_list.html'
-	})
+    mui.openWindow({
+        url: base_path + '/wxCart/goProductList'
+    })
 });
 mui('body').on('tap', '.go_chanpin_details', function() {
-	mui.openWindow({
-		url: base_path + '/product/desc?productId=' + this.getAttribute("proid")+'&colorId='+this.getAttribute("colorid")
-	})
+    mui.openWindow({
+        url: base_path + '/product/desc?productId=' + this.getAttribute("proid")+'&colorId='+this.getAttribute("colorid")
+    })
 });
 mui('body').on('tap', '.go_couponList', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/coupon_list.html'
-	})
+    mui.openWindow({
+        url: base_path + '/couponWechat/couponList'
+    })
 });
 mui('body').on('tap', '.go-clearing', function() {
-	var th=this;
-	$.ajax(base_path + '/cart/addProductToCart', {
-		data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
-        xhrFields: {
-            withCredentials: true
+    var th=this;
+    mui.ajax(base_path + '/cart/addProductToCart', {
+        data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
+        dataType: 'json',
+        type: 'GET',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                mui.openWindow({
+                    url: '/watero/pay/settlement?cartId=' + dt.data + "&tiemstamp=" + new Date().getTime()
+                })
+            } else {
+                mui.alert(dt.message)
+            }
         },
-		dataType: 'json',
-		type: 'GET',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				mui.openWindow({
-					url: url_path + '/watero/pay/settlement?cartId=' + dt.data + "&tiemstamp=" + new Date().getTime()
-				})
-			} else {
-				mui.alert(dt.message)
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    })
 });
 mui('body').on('tap', '.go_gwc_pro', function() {
-	var th=this;
-	$.ajax(base_path + '/cart/addProductToCart', {
-		data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
-        xhrFields: {
-            withCredentials: true
+    var th=this;
+    mui.ajax(base_path + '/cart/addProductToCart', {
+        data: {"productId":th.getAttribute("proid"),"colorId":th.getAttribute("colorid")},
+        dataType: 'json',
+        type: 'GET',
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                getCartNum()
+            } else {
+                mui.alert(dt.message)
+            }
         },
-		dataType: 'json',
-		type: 'GET',
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				getCartNum()
-			} else {
-				mui.alert(dt.message)
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			errorfn(xhr)
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            errorfn(xhr)
+        }
+    })
 });
 
 function marquee_Show() {
-	$.ajax(base_path + '/coupon/checkCurrentPreferential', {
-        xhrFields: {
-            withCredentials: true
+    mui.ajax(base_path + '/coupon/checkCurrentPreferential', {
+        dataType: 'json',
+        type: 'POST',
+        async: false,
+        timeout: 15000,
+        success: function(dt) {
+            if(dt.status) {
+                marquee = '<span class="mui-h6">专属优惠：</span>'
+            } else {
+                marquee = ''
+            }
         },
-		dataType: 'json',
-		type: 'POST',
-		async: false,
-		timeout: 15000,
-		success: function(dt) {
-			if(dt.status) {
-				marquee = '<span class="mui-h6">专属优惠：</span>'
-			} else {
-				marquee = ''
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	})
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    })
 };
 mui('body').on('tap', '.go_order_details', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/order_details.html?orderId=' + this.getAttribute("value")
-	})
+    mui.openWindow({
+        url: '/watero/pay/goOrderInfo?orderId=' + this.getAttribute("value")
+    })
 });
 mui('body').on('tap', '.go_pay_count', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/order_list.html?salesStatus=1'
-	})
+    mui.openWindow({
+        url: '/watero/pay/goOrderList?salesStatus=1'
+    })
 });
 mui('body').on('tap', '.go_deliver_count', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/order_list.html?salesStatus=2'
-	})
+    mui.openWindow({
+        url: '/watero/pay/goOrderList?salesStatus=2'
+    })
 });
 mui('body').on('tap', '.go_delivered_count', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/order_list.html?salesStatus=5'
-	})
+    mui.openWindow({
+        url: '/watero/pay/goOrderList?salesStatus=5'
+    })
 });
 mui('body').on('tap', '.go_all_count', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/order_list.html?salesStatus=-1'
-	})
+    mui.openWindow({
+        url: '/watero/pay/goOrderList?salesStatus=-1'
+    })
 });
 mui('body').on('tap', '.go_tixian_guize', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/tixian_guize.html'
-	})
+    mui.openWindow({
+        url: base_path + '/integralWechat/withdrawRule'
+    })
 });
 mui('body').on('tap', '.go_agent_rule', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/daili_guize.html'
-	})
+    mui.openWindow({
+        url: base_path + '/agentWechat/agentRule'
+    })
 });
 mui('body').on('tap', '.go_publicity', function() {
-	mui.openWindow({
-		url: base_path + '/agentWechat/goPublicity?userType=' + this.getAttribute("userType") + "&isDrp=" + this.getAttribute("isDrp")
-	})
+    mui.openWindow({
+        url: base_path + '/agentWechat/goPublicity?userType=' + this.getAttribute("userType") + "&isDrp=" + this.getAttribute("isDrp")
+    })
 });
 mui('body').on('tap', '.go_daili_order_list', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/daili_order_list.html'
-	})
+    mui.openWindow({
+        url: base_path + '/agentWechat/order'
+    })
 });
 mui('body').on('tap', '.go_daili_rebackOrder_list', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/daili_rebackOrder_list.html'
-	})
+    mui.openWindow({
+        url: base_path + '/agentWechat/reback'
+    })
 });
 mui('body').on('tap', '.go_order_list', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/order_list.html'
-	})
+    mui.openWindow({
+        url: '/watero/pay/goOrderList'
+    })
 });
 mui('body').on('tap', '.go_xiaxian_list', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/xiaxian_list.html'
-	})
+    mui.openWindow({
+        url: base_path + '/agentWechat/agentNext'
+    })
 });
 mui('body').on('tap', '.go_tixian_apply', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/tixian_apply.html'
-	})
+    mui.openWindow({
+        url: base_path + '/withdraw/index'
+    })
 });
 mui('body').on('tap', '.go_tixian_cash', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/tixian_apply_cash.html'
-	})
+    mui.openWindow({
+        url: base_path + '/withdraw/cash'
+    })
 });
 mui('body').on('tap', '.go_daili_2wm', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/daili_2wm.html'
-	})
+    mui.openWindow({
+        url: base_path + '/member/showQrcode'
+    })
 });
 mui('body').on('tap', '.go_cash_log', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/cash_log.html'
-	})
+    mui.openWindow({
+        url: base_path + '/cashWechat/log'
+    })
 });
 mui('body').on('tap', '.go_jifen_log', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/jifen_log.html'
-	})
+    mui.openWindow({
+        url: base_path + '/integralWechat/log'
+    })
 });
 mui('body').on('tap', '.go_jifen_guize', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/fenxiao_guize.html'
-	})
+    mui.openWindow({
+        url: base_path + '/integralWechat/integralRule'
+    })
 });
 mui('body').on('tap', '.go_tixian_log', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/tixian_log.html'
-	})
+    mui.openWindow({
+        url: base_path + '/integralWechat/withdrawLog'
+    })
 });
 mui('body').on('tap', '.go_tixian_cash_log', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/tixian_log_cash.html'
-	})
+    mui.openWindow({
+        url: base_path + '/agentWechat/withdrawCashLog'
+    })
 });
 mui('body').on('tap', '.show_post_info', function() {
-	var urlStr = document.domain;
-	var postfirm = $(this).prop('postfirm');
-	if (postfirm == 'sto') {
-		mui.openWindow({
-			url: 'http://tuisong.wx.sto.cn/Track/Result163?billCode=' + this.getAttribute("postNum")
-		});
-	} else {
-		var href = window.location.href;
-		mui.openWindow({
-			url: 'https://m.kuaidi100.com/index_all.html?type=ems&postid=' + this.getAttribute("postNum") + '&callbackurl=' + href
-		});
-	}
+    var urlStr = document.domain;
+    var postfirm = $(this).prop('postfirm');
+    if (postfirm == 'sto') {
+        mui.openWindow({
+            url: 'http://tuisong.wx.sto.cn/Track/Result163?billCode=' + this.getAttribute("postNum")
+        });
+    } else {
+        var href = window.location.href;
+        mui.openWindow({
+            url: '//m.kuaidi100.com/index_all.html?type=ems&postid=' + this.getAttribute("postNum") + '&callbackurl=' + href
+        });
+    }
 });
 mui('body').on('tap', '.go_fenxiao_tixian_apply', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/fenxiao_tixian_apply.html?openid='
-	})
+    mui.openWindow({
+        url: base_path + '/drp/withdrawalsPage?openid='
+    })
 });
 mui('body').on('tap', '.go_fenxiao_tixian_log', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/fenxiao_tixian_log.html'
-	})
+    mui.openWindow({
+        url: base_path + '/drp/withdrawalsList'
+    })
 });
 mui('body').on('tap', '.fenxiao_vip', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/fenxiao_guize.html'
-	})
+    mui.openWindow({
+        url: base_path + '/drp/rulePage'
+    })
 });
 mui('body').on('tap', '.to-up-img', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/up.html?userType=1'
-	})
+    mui.openWindow({
+        url: base_path + '/sharePage/upShare?userType=1'
+    })
 });
 mui('body').on('tap', '.fenxiao_info', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/personal_information.html'
-	})
+    mui.openWindow({
+        url: base_path + '/drp/placeInfo_detail'
+    })
 });
 mui('body').on('tap', '.go_luck_draw', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/share_zhuanpan.html?orderId=' + this.getAttribute("value")
-	})
+    mui.openWindow({
+        url: base_path + '/activity/go_luck_draw?orderId=' + this.getAttribute("value")
+    })
 });
 mui('body').on('tap', '.go_prize_log', function() {
-	mui.openWindow({
-		url: '/watero/html/wechat/wheel_log.html?gameId=' + this.getAttribute("value")
-	})
+    mui.openWindow({
+        url: base_path + '/activity/go_prize_log?gameId=' + this.getAttribute("value")
+    })
 });
 
 function errorfn(xhr) {
-	if(xhr.readyState == 4 && xhr.status == 200) {} else {
-		var ref = location.href.split("#")[0],
-			src = '';
-		if(ref.indexOf('?') != -1) {
-			src = ref + "&date=" + new Date().getTime()
-		} else {
-			src = ref + "?date=" + new Date().getTime()
-		}
-		location.href = src;
-		return
-	}
+    if(xhr.readyState == 4 && xhr.status == 200) {} else {
+        var ref = location.href.split("#")[0],
+            src = '';
+        if(ref.indexOf('?') != -1) {
+            src = ref + "&date=" + new Date().getTime()
+        } else {
+            src = ref + "?date=" + new Date().getTime()
+        }
+        location.href = src;
+        return
+    }
 }
 
 function CheckImgExists(imgurl) {
-	var ImgObj = new Image();
-	ImgObj.src = imgurl;
-	if(ImgObj.fileSize > 0 || (ImgObj.width > 0 && ImgObj.height > 0)) {
-		return ImgObj
-	} else {
-		return false
-	}
+    var ImgObj = new Image();
+    ImgObj.src = imgurl;
+    if(ImgObj.fileSize > 0 || (ImgObj.width > 0 && ImgObj.height > 0)) {
+        return ImgObj
+    } else {
+        return false
+    }
 };
 
 function gotoTop(acceleration, stime) {
-	acceleration = acceleration || 0.1;
-	stime = stime || 10;
-	var x1 = 0,
-		y1 = 0,
-		x2 = 0,
-		y2 = 0,
-		x3 = 0,
-		y3 = 0;
-	if(document.documentElement) {
-		x1 = document.documentElement.scrollLeft || 0;
-		y1 = document.documentElement.scrollTop || 0
-	}
-	if(document.body) {
-		x2 = document.body.scrollLeft || 0;
-		y2 = document.body.scrollTop || 0
-	}
-	var x3 = window.scrollX || 0;
-	var y3 = window.scrollY || 0;
-	var x = Math.max(x1, Math.max(x2, x3));
-	var y = Math.max(y1, Math.max(y2, y3));
-	var speeding = 1 + acceleration;
-	window.scrollTo(Math.floor(x / speeding), Math.floor(y / speeding));
-	if(x > 0 || y > 0) {
-		var run = "gotoTop(" + acceleration + ", " + stime + ")";
-		window.setTimeout(run, stime)
-	}
+    acceleration = acceleration || 0.1;
+    stime = stime || 10;
+    var x1 = 0,
+        y1 = 0,
+        x2 = 0,
+        y2 = 0,
+        x3 = 0,
+        y3 = 0;
+    if(document.documentElement) {
+        x1 = document.documentElement.scrollLeft || 0;
+        y1 = document.documentElement.scrollTop || 0
+    }
+    if(document.body) {
+        x2 = document.body.scrollLeft || 0;
+        y2 = document.body.scrollTop || 0
+    }
+    var x3 = window.scrollX || 0;
+    var y3 = window.scrollY || 0;
+    var x = Math.max(x1, Math.max(x2, x3));
+    var y = Math.max(y1, Math.max(y2, y3));
+    var speeding = 1 + acceleration;
+    window.scrollTo(Math.floor(x / speeding), Math.floor(y / speeding));
+    if(x > 0 || y > 0) {
+        var run = "gotoTop(" + acceleration + ", " + stime + ")";
+        window.setTimeout(run, stime)
+    }
 };
 
 function accDiv(arg1, arg2) {
-	var t1 = 0,
-		t2 = 0,
-		r1, r2;
-	try {
-		t1 = arg1.toString().split(".")[1].length
-	} catch(e) {}
-	try {
-		t2 = arg2.toString().split(".")[1].length
-	} catch(e) {}
-	with(Math) {
-		r1 = Number(arg1.toString().replace(".", ""));
-		r2 = Number(arg2.toString().replace(".", ""));
-		return(r1 / r2) * pow(10, t2 - t1)
-	}
+    var t1 = 0,
+        t2 = 0,
+        r1, r2;
+    try {
+        t1 = arg1.toString().split(".")[1].length
+    } catch(e) {}
+    try {
+        t2 = arg2.toString().split(".")[1].length
+    } catch(e) {}
+    with(Math) {
+        r1 = Number(arg1.toString().replace(".", ""));
+        r2 = Number(arg2.toString().replace(".", ""));
+        return(r1 / r2) * pow(10, t2 - t1)
+    }
 };
 Number.prototype.div = function(arg) {
-	return accDiv(this, arg)
+    return accDiv(this, arg)
 };
 
 function accAdd(arg1, arg2) {
-	var r1, r2, m, c;
-	try {
-		r1 = arg1.toString().split(".")[1].length
-	} catch(e) {
-		r1 = 0
-	}
-	try {
-		r2 = arg2.toString().split(".")[1].length
-	} catch(e) {
-		r2 = 0
-	}
-	c = Math.abs(r1 - r2);
-	m = Math.pow(10, Math.max(r1, r2));
-	if(c > 0) {
-		var cm = Math.pow(10, c);
-		if(r1 > r2) {
-			arg1 = Number(arg1.toString().replace(".", ""));
-			arg2 = Number(arg2.toString().replace(".", "")) * cm
-		} else {
-			arg1 = Number(arg1.toString().replace(".", "")) * cm;
-			arg2 = Number(arg2.toString().replace(".", ""))
-		}
-	} else {
-		arg1 = Number(arg1.toString().replace(".", ""));
-		arg2 = Number(arg2.toString().replace(".", ""))
-	}
-	return(arg1 + arg2) / m
+    var r1, r2, m, c;
+    try {
+        r1 = arg1.toString().split(".")[1].length
+    } catch(e) {
+        r1 = 0
+    }
+    try {
+        r2 = arg2.toString().split(".")[1].length
+    } catch(e) {
+        r2 = 0
+    }
+    c = Math.abs(r1 - r2);
+    m = Math.pow(10, Math.max(r1, r2));
+    if(c > 0) {
+        var cm = Math.pow(10, c);
+        if(r1 > r2) {
+            arg1 = Number(arg1.toString().replace(".", ""));
+            arg2 = Number(arg2.toString().replace(".", "")) * cm
+        } else {
+            arg1 = Number(arg1.toString().replace(".", "")) * cm;
+            arg2 = Number(arg2.toString().replace(".", ""))
+        }
+    } else {
+        arg1 = Number(arg1.toString().replace(".", ""));
+        arg2 = Number(arg2.toString().replace(".", ""))
+    }
+    return(arg1 + arg2) / m
 };
 Number.prototype.add = function(arg) {
-	return accAdd(arg, this)
+    return accAdd(arg, this)
 };
 
 function accSub(arg1, arg2) {
-	var r1, r2, m, n;
-	try {
-		r1 = arg1.toString().split(".")[1].length
-	} catch(e) {
-		r1 = 0
-	}
-	try {
-		r2 = arg2.toString().split(".")[1].length
-	} catch(e) {
-		r2 = 0
-	}
-	m = Math.pow(10, Math.max(r1, r2));
-	n = (r1 >= r2) ? r1 : r2;
-	return((arg1 * m - arg2 * m) / m).toFixed(n)
+    var r1, r2, m, n;
+    try {
+        r1 = arg1.toString().split(".")[1].length
+    } catch(e) {
+        r1 = 0
+    }
+    try {
+        r2 = arg2.toString().split(".")[1].length
+    } catch(e) {
+        r2 = 0
+    }
+    m = Math.pow(10, Math.max(r1, r2));
+    n = (r1 >= r2) ? r1 : r2;
+    return((arg1 * m - arg2 * m) / m).toFixed(n)
 };
 Number.prototype.sub = function(arg) {
-	return accMul(arg, this)
+    return accMul(arg, this)
 };
 
 function accMul(arg1, arg2) {
-	var m = 0,
-		s1 = arg1.toString(),
-		s2 = arg2.toString();
-	try {
-		m += s1.split(".")[1].length
-	} catch(e) {}
-	try {
-		m += s2.split(".")[1].length
-	} catch(e) {}
-	return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
+    var m = 0,
+        s1 = arg1.toString(),
+        s2 = arg2.toString();
+    try {
+        m += s1.split(".")[1].length
+    } catch(e) {}
+    try {
+        m += s2.split(".")[1].length
+    } catch(e) {}
+    return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
 };
 Number.prototype.mul = function(arg) {
-	return accMul(arg, this)
+    return accMul(arg, this)
 };
 
 function switchcolor(color) {
-	var pro_color = "";
-	switch(color) {
-		case 1:
-			pro_color = "品蓝";
-			break;
-		case 2:
-			pro_color = "品黑";
-			break;
-		case 3:
-			pro_color = "苹果绿";
-			break;
-		case 4:
-			pro_color = "西瓜红";
-			break;
-		case 5:
-			pro_color = "白色";
-			break;
+    var pro_color = "";
+    switch(color) {
+        case 1:
+            pro_color = "品蓝";
+            break;
+        case 2:
+            pro_color = "品黑";
+            break;
+        case 3:
+            pro_color = "苹果绿";
+            break;
+        case 4:
+            pro_color = "西瓜红";
+            break;
+        case 5:
+            pro_color = "白色";
+            break;
         case 36:
             pro_color = "银色";
             break;
         case 37:
             pro_color = "磨砂";
             break;
-		default:
-			pro_color = "品蓝";
-			break
-	}
-	return pro_color
+        default:
+            pro_color = "品蓝";
+            break
+    }
+    return pro_color
 };
 
 function switchColorImg(colorId){
-	var img='';
-	switch (colorId){
-		case 1:
-			img='http://static.iamberry.com/watero/images/shop/cp-blue.png'
-			break;
-		case 2:
-			img='http://static.iamberry.com/watero/images/shop/cp-black.png'
-			break;
-		case 3:
-			img='http://static.iamberry.com/watero/images/shop/cp-green.png'
-			break;
-		case 4:
-			img='http://static.iamberry.com/watero/images/shop/cp-red.png'
-			break;
-		default:
-			img='http://static.iamberry.com/watero/images/shop/cp-blue.png'
-			break;
-	}
-	return img;
+    var img='';
+    switch (colorId){
+        case 1:
+            img='//s.iamberry.com/watero/images/shop/cp-blue.png'
+            break;
+        case 2:
+            img='//s.iamberry.com/watero/images/shop/cp-black.png'
+            break;
+        case 3:
+            img='//s.iamberry.com/watero/images/shop/cp-green.png'
+            break;
+        case 4:
+            img='//s.iamberry.com/watero/images/shop/cp-red.png'
+            break;
+        default:
+            img='//s.iamberry.com/watero/images/shop/cp-blue.png'
+            break;
+    }
+    return img;
 };
 
 function getParam(paramName) {
-	paramValue = "", isFound = !1;
-	if(this.location.search.indexOf("?") == 0 && this.location.search.indexOf("=") > 1) {
-		arrSource = unescape(this.location.search).substring(1, this.location.search.length).split("&"), i = 0;
-		while(i < arrSource.length && !isFound) {
-			arrSource[i].indexOf("=") > 0 && arrSource[i].split("=")[0].toLowerCase() == paramName.toLowerCase() && (paramValue = arrSource[i].split("=")[1], isFound = !0), i++
-		}
-	}
-	return paramValue == "" && (paramValue = null), paramValue
+    paramValue = "", isFound = !1;
+    if(this.location.search.indexOf("?") == 0 && this.location.search.indexOf("=") > 1) {
+        arrSource = unescape(this.location.search).substring(1, this.location.search.length).split("&"), i = 0;
+        while(i < arrSource.length && !isFound) {
+            arrSource[i].indexOf("=") > 0 && arrSource[i].split("=")[0].toLowerCase() == paramName.toLowerCase() && (paramValue = arrSource[i].split("=")[1], isFound = !0), i++
+        }
+    }
+    return paramValue == "" && (paramValue = null), paramValue
 };
 
 function dc(objectid) {
-	if(document.getElementById && document.getElementById(objectid)) {
-		return document.getElementById(objectid)
-	} else if(document.all && document.all(objectid)) {
-		return document.all(objectid)
-	} else if(document.layers && document.layers[objectid]) {
-		return document.layers[objectid]
-	} else {
-		return false
-	}
+    if(document.getElementById && document.getElementById(objectid)) {
+        return document.getElementById(objectid)
+    } else if(document.all && document.all(objectid)) {
+        return document.all(objectid)
+    } else if(document.layers && document.layers[objectid]) {
+        return document.layers[objectid]
+    } else {
+        return false
+    }
 };
 
 function formatDate(now) {
-	now = new Date(now);
-	var year = now.getFullYear();
-	var month = now.getMonth() + 1;
-	var date = now.getDate();
-	var hour = now.getHours();
-	var minute = now.getMinutes();
-	var second = now.getSeconds();
-	return year + "-" + month + "-" + date + "   " + hour + ":" + minute + ":" + second
+    now = new Date(now);
+    var year = now.getFullYear();
+    var month = now.getMonth() + 1;
+    var date = now.getDate();
+    var hour = now.getHours();
+    var minute = now.getMinutes();
+    var second = now.getSeconds();
+    return year + "-" + month + "-" + date + "   " + hour + ":" + minute + ":" + second
 };
 
 function springFestivalPop() {
-	if(getCookie("WATERO_WEB_") == null) {
-		maskspringFestival.show();
-		$(".mui-backdrop").append('<div style="position:relative;"><img src="http://static.iamberry.com/watero/images/shop/springFestival_2017.png" style="width:80%;margin:10% 10% auto 10%;"/><button type="button" id="close-springFestival" class="mui-btn my-btn-red" style="position: absolute;bottom: 5%;left: 50%;-webkit-transform: translateX(-50%)">我知道了</button></div>');
-		mui('body').on('tap', '#close-springFestival', function(e) {
-			setCookie();
-			$(".mui-backdrop").hide();
-		});
-	}
+    if(getCookie("WATERO_WEB_") == null) {
+        maskspringFestival.show();
+        $(".mui-backdrop").append('<div style="position:relative;"><img src="//s.iamberry.com/watero/images/shop/springFestival_2017.png" style="width:80%;margin:10% 10% auto 10%;"/><button type="button" id="close-springFestival" class="mui-btn my-btn-red" style="position: absolute;bottom: 5%;left: 50%;-webkit-transform: translateX(-50%)">我知道了</button></div>');
+        mui('body').on('tap', '#close-springFestival', function(e) {
+            setCookie();
+            $(".mui-backdrop").hide();
+        });
+    }
 };
 
 function getCookie(name) {
-	var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
-	if(arr = document.cookie.match(reg))
-		return unescape(arr[2]);
-	else
-		return null;
+    var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+    if(arr = document.cookie.match(reg))
+        return unescape(arr[2]);
+    else
+        return null;
 };
 var maskspringFestival = mui.createMask(function() {
-	return false;
+    return false;
 }); //callback为用户点击蒙版时自动执行的回调；
 function setCookie() {
-	var Days = 30;
-	var exp = new Date();
-	exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
-	document.cookie = "WATERO_WEB_=OK;Path=/;expires=" + exp.toGMTString();
+    var Days = 30;
+    var exp = new Date();
+    exp.setTime(exp.getTime() + Days * 24 * 60 * 60 * 1000);
+    document.cookie = "WATERO_WEB_=OK;Path=/;expires=" + exp.toGMTString();
 };

watero-wechat-web/src/main/webapp/common/shop/js/page/order_details.js

@@ -1,22 +1,21 @@
 var isPay = true;
 var isEfficacious = true;
-mui.ready(function () {
+mui
+    .ready(function() {
         var orderId = getParam("orderId");
         $('#check-luck-draw').attr("value", orderId);
         var table = document.body.querySelector('.shopping-cart-list');
-        $.ajax(
+        mui
+            .ajax(
                 base_path + '/cart/getShopOrderByOrderId',
                 {
-                    data: {
-                        orderId: orderId
+                    data : {
+                        orderId : orderId
                     },
-                    xhrFields: {
-                        withCredentials: true
-                    },
-                    dataType: 'json',
-                    type: 'post',
-                    timeout: 15000,
-                    success: function (dt) {
+                    dataType : 'json',
+                    type : 'post',
+                    timeout : 15000,
+                    success : function(dt) {
                         if (dt.status) {
                             var bannerdata = dt.data;
                             isEfficacious = bannerdata.efficacious;
@@ -144,7 +143,7 @@ mui.ready(function () {
                             if (item != null) {
                                 $(item)
                                     .each(
-                                        function (index) {
+                                        function(index) {
                                             var pro_color = switchcolor(this.itemColorId);
                                             var colorImg = switchColorImg(this.itemColorId);
                                             var li = document
@@ -185,7 +184,7 @@ mui.ready(function () {
                             document.querySelector('.loading-bg').style.display = 'none'
                         }
                     },
-                    error: function (xhr, type, errorThrown) {
+                    error : function(xhr, type, errorThrown) {
                         console.log(xhr)
                     }
                 });
@@ -198,26 +197,24 @@ function goOrderPay() {
     }
     var salesOrderid = $('#salesOrderid').html();
     var dataArgs = {
-        "orderId": salesOrderid
+        "orderId" : salesOrderid
     };
     if (isPay) {
         layer.open({
-            type: 2,
-            shadeClose: false,
-            content: "正在请求加载订单信息..."
+            type : 2,
+            shadeClose : false,
+            content : "正在请求加载订单信息..."
         });
         isPay = false;
-        $.ajax(
+        mui
+            .ajax(
                 base_path + '/cart/orderPay',
                 {
-                    data: dataArgs,
-                    xhrFields: {
-                        withCredentials: true
-                    },
-                    dataType: 'json',
-                    type: 'POST',
-                    timeout: 15000,
-                    success: function (dt) {
+                    data : dataArgs,
+                    dataType : 'json',
+                    type : 'POST',
+                    timeout : 15000,
+                    success : function(dt) {
                         layer.closeAll();
                         if (dt.status) {
                             var str = dt.data.info;
@@ -226,29 +223,28 @@ function goOrderPay() {
                                 .invoke(
                                     'getBrandWCPayRequest',
                                     obj,
-                                    function (res) {
+                                    function(res) {
                                         if (res.err_msg == 'get_brand_wcpay_request:ok') {
                                             var orderIds = {
-                                                "orderId": dt.data.orderId
+                                                "orderId" : dt.data.orderId
                                             };
                                             layer
                                                 .open({
-                                                    type: 2,
-                                                    shadeClose: false,
-                                                    content: "正在请求加载订单信息..."
+                                                    type : 2,
+                                                    shadeClose : false,
+                                                    content : "正在请求加载订单信息..."
                                                 });
-                                            $.ajax(
+                                            mui
+                                                .ajax(
                                                     base_path
                                                     + '/order/checkOrderPaySuccess',
                                                     {
-                                                        data: orderIds,
-                                                        xhrFields: {
-                                                            withCredentials: true
-                                                        },
-                                                        dataType: 'json',
-                                                        type: 'post',
-                                                        timeout: 15000,
-                                                        success: function (dt) {
+                                                        data : orderIds,
+                                                        dataType : 'json',
+                                                        type : 'post',
+                                                        timeout : 15000,
+                                                        success : function(
+                                                            dt) {
                                                             if (dt.status) {
                                                                 window.location.href = base_path
                                                                     + "/order/paySuccess?orderId="
@@ -263,9 +259,10 @@ function goOrderPay() {
                                                                     1000)
                                                             }
                                                         },
-                                                        error: function (xhr,
-                                                                         type,
-                                                                         errorThrown) {
+                                                        error : function(
+                                                            xhr,
+                                                            type,
+                                                            errorThrown) {
                                                             isPay = true;
                                                             layer
                                                                 .closeAll();
@@ -293,7 +290,7 @@ function goOrderPay() {
                             mui.alert(dt.message)
                         }
                     },
-                    error: function (xhr, type, errorThrown) {
+                    error : function(xhr, type, errorThrown) {
                         isPay = true;
                         layer.closeAll();
                         mui.alert("您的网络异常，请刷新重试!");
@@ -323,9 +320,9 @@ function operation(num) {
         info = "您确定要取消订单吗?";
         url = base_path + '/cart/cancelOrder';
         data = {
-            orderId: orderId,
-            changeOrderId: changeOrderId,
-            status: status
+            orderId : orderId,
+            changeOrderId : changeOrderId,
+            status : status
         }
     } else if (status == 2) {
         if (salesLockType == 2) {
@@ -346,9 +343,9 @@ function operation(num) {
             }
         }
         data = {
-            orderId: orderId,
-            remark: returnReason,
-            status: status
+            orderId : orderId,
+            remark : returnReason,
+            status : status
         }
     } else if (status == 5 || status == 12) {
         if (num == 1) {
@@ -356,9 +353,9 @@ function operation(num) {
             message = "超出换货期限,不能换货!";
             url = base_path + '/cart/exchangeOrder';
             data = {
-                orderId: orderId,
-                changeOrderId: changeOrderId,
-                status: status
+                orderId : orderId,
+                changeOrderId : changeOrderId,
+                status : status
             }
         } else {
             if (salesLockType == 2) {
@@ -379,26 +376,23 @@ function operation(num) {
                 }
             }
             data = {
-                orderId: orderId,
-                remark: returnReason,
-                returnOrderId: returnOrderId,
-                status: status
+                orderId : orderId,
+                remark : returnReason,
+                returnOrderId : returnOrderId,
+                status : status
             }
         }
     }
-    var btnArray = ['否', '是'];
-    mui.confirm(info, '水时代-提示', btnArray, function (e) {
+    var btnArray = [ '否', '是' ];
+    mui.confirm(info, '水时代-提示', btnArray, function(e) {
         if (e.index == 1) {
             $.ajax({
-                data: data,
-                xhrFields: {
-                    withCredentials: true
-                },
-                url: url,
-                dataType: 'json',
-                type: 'post',
-                timeout: 15000,
-                success: function (dt) {
+                data : data,
+                url : url,
+                dataType : 'json',
+                type : 'post',
+                timeout : 15000,
+                success : function(dt) {
                     if (dt.status) {
                         var bannerdata = dt.data;
                         location.reload()

watero-wechat-web/src/main/webapp/common/shop/js/page/pay_win.js

@@ -9,11 +9,8 @@ mui.ready(function () {
 });
 function selectUser(orderId) {
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/order/getOrderInfo', {
+    mui.ajax(base_path + '/order/getOrderInfo', {
         data: orderId,
-        xhrFields: {
-            withCredentials: true
-        },
         dataType: 'json',
         type: 'post',
         timeout: 15000,

watero-wechat-web/src/main/webapp/common/shop/js/page/personal_information.js

@@ -1,10 +1,7 @@
 mui.ready(function () {
     var showCityPickerButton = dc('showCityPicker3');
-    $.ajax({
+    mui.ajax({
         data: {},
-        xhrFields: {
-            withCredentials: true
-        },
         dataType: "json",
         type: 'post',
         url: base_path + '/placeInfo/get_placeInfo_detail',
@@ -54,7 +51,7 @@ mui.ready(function () {
     })
 });
 mui('body').on('tap', '#btn_submit', function () {
-    mui.openWindow({url: '/watero/html/wechat/add_information.html?dates=' + new Date().getTime()})
+    mui.openWindow({url: base_path + '/drp/placeInfo_update?dates=' + new Date().getTime()})
 });
 function toDrpCenter() {
     window.location.href = base_path + "/drp/indexPage?dates=" + new Date().getTime()

watero-wechat-web/src/main/webapp/common/shop/js/page/tixian_apply_cash.js

@@ -48,11 +48,8 @@ mui.ready(function () {
                 "bankName": bankNo,
                 "branch": bankch
             };
-            $.ajax(base_path + '/withdraw/applyCash', {
+            mui.ajax(base_path + '/withdraw/applyCash', {
                 data: paramArgs,
-                xhrFields: {
-                    withCredentials: true
-                },
                 dataType: 'json',
                 async: false,
                 type: 'POST',
@@ -92,10 +89,7 @@ function cashChange() {
     }
     userInputMoney = cashNum
 };function applyBofore() {
-    $.ajax(base_path + '/withdraw/applyCashBefore', {
-        xhrFields: {
-            withCredentials: true
-        },
+    mui.ajax(base_path + '/withdraw/applyCashBefore', {
         dataType: 'json',
         type: 'POST',
         timeout: 15000,

watero-wechat-web/src/main/webapp/common/shop/js/page/tixian_log.js

@@ -9,15 +9,11 @@ var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
     var btnArray = ['否', '是'];
-    $.ajax(base_path + '/withdraw/selectUserLogs?dates=' + new Date().getTime(), {
+    mui.ajax(base_path + '/withdraw/selectUserLogs?dates=' + new Date().getTime(), {
         data: {
             "pageSize": pagesize,
             "pageNo": pageNumber
-        },
-        xhrFields: {
-            withCredentials: true
-        },
-        dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
+        }, dataType: 'json', type: 'post', timeout: 15000, success: function (dt) {
             if (dt.status) {
                 var log_list = [];
                 log_list = dt.data;

watero-wechat-web/src/main/webapp/common/shop/js/page/tixian_log_cash.js

@@ -8,11 +8,8 @@ mui.init({
 var pageNumber = 0, pagesize = 10;
 function pullupRefresh() {
     pageNumber += 1;
-    $.ajax(base_path + '/withdraw/selectUserLogs', {
+    mui.ajax(base_path + '/withdraw/selectUserLogs', {
         data: {"pageSize": pagesize, "pageNo": pageNumber},
-        xhrFields: {
-            withCredentials: true
-        },
         dataType: 'json',
         type: 'post',
         timeout: 15000,

watero-wechat-web/src/main/webapp/common/shop/js/page/vip_center.js

@@ -1,285 +1,268 @@
 mui.ready(function() {
-	marquee_Show();
-	getCartNum();
-	mui.each(document.querySelectorAll('#menu-lease-other .mui-control-item'), function(index, el) {
-		el.addEventListener('tap', function() {
-			switch(index) {
-				case 0:
-					mui.openWindow({
-						url: '/watero/html/wechat/xiaxian_list.html'
-					});
-					break;
-				case 1:
-					mui.openWindow({
-						url: 'http://www.iamberry.com/iamberry_wechat/after_service_watero.html'
-					});
-					break;
-				case 2:
-					mui.confirm('服务时间：工作日9:00-18:00', '客服电话：<a>400-8006692</a>', ['取消', '拨打'], function(e) {
-						if(e.index == 1) {
-							location.href = 'tel:4008006692'
-						}
-					});
-					break;
-				case 3:
-					mui.openWindow({
-						url: 'http://w.iamberry.com/watero/view/faq.html'
-					});
-					break;
-				default:
-					break
-			}
-		}, false)
-	});
-	/*mui.each(document.querySelectorAll('#menu-nav .mui-control-item'), function(index, el) {
-		var th=this;
-		el.addEventListener('tap', function() {
-					mui.openWindow({
-						url: th.getAttribute("href")
-					});
-		}, false)
-	});*/
-    mui('body').on('tap', '#menu-nav .go_coupon_bag', function() {
-        mui.openWindow({
-            url: '/watero/view/coupon_bag.html'
-        })
+    marquee_Show();
+    getCartNum();
+    mui.each(document.querySelectorAll('#menu-lease-other .mui-control-item'), function(index, el) {
+        el.addEventListener('tap', function() {
+            switch(index) {
+                case 0:
+                    mui.openWindow({
+                        url: base_path + '/agentWechat/agentNext'
+                    });
+                    break;
+                case 1:
+                    mui.openWindow({
+                        url: '//www.iamberry.com/iamberry_wechat/after_service_watero.html'
+                    });
+                    break;
+                case 2:
+                    mui.confirm('服务时间：工作日9:00-18:00', '客服电话：<a>400-8006692</a>', ['取消', '拨打'], function(e) {
+                        if(e.index == 1) {
+                            location.href = 'tel:4008006692'
+                        }
+                    });
+                    break;
+                case 3:
+                    mui.openWindow({
+                        url: '//w.iamberry.com/watero/view/faq.html'
+                    });
+                    break;
+                default:
+                    break
+            }
+        }, false)
     });
-	$.ajax(base_path + '/agent/member?dates=' + new Date().getTime(), {
-        xhrFields: {
-            withCredentials: true
-        },
-		dataType: 'json',
-		type: 'post',
-		timeout: 15000,
-		success: function(dt) {
-			var data = dt.data;
-			if(dt.status) {
-				if(data.userHead != null && typeof(data.userHead) != "undefined" && data.userHead != '') {
-					var imgObj = $("<img src='" + data.userHead + "?" + new Date().getTime() + "'/>");
-					$("#headDiv").empty().append(imgObj)
-				}
-				if(data.userNickname != null && typeof(data.userNickname) != "undefined" && data.userNickname != '') {
-					$("#userNickname").html(decodeURI(data.userNickname))
-				}
-				var userNickname = $("#userNickname").html();
-				if(data.shareType != null && typeof(data.shareType) != "undefined" && data.shareType == 2) {
-					$("#2WM").show();
-					if(userNickname != "") {
-						$("#userNickname").html(userNickname + "(会员)")
-					}
-				} else {
-					if(userNickname != "") {
-						$("#userNickname").html(userNickname + "(用户)")
-					}
-				}
-				$.ajax({
-					type: 'post',
-					url: base_path + '/probationOrder/membersProbationOrder',
-					data: {},
-                    xhrFields: {
-                        withCredentials: true
+    mui.each(document.querySelectorAll('#menu-nav .mui-control-item'), function(index, el) {
+        var th=this;
+        el.addEventListener('tap', function() {
+            mui.openWindow({
+                url: th.getAttribute("href")
+            });
+        }, false)
+    });
+    mui.ajax(base_path + '/agent/member?dates=' + new Date().getTime(), {
+        dataType: 'json',
+        type: 'post',
+        timeout: 15000,
+        success: function(dt) {
+            var data = dt.data;
+            if(dt.status) {
+                if(data.userHead != null && typeof(data.userHead) != "undefined" && data.userHead != '') {
+                    var imgObj = $("<img src='" + data.userHead + "?" + new Date().getTime() + "'/>");
+                    $("#headDiv").empty().append(imgObj)
+                }
+                if(data.userNickname != null && typeof(data.userNickname) != "undefined" && data.userNickname != '') {
+                    $("#userNickname").html(decodeURI(data.userNickname))
+                }
+                var userNickname = $("#userNickname").html();
+                if(data.shareType != null && typeof(data.shareType) != "undefined" && data.shareType == 2) {
+                    $("#2WM").show();
+                    if(userNickname != "") {
+                        $("#userNickname").html(userNickname + "(会员)")
+                    }
+                } else {
+                    if(userNickname != "") {
+                        $("#userNickname").html(userNickname + "(用户)")
+                    }
+                }
+                $.ajax({
+                    type: 'post',
+                    url: base_path + '/probationOrder/membersProbationOrder',
+                    data: {},
+                    dataType: 'json',
+                    timeout: 15000,
+                    success: function(dts) {
+                        if(dts.status) {
+                            var str = '';
+                            if(dts.data.probationOrderDtoList.length == 0) {
+                                $("#try_order_list").hide()
+                            }
+                            mui(dts.data.probationOrderDtoList).each(function(index) {
+                                switch(this.probationStatus) {
+                                    case 1:
+                                        str = "待派送";
+                                        break;
+                                    case 2:
+                                        str = "派送中";
+                                        break;
+                                    case 3:
+                                        str = "待支付";
+                                        break;
+                                    case 4:
+                                        str = "暂停试用";
+                                        break;
+                                    case 5:
+                                        str = "支付完成";
+                                        break;
+                                    default:
+                                        str = "订单关闭";
+                                        break
+                                }
+                                var str1 = '',
+                                    str2 = '';
+                                if(str == "待支付") {
+                                    str1 = '<a data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="正在支付" class="mui-btn try-btn-pay mui-pull-right" style="margin-right: 12px;" proid="' + this.probationOrderid + '">立即支付</a>';
+                                    str2 = '<div>试用剩余时间：<span id="time_out' + (index + 1) + '"></span></div>'
+                                }
+                                $("#try_order_list").append('<li class="mui-table-view-cell mui-media"><a class="go_try_order" proid="' + this.probationOrderid + '" style="margin-left: -20px;"><span class="mui-media-object mui-pull-left wh-80"><img src="' + this.productIntroduceImg + '"></span><div class="mui-media-body center-middle"><div>' + str + '</div><div>订单号：' + this.probationOrderid + '</div>' + str2 + '</div></a><div class="btn-box">' + str1 + '</div></li>');
+                                if(str == "待支付") {
+                                    addTimer('time_out' + (index + 1), this.probationRemainingTime / 1000)
+                                }
+                            })
+                        } else {
+                            mui.alert(dts.data.message)
+                        }
                     },
-					dataType: 'json',
-					timeout: 15000,
-					success: function(dts) {
-						if(dts.status) {
-							var str = '';
-							if(dts.data.probationOrderDtoList.length == 0) {
-								$("#try_order_list").hide()
-							}
-							mui(dts.data.probationOrderDtoList).each(function(index) {
-								switch(this.probationStatus) {
-									case 1:
-										str = "待派送";
-										break;
-									case 2:
-										str = "派送中";
-										break;
-									case 3:
-										str = "待支付";
-										break;
-									case 4:
-										str = "暂停试用";
-										break;
-									case 5:
-										str = "支付完成";
-										break;
-									default:
-										str = "订单关闭";
-										break
-								}
-								var str1 = '',
-									str2 = '';
-								if(str == "待支付") {
-									str1 = '<a data-loading-icon="mui-spinner mui-spinner-custom" data-loading-text="正在支付" class="mui-btn try-btn-pay mui-pull-right" style="margin-right: 12px;" proid="' + this.probationOrderid + '">立即支付</a>';
-									str2 = '<div>试用剩余时间：<span id="time_out' + (index + 1) + '"></span></div>'
-								}
-								$("#try_order_list").append('<li class="mui-table-view-cell mui-media"><a class="go_try_order" proid="' + this.probationOrderid + '" style="margin-left: -20px;"><span class="mui-media-object mui-pull-left wh-80"><img src="' + this.productIntroduceImg + '"></span><div class="mui-media-body center-middle"><div>' + str + '</div><div>订单号：' + this.probationOrderid + '</div>' + str2 + '</div></a><div class="btn-box">' + str1 + '</div></li>');
-								if(str == "待支付") {
-									addTimer('time_out' + (index + 1), this.probationRemainingTime / 1000)
-								}
-							})
-						} else {
-							mui.alert(dts.data.message)
-						}
-					},
-					error: function(xhr, type, errorThrown) {
-						console.log(xhr);
-						mui.alert("请检查网络或刷新页面重试！")
-					}
-				});
-				document.querySelector('.loading-bg').style.display = 'none'
-			} else {
-				var btnArray = ['否', '是'];
-				mui.confirm(dt.message, '提示', btnArray, function(e) {
-					if(e.index == 1) {
-						location.reload(true)
-					}
-				})
-			}
-		},
-		error: function(xhr, type, errorThrown) {
-			console.log(xhr)
-		}
-	});
-	if(marquee != '') {
-		$('body').append('<div class="marquee-show"><div></div></div>')
-	}
+                    error: function(xhr, type, errorThrown) {
+                        console.log(xhr);
+                        mui.alert("请检查网络或刷新页面重试！")
+                    }
+                });
+                document.querySelector('.loading-bg').style.display = 'none'
+            } else {
+                var btnArray = ['否', '是'];
+                mui.confirm(dt.message, '提示', btnArray, function(e) {
+                    if(e.index == 1) {
+                        location.reload(true)
+                    }
+                })
+            }
+        },
+        error: function(xhr, type, errorThrown) {
+            console.log(xhr)
+        }
+    });
+    if(marquee != '') {
+        $('body').append('<div class="marquee-show"><div></div></div>')
+    }
 });
 mui('body').on('tap', '#rent_wait_deliver', function() {
-	mui.openWindow({
-		url: '/watero/html/rent/lease_order_details.html?rentStatus=-1'
-	})
+    mui.openWindow({
+        url: '/watero/view/rent/lease_order_details.html?rentStatus=-1'
+    })
 });
 mui('body').on('tap', '#rent_already_deliver', function() {
-	mui.openWindow({
-		url: '/watero/html/rent/lease_order_details.html?rentStatus=5'
-	})
+    mui.openWindow({
+        url: '/watero/view/rent/lease_order_details.html?rentStatus=5'
+    })
 });
 mui('body').on('tap', '.icon-shebeiliebiao', function() {
-	mui.openWindow({
-		url: '/watero/html/rent/my_equipment.html'
-	})
+    mui.openWindow({
+        url: '/watero/view/rent/my_equipment.html'
+    })
 });
 mui('body').on('tap', '#xieyi-dalog', function() {
-	mui.openWindow({
-		url: '/watero/html/rent/try_xieyi.html'
-	});
+    mui.openWindow({
+        url: '/watero/view/rent/try_xieyi.html'
+    });
 });
 mui('body').on('tap', '.go_try_order', function() {
-	mui.openWindow({
-		url: base_path + '/probation/try_order?orderId=' + this.getAttribute("proid")
-	})
+    mui.openWindow({
+        url: base_path + '/probation/try_order?orderId=' + this.getAttribute("proid")
+    })
 });
 var isPay = true;
 mui('body').on('tap', '.try-btn-pay', function() {
-	var th = this;
-	if(isPay) {
-		mui(this).button('loading');
-		isPay = false;
-		$.ajax({
-			type: 'post',
-			url: base_path + '/probation/pay',
-			data: {
-				"orderId": th.getAttribute("proid")
-			},
-            xhrFields: {
-                withCredentials: true
+    var th = this;
+    if(isPay) {
+        mui(this).button('loading');
+        isPay = false;
+        $.ajax({
+            type: 'post',
+            url: base_path + '/probation/pay',
+            data: {
+                "orderId": th.getAttribute("proid")
             },
-			dataType: 'json',
-			timeout: 15000,
-			success: function(dt) {
-				if(dt.status) {
-					var obj = JSON.parse("{" + dt.data.info + "}");
-					WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
-						if(res.err_msg == 'get_brand_wcpay_request:ok') {
-							$.ajax({
-								type: 'post',
-								url: base_path + '/probation/check_probation_pay_success',
-								data: {
-									"orderId": th.getAttribute("proid")
-								},
-                                xhrFields: {
-                                    withCredentials: true
+            dataType: 'json',
+            timeout: 15000,
+            success: function(dt) {
+                if(dt.status) {
+                    var obj = JSON.parse("{" + dt.data.info + "}");
+                    WeixinJSBridge.invoke('getBrandWCPayRequest', obj, function(res) {
+                        if(res.err_msg == 'get_brand_wcpay_request:ok') {
+                            $.ajax({
+                                type: 'post',
+                                url: base_path + '/probation/check_probation_pay_success',
+                                data: {
+                                    "orderId": th.getAttribute("proid")
+                                },
+                                dataType: 'json',
+                                timeout: 15000,
+                                success: function(data) {
+                                    if(data.status) {
+                                        if(data.data == 5) {
+                                            mui.alert("支付成功", '', function() {
+                                                mui.openWindow({
+                                                    url: base_path + '/probation/try_order?orderId=' + th.getAttribute("proid")
+                                                })
+                                            })
+                                        } else {
+                                            mui.alert(data.message, '', function() {
+                                                mui(th).button('reset')
+                                            })
+                                        }
+                                    } else {
+                                        mui(th).button('reset');
+                                        mui.alert(data.message)
+                                    }
                                 },
-								dataType: 'json',
-								timeout: 15000,
-								success: function(data) {
-									if(data.status) {
-										if(data.data == 5) {
-											mui.alert("支付成功", '', function() {
-												mui.openWindow({
-													url: base_path + '/probation/try_order?orderId=' + th.getAttribute("proid")
-												})
-											})
-										} else {
-											mui.alert(data.message, '', function() {
-												mui(th).button('reset')
-											})
-										}
-									} else {
-										mui(th).button('reset');
-										mui.alert(data.message)
-									}
-								},
-								error: function(xhr, type, errorThrown) {
-									isPay = true;
-									console.log(xhr);
-									mui(th).button('reset');
-									mui.alert("请检查网络或刷新页面重试！")
-								}
-							})
-						} else {
-							isPay = true;
-							mui(th).button('reset');
-							mui.alert("对不起，支付失败!请稍后重试!")
-						}
-					})
-				} else {
-					mui(th).button('reset');
-					mui.alert(dt.message)
-				}
-			},
-			error: function(xhr, type, errorThrown) {
-				isPay = true;
-				console.log(xhr);
-				mui(th).button('reset');
-				mui.alert("请检查网络或刷新页面重试！")
-			}
-		})
-	} else {
-		mui.alert("正在请求支付中~~请稍后!");
-		return
-	}
+                                error: function(xhr, type, errorThrown) {
+                                    isPay = true;
+                                    console.log(xhr);
+                                    mui(th).button('reset');
+                                    mui.alert("请检查网络或刷新页面重试！")
+                                }
+                            })
+                        } else {
+                            isPay = true;
+                            mui(th).button('reset');
+                            mui.alert("对不起，支付失败!请稍后重试!")
+                        }
+                    })
+                } else {
+                    mui(th).button('reset');
+                    mui.alert(dt.message)
+                }
+            },
+            error: function(xhr, type, errorThrown) {
+                isPay = true;
+                console.log(xhr);
+                mui(th).button('reset');
+                mui.alert("请检查网络或刷新页面重试！")
+            }
+        })
+    } else {
+        mui.alert("正在请求支付中~~请稍后!");
+        return
+    }
 });
 var addTimer = function() {
-	var list = [],
-		interval;
-	return function(id, time) {
-		if(!interval) {
-			interval = setInterval(go, 1000)
-		}
-		list.push({
-			ele: document.getElementById(id),
-			time: time
-		})
-	};
+    var list = [],
+        interval;
+    return function(id, time) {
+        if(!interval) {
+            interval = setInterval(go, 1000)
+        }
+        list.push({
+            ele: document.getElementById(id),
+            time: time
+        })
+    };
 
-	function go() {
-		for(var i = 0; i < list.length; i += 1) {
-			list[i].ele.innerHTML = getTimerString(list[i].time ? list[i].time -= 1 : 0);
-			if(!list[i].time) {
-				list.splice(i--, 1)
-			}
-		}
-	}
+    function go() {
+        for(var i = 0; i < list.length; i += 1) {
+            list[i].ele.innerHTML = getTimerString(list[i].time ? list[i].time -= 1 : 0);
+            if(!list[i].time) {
+                list.splice(i--, 1)
+            }
+        }
+    }
 
-	function getTimerString(time) {
-		d = Math.floor(time / 86400), h = Math.floor((time % 86400) / 3600), m = Math.floor(((time % 86400) % 3600) / 60), s = Math.floor(((time % 86400) % 3600) % 60);
-		if(time > 0) {
-			return d + "天" + h + "时" + m + "分" + s + "秒"
-		} else {
-			return "试用已结束"
-		}
-	}
+    function getTimerString(time) {
+        d = Math.floor(time / 86400), h = Math.floor((time % 86400) / 3600), m = Math.floor(((time % 86400) % 3600) / 60), s = Math.floor(((time % 86400) % 3600) % 60);
+        if(time > 0) {
+            return d + "天" + h + "时" + m + "分" + s + "秒"
+        } else {
+            return "试用已结束"
+        }
+    }
 }();