watero框架更新

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/AdminUtils.java

@@ -18,7 +18,7 @@ import com.iamberry.app.tool.log.RatFWLogger;
 import com.iamberry.wechat.core.entity.admin.AdminLoginDTO;
 
 @Component
-@Deprecated
+//@Deprecated
 public class AdminUtils {
 	
 	public static void addAdminUserToSession(Object object, HttpServletRequest request) {

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

@@ -3,6 +3,7 @@ package com.iamberry.wechat.core.entity;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.iamberry.app.tool.des.MD5;
@@ -60,6 +61,7 @@ public class OrderUtil {
 		public final MD5 md5 = new MD5("orderact");
 		
 		// 安全的随机数
+		@Autowired
 		private AdminUtils adminUtils;
 		public void setAdminUtils(AdminUtils adminUtils) {
 			this.adminUtils = adminUtils;
@@ -146,12 +148,12 @@ public class OrderUtil {
 								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
 				operations.add(operation1);
 			case 2: // 已支付，待发货
-				
+				byte[] by = adminUtils.createRandomByte();
+				String md5x = md5.encrypt(orderId + "_" + orderActin[2] + "-"+ adminUtils.byte2hex(by));
 				OrderOperation operation3 = new OrderOperation("", "发货" ,
 						"/admin/order/" + orderActin[2] + "/" + orderId + "?orderStatus="
 								+ orderStatusStrList[status] + "&toOrderStatus=sendOrder&osid="
-								+ md5.encrypt(orderId + "_" + orderActin[2] + "-"
-								+ adminUtils.byte2hex(adminUtils.createRandomByte())));
+								+ md5x);
 				operations.add(operation3);
 				return operations;
 			case 3: // 申请退款中

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/member/Member.java

@@ -31,6 +31,7 @@ public class Member implements Serializable{
 	@DateTimeFormat(pattern="yyyy-MM-dd")
 	@JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
 	private Date userBirthDate;				//生日
+	private String userBirthDateStr;			//生日
 	private Date userCreateDate;			//创建时间
 	
 	private Integer userIdentity;			//会员身份			1:会员   2:微代理
@@ -283,6 +284,14 @@ public class Member implements Serializable{
 		this.userPendIntegral = userPendIntegral;
 	}
 
+	public String getUserBirthDateStr() {
+		return userBirthDateStr;
+	}
+
+	public void setUserBirthDateStr(String userBirthDateStr) {
+		this.userBirthDateStr = userBirthDateStr;
+	}
+
 	@Override
 	public String toString() {
 		return "Member [userId=" + userId + ", userOpenid=" + userOpenid

watero-wechat-service/src/main/java/com/iamberry/wechat/service/ActivityUtil.java

@@ -114,8 +114,8 @@ public class ActivityUtil {
             return ;
         }
         Promotions promotions = promotionsService.getPromotionsListByTime();
+        this.getColorSpikePriv(cartDtoList,promotions); //必须要先执行秒杀，否则秒杀与赠品想冲突
         this.giftCartPriv(cartDtoList,promotions);
-        this.getColorSpikePriv(cartDtoList,promotions);
     }
 
     /**

watero-wechat-service/src/main/java/com/iamberry/wechat/service/giftCard/GiftCardServiceImpl.java

@@ -152,12 +152,12 @@ public class GiftCardServiceImpl implements GiftCardService {
 		orderData.put("district_name", addressDesc[2]);                                    // 区域
 		orderData.put("postalcode", machineInfo.getUserMachineAddressPostalcode());     // 邮政编码
 		orderData.put("email", "");                                                         // email
-		orderData.put("goods_amount", productColor.getColorDiscount() / 100);                    // 商品总价
+		orderData.put("goods_amount", 0);                    // 商品总价
 		orderData.put("goods_count", 1);                                        // 产品数量
 		orderData.put("mobile", machineInfo.getUserMachineAddressTel());                            // 手机号码
-		orderData.put("money_paid", productColor.getColorDiscount() / 100);                                        // 已付款
+		orderData.put("money_paid", 0);                                        // 已付款
 		orderData.put("oid", "DH00000000" + machineInfo.getUserMachineId());                                    // 订单号
-		orderData.put("order_amount", productColor.getColorDiscount() / 100);                                    // 应付款,应付款金额要与已付款金额相同
+		orderData.put("order_amount", 0);                                    // 应付款,应付款金额要与已付款金额相同
 		/**
 		 * 产品信息
 		 */
@@ -165,22 +165,23 @@ public class GiftCardServiceImpl implements GiftCardService {
 			Map<String, Object> orders1 = new HashMap<String, Object>();
 			orders1.put("goods_name", "【美国watero】净饮水一体机");                            // 产品名称
 			orders1.put("goods_number", 1);                                    // 产品数量
-			orders1.put("goods_price", productColor.getColorDiscount() / 100);                    // 产品原价
+			orders1.put("goods_price", 0);                    // 产品原价
+			orders1.put("goods_discount", 0);                    // 产品原价
+			orders1.put("goods_total", 0);                    // 产品原价
 			orders1.put("outer_sku", productColor.getColor69Code());                                // 产品SKU
-			orders1.put("payment_ft", productColor.getColorDiscount() / 100);                // 产品分摊价
+			orders1.put("payment_ft", 0);                // 产品分摊价
 			maps.add(orders1);
 		orderData.put("orders", maps);                                                    // 订单产品
 		orderData.put("pay_name", "weixinpay");                                            // 支付方式
 		orderData.put("pay_time", DateTimeUtil.format(new Date()));// 支付时间
-		orderData.put("postscript","礼品卡提货");                        // 买家留言
+		orderData.put("postscript","礼品卡提货-价格为0");                        // 买家留言
 		orderData.put("province_name", provinceName);                                    // 省份
 		orderData.put("sd_id", sd_id);                                                    // 对应 efast 店铺 id
 		orderData.put("shipping_fee", 0);                                                // 快递费
 		orderData.put("shipping_name", "yto");                                            // 快递公司代码
 		orderData.put("tel", machineInfo.getUserMachineAddressTel());                                            // 我司电话
-		orderData.put("to_buyer", "");                                                    // 商家备注
-		//orderData.put("total_amount", (order.getSalesAmount()/100.0));					// 订单总额
-		orderData.put("total_amount", (productColor.getColorDiscount() / 100));                    // 订单总额
+		orderData.put("to_buyer", "礼品卡提货-价格为0");                                                    // 商家备注
+		orderData.put("total_amount", 0);                    // 订单总额
 		orderData.put("user_name", machineInfo.getUserMachineOpenId());                            // 买家账户   百胜根据user_name来判断是否有重复，传openId是为了防止重复
 		orderData.put("zipcode", "000000");                        // 邮编
 

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/MemberMapper.java

@@ -146,4 +146,10 @@ public interface MemberMapper {
 	 * @return
 	 */
 	List<Member> getNoRegister(Member member);
+
+	/**
+	 *获取member
+	 * @return
+	 */
+	Member getMemberByUserOpenIdForUpdate(String openId);
 }

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

@@ -410,4 +410,11 @@
 		AND user_is_vip = 1
 	</select>
 
+	<!-- 	根据openid查询会员信息 -->
+	<select id="getMemberByUserOpenIdForUpdate" resultType="Member" parameterType="String">
+		SELECT
+			<include refid="allField"/>
+		FROM TB_IAMBERRY_USER_USERINFO
+		WHERE user_openid = #{userOpenid} for update
+	</select>
 </mapper> 

watero-wechat-service/src/main/java/com/iamberry/wechat/service/member/MemberServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 
+import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.admin.FullReduction;
 import com.iamberry.wechat.core.entity.coupon.CouponItem;
 import com.iamberry.wechat.core.entity.coupon.CouponItemDto;
@@ -31,6 +32,7 @@ import com.iamberry.wechat.service.member.dao.MemberDao;
 import com.iamberry.wechat.service.relationship.Dao.WdRelationDao;
 import com.iamberry.wechat.service.system.dao.SystemDao;
 import com.iamberry.wechat.tools.StaticInfo;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 会员信息 service 实现
@@ -99,7 +101,13 @@ public class MemberServiceImpl implements MemberService {
 	}
 
 	@Override
+	@Transactional
 	public Integer becomeVipByOpenId(Member member) {
+		Member m = memberDao.getMemberByUserOpenIdForUpdate(member.getUserOpenid());
+		if(m.getUserIsVip() == 2 && m.getUserArrange() == 1){
+			throw new RuntimeException("已经是会员了");
+		}
+
 		Integer flag = memberDao.becomeVipByOpenId(member);
 		if(flag < 1){
 			throw new RuntimeException("成为会员失败");

watero-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/MemberDao.java

@@ -142,5 +142,11 @@ public interface MemberDao {
 	 */
 	List<Member> getNoRegister(Member member);
 
+	/**
+	 *获取member
+	 * @return
+	 */
+	Member getMemberByUserOpenIdForUpdate(String openId);
+
 
 }

watero-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/imp/MemberDaoImpl.java

@@ -203,4 +203,11 @@ public class MemberDaoImpl  implements MemberDao {
 	public List<Member> getNoRegister(Member member) {
 		return memberMapper.getNoRegister(member);
 	}
+
+	@Override
+	public Member getMemberByUserOpenIdForUpdate(String openId) {
+		return memberMapper.getMemberByUserOpenIdForUpdate(openId);
+	}
+
+
 }

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminLoginHandler.java

@@ -196,7 +196,7 @@ public class AdminLoginHandler {
 		}
 		// 登陆成功
 		AdminUtils.addAdminUserToSession(object, request);
-		CSRFTokenFilter.savesSignatureToToken(request, response);
+		// CSRFTokenFilter.savesSignatureToToken(request, response);
 		if(dto.getOnline() != null && dto.getOnline().equals("true")) {
 			adminUtils.setCookieToResponse(response, dto.getAdminLoginName(), dto.getAdminLoginPwd());
 		}

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/LoginController.java

@@ -1,6 +1,10 @@
 package com.iamberry.wechat.handles.admin;
 
 import com.iamberry.sys.Admin;
+import com.iamberry.wechat.core.entity.admin.AdminChildPermissionErmissions;
+import com.iamberry.wechat.core.entity.admin.AdminInfo;
+import com.iamberry.wechat.core.entity.admin.AdminLoginDTO;
+import com.iamberry.wechat.face.admin.AdminLoginService;
 import com.iamberry.wechat.face.mq.MQSerivce;
 import com.iamberry.wechat.face.sys.SysService;
 import com.iamberry.wechat.realm.IamberryRealm;
@@ -26,6 +30,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.util.List;
 import java.util.Random;
 
 /**
@@ -42,9 +47,11 @@ public class LoginController {
 
     @Autowired
     private SysService sysService;
-
     @Autowired
-    private IamberryRealm iamberryRealm;
+    private AdminLoginService adminLoginService;
+
+//    @Autowired
+//    private IamberryRealm iamberryRealm;
 
     @RequestMapping("/_login")
     public ModelAndView loginUI(HttpServletRequest request) {
@@ -65,8 +72,26 @@ public class LoginController {
             }
         }
 
+        // 登陆判断
+        AdminLoginDTO dto = new AdminLoginDTO();
+        dto.setAdminLoginName("hexiugang");
+        dto.setAdminLoginPwd("da7a6a69f2b4ed72078bef9d0162b991");
+
+        Object object = null;
+        try {
+            object = adminLoginService.selectAdminInfoByNameAndPwd(dto);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        AdminInfo adminInfo = (AdminInfo) object;
+        request.getSession().setAttribute("menuInfos", adminLoginService.selectMenusById(adminInfo.getAdminId(), true));
+
+        List<AdminChildPermissionErmissions> list=adminLoginService.selectAdminChildHavePermissionById(1);
+        request.getSession().setAttribute("permission", list);
+
         // 已登陆
-        return new ModelAndView("redirect:/admin/sys/_index");
+//        return new ModelAndView("redirect:/admin/sys/_index");
+        return new ModelAndView("admin/main/index");
     }
 
     @ResponseBody
@@ -151,7 +176,7 @@ public class LoginController {
         Subject subject = SecurityUtils.getSubject();
         if (subject.isAuthenticated()) {
             // 清空缓存的权限
-            iamberryRealm.getAuthorizationCache().remove(subject);
+//            iamberryRealm.getAuthorizationCache().remove(subject);
             subject.logout();
         }
         // 返回Login页面

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -272,6 +272,12 @@ public class CouponTypeHandler {
 		Member member = WechatUtils.getUserBySession(req);
 		openid = member.getUserOpenid();
 
+		if("".equals(openid)){
+			map.put("itemList", list);
+			rm.setData(map);
+			return rm;
+		}
+
 		CouponItemDto cDto = new CouponItemDto();
 		cDto.setCouponUseStatus(1);
 		cDto.setCouponVipExclusive(Integer.valueOf(useStatus));
@@ -279,6 +285,7 @@ public class CouponTypeHandler {
 		cDto.setPage(new PageBean());
 		cDto.getPage().setPageSize(pageSize);
 		cDto.getPage().setPageNumber(pageNO);
+		cDto.setUseropenid(openid);
 		list = couponItemService.getCouponItemDtoList(cDto);
 
 		Date now = new Date();

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/member/UserHandler.java

@@ -16,6 +16,8 @@ import com.iamberry.wechat.service.ImberryConfig;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.payUtil.RandomUtil;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +34,8 @@ import java.util.*;
 @Controller
 @RequestMapping("/wechat/user")
 public class UserHandler {
-    private static LinkedList<Map> sendList = new LinkedList<>();
-    private static final int MaxSize = 20;
+//    private static LinkedList<Map> sendList = new LinkedList<>();
+//    private static final int MaxSize = 20;
 
     private Logger logger = LoggerFactory.getLogger(UserHandler.class);
     @Autowired
@@ -127,9 +129,16 @@ public class UserHandler {
             return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，性别不能为空!",null);
         }
         //生日	userBirthDate
-        if(member.getUserBirthDate() == null){
+        if(member.getUserBirthDateStr() == null && member.getUserBirthDate() == null){
             return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，生日不能为空!",null);
         }
+        if(member.getUserBirthDateStr() != null){
+            String userBirthDateStr = member.getUserBirthDateStr();
+            DateTime dateTime = new DateTime(userBirthDateStr, DateTimeZone.forID("+08:00"));
+            Date date = new Date(dateTime.getMillis());
+            member.setUserBirthDate(date);
+        }
+
         //手机号码
         if(member.getUserTel() == null){
             return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，手机号码为空!",null);
@@ -139,19 +148,9 @@ public class UserHandler {
             return new ResultMsg(false, ResultMsg.ERROR, "完善信息失败，验证码为空!",null);
         }
 
-        int indesxOf = 0;
-        for (int i=0;i<sendList.size();i++) {
-            Map itemMap = sendList.get(i);
-            String openid = (String) itemMap.get("verification_openId");
-            if(openid.equals(m.getUserOpenid())){
-                indesxOf = i;
-            }
-        }
-        Map verificMemberPhoneMap = sendList.get(indesxOf);
-
         //使用request对象的getSession()获取session，如果session不存在则创建一个
-//		HttpSession session = request.getSession();
-//		Map verificMemberPhoneMap = (Map) session.getAttribute("verification_tel_"+m.getUserOpenid());
+		HttpSession session = request.getSession();
+		Map verificMemberPhoneMap = (Map) session.getAttribute("verification_tel_"+m.getUserOpenid());
         String verificationTel = (String) verificMemberPhoneMap.get("verification_tel");
         String verificationCode = (String) verificMemberPhoneMap.get("verification_code");
         Date verificationDate = (Date)  verificMemberPhoneMap.get("verification_date");
@@ -185,7 +184,7 @@ public class UserHandler {
         member.setUserArrange(1);	////1：已整理  2：未整理
         Integer  flag = memberService.becomeVipByOpenId(member);
         if (flag > 0 ) {
-            sendList.remove(indesxOf);
+//            sendList.remove(indesxOf);
             msg.setResultCode(ResultInfo.SUCCESSCODE);
             msg.setStatus(true);
             return msg;
@@ -217,18 +216,18 @@ public class UserHandler {
             return new ResultMsg(false, ResultMsg.ERROR, "修改手机号码失败，验证码为空!",null);
         }
 
-        int indesxOf = 0;
-        for (int i=0;i<sendList.size();i++) {
-            Map itemMap = sendList.get(i);
-            String openid = (String) itemMap.get("verification_openId");
-            if(openid.equals(m.getUserOpenid())){
-                indesxOf = i;
-            }
-        }
-        Map verificMemberPhoneMap = sendList.get(indesxOf);
+//        int indesxOf = 0;
+//        for (int i=0;i<sendList.size();i++) {
+//            Map itemMap = sendList.get(i);
+//            String openid = (String) itemMap.get("verification_openId");
+//            if(openid.equals(m.getUserOpenid())){
+//                indesxOf = i;
+//            }
+//        }
+//        Map verificMemberPhoneMap = sendList.get(indesxOf);
         //使用request对象的getSession()获取session，如果session不存在则创建一个
-//		HttpSession session = request.getSession();
-//		Map verificMemberPhoneMap = (Map) session.getAttribute("verification_tel_"+m.getUserOpenid());
+		HttpSession session = request.getSession();
+		Map verificMemberPhoneMap = (Map) session.getAttribute("verification_tel_"+m.getUserOpenid());
         String verificationTel = (String) verificMemberPhoneMap.get("verification_tel");
         String verificationCode = (String) verificMemberPhoneMap.get("verification_code");
         Date verificationDate = (Date)  verificMemberPhoneMap.get("verification_date");
@@ -260,7 +259,7 @@ public class UserHandler {
         member.setUserOpenid(m.getUserOpenid());
         Integer  flag = memberService.nowUpdateUserByOpenId(member);
         if (flag > 0 ) {
-            sendList.remove(indesxOf);
+//            sendList.remove(indesxOf);
             msg.setResultCode(ResultInfo.SUCCESSCODE);
             msg.setStatus(true);
             return msg;
@@ -304,11 +303,11 @@ public class UserHandler {
         verificMemberPhoneMap.put("verification_tel",phone);
         verificMemberPhoneMap.put("verification_date",new Date());
 
-        sendList.add(verificMemberPhoneMap);
-        if(sendList.size() > MaxSize){
-            sendList.removeFirst();
-        }
-//		session.setAttribute("verification_tel_"+m.getUserOpenid(),verificMemberPhoneMap);
+//        sendList.add(verificMemberPhoneMap);
+//        if(sendList.size() > MaxSize){
+//            sendList.removeFirst();
+//        }
+		session.setAttribute("verification_tel_"+m.getUserOpenid(),verificMemberPhoneMap);
 
         if ("SUCCESS".equals(result)) {
             logger.info("短信发送成功，验证码为：" + num);

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

@@ -1,42 +1,43 @@
-# 根日志的基本定义为info,具体实例为: stdout,infoLog,errorLog,debug；levels :ALL < DEBUG < INFO < WARN < ERROR < FATAL < OFF
-log4j.rootLogger=info,stdout,infoLog,errorLog,debug
-# stdout日志配置
+#levels: debug, info, warn, error, fatal
+log4j.rootLogger=info,stdout,infoLog,errorLog
+
+#\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/watero/out.log
-# infoLog日志配置
+log4j.appender.stdout.File=D:/log/watero/iamberry_wechat_out.log
+
+#\u4e3b\u65e5\u5fd7\u6587\u4ef6
 log4j.appender.infoLog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.infoLog.File=D:/log/watero/info.log
+log4j.appender.infoLog.File=D:/log/watero/iamberry_wechat_info.log
 log4j.appender.infoLog.Append=true
 log4j.appender.infoLog.Threshold=INFO
 log4j.appender.infoLog.layout=org.apache.log4j.PatternLayout
 log4j.appender.infoLog.layout.ConversionPattern=%d %p [%c] - %m %n 
 log4j.appender.infoLog.encoding=UTF-8
-# error日志配置
+
+#\u9519\u8bef\u65e5\u5fd7
 log4j.appender.errorLog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.errorLog.File=D:/log/watero/error.log
+log4j.appender.errorLog.File=D:/log/watero/iamberry_wechat_error.log
 log4j.appender.errorLog.Append=true
 log4j.appender.errorLog.Threshold=ERROR
 log4j.appender.errorLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.errorLog.layout.ConversionPattern=%d %p [%c] - %m %n
+log4j.appender.errorLog.layout.ConversionPattern=%d %p [%c] - %m %n 
 log4j.appender.errorLog.encoding=UTF-8
-# debug日志配置
-log4j.appender.debug=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.debug.File=D:/log/watero/debug.log
-log4j.appender.debug.Append=true
-log4j.appender.debug.Threshold=DEBUG
-log4j.appender.debug.layout=org.apache.log4j.PatternLayout
-log4j.appender.debug.layout.ConversionPattern=%d %p [%c] - %m %n
-log4j.appender.debug.encoding=UTF-8
-# apache日志级别
+
+#\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.com.iamberry=INFO
-# mybatis日志配置,为了方便定位问题，将日志级别设置为DEBUG，方便打印SQL语句
-log4j.logger.com.ibatis=DEBUG
-log4j.logger.java.sql.Connection=DEBUG
-log4j.logger.java.sql.Statement=DEBUG
-log4j.logger.java.sql.PreparedStatement=DEBUG
-log4j.logger.java.sql.ResultSet=DEBUG
+log4j.logger.java.sql.Connection=INFO
+log4j.logger.java.sql.Statement=INFO
+log4j.logger.java.sql.PreparedStatement=INFO
+
+#\u663e\u793aSQL\u8bed\u53e5\u90e8\u5206
+log4j.logger.com.iamberry.rent.service=DEBUG
+log4j.logger.java.sql.ResultSet=INFO
+log4j.logger.org.apache=INFO
+log4j.logger.java.sql.Connection=INFO
+log4j.logger.java.sql.Statement=INFO
+log4j.logger.java.sql.PreparedStatement=INFO

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

@@ -14,16 +14,16 @@
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css"
 	rel="stylesheet" type="text/css" />
 <link
 	href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/style.css"
+	href="${pageContext.request.contextPath }/common/css/style.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"
+	href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"
 	rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -100,13 +100,13 @@
 	</form>
 </div>
 <script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
 <script type="text/javascript">

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

@@ -20,11 +20,11 @@ scale=1.0,user-scalable=no" />
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -110,10 +110,10 @@ scale=1.0,user-scalable=no" />
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript">
 /*
 *	参数解释：

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/admin/updateAdmin.jsp

@@ -14,16 +14,16 @@
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css"
 	rel="stylesheet" type="text/css" />
 <link
 	href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/style.css"
+	href="${pageContext.request.contextPath }/common/css/style.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"
+	href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"
 	rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -74,13 +74,13 @@
 	</form>
 </div>
 <script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
  	<script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/admin/updatePermissions.jsp

@@ -7,11 +7,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Insert title here</title>
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <div class="row-fluid">
@@ -66,10 +66,10 @@
 			</div>	
 		  </form>
 		  </div>
-		  <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		  <script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript">
 		//勾选一级权限则选中全部二级权限
 		function selected(_this){

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/admin/updateSuperAdmin.jsp

@@ -14,16 +14,16 @@
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css"
 	rel="stylesheet" type="text/css" />
 <link
 	href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/style.css"
+	href="${pageContext.request.contextPath }/common/css/style.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"
+	href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"
 	rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -74,13 +74,13 @@
 	</form>
 </div>
 <script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
  	<script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/admin/updateUI.jsp

@@ -17,16 +17,16 @@
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css"
 	rel="stylesheet" type="text/css" />
 <link
 	href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/style.css"
+	href="${pageContext.request.contextPath }/common/css/style.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"
+	href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"
 	rel="stylesheet" type="text/css" />
 <title>修改管理员</title>
 </head>
@@ -120,13 +120,13 @@
 		</form>
 	</div>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 		<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
 	<script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/agent/agentList.jsp

@@ -18,11 +18,11 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -106,10 +106,10 @@
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 

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

@@ -12,10 +12,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -84,13 +84,13 @@
     </div>
   </form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$("#form-member-add").Validform({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/banner/bannerImgList.jsp

@@ -15,14 +15,14 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <!-- 排序插件 style start -->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/other/sort/jquery-ui.css" rel="stylesheet" type="text/css" />
 <!-- 排序插件 style end -->
 <link href="${pageContext.request.contextPath }/common/other/sort/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script charset="utf-8" src="${pageContext.request.contextPath }/common/other/kingedit/kindeditor-min.js"></script>
 <script charset="utf-8" src="${pageContext.request.contextPath }/common/other/kingedit/lang/zh_CN.js"></script>
 <!--[if IE 6]>
@@ -147,11 +147,11 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/other/sort/jquery-1.12.4.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/other/sort/jquery-ui.js"></script>
 <!-- 排序插件 js end --> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script>
 	var isAdd = false;
 	var imgUrl = "";

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

@@ -14,9 +14,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -91,13 +91,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 </body>
 <script type="text/javascript">
 function member_add(title,url,w,h){

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

@@ -15,10 +15,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -103,13 +103,13 @@
     </div>
   </form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$("#form-member-add").Validform({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/binding/bindingList.jsp

@@ -18,11 +18,11 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -104,10 +104,10 @@
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/channel/addChannel.jsp

@@ -13,10 +13,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -87,12 +87,12 @@
 	    </div>
 	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$('.skin-minimal input').iCheck({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/channel/list.jsp

@@ -14,10 +14,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -116,12 +116,12 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 /*图片-添加*/
 function showLayer(title,url){

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/channel/qrCodeList.jsp

@@ -14,11 +14,11 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -106,12 +106,12 @@
 		</tbody>
 	</table>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 
 // 关闭窗口

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/channel/updateChannel.jsp

@@ -14,10 +14,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -103,12 +103,12 @@
 	    </div>
 	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$('.skin-minimal input').iCheck({

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

@@ -14,10 +14,10 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -153,14 +153,14 @@
   </form>
 </div>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>  
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/coupon/batchaddcoupon.jsp

@@ -14,10 +14,10 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -99,13 +99,13 @@
   </form>
 </div>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>  
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	

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

@@ -16,9 +16,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -91,13 +91,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function() {
 	$("#searchButton").click(function() {

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/coupon/couponTypeDetail.jsp

@@ -16,10 +16,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -125,13 +125,13 @@
 			
   	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$("#form-member-add").Validform({

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

@@ -16,9 +16,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -149,13 +149,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
 	$("#searchButton").click(function() {

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/coupon/updateCouponItem.jsp

@@ -16,10 +16,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -88,13 +88,13 @@
 	    </div>
   	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$("#form-member-add").Validform({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/coupon/updateCouponType.jsp

@@ -16,10 +16,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -148,14 +148,14 @@
 	    </div>
   	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	/* $("#form-member-add").Validform({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/addDrpRoleInfo.jsp

@@ -12,10 +12,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -61,13 +61,13 @@
     </div>
   </form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$("#form-member-add").Validform({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/addPlaceInfo.jsp

@@ -17,10 +17,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <link href="${pageContext.request.contextPath }/common/css/bootstrap.min-3.3.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/select2/select2.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -143,13 +143,13 @@
 
 
 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/select2/select2.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/select2/zh-CN.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/addPlaceInfoBattle.jsp

@@ -12,12 +12,12 @@
 <meta http-equiv="Cache-Control" content="no-siteapp" />
 <LINK rel="Bookmark" href="/favicon.ico">
 <LINK rel="Shortcut Icon" href="/favicon.ico" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/select2/select2.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -187,10 +187,10 @@
 		</table>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/select2/select2.min.js"></script>
     <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/select2/zh-CN.js"></script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/applyAgentList.jsp

@@ -14,9 +14,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -77,13 +77,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 	function member_add(title,url,w,h){
 		layer_show(title,url,w,h);

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/applyList.jsp

@@ -15,11 +15,11 @@ scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
 <LINK rel="Bookmark" href="/favicon.ico">
 <LINK rel="Shortcut Icon" href="/favicon.ico" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -94,10 +94,10 @@ scale=1.0,user-scalable=no" />
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript">

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

@@ -17,9 +17,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <link href="${pageContext.request.contextPath }/common/css/bootstrap.min-3.3.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/select2/select2.min.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -34,7 +34,7 @@
 <title>分销商管理操作</title>
 </head>
 <body>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/select2/select2.min.js"></script>
 <div class="codeView">
 			<form class="form form-horizontal" id="form-Validform" novalidate="novalidate">
@@ -96,12 +96,12 @@
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
 <script type="text/javascript"> 
 function binding(){

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/editPlaceInfo.jsp

@@ -17,9 +17,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <link href="${pageContext.request.contextPath }/common/css/bootstrap.min-3.3.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/select2/select2.min.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -34,7 +34,7 @@
 <title>分销商管理操作</title>
 </head>
 <body>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/select2/select2.min.js"></script>
 <div class="codeView">
 			<form action="/watero/admin/drp/EditPlaceInfoSubmit" method="post" class="form form-horizontal" id="form-Validform" novalidate="novalidate">
@@ -150,12 +150,12 @@
 
 
 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
 <script type="text/javascript"> 
 $(function(){ 

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/orderEarningLogslist.jsp

@@ -17,9 +17,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <link href="${pageContext.request.contextPath }/common/css/bootstrap.min-3.3.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -86,13 +86,13 @@
 	<ul class="pagination" id="pagination2"></ul>
 </div>  
 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/js/page/jqPaginator.js"></script>
 <script type="text/javascript">
 var gobaltable;

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/placeInfolist.jsp

@@ -17,9 +17,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <link href="${pageContext.request.contextPath }/common/css/bootstrap.min-3.3.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -181,14 +181,14 @@ text-overflow: ellipsis;
   </div>
 </div>
 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/dataTableUtil.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/js/page/jqPaginator.js"></script>
 <script type="text/javascript">
 var gobaltable;

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/placeLogslist.jsp

@@ -17,9 +17,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <link href="${pageContext.request.contextPath }/common/css/bootstrap.min-3.3.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -91,14 +91,14 @@
 	<ul class="pagination" id="pagination2"></ul>
 </div>  
 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/dataTableUtil.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/js/page/jqPaginator.js"></script>
 <script type="text/javascript">
 

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/roleList.jsp

@@ -14,9 +14,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -84,13 +84,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 	function member_add(title,url,w,h){
 		layer_show(title,url,w,h);

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/updateDrpRoleInfo.jsp

@@ -13,10 +13,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -77,13 +77,13 @@
     </div>
   </form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$("#form-member-add").Validform({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/withdrawPaper.jsp

@@ -17,9 +17,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <link href="${pageContext.request.contextPath }/common/css/bootstrap.min-3.3.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -78,13 +78,13 @@
 			</form>
 		</div>
 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
 <script type="text/javascript"> 
 $(function(){ 

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/withdrawlist.jsp

@@ -17,9 +17,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <link href="${pageContext.request.contextPath }/common/css/bootstrap.min-3.3.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -89,14 +89,14 @@
 	<ul class="pagination" id="pagination2"></ul>
 </div>  
 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/dataTableUtil.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/js/page/jqPaginator.js"></script>
 <script type="text/javascript">
 var gobaltable;

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/etcOrder/list.jsp

@@ -16,10 +16,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -238,11 +238,11 @@
 		</div>
 		</div>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript">
 		// 选中对应的订单头信息
 		$(".${orderStatusStr}").attr("class", "current");

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/etcOrder/orderinfo.jsp

@@ -15,10 +15,10 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -164,12 +164,12 @@
 		</div>
 	</div>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 
 $(function(){

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/flow/addTemplateFlowInfo.jsp

@@ -17,10 +17,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css" />
 <title>添加返利节点</title>
 </head>
@@ -43,14 +43,14 @@
       		</div>
   		</form>
   	</div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 	var count = 0;
 	var templateName = '';

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/flow/addTemplateInfo.jsp

@@ -12,10 +12,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -68,13 +68,13 @@
     </div>
   </form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$("#form-member-add").Validform({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/flow/templateList.jsp

@@ -14,9 +14,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -91,13 +91,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 	function member_add(title,url,w,h){
 		layer_show(title,url,w,h);

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/flow/updateTemplateFlowInfo.jsp

@@ -4,9 +4,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <title>添加返利节点</title>
 </head>
 <body>
@@ -31,13 +31,13 @@
 		  </c:forEach>
 		</div>
   	</div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 	var count = 0;
 	var templateName = '';

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/flow/updateTemplateInfo.jsp

@@ -13,10 +13,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -80,13 +80,13 @@
     </div>
   </form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$("#form-member-add").Validform({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/addCard.jsp

@@ -14,10 +14,10 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -50,14 +50,14 @@
   </form>
 </div>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>  
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 	$(function(){
 		addSelect();

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/agentMachineList.jsp

@@ -18,11 +18,11 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -170,10 +170,10 @@
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/cardCashList.jsp

@@ -14,10 +14,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -131,11 +131,11 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 	function exitWindowsDiv(obj) {
 		$("#layui-layer4").hide();

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/deliveryUI.jsp

@@ -6,16 +6,16 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Insert title here</title>
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css"
 	rel="stylesheet" type="text/css" />
 <link
 	href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/style.css"
+	href="${pageContext.request.contextPath }/common/css/style.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"
+	href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"
 	rel="stylesheet" type="text/css" />
 </head>
 <body>
@@ -32,13 +32,13 @@
 	</form>
 </body>
 <script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 <script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/list.jsp

@@ -14,10 +14,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -126,12 +126,12 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 	function exitWindowsDiv(obj) {
 		$("#layui-layer4").hide();

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/payCodeList.jsp

@@ -14,10 +14,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -92,13 +92,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	addSelect();

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goods/addGoods.jsp

@@ -10,10 +10,10 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <title>添加商品</title>
 </head>
 <body>
@@ -162,10 +162,10 @@
 		
 		</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.all.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.config.js"></script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goods/addGoodsType.jsp

@@ -14,16 +14,16 @@
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css"
 	rel="stylesheet" type="text/css" />
 <link
 	href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/style.css"
+	href="${pageContext.request.contextPath }/common/css/style.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"
+	href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"
 	rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -75,13 +75,13 @@
 	</form>
 </div>
 <script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 <script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goods/listGoods.jsp

@@ -18,11 +18,11 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -113,10 +113,10 @@
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goods/listGoodsType.jsp

@@ -13,11 +13,11 @@
 <meta http-equiv="Cache-Control" content="no-siteapp" />
 <LINK rel="Bookmark" href="/favicon.ico">
 <LINK rel="Shortcut Icon" href="/favicon.ico" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <title>商品类型管理</title>
 </head>
@@ -105,10 +105,10 @@
   		</div>
   		</form>
 	</div>
-		<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 		<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript">
 	/*模糊查找数据验证*/

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goods/listSorting.jsp

@@ -18,11 +18,11 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -117,10 +117,10 @@
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goods/secces.jsp

@@ -6,16 +6,16 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Insert title here</title>
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css"
 	rel="stylesheet" type="text/css" />
 <link
 	href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/style.css"
+	href="${pageContext.request.contextPath }/common/css/style.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"
+	href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"
 	rel="stylesheet" type="text/css" />
 </head>
 <body>
@@ -24,13 +24,13 @@
 	<button type="button" onclick="jumptwo()" >继续添加</button>
 </body>
 <script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 <script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goods/updateGoods.jsp

@@ -11,10 +11,10 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"rel="stylesheet" type="text/css" />
 <title>修改商品</title>
 </head>
 <body>
@@ -161,10 +161,10 @@
 		</div>
 	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.all.min.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.config.js"></script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goods/updateGoodsType.jsp

@@ -14,16 +14,16 @@
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css"
 	rel="stylesheet" type="text/css" />
 <link
 	href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/style.css"
+	href="${pageContext.request.contextPath }/common/css/style.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"
+	href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"
 	rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -76,13 +76,13 @@
 	</form>
 </div>
 <script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 <script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goodsSystemRule/systemRulelistUI.jsp

@@ -21,11 +21,11 @@ scale=1.0,user-scalable=no" />
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -90,10 +90,10 @@ scale=1.0,user-scalable=no" />
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript">
 /*
 *	参数解释：

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/goodsSystemRule/updateSystemRule.jsp

@@ -11,10 +11,10 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"rel="stylesheet" type="text/css" />
 <title>修改商城系统规则</title>
 </head>
 <body>
@@ -72,10 +72,10 @@
 		</div>
 	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.all.min.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.config.js"></script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/addIntegeral.jsp

@@ -10,10 +10,10 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <title>添加商品</title>
 </head>
 <body>
@@ -133,10 +133,10 @@
 		</div>
 		</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.all.min.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.config.js"></script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/integralRecord.jsp

@@ -18,11 +18,11 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <title>积分使用记录 </title>
 </head>
@@ -66,10 +66,10 @@
     </tbody>
   </table>
   </div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listEtcIntegralRecord.jsp

@@ -18,11 +18,11 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -101,10 +101,10 @@
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript">

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listIntegralRecord.jsp

@@ -13,11 +13,11 @@
 <meta http-equiv="Cache-Control" content="no-siteapp" />
 <LINK rel="Bookmark" href="/favicon.ico">
 <LINK rel="Shortcut Icon" href="/favicon.ico" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -97,10 +97,10 @@
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript">

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

@@ -18,19 +18,19 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css"
+	href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css"
 	rel="stylesheet" type="text/css" id="skin" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css"
+	href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css"
 	rel="stylesheet" type="text/css" />
 <link
-	href="${pageContext.request.contextPath }/common/admin/css/style.css"
+	href="${pageContext.request.contextPath }/common/css/style.css"
 	rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -88,7 +88,15 @@
 							<ul>
 								<!-- 组装一级菜单下面的二级菜单 -->
 								<c:forEach items="${menu.menus }" var="info">
-									<li><a _href="${pageContext.request.contextPath }${info.ermissionsUrl }" href="javascript:void(0)">${info.ermissionsName }</a></li>
+									<li
+											data-href="${pageContext.request.contextPath }${info.ermissionsUrl }"
+											data-title="${info.ermissionsName }"
+										><a
+											_href="${pageContext.request.contextPath }${info.ermissionsUrl }"
+											href="javascript:void(0)"
+											data-href="${pageContext.request.contextPath }${info.ermissionsUrl }"
+									data-title="${info.ermissionsName }"
+									>${info.ermissionsName }</a></li>
 								</c:forEach>
 							</ul>
 						</dd>
@@ -117,18 +125,18 @@
 		<div id="iframe_box" class="Hui-article">
 			<div class="show_iframe">
 				<div style="display: none" class="loading"></div>
-				<iframe scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/common/admin/welcome/welcome.html"></iframe>
+				<%--<iframe scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/common/static/welcome/welcome.html"></iframe>--%>
 			</div>
 		</div>
 	</section>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+		src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	
 </body>
 </html>

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

@@ -16,10 +16,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -40,7 +40,7 @@
 	<input type="hidden" id="TenantId" name="TenantId" value="" />
 	<div class="header"></div>
 	<div class="loginWraper">
-		<div id="loginform" class="loginBox bk-gray radius box-shadow">
+		<div id="loginform" class=" loginBox bk-gray radius box-shadow" style="margin-top: 86px;">
 			<form onsubmit="checkLogin()" class="form form-horizontal" id="login-from" action="${pageContext.request.contextPath }/login" method="post">
 				<input type="hidden"
 					value="<%=session.getAttribute("loginToken")%>" name="loginToken">
@@ -97,8 +97,8 @@
 	</div>
 	<div class="footer">Copyright 深圳爱贝源科技有限公司</div>
 	<script type="text/javascript"
-		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
+		src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/js/utils/md5.js"></script>
 	<script type="text/javascript">
 		$(function() {

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/member/Integrallogs.jsp

@@ -16,9 +16,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -70,12 +70,12 @@
 	</table>
 	</div>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$('.table-sort').dataTable({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/member/levels.jsp

@@ -17,10 +17,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -76,11 +76,11 @@
 		</tbody>
 	</table>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>  
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 </body>
 </html>

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

@@ -16,9 +16,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -92,13 +92,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 // $(function(){
 // 	$('.table-sort').dataTable({

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

@@ -15,10 +15,10 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -176,12 +176,12 @@
 		</div>
 	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 
 $(function(){

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/member/updateLevel.jsp

@@ -13,10 +13,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -64,12 +64,12 @@
 		</div>
 	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$('.skin-minimal input').iCheck({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/msg/error.jsp

@@ -14,9 +14,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/msg/msg.jsp

@@ -14,9 +14,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/official/addProspectus.jsp

@@ -13,10 +13,10 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -62,12 +62,12 @@
 		</div>
 	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 $(function(){
 	$('.skin-minimal input').iCheck({

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/official/list.jsp

@@ -16,9 +16,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -82,13 +82,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 
 /*用户-添加*/

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/offlineOrder/list.jsp

@@ -16,9 +16,9 @@
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/respond.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <!--[if IE 6]>
 <script type="text/javascript" src="http://lib.h-ui.net/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
@@ -87,13 +87,13 @@
 <div align="right">
 	<%@include file="/common/other/paper/pager.jsp"%>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/laypage/1.2/laypage.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 
 $(function() {

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

@@ -15,10 +15,10 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <title>订单详细信息</title>
 </head>
 <body>
@@ -196,12 +196,12 @@
 		</div>
 	</div>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 
 $(function(){

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

@@ -14,10 +14,10 @@
 <meta http-equiv="Pragma" content="no-cache">
 <meta http-equiv="Cache-control" content="no-cache">
 <meta http-equiv="Cache" content="no-cache">
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <title>订单管理</title>
 </head>
 <body>
@@ -153,7 +153,7 @@
 			<table class="table table-border table-bordered table-bg table-hover table-sort">
 				<thead>
 					<tr class="text-c">
-						<th width="10">订单编号</th>
+						<th width="260">订单编号</th>
 						<th width="100">收货人</th>
 						<th width="100">昵称</th>
 						<th width="100">手机号码</th>
@@ -294,11 +294,11 @@
 					<%@include file="/common/other/paper/pager.jsp"%>
 				</div>
 				</div>
-				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+				<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+				<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+				<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+				<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 				<script type="text/javascript">
 				// 选中对应的订单头信息
 				$(".${orderStatusStr}").attr("class", "current");

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

@@ -15,10 +15,10 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <title>订单详细信息</title>
 </head>
 <body>
@@ -162,12 +162,12 @@
 		</div>
 	</div>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/Validform/5.3.2/Validform.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/icheck/jquery.icheck.min.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script> 
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script> 
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript">
 
 $(function(){

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

@@ -14,10 +14,10 @@
 <meta http-equiv="Pragma" content="no-cache">
 <meta http-equiv="Cache-control" content="no-cache">
 <meta http-equiv="Cache" content="no-cache">
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <title>订单管理</title>
 </head>
 <body>
@@ -252,11 +252,11 @@
 					<%@include file="/common/other/paper/pager.jsp"%>
 				</div>
 				</div>
-				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
+				<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+				<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
 				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/My97DatePicker/WdatePicker.js"></script>
-				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-				<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+				<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+				<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 				<script type="text/javascript">
 				
 				$(document).ready(function(){

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/product/addProduct.jsp

@@ -10,10 +10,10 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/other/kingedit/themes/default/default.css" rel="stylesheet" type="text/css" />
 <title>添加商品</title>
 </head>
@@ -165,10 +165,10 @@
 		<input type="hidden" name="productAccessnum" value="0">
 		</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.all.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.config.js"></script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/product/addProductColor.jsp

@@ -10,10 +10,10 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/other/kingedit/themes/default/default.css" rel="stylesheet" type="text/css" />
 <title>添加商品</title>
 </head>
@@ -63,10 +63,10 @@
 		</div>
 	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.all.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.config.js"></script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/product/addProductType.jsp

@@ -10,10 +10,10 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
 <meta http-equiv="Cache-Control" content="no-siteapp" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/admin/css/H-ui.login.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
 <link href="${pageContext.request.contextPath }/common/other/kingedit/themes/default/default.css" rel="stylesheet" type="text/css" />
 <title>添加商品</title>
 </head>
@@ -56,10 +56,10 @@
 		</div>
 	</form>
 </div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.all.min.js"></script> 
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/ueditor.config.js"></script>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/product/productColorList.jsp

@@ -18,11 +18,11 @@
 <script type="text/javascript" src="lib/respond.min.js"></script>
 <script type="text/javascript" src="lib/PIE_IE678.js"></script>
 <![endif]-->
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.min.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
-<link href="${pageContext.request.contextPath }/common/admin/lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-<link href="${pageContext.request.contextPath }/common/admin/css/style.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/static/h-ui.admin/skin/default/skin.css" rel="stylesheet" type="text/css" id="skin" />
+<link href="${pageContext.request.contextPath }/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+<link href="${pageContext.request.contextPath }/common/css/style.css" rel="stylesheet" type="text/css" />
 
 <!--[if IE 6]>
 <script type="text/javascript" src="lib/DD_belatedPNG_0.0.8a-min.js" ></script>
@@ -95,10 +95,10 @@
   		</div>
   		</form>
 	</div>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
-	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/jquery/1.9.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/lib/layer/2.4/layer.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui/js/H-ui.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath }/common/static/h-ui.admin/js/H-ui.admin.js"></script>
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/js/tips.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/My97DatePicker/WdatePicker.js"></script> 
 	<script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/datatables/1.10.0/jquery.dataTables.min.js"></script>