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

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsDevice.java

@@ -9,13 +9,13 @@ import java.util.Date;
 public class PtsDevice implements Serializable{
     private static final long serialVersionUID = -8892296972992346022L;
     private Integer deviceId;//设备id
-   private String deviceNumber;//设备编号
-   private String deviceName;//设备名称
-   private Date deviceDate;//购买日期
-   private Integer deviceStatus;//设备状态
-   private String deviceRemake;//设备备注
-   private Date deviceCreateTime;//创建时间
-   private Date deviceUpdateTime;//修改时间
+    private String deviceNumber;//设备编号
+    private String deviceName;//设备名称
+    private Date deviceDate;//购买日期
+    private Integer deviceStatus;//设备状态
+    private String deviceRemake;//设备备注
+    private Date deviceCreateTime;//创建时间
+    private Date deviceUpdateTime;//修改时间
 
     public Integer getDeviceId() {
         return deviceId;

wateroPF-common-core/src/main/java/com/iamberry/wechat/core/entity/OrderUtil.java

@@ -12,234 +12,244 @@ import com.iamberry.wechat.core.entity.order.OrderOperation;
 @Component
 public class OrderUtil {
 
-	
-		// 订单状态:下标对应数据库中记录状态, 此用于请求操作时
-		public final String[] orderStatusStrList = 
-			{
-				"quitOrder", "etcOrder", "paySuccess", "returnOrder",
-				"returnOrderSuccess", "sendOrder", "returnOrderEtc", "returnOrderEtcAdmin", "returnOrderThe",
-				"theOrderSuccess", "theOrderSuccessAdmin", "inOrder", "inFinish"
-			};
-		
-		public String[] getOrderStatusStrList() {
-			return orderStatusStrList;
-		}
-		
-		// 订单状态文字，显示给用户看
-		public final String[] orderStatusView = 
-			{
-				"取消订单", "待支付", "已支付、待发货", "退款申请中",
-				"已退款", "已发货", "申请退货中", "退货中", "订单退货，订单关闭" ,
-				"换货中", "换货完成", "申请换货中", "已完成"
-			};
-		
-		// 订单操作状态
-		private final String [] orderActin = 
-			{
-				"quitOrderAction", 			// 取消订单操作
-				"getShopOrderByOrderId",	// 查看订单详情操作
-				"sendOrder", 				// 发货
-				"remark", 					// 订单备注
-				"rejectedRefund", 			// 驳回退款
-				"agreedRefund", 			// 同意退款
-				"rejectedOrder", 			// 同意退货，等等收取货物
-				"agreedOrder", 				// 确认退货
-				"successInOrder", 			// 同意换货
-				"insertPostInfoAndSend", 	// 录入物流信息并发货
-				"rejectedReturn",			//拒绝退货
-				"rejectedInOrder",			//拒绝换货
-				"select_efast_order"		//同步订单状态
-			};
-		
-		public String[] getOrderActin() {
-			return orderActin;
-		}
-		
-		// 加密
-		public final MD5 md5 = new MD5("orderact");
-		
-		// 安全的随机数
-		private AdminUtils adminUtils;
-		public void setAdminUtils(AdminUtils adminUtils) {
-			this.adminUtils = adminUtils;
-		}
-		
-		/**
-		 * 根据订单因为标识，获取订单的数字标识
-		 * @param status
-		 * @return
-		 */
-		public Integer getOrderStatusByStr(String status) {
-			for(int i = 0; i < orderStatusStrList.length; i++) {
-				if (orderStatusStrList[i].equals(status)) {
-					return i;
-				}
-			}
-			return 2;
-		}
-		
-		/**
-		 * 转换订单类型为字母表示
-		 * @param orderStatus
-		 * @return
-		 */
-		public String orderStatusIntToOrderStatusString(Integer orderStatus) {
-			if (orderStatus == null || orderStatus >= orderStatusStrList.length) {
-				return "订单状态有误";
-			}
-			if (orderStatus == -1) {
-				return "allOrder";
-			}
-			return orderStatusStrList[orderStatus];
-		}
-		
-		/**
-		 * 订单状态修改为文字
-		 * @param status
-		 * @return
-		 */
-		public String orderStatusToString(Integer status) {
-			
-			if (status == null || status >= orderStatusView.length) {
-				return "订单状态有误";
-			}
-			
-			if (status == -1) {
-				return "所有订单";
-			}
-			
-			return orderStatusView[status];
-		}
-		
-	/**
-	 * 后台：根据订单状态，获取订单的操作
-	 * @param status
-	 * @return
-	 * @throws Exception 
-	 */
-	public List<OrderOperation> orderStatusToOperation(Integer status, String orderId) throws Exception {
-		if (status == null) {
-			return null;
-		}
-		// 返回的操作
-		List<OrderOperation> operations = new ArrayList<OrderOperation>();
-		// 每个订单默认有查看详情和备注的功能权限
-		OrderOperation orderDesc = new OrderOperation("&#xe60c;", "查看订单详情",
-				"/admin/order/" + orderActin[1] + "/" + orderId);// + "&orderStatus=" + orderStatusStrList[status]
-		operations.add(orderDesc);// 订单详情
-		OrderOperation orderRemank = new OrderOperation("&#xe6de;", "备注",
-				"/admin/order/" + orderActin[3] + "/" + orderId);
-		operations.add(orderRemank);// 订单备注
-		OrderOperation orderSync = new OrderOperation("&#xe60c;", "同步订单状态",  "/admin/order/" + orderActin[12] + "/" + orderId + "/1");
-		operations.add(orderSync);// 订单同步
-		// 根据状态分发权限
-		switch (status) {
-			case 0:
-				return operations;
-			case 1: // 待支付
-				
-				OrderOperation operation1 = new OrderOperation("&#xe60c;", "取消订单" ,
-						"/admin/order/" + orderActin[0] + "/" + orderId + "?orderStatus="
-								+ orderStatusStrList[status] + "&toOrderStatus=quitOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[0] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(operation1);
-			case 2: // 已支付，待发货
-				
-				OrderOperation operation3 = new OrderOperation("&#xe60c;", "发货" ,
-						"/admin/order/" + orderActin[2] + "/" + orderId + "?orderStatus="
-								+ orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[2] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(operation3);
-				return operations;
-			case 3: // 申请退款中
-				
-				OrderOperation returnPay = new OrderOperation("&#xe60c;", "驳回退款" ,
-						"/admin/order/" + orderActin[4] + "/" + orderId + "?orderStatus="
-								+ orderStatusStrList[status] + "&toOrderStatus=paySuccess&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[4] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(returnPay);
-				OrderOperation agreedRefund = new OrderOperation("&#xe60c;", "确认退款" ,
-						"/admin/order/" + orderActin[5] + "/" +orderId + "?orderStatus="
-								+ orderStatusStrList[status] + "&toOrderStatus=returnOrderSuccess&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[5] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(agreedRefund);
-				return operations;
-			case 4: // 无操作权限
-				
-				return operations;
-			case 5: // 无操作权限
-				
-				return operations;
-			case 6: // 申请退货中
-				
-				OrderOperation ruturnOrderError = new OrderOperation("&#xe60c;", "同意退货，等待收货" ,
-						"/admin/order/" + orderActin[6] + "/" + orderId + "?orderStatus=" +
-								orderStatusStrList[status] + "&toOrderStatus=returnOrderEtcAdmin&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[6] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(ruturnOrderError);
-				OrderOperation rejectedReturn = new OrderOperation("&#xe60c;", "驳回退货" ,
-						"/admin/order/" + orderActin[10] + "/" + orderId + "?orderStatus="
-								+ orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[10] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(rejectedReturn);
-				return operations;
-			case 7: // 退货中
-				
-				OrderOperation quitOrderSuccess = new OrderOperation("&#xe60c;", "确认退货，已经收到货物" ,
-						"/admin/order/" + orderActin[7] + "/" + orderId + "?orderStatus="
-								+ orderStatusStrList[status] + "&toOrderStatus=returnOrderThe&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[7] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(quitOrderSuccess);
-				return operations;
-			case 8: // 无操作权限
-				
-				return operations;
-			case 9: // 换货中
-				
-				OrderOperation inOrderSuccess = new OrderOperation("&#xe60c;", "录入物流信息并发货" ,
-						"/admin/order/" + orderActin[9] + "/" + orderId + "?orderStatus="
-								+ orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[9] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(inOrderSuccess);
-				return operations;
-			case 11: // 申请换货
-				
-				OrderOperation inOrder = new OrderOperation("&#xe60c;", "同意换货" ,
-						"/admin/order/" + orderActin[8] + "/" + orderId + "?orderStatus="
-								+ orderStatusStrList[status] + "&toOrderStatus=theOrderSuccess&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[8] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(inOrder);
-				OrderOperation rejectedInOrder = new OrderOperation("&#xe60c;", "驳回换货" ,
-						"/admin/order/" + orderActin[11] + "/" + orderId + "?orderStatus="
-								+ orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[11] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
-				operations.add(rejectedInOrder);
-				return operations;
-				
-			case 12://已完成
-				
-				return operations;
-			default:
-				break;
-		}
-		return operations;
-	}
-	
-	/**
+
+    // 订单状态:下标对应数据库中记录状态, 此用于请求操作时
+    public final String[] orderStatusStrList =
+            {
+                    "quitOrder", "etcOrder", "paySuccess", "returnOrder",
+                    "returnOrderSuccess", "sendOrder", "returnOrderEtc", "returnOrderEtcAdmin", "returnOrderThe",
+                    "theOrderSuccess", "theOrderSuccessAdmin", "inOrder", "inFinish"
+            };
+
+    public String[] getOrderStatusStrList() {
+        return orderStatusStrList;
+    }
+
+    // 订单状态文字，显示给用户看
+    public final String[] orderStatusView =
+            {
+                    "取消订单", "待支付", "已支付、待发货", "退款申请中",
+                    "已退款", "已发货", "申请退货中", "退货中", "订单退货，订单关闭",
+                    "换货中", "换货完成", "申请换货中", "已完成"
+            };
+
+    // 订单操作状态
+    private final String[] orderActin =
+            {
+                    "quitOrderAction",            // 取消订单操作
+                    "getShopOrderByOrderId",    // 查看订单详情操作
+                    "sendOrder",                // 发货
+                    "remark",                    // 订单备注
+                    "rejectedRefund",            // 驳回退款
+                    "agreedRefund",            // 同意退款
+                    "rejectedOrder",            // 同意退货，等等收取货物
+                    "agreedOrder",                // 确认退货
+                    "successInOrder",            // 同意换货
+                    "insertPostInfoAndSend",    // 录入物流信息并发货
+                    "rejectedReturn",            //拒绝退货
+                    "rejectedInOrder",            //拒绝换货
+                    "select_efast_order"        //同步订单状态
+            };
+
+    public String[] getOrderActin() {
+        return orderActin;
+    }
+
+    // 加密
+    public final MD5 md5 = new MD5("orderact");
+
+    // 安全的随机数
+    private AdminUtils adminUtils;
+
+    public void setAdminUtils(AdminUtils adminUtils) {
+        this.adminUtils = adminUtils;
+    }
+
+    /**
+     * 根据订单因为标识，获取订单的数字标识
+     *
+     * @param status
+     * @return
+     */
+    public Integer getOrderStatusByStr(String status) {
+        for (int i = 0; i < orderStatusStrList.length; i++) {
+            if (orderStatusStrList[i].equals(status)) {
+                return i;
+            }
+        }
+        return 2;
+    }
+
+    /**
+     * 转换订单类型为字母表示
+     *
+     * @param orderStatus
+     * @return
+     */
+    public String orderStatusIntToOrderStatusString(Integer orderStatus) {
+        if (orderStatus == null || orderStatus >= orderStatusStrList.length) {
+            return "订单状态有误";
+        }
+        if (orderStatus == -1) {
+            return "allOrder";
+        }
+        return orderStatusStrList[orderStatus];
+    }
+
+    /**
+     * 订单状态修改为文字
+     *
+     * @param status
+     * @return
+     */
+    public String orderStatusToString(Integer status) {
+
+        if (status == null || status >= orderStatusView.length) {
+            return "订单状态有误";
+        }
+
+        if (status == -1) {
+            return "所有订单";
+        }
+
+        return orderStatusView[status];
+    }
+
+    /**
+     * 后台：根据订单状态，获取订单的操作
+     *
+     * @param status
+     * @return
+     * @throws Exception
+     */
+    public List<OrderOperation> orderStatusToOperation(Integer status, String orderId) throws Exception {
+        if (status == null) {
+            return null;
+        }
+        // 返回的操作
+        List<OrderOperation> operations = new ArrayList<OrderOperation>();
+        // 每个订单默认有查看详情和备注的功能权限
+        OrderOperation orderDesc = new OrderOperation("&#xe60c;", "查看订单详情",
+                "/admin/order/" + orderActin[1] + "/" + orderId);// + "&orderStatus=" + orderStatusStrList[status]
+        operations.add(orderDesc);// 订单详情
+        OrderOperation orderRemank = new OrderOperation("&#xe6de;", "备注",
+                "/admin/order/" + orderActin[3] + "/" + orderId);
+        operations.add(orderRemank);// 订单备注
+
+        // 根据状态分发权限
+        switch (status) {
+            case 0:
+                return operations;
+            case 1: // 待支付
+
+                OrderOperation operation1 = new OrderOperation("&#xe60c;", "取消订单",
+                        "/admin/order/" + orderActin[0] + "/" + orderId + "?orderStatus="
+                                + orderStatusStrList[status] + "&toOrderStatus=quitOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[0] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(operation1);
+                return operations;
+            case 2: // 已支付，待发货
+
+                OrderOperation operation3 = new OrderOperation("&#xe60c;", "发货",
+                        "/admin/order/" + orderActin[2] + "/" + orderId + "?orderStatus="
+                                + orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[2] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(operation3);
+
+                OrderOperation orderSync = new OrderOperation("&#xe60c;", "同步订单状态", "/admin/order/" + orderActin[12] + "/" + orderId + "/1");
+                operations.add(orderSync);// 订单同步
+
+                return operations;
+            case 3: // 申请退款中
+
+                OrderOperation returnPay = new OrderOperation("&#xe60c;", "驳回退款",
+                        "/admin/order/" + orderActin[4] + "/" + orderId + "?orderStatus="
+                                + orderStatusStrList[status] + "&toOrderStatus=paySuccess&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[4] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(returnPay);
+                OrderOperation agreedRefund = new OrderOperation("&#xe60c;", "确认退款",
+                        "/admin/order/" + orderActin[5] + "/" + orderId + "?orderStatus="
+                                + orderStatusStrList[status] + "&toOrderStatus=returnOrderSuccess&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[5] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(agreedRefund);
+                return operations;
+            case 4: // 无操作权限
+
+                return operations;
+            case 5: // 无操作权限
+
+                return operations;
+            case 6: // 申请退货中
+
+                OrderOperation ruturnOrderError = new OrderOperation("&#xe60c;", "同意退货，等待收货",
+                        "/admin/order/" + orderActin[6] + "/" + orderId + "?orderStatus=" +
+                                orderStatusStrList[status] + "&toOrderStatus=returnOrderEtcAdmin&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[6] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(ruturnOrderError);
+                OrderOperation rejectedReturn = new OrderOperation("&#xe60c;", "驳回退货",
+                        "/admin/order/" + orderActin[10] + "/" + orderId + "?orderStatus="
+                                + orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[10] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(rejectedReturn);
+                return operations;
+            case 7: // 退货中
+
+                OrderOperation quitOrderSuccess = new OrderOperation("&#xe60c;", "确认退货，已经收到货物",
+                        "/admin/order/" + orderActin[7] + "/" + orderId + "?orderStatus="
+                                + orderStatusStrList[status] + "&toOrderStatus=returnOrderThe&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[7] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(quitOrderSuccess);
+                return operations;
+            case 8: // 无操作权限
+
+                return operations;
+            case 9: // 换货中
+
+                OrderOperation inOrderSuccess = new OrderOperation("&#xe60c;", "录入物流信息并发货",
+                        "/admin/order/" + orderActin[9] + "/" + orderId + "?orderStatus="
+                                + orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[9] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(inOrderSuccess);
+                return operations;
+            case 11: // 申请换货
+
+                OrderOperation inOrder = new OrderOperation("&#xe60c;", "同意换货",
+                        "/admin/order/" + orderActin[8] + "/" + orderId + "?orderStatus="
+                                + orderStatusStrList[status] + "&toOrderStatus=theOrderSuccess&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[8] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(inOrder);
+                OrderOperation rejectedInOrder = new OrderOperation("&#xe60c;", "驳回换货",
+                        "/admin/order/" + orderActin[11] + "/" + orderId + "?orderStatus="
+                                + orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[11] + "-"
+                                + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                operations.add(rejectedInOrder);
+                return operations;
+
+            case 12://已完成
+
+                return operations;
+            default:
+                break;
+        }
+        return operations;
+    }
+
+    /**
      * 后台：根据租赁订单状态，获取租赁订单的操作
+     *
      * @param status
      * @return
-     * @throws Exception 
+     * @throws Exception
      */
     public List<OrderOperation> rentOrderStatusToOperation(Integer status, String orderId) throws Exception {
         if (status == null) {
@@ -248,42 +258,42 @@ public class OrderUtil {
         // 返回的操作
         List<OrderOperation> operations = new ArrayList<OrderOperation>();
         // 每个订单默认有查看详情和备注的功能权限
-        OrderOperation orderDesc = new OrderOperation("&#xe60c;", "查看订单详情",  "/admin/rent_order/" + orderActin[1] + "/" + orderId);// + "&orderStatus=" + orderStatusStrList[status]
+        OrderOperation orderDesc = new OrderOperation("&#xe60c;", "查看订单详情", "/admin/rent_order/" + orderActin[1] + "/" + orderId);// + "&orderStatus=" + orderStatusStrList[status]
         operations.add(orderDesc);// 订单详情
-        OrderOperation orderRemank = new OrderOperation("&#xe6de;", "备注",  "/admin/rent_order/" + orderActin[3] + "/" + orderId);
+        OrderOperation orderRemank = new OrderOperation("&#xe6de;", "备注", "/admin/rent_order/" + orderActin[3] + "/" + orderId);
         operations.add(orderRemank);// 订单备注
-		OrderOperation orderSync = new OrderOperation("&#xe60c;", "同步订单状态",  "/admin/rent/efast/" + orderActin[12] + "/" + orderId + "/1");
-		operations.add(orderSync);// 订单同步
+        OrderOperation orderSync = new OrderOperation("&#xe60c;", "同步订单状态", "/admin/rent/efast/" + orderActin[12] + "/" + orderId + "/1");
+        operations.add(orderSync);// 订单同步
         // 根据状态分发权限
         switch (status) {
             case 0:
                 return operations;
             case 1: // 待支付
-                OrderOperation operation1 = new OrderOperation("&#xe60c;", "取消订单" ,
-						"/admin/rent_order/" + orderActin[0]
-						+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=quitOrder&osid="
-						+ md5.encrypt(orderId + "_" + orderActin[0] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                OrderOperation operation1 = new OrderOperation("&#xe60c;", "取消订单",
+                        "/admin/rent_order/" + orderActin[0]
+                                + "/" + orderId + "?orderStatus=" + orderStatusStrList[status] + "&toOrderStatus=quitOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[0] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(operation1);
             case 2: // 已支付，待发货
-                OrderOperation operation3 = new OrderOperation("&#xe60c;", "发货" ,
-						"/admin/rent_order/" + orderActin[2] +
-								"/" + orderId + "?orderStatus=" + orderStatusStrList[status]
-								+ "&toOrderStatus=sendOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[2] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                OrderOperation operation3 = new OrderOperation("&#xe60c;", "发货",
+                        "/admin/rent_order/" + orderActin[2] +
+                                "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+                                + "&toOrderStatus=sendOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[2] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(operation3);
                 return operations;
             case 3: // 申请退款中
-                OrderOperation returnPay = new OrderOperation("&#xe60c;", "驳回退款" ,
-						"/admin/rent_order/" + orderActin[4]
-								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
-								+ "&toOrderStatus=paySuccess&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[4] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                OrderOperation returnPay = new OrderOperation("&#xe60c;", "驳回退款",
+                        "/admin/rent_order/" + orderActin[4]
+                                + "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+                                + "&toOrderStatus=paySuccess&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[4] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(returnPay);
-                OrderOperation agreedRefund = new OrderOperation("&#xe60c;", "确认退款" ,
-						"/admin/rent_order/" + orderActin[5]
-								+ "/" +orderId + "?orderStatus=" + orderStatusStrList[status]
-								+ "&toOrderStatus=returnOrderSuccess&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[5] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                OrderOperation agreedRefund = new OrderOperation("&#xe60c;", "确认退款",
+                        "/admin/rent_order/" + orderActin[5]
+                                + "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+                                + "&toOrderStatus=returnOrderSuccess&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[5] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(agreedRefund);
                 return operations;
             case 4: // 无操作权限
@@ -291,49 +301,49 @@ public class OrderUtil {
             case 5: // 无操作权限
                 return operations;
             case 6: // 申请退货中
-                OrderOperation ruturnOrderError = new OrderOperation("&#xe60c;", "同意退货，等待收货" ,
-						"/admin/rent_order/" + orderActin[6]
-								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
-								+ "&toOrderStatus=returnOrderEtcAdmin&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[6] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                OrderOperation ruturnOrderError = new OrderOperation("&#xe60c;", "同意退货，等待收货",
+                        "/admin/rent_order/" + orderActin[6]
+                                + "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+                                + "&toOrderStatus=returnOrderEtcAdmin&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[6] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(ruturnOrderError);
-                OrderOperation rejectedReturn = new OrderOperation("&#xe60c;", "驳回退货" ,
-						"/admin/rent_order/" + orderActin[10]
-								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
-								+ "&toOrderStatus=sendOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[10] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                OrderOperation rejectedReturn = new OrderOperation("&#xe60c;", "驳回退货",
+                        "/admin/rent_order/" + orderActin[10]
+                                + "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+                                + "&toOrderStatus=sendOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[10] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(rejectedReturn);
                 return operations;
             case 7: // 退货中
-                OrderOperation quitOrderSuccess = new OrderOperation("&#xe60c;", "确认退货，已经收到货物" ,
-						"/admin/rent_order/" + orderActin[7]
-								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
-								+ "&toOrderStatus=returnOrderThe&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[7] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                OrderOperation quitOrderSuccess = new OrderOperation("&#xe60c;", "确认退货，已经收到货物",
+                        "/admin/rent_order/" + orderActin[7]
+                                + "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+                                + "&toOrderStatus=returnOrderThe&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[7] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(quitOrderSuccess);
                 return operations;
             case 8: // 无操作权限
                 return operations;
             case 9: // 换货中
                 OrderOperation inOrderSuccess = new OrderOperation("&#xe60c;", "录入物流信息并发货",
-						"/admin/rent_order/" + orderActin[9]
-								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
-								+ "&toOrderStatus=sendOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[9] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                        "/admin/rent_order/" + orderActin[9]
+                                + "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+                                + "&toOrderStatus=sendOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[9] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(inOrderSuccess);
                 return operations;
             case 11: // 申请换货
-                OrderOperation inOrder = new OrderOperation("&#xe60c;", "同意换货" ,
-						"/admin/rent_order/" + orderActin[8]
-								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
-								+ "&toOrderStatus=theOrderSuccess&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[8] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                OrderOperation inOrder = new OrderOperation("&#xe60c;", "同意换货",
+                        "/admin/rent_order/" + orderActin[8]
+                                + "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+                                + "&toOrderStatus=theOrderSuccess&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[8] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(inOrder);
-                OrderOperation rejectedInOrder = new OrderOperation("&#xe60c;", "驳回换货" ,
-						"/admin/rent_order/" + orderActin[11]
-								+ "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
-								+ "&toOrderStatus=sendOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[11] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
+                OrderOperation rejectedInOrder = new OrderOperation("&#xe60c;", "驳回换货",
+                        "/admin/rent_order/" + orderActin[11]
+                                + "/" + orderId + "?orderStatus=" + orderStatusStrList[status]
+                                + "&toOrderStatus=sendOrder&osid="
+                                + md5.encrypt(orderId + "_" + orderActin[11] + "-" + adminUtils.byte2hex(adminUtils.createRandomByte())));
                 operations.add(rejectedInOrder);
                 return operations;
             case 12://已完成

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

@@ -1,162 +1,162 @@
 <!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="//s.iamberry.com/wateroPF/css/mui.min.css?v=2016111701" />
-		<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/new/css/iconfont.css?v=2017081001" />
-		<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/css/icons-extra.css?v=2016111701"/>
-		<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/new/css/style.css?v=2017081001" />
-		<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/new/css/chanpin_details.css?v=2017081001" />
-		<style>
-			.color-list>button{margin: 0 10px 10px 0;}
-			.color-list .blue{border:1px solid #ccc;padding: 12px 12px 12px 45px; background: url(http://s.iamberry.com/wateroPF/new/images/shop/rent_blue_1.png) 5px center no-repeat;background-size:auto 80%;color:#999;}
-			.color-list .blue.active{border:1px solid #59c0d9;color:#37bcdc;background-color: #eafafe;}
-			.color-list .red{border:1px solid #ccc;padding: 12px 12px 12px 45px; background: url(http://s.iamberry.com/wateroPF/new/images/shop/rent_red_1.png) 5px center no-repeat;background-size:auto 80%;color:#999;}
-			.color-list .red.active{border:1px solid #ff8da9;color:#f8527b;background-color: #ffeef2;}
-			.color-list .black{border:1px solid #ccc;padding: 12px 12px 12px 45px; background: url(http://s.iamberry.com/wateroPF/new/images/shop/rent_black_1.png) 5px center no-repeat;background-size:auto 80%;color:#999;}
-			.color-list .black.active{border:1px solid #a1a1a1;color:#565555;background-color: #edecec;}
-		</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="//s.iamberry.com/wateroPF/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/new/css/iconfont.css?v=2017081001" />
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/css/icons-extra.css?v=2016111701"/>
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/new/css/style.css?v=2017081001" />
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/new/css/chanpin_details.css?v=2017081001" />
+	<style>
+		.color-list>button{margin: 0 10px 10px 0;}
+		.color-list .blue{border:1px solid #ccc;padding: 12px 12px 12px 45px; background: url(http://s.iamberry.com/wateroPF/new/images/shop/rent_blue_1.png) 5px center no-repeat;background-size:auto 80%;color:#999;}
+		.color-list .blue.active{border:1px solid #59c0d9;color:#37bcdc;background-color: #eafafe;}
+		.color-list .red{border:1px solid #ccc;padding: 12px 12px 12px 45px; background: url(http://s.iamberry.com/wateroPF/new/images/shop/rent_red_1.png) 5px center no-repeat;background-size:auto 80%;color:#999;}
+		.color-list .red.active{border:1px solid #ff8da9;color:#f8527b;background-color: #ffeef2;}
+		.color-list .black{border:1px solid #ccc;padding: 12px 12px 12px 45px; background: url(http://s.iamberry.com/wateroPF/new/images/shop/rent_black_1.png) 5px center no-repeat;background-size:auto 80%;color:#999;}
+		.color-list .black.active{border:1px solid #a1a1a1;color:#565555;background-color: #edecec;}
+	</style>
+	<script type="text/javascript" src="http://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 class="mui-segmented-control tab-with-chanpin-nav">
+		<a class="mui-control-item mui-active" href="#item1" id="item1_qrcode" style="display: none">
+			<span class="mui-tab-label">产品详情</span>
+		</a>
+		<a class="mui-control-item" href="#item2" id="item2_qrcode" style="display: none">
+			<span class="mui-tab-label">优惠二维码</span>
+		</a>
+		<a class="mui-control-item" href="#item3" id="item3_qrcode" style="display: none">
+			<span class="mui-tab-label">购买二维码</span>
+		</a>
+	</div>
+	<div id="item1" class="mui-control-content mui-active" style="margin-top: 0px;">
+		<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 class="mui-segmented-control tab-with-chanpin-nav">
-				<a class="mui-control-item mui-active" href="#item1" id="item1_qrcode" style="display: none">
-					<span class="mui-tab-label">产品详情</span>
-				</a>
-				<a class="mui-control-item" href="#item2" id="item2_qrcode" style="display: none">
-					<span class="mui-tab-label">优惠二维码</span>
-				</a>
-				<a class="mui-control-item" href="#item3" id="item3_qrcode" style="display: none">
-					<span class="mui-tab-label">购买二维码</span>
-				</a>
-			</div>
-			<div id="item1" class="mui-control-content mui-active" style="margin-top: 0px;">
-			<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-fenxiang1 ft-18"></span>
-				</div>
+		<div class="food-tt">
+			<div><font id="product-name-font">加载中...</font><span class="iconfont icon-baoyou cl-baoyou"></span>
 			</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 class="share_wechat">
+				<span class="iconfont icon-fenxiang1 ft-18"></span>
 			</div>
-			
-				<div class="chanpin-ditails-dic">
-					<ul>
-						<li class="color-list">
-							<button type="button" class="blue chanpin_details" proid="59" colorid="41">蓝色款</button><button type="button" class="red chanpin_details" proid="56" colorid="37">红色款</button><button type="button" class="black chanpin_details" proid="57" colorid="39">黑色款</button>
-						</li>
-						<!-- 产品参数图 -->
-						<li id="product-param-img">
+		</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 class="color-list">
+					<button type="button" class="blue chanpin_details" proid="59" colorid="41">蓝色款</button><button type="button" class="red chanpin_details" proid="56" colorid="37">红色款</button><button type="button" class="black chanpin_details" proid="57" colorid="39">黑色款</button>
+				</li>
+				<!-- 产品参数图 -->
+				<li id="product-param-img">
                             <span id="youhui_img">
 							    <img src="//s.iamberry.com/wateroPF/new/images/2017-08-10-01.jpg" style="margin-bottom: 15px;"/>
                             </span>
-						</li>
-					</ul>
-				</div>
-				<div class="buy-footer">
-					<div class="go_index">
-						<img id="add_cart_logo_div" src="http://s.iamberry.com/wateroPF/images/shop/logo.png" />
-					</div>
-					<div id="add-cart-div" >加入购物车</div>
-					<div id="shopp-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>
+				</li>
+			</ul>
+		</div>
+		<div class="buy-footer">
+			<div class="go_index">
+				<img id="add_cart_logo_div" src="http://s.iamberry.com/wateroPF/images/shop/logo.png" />
 			</div>
-			<!-- 优惠二维码 -->
-			<div id="item2" class="mui-control-content">
-				<div class="mui-text-center">二维码功能</div>
-				<ul style="margin:20px 0 0 20px;">
-					<li class="mui-h5">1、用户扫描后，将会与你绑定返利关系</li>
-					<li class="mui-h5">2、用户购买水机即赠送滤芯（t1 t2 t3 t4）各一支</li>
-				</ul>
-				<div>
-					<div style="width: 60%;margin: 40px auto 0 auto;padding: 10px;border: 1px solid #55c0dc;">
-					<img id="item2_img" width="100%" src="//s.iamberry.com/wateroPF/new/images/daili-2wm.png"/>
-					</div>
-				</div>
-				<div class="mui-h5 mui-text-center" style="padding: 10px 0;">长按二维码保存本地</div>
+			<div id="add-cart-div" >加入购物车</div>
+			<div id="shopp-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>
+	</div>
+	<!-- 优惠二维码 -->
+	<div id="item2" class="mui-control-content">
+		<div class="mui-text-center">二维码功能</div>
+		<ul style="margin:20px 0 0 20px;">
+			<li class="mui-h5">1、用户扫描后，将会与你绑定返利关系</li>
+			<li class="mui-h5">2、用户购买水机即赠送滤芯（t1 t2 t3 t4）各一支</li>
+		</ul>
+		<div>
+			<div style="width: 60%;margin: 40px auto 0 auto;padding: 10px;border: 1px solid #55c0dc;">
+				<img id="item2_img" width="100%" src="//s.iamberry.com/wateroPF/new/images/daili-2wm.png"/>
 			</div>
-			<!-- 购买二维码 -->
-			<div id="item3" class="mui-control-content">
-				<div class="mui-text-center">二维码功能</div>
-				<ul style="margin:20px 0 0 20px;">
-					<li class="mui-h5">1、用户扫描后，将会与你绑定返利关系</li>
-				</ul>
-				<div>
-					<div style="width: 60%;margin: 40px auto 0 auto;padding: 10px;border: 1px solid #55c0dc;">
-						<img id="item3_img" width="100%" src="//s.iamberry.com/wateroPF/new/images/daili-2wm.png"/>
-					</div>
-				</div>
-				<div class="mui-h5 mui-text-center" style="padding: 10px 0;">长按二维码保存本地</div>
+		</div>
+		<div class="mui-h5 mui-text-center" style="padding: 10px 0;">长按二维码保存本地</div>
+	</div>
+	<!-- 购买二维码 -->
+	<div id="item3" class="mui-control-content">
+		<div class="mui-text-center">二维码功能</div>
+		<ul style="margin:20px 0 0 20px;">
+			<li class="mui-h5">1、用户扫描后，将会与你绑定返利关系</li>
+		</ul>
+		<div>
+			<div style="width: 60%;margin: 40px auto 0 auto;padding: 10px;border: 1px solid #55c0dc;">
+				<img id="item3_img" width="100%" src="//s.iamberry.com/wateroPF/new/images/daili-2wm.png"/>
 			</div>
-					
-				
-
 		</div>
-		<div id="dalog_guanzhu" style="background-color: rgba(0,0,0,.5);position: fixed;width: 100%;height: 100%;left: 0;top: 0;bottom: 0;right: 0;z-index: 99;display: none;">
-			<div style="position: absolute;width: 300px;left: 50%;top: 45%;-webkit-transform: translateX(-50%) translateY(-50%);">
-				<div style="position: relative">
-				<img width="100%" src="/wateroPF/common/shop/images/dalog_guanzhu.png"/>
-					<div style="position: absolute;top: 35%;width: 50%;left: 25%;">
-						<img width="100%" style="display: block;" src="http://s.iamberry.com/wateroPF/images/system_qrcode.jpg" />
-						<div style="text-align: center;font-size: 12px;color: #999;">长按二维码识别关注</div>
-						<div style="text-align: center;">
-							<button type="button" style="width:90%;margin-top: 10px;color: #999;;" id="close_dalog">下次关注</button>
-						</div>
-					</div>
+		<div class="mui-h5 mui-text-center" style="padding: 10px 0;">长按二维码保存本地</div>
+	</div>
+
+
+
+</div>
+<div id="dalog_guanzhu" style="background-color: rgba(0,0,0,.5);position: fixed;width: 100%;height: 100%;left: 0;top: 0;bottom: 0;right: 0;z-index: 99;display: none;">
+	<div style="position: absolute;width: 300px;left: 50%;top: 45%;-webkit-transform: translateX(-50%) translateY(-50%);">
+		<div style="position: relative">
+			<img width="100%" src="//s.iamberry.com/wateroPF/new/images/dalog_guanzhu.png"/>
+			<div style="position: absolute;top: 35%;width: 50%;left: 25%;">
+				<img width="100%" style="display: block;" src="http://s.iamberry.com/wateroPF/images/system_qrcode.jpg" />
+				<div style="text-align: center;font-size: 12px;color: #999;">长按二维码识别关注</div>
+				<div style="text-align: center;">
+					<button type="button" style="width:90%;margin-top: 10px;color: #999;;" id="close_dalog">下次关注</button>
 				</div>
 			</div>
 		</div>
-		<script src="//s.iamberry.com/wateroPF/js/mui.min.js?v=2016111701"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2016111701"></script>
-		<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
-		<script src="/wateroPF/common/shop/js/page/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%");
-			}
-            mui('body').on('tap', '#close_dalog', function() {
-                $("#dalog_guanzhu").hide();
-                window.close();
-			});
-            $(document).on('tap', '.color-list>button', function() {
-                $(this).addClass("active").siblings().removeClass("active");
-            });
-		</script>
-	</body>
+	</div>
+</div>
+<script src="//s.iamberry.com/wateroPF/js/mui.min.js?v=2016111701"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2016111701"></script>
+<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/wateroPF/new/js/page/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%");
+    }
+    mui('body').on('tap', '#close_dalog', function() {
+        $("#dalog_guanzhu").hide();
+        window.close();
+    });
+    $(document).on('tap', '.color-list>button', function() {
+        $(this).addClass("active").siblings().removeClass("active");
+    });
+</script>
+</body>
 </html>

wateroPF-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="//s.iamberry.com/wateroPF/css/mui.min.css?v=2016111701" />
-		<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/css/iconfont.css?v=2016111701" />
-		<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/new/css/style.css?v=2017080101" />
-		<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="//s.iamberry.com/wateroPF/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/new/css/style.css?v=2017080101" />
+	<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="http://static.iamberry.com/wateroPF/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="mui-tab-label muying">母婴款</span>
-			</a>-->
-			<a class="mui-control-item mui-active">
-				<span class="mui-tab-label jingying">精英款</span>
-			</a>
-			<!--<a class="mui-control-item  mui-active">
-				<span class="mui-tab-label dingzhi">经典款</span>
-			</a>-->
-			<a class="mui-control-item">
-				<span class="mui-tab-label filter">配件</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="http://s.iamberry.com/wateroPF/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="mui-tab-label muying">母婴款</span>
+    </a>-->
+	<a class="mui-control-item mui-active">
+		<span class="mui-tab-label jingying">精英款</span>
+	</a>
+	<!--<a class="mui-control-item  mui-active">
+        <span class="mui-tab-label dingzhi">经典款</span>
+    </a>-->
+	<a class="mui-control-item">
+		<span class="mui-tab-label filter">配件</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="//s.iamberry.com/wateroPF/js/mui.min.js?v=2016111701"></script>
-		<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2017030601"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/validate.js?v=2016111701"></script>
-		<script src="//s.iamberry.com/wateroPF/new/js/page/chanpin_list.js"></script>
-	</body>
+		</ul>
+	</div>
+</div>
+<script src="//s.iamberry.com/wateroPF/js/mui.min.js?v=2016111701"></script>
+<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2017030601"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/validate.js?v=2016111701"></script>
+<script src="//s.iamberry.com/wateroPF/new/js/page/chanpin_list.js"></script>
+</body>
 </html>

wateroPF-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="//s.iamberry.com/wateroPF/css/mui.min.css?v=2016111701" />
-		<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/css/iconfont.css?v=2016111701" />
-		<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/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(http://static.iamberry.com/wateroPF/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(http://static.iamberry.com/wateroPF/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="//s.iamberry.com/wateroPF/css/mui.min.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/css/iconfont.css?v=2016111701" />
+	<link rel="stylesheet" type="text/css" href="//s.iamberry.com/wateroPF/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(http://s.iamberry.com/wateroPF/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(http://s.iamberry.com/wateroPF/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="//s.iamberry.com/wateroPF/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">
+		&nbsp;&nbsp;加载中...
+	</div>
+</div>
+<div class="mui-content">
+	<div class="gwc_null">
+		<img src="//s.iamberry.com/wateroPF/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,47 +58,47 @@
 				<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="//s.iamberry.com/wateroPF/images/shop/jiao1.png" /></span>
-				<span class="right"><img src="//s.iamberry.com/wateroPF/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>
+		</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="//s.iamberry.com/wateroPF/js/mui.min.js?v=2017030101"></script>
-		<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2017030101"></script>
-		<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
-		<!--<script src="http://static.iamberry.com/wateroPF/js/shop/shopping_cart.js?v=2017030801"></script>-->
-		<script src="/wateroPF/common/shop/js/page/shopping_cart.js?v=2017030801"></script>
-	</body>
+
+	</div>
+	<div class="shoping-tt">
+		<span class="left"><img src="//s.iamberry.com/wateroPF/images/shop/jiao1.png" /></span>
+		<span class="right"><img src="//s.iamberry.com/wateroPF/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/wateroPF/js/mui.min.js?v=2017030101"></script>
+<script src="//s.iamberry.com/wateroPF/js/jquery-2.1.1.min.js"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/main.js?v=2017030101"></script>
+<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
+<!--<script src="http://static.iamberry.com/wateroPF/js/shop/shopping_cart.js?v=2017030801"></script>-->
+<script src="//s.iamberry.com/wateroPF/new/js/page/shopping_cart.js?v=2017030801"></script>
+</body>
 
 </html>