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

watero-common-tool/src/main/java/com/iamberry/wechat/tools/AddrUtil.java

@@ -68,16 +68,38 @@ public class AddrUtil {
 			String url = "http://www.baidu.com/s?ie=utf-8&f=8&rsv_bp=1&rsv_idx=1&tn=baidu&wd=" + URLEncoder.encode(addr + "邮编", "UTF-8");
 			Document doc = Jsoup.parse(HttpClient431Util.doGet(null, url));
 			Elements rows = doc.select(".op_exactqa_s_answer");
-			return rows.text().trim();
+			String result = rows.text().trim();
+			if (result.isEmpty() || result.length() >= 7) {
+				LOGGER.error("{} 查询邮政编码失败 {}", addr, result);
+				return null;
+			}
+			return result;
 		} catch (Exception e) {
 			LOGGER.error("", e);
 		}
 		return null;
 	}
 
-	public static String dealCite(String cite) {
-		//
-
-		return null;
+	/**
+	 * 处理系统中地址数据信息，因为各个地址上传的城市数据不一致，所以系统需要进行处理
+	 * @param pro 省份
+	 * @param city 城市
+	 * @param area 区域
+	 * @param address 详细地址
+	 * @param splitChar 分隔符
+	 * @return
+	 */
+	public static String dealAddress(String pro, String city, String area, String address, String splitChar, boolean append) {
+		// 判断是否通过分隔符来处理的
+		if (splitChar != null) {
+			String start = pro + splitChar + city + splitChar + area + splitChar;
+			return pro + " " + (append ? "" : (city + " ")) + area + " " + address.substring(start.length(), address.length());
+		}
+		String result = address.substring(pro.length()).trim();
+		if (!append) {
+			result = result.substring(city.length()).trim();
+		}
+		result = result.substring(area.length()).trim();
+		return pro + " " + (append ? "" : (city + " ")) + area + " " + result;
 	}
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/DownloadProgressInfo.java

@@ -13,7 +13,7 @@ public class DownloadProgressInfo implements Serializable {
     private String downloadProgress;
     private Integer downloadStatus;
     private String downloadUrl;
-    private Date downloadDate;
+    private String downloadDate;
     private Date downloadCreateTime;
 
     public Integer getDownloadId() {
@@ -56,11 +56,11 @@ public class DownloadProgressInfo implements Serializable {
         this.downloadUrl = downloadUrl;
     }
 
-    public Date getDownloadDate() {
+    public String getDownloadDate() {
         return downloadDate;
     }
 
-    public void setDownloadDate(Date downloadDate) {
+    public void setDownloadDate(String downloadDate) {
         this.downloadDate = downloadDate;
     }
 

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -173,7 +173,7 @@ public interface CustomerService {
      * 导出客诉信息到excel
      * @return
      */
-    List<CustomerStatisticalInfo> listStatisticalCustomer();
+    List<CustomerStatisticalInfo> listStatisticalCustomer(CustomerInfo customerInfo);
 
     /**
      * 总销量

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -796,8 +796,8 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
-    public List<CustomerStatisticalInfo> listStatisticalCustomer() {
-        return customerInfoMapper.listStatisticalCustomer();
+    public List<CustomerStatisticalInfo> listStatisticalCustomer(CustomerInfo customerInfo) {
+        return customerInfoMapper.listStatisticalCustomer(customerInfo);
     }
 
     @Override

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/CustomerInfoMapper.java

@@ -52,7 +52,7 @@ public interface CustomerInfoMapper {
      * 导出客诉信息到excel
      * @return
      */
-    List<CustomerStatisticalInfo> listStatisticalCustomer();
+    List<CustomerStatisticalInfo> listStatisticalCustomer(CustomerInfo customerInfo);
 
     /**
      * 总销量

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -725,7 +725,7 @@
   </select>
 
   <!-- 导出客诉信息到excel -->
-  <select id="listStatisticalCustomer" resultType="CustomerStatisticalInfo">
+  <select id="listStatisticalCustomer" parameterType="CustomerInfo" resultType="CustomerStatisticalInfo">
 SELECT
 	c.customer_id customerId,
 	null AS orderId,
@@ -803,6 +803,23 @@ LEFT JOIN tb_rst_cm_relation cr ON cr.customer_id = c.customer_id
 LEFT JOIN tb_rst_cm_proc_method cpm ON cpm.proc_method_id = cr.proc_method_id
 LEFT JOIN tb_rst_cm_proc_type cpt ON cpt.proc_type_id = cpm.proc_type_id
 LEFT JOIN tb_rst_cm_sendback_info csi ON csi.relation_id = cr.relation_id
+<where>
+  <if test="companyId != null and companyId!=''">
+    c.company_id = #{companyId}
+  </if>
+  <if test="storeId != null and storeId!=''">
+    AND c.store_id = #{storeId}
+  </if>
+  <if test="procTypeId != null and procTypeId!=''">
+    AND cpt.proc_type_id = #{procTypeId}
+  </if>
+  <if test="startTime!=null and startTime!='' ">
+    AND c.customer_create_time &gt; #{startTime}
+  </if>
+  <if test="endTime!=null and endTime!=''">
+    and c.customer_create_time &lt; #{endTime}
+  </if>
+</where>
 </select>
   <!-- 退换货统计sql start -->
   <!-- 总销量 -->
@@ -1436,34 +1453,36 @@ LEFT JOIN tb_rst_cm_sendback_info csi ON csi.relation_id = cr.relation_id
   <select id="listDownloadProgressInfo" parameterType="DownloadProgressInfo" resultType="DownloadProgressInfo">
       SELECT * FROM tb_rst_download_progress_info
       <where>
-        <if test="downloadId != null || downloadId != ''">
+        <if test="downloadId != null and downloadId != ''">
           download_id = #{downloadId}
         </if>
-        <if test="downloadAdminId != null || downloadAdminId != ''">
+        <if test="downloadAdminId != null and downloadAdminId != ''">
           download_admin_id = #{downloadAdminId}
         </if>
-        <if test="downloadStatus != null || downloadStatus != ''">
+        <if test="downloadStatus != null and downloadStatus != ''">
           download_status = #{downloadStatus}
         </if>
       </where>
+      ORDER BY download_create_time DESC
+      Limit 0,5
   </select>
   <update id="updateDownloadProgressInfo" parameterType="DownloadProgressInfo">
       update tb_rst_download_progress_info
       <set>
-        <if test="downloadStatus != null || downloadStatus != ''">
+        <if test="downloadStatus != null and downloadStatus != ''">
           download_status = #{downloadStatus},
         </if>
-        <if test="downloadProgress != null || downloadProgress != ''">
+        <if test="downloadProgress != null and downloadProgress != ''">
           download_progress = #{downloadProgress},
         </if>
-        <if test="downloadUrl != null || downloadUrl != ''">
+        <if test="downloadUrl != null and downloadUrl != ''">
           download_url = #{downloadUrl},
         </if>
-        <if test="downloadDate != null || downloadDate != ''">
+        <if test="downloadDate != null and downloadDate != ''">
           download_date = #{downloadDate}
         </if>
       </set>
-
+      WHERE download_id = #{downloadId}
   </update>
 
   <insert id="addDownloadProgressInfo" parameterType="DownloadProgressInfo"  keyProperty="downloadId" useGeneratedKeys="true">

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -1682,142 +1682,211 @@ public class AdminCustomerController {
         }
     }
 
+    /**
+     * 进入下载客诉页面
+     *
+     * @param request
+     * @param res
+     * @param
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/to_download_customer_excel")
+    public ModelAndView toDownloadCustomerExcel(HttpServletRequest request, HttpServletResponse res, CustomerInfo customerInfo) throws Exception {
+        ModelAndView mv = new ModelAndView("cm/customer/download_customer");
+        Admin admin = AdminUtils.getLoginAdmin();
+        //获取销售公司
+        List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
+        //查询店铺
+        StoreInfo storeInfo = new StoreInfo();
+        storeInfo.setCompanyId(companyInfoList.get(0).getCompanyId());
+        List<StoreInfo> storeList = storeInfoService.listStore(storeInfo);
+        //查询处理类型
+        List<ProcType> procTypeList = customerService.listProcType();
+        //查询登录人下载客诉记录
+        DownloadProgressInfo downloadProgressInfo = new DownloadProgressInfo();
+        downloadProgressInfo.setDownloadAdminId(admin.getAdminId());
+        List<DownloadProgressInfo> listDownloadProgressInfo = customerService.listDownloadProgressInfo(downloadProgressInfo);
+        mv.addObject("listDownloadProgressInfo",listDownloadProgressInfo);
+        mv.addObject("companyInfoList",companyInfoList);
+        mv.addObject("storeList",storeList);
+        mv.addObject("procTypeList",procTypeList);
+        return mv;
+    }
 
     /**
-     * 下载客诉信息 (2018-05-29)
+     * 查询下载客诉信息 (2018-05-29)
      *
      * @param request
      * @param res
      * @param
      * @throws Exception
      */
-    @RequestMapping("/download_customer_excel")
-    public void downloadEfastOrderExcel(HttpServletRequest request, HttpServletResponse res) throws Exception {
+    @ResponseBody
+    @RequestMapping("/list_download_customer_excel")
+    public ResponseJson listdownloadEfastOrderExcel(HttpServletRequest request, HttpServletResponse res) throws Exception {
         Admin admin = AdminUtils.getLoginAdmin();
-        //添加一条下载记录
+        //查询登录人下载客诉记录
         DownloadProgressInfo downloadProgressInfo = new DownloadProgressInfo();
+        /*downloadProgressInfo.setDownloadStatus(1);*/
         downloadProgressInfo.setDownloadAdminId(admin.getAdminId());
-        downloadProgressInfo.setDownloadProgress("00.00%");
-        downloadProgressInfo.setDownloadStatus(1);
-        customerService.addDownloadProgressInfo(downloadProgressInfo);
-        //循环一次的时间（毫秒）
-        long cycleOne = 0;
-        long cycleOnes = 0;
-        Date date = new Date();
-        int s = 0;
-        List<CustomerStatisticalInfo> customerList = customerService.listStatisticalCustomer();
-        String[] cells = {
-                "日期", "姓名", "联系电话", "类别", "来源入口",
-                "问题类别", "小类名称", "客诉问题", "处理过程", "购买日期",
-                "处理方式","处理结果", "销售公司", "销售渠道", "产品型号", "产品颜色",
-                "产品数量", "寄回快递", "寄回单号", "签收日期",
-                "状态", "寄出快递", "寄出快递", "开箱损", "二次客诉", "跟进客服", "工厂报价", "客户报价", "邮费信息"
-        };
-        List<CustomerStatisticalInfo> customerStatisticalInfoList = new ArrayList<>();
-        for (CustomerStatisticalInfo customerInfo : customerList) {
-            long startTime=System.currentTimeMillis();   //获取开始时间
-            s++;
-            //新建一个容器
-            CustomerStatisticalInfo customer = new CustomerStatisticalInfo();
-            //将数据copy到新容器
-            BeanUtils.copyProperties(customerInfo, customer);
-            CustomerCommon customerCommon = new CustomerCommon();
-            customerCommon.setCustomerId(customerInfo.getCustomerId());
-            customerCommon.setRelationId(customerInfo.getRelationId());
-            List<CustomerCommon> listCustomerCommon = customerService.listCustomerCommons(customerCommon);
-            if(listCustomerCommon.size() > 0) {
-                for (CustomerCommon common : listCustomerCommon) {
-                    if (common.getSalesOrderList().size() > 0) {
-                        for (SalesOrder salesOrder : common.getSalesOrderList()) {
-                            if (salesOrder.getSalesOrderItemList().size() > 0) {
-                                for (SalesOrderItem salesOrderItem : salesOrder.getSalesOrderItemList()) {
-                                    //将数据copy到新容器
-                                    CustomerStatisticalInfo customers = new CustomerStatisticalInfo();
-                                    BeanUtils.copyProperties(customer, customers);
-                                    customers.setRelationBackLogisticsCompany(customerInfo.getRelationBackLogisticsCompany());
-                                    customers.setRelationBackLogisticsNo(customerInfo.getRelationBackLogisticsNo());
-                                    customers.setRelationSendLogisticsCompany(customerInfo.getRelationSendLogisticsCompany());
-                                    customers.setRelationSendLogisticsNo(customerInfo.getRelationSendLogisticsNo());
-                                    customers.setRelationBackStatus(String.valueOf(customerInfo.getRelationBackStatus()));
-                                            if(customerInfo.getRelationBackReceiptDate() == null){
-                                                customers.setRelationBackReceiptDate(null);
-                                            }else{
-                                                customers.setRelationBackReceiptDate(customerInfo.getRelationBackReceiptDate());
-                                            }
-                                    customers.setSalesPayTime(salesOrder.getSalesPayTime());
-                                    customers.setItemProductName(salesOrderItem.getItemProductName());
-                                    customers.setItemProductColor(salesOrderItem.getItemProductColor());
-                                    customers.setItemNum(String.valueOf(salesOrderItem.getItemNum()));
-                                    customers.setRelationFactoryCosts(customerInfo.getRelationFactoryCosts());
-                                    customers.setRelationCustomerCosts(customerInfo.getRelationCustomerCosts());
-                                    String postageString = "";
-                                    //查询邮费信息
-                                    List<PostageInfo> listPostageInfo = customerService.listPostageInfo(customers.getRelationId());
-                                    if(listPostageInfo.size() > 0){
-                                        for(PostageInfo postageInfo : listPostageInfo){
-                                            String state = "";
-                                            if(postageInfo.getPostageStatus() == 1){
-                                                state = "未申请";
-                                            }
-                                            if(postageInfo.getPostageStatus() == 2){
-                                                state = "已申请（待转账）";
-                                            }
-                                            if(postageInfo.getPostageStatus() == 3){
-                                                state = "已转账";
+        List<DownloadProgressInfo> listDownloadProgressInfo = customerService.listDownloadProgressInfo(downloadProgressInfo);
+        ResponseJson rj = new ResponseJson(200, "查询成功", 200);
+        rj.addResponseKeyValue("listDownloadProgressInfo", listDownloadProgressInfo);
+        return rj;
+    }
+
+    /**
+     * 下载客诉信息 (2018-05-29)
+     *
+     * @param request
+     * @param res
+     * @param
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/download_customer_excel")
+    public ResponseJson downloadEfastOrderExcel(HttpServletRequest request, HttpServletResponse res, CustomerInfo customerInfo) throws Exception {
+        String path = request.getSession().getServletContext().getRealPath("/");
+        new Thread(new Mythread(path,customerInfo)).start();
+        return new ResponseJson(200, "查询成功", 200);
+    }
+
+    class Mythread extends Thread{
+        private String path;
+        private CustomerInfo customerInfo;
+        public Mythread(String path,CustomerInfo customerInfo) {
+            this.path=path;
+            this.customerInfo=customerInfo;
+        }
+        @Override
+        public void run(){
+            Admin admin = AdminUtils.getLoginAdmin();
+            //添加一条下载记录
+            DownloadProgressInfo downloadProgressInfo = new DownloadProgressInfo();
+            downloadProgressInfo.setDownloadAdminId(admin.getAdminId());
+            downloadProgressInfo.setDownloadProgress("00.00");
+            downloadProgressInfo.setDownloadStatus(1);
+            customerService.addDownloadProgressInfo(downloadProgressInfo);
+            //循环一次的时间（毫秒）
+            long cycleOne = 0;
+            long cycleOnes = 0;
+            int s = 0;
+            List<CustomerStatisticalInfo> customerList = customerService.listStatisticalCustomer(customerInfo);
+            String[] cells = {
+                    "日期", "姓名", "联系电话", "类别", "来源入口",
+                    "问题类别", "小类名称", "客诉问题", "处理过程", "购买日期",
+                    "处理方式","处理结果", "销售公司", "销售渠道", "产品型号", "产品颜色",
+                    "产品数量", "寄回快递", "寄回单号", "签收日期",
+                    "状态", "寄出快递", "寄出快递", "开箱损", "二次客诉", "跟进客服", "工厂报价", "客户报价", "邮费信息"
+            };
+            List<CustomerStatisticalInfo> customerStatisticalInfoList = new ArrayList<>();
+            for (CustomerStatisticalInfo customerInfo : customerList) {
+                long startTime=System.currentTimeMillis();   //获取开始时间
+                s++;
+                //新建一个容器
+                CustomerStatisticalInfo customer = new CustomerStatisticalInfo();
+                //将数据copy到新容器
+                BeanUtils.copyProperties(customerInfo, customer);
+                CustomerCommon customerCommon = new CustomerCommon();
+                customerCommon.setCustomerId(customerInfo.getCustomerId());
+                customerCommon.setRelationId(customerInfo.getRelationId());
+                List<CustomerCommon> listCustomerCommon = customerService.listCustomerCommons(customerCommon);
+                if(listCustomerCommon.size() > 0) {
+                    for (CustomerCommon common : listCustomerCommon) {
+                        if (common.getSalesOrderList().size() > 0) {
+                            for (SalesOrder salesOrder : common.getSalesOrderList()) {
+                                if (salesOrder.getSalesOrderItemList().size() > 0) {
+                                    for (SalesOrderItem salesOrderItem : salesOrder.getSalesOrderItemList()) {
+                                        //将数据copy到新容器
+                                        CustomerStatisticalInfo customers = new CustomerStatisticalInfo();
+                                        BeanUtils.copyProperties(customer, customers);
+                                        customers.setRelationBackLogisticsCompany(customerInfo.getRelationBackLogisticsCompany());
+                                        customers.setRelationBackLogisticsNo(customerInfo.getRelationBackLogisticsNo());
+                                        customers.setRelationSendLogisticsCompany(customerInfo.getRelationSendLogisticsCompany());
+                                        customers.setRelationSendLogisticsNo(customerInfo.getRelationSendLogisticsNo());
+                                        customers.setRelationBackStatus(String.valueOf(customerInfo.getRelationBackStatus()));
+                                                if(customerInfo.getRelationBackReceiptDate() == null){
+                                                    customers.setRelationBackReceiptDate(null);
+                                                }else{
+                                                    customers.setRelationBackReceiptDate(customerInfo.getRelationBackReceiptDate());
+                                                }
+                                        customers.setSalesPayTime(salesOrder.getSalesPayTime());
+                                        customers.setItemProductName(salesOrderItem.getItemProductName());
+                                        customers.setItemProductColor(salesOrderItem.getItemProductColor());
+                                        customers.setItemNum(String.valueOf(salesOrderItem.getItemNum()));
+                                        customers.setRelationFactoryCosts(customerInfo.getRelationFactoryCosts());
+                                        customers.setRelationCustomerCosts(customerInfo.getRelationCustomerCosts());
+                                        String postageString = "";
+                                        //查询邮费信息
+                                        List<PostageInfo> listPostageInfo = customerService.listPostageInfo(customers.getRelationId());
+                                        if(listPostageInfo.size() > 0){
+                                            for(PostageInfo postageInfo : listPostageInfo){
+                                                String state = "";
+                                                if(postageInfo.getPostageStatus() == 1){
+                                                    state = "未申请";
+                                                }
+                                                if(postageInfo.getPostageStatus() == 2){
+                                                    state = "已申请（待转账）";
+                                                }
+                                                if(postageInfo.getPostageStatus() == 3){
+                                                    state = "已转账";
+                                                }
+                                                postageString = postageString+"状态："+state+" ,金额:"+postageInfo.getPostageAmount()/100+" ,支付宝账号："+postageInfo.getPostageAlipay()+";";
                                             }
-                                            postageString = postageString+"状态："+state+" ,金额:"+postageInfo.getPostageAmount()/100+" ,支付宝账号："+postageInfo.getPostageAlipay()+";";
                                         }
+                                        customers.setPostageString(postageString);
+                                        customerStatisticalInfoList.add(customers);
                                     }
-                                    customers.setPostageString(postageString);
-                                    customerStatisticalInfoList.add(customers);
+                                } else {
+                                    customerStatisticalInfoList.add(customer);
                                 }
-                            } else {
-                                customerStatisticalInfoList.add(customer);
                             }
+                        } else {
+                            customerStatisticalInfoList.add(customer);
                         }
-                    } else {
-                        customerStatisticalInfoList.add(customer);
-                    }
 
+                    }
+                }else{
+                    customerStatisticalInfoList.add(customer);
                 }
-            }else{
-                customerStatisticalInfoList.add(customer);
-            }
-            long endTime=System.currentTimeMillis(); //获取结束时间
-            if(s == 1){
-                cycleOne = startTime - endTime;
-                cycleOnes = cycleOne * customerList.size();
-                date.setTime(cycleOnes);
-                //修改预计下载完成时间
-                downloadProgressInfo.setDownloadDate(date);
-                downloadProgressInfo.setDownloadProgress("01.00%");//进度变为1
-                customerService.updateDownloadProgressInfo(downloadProgressInfo);
-            }else{
+                long endTime=System.currentTimeMillis(); //获取结束时间
                 NumberFormat numberFormat = NumberFormat.getInstance();
-                numberFormat.setMaximumFractionDigits(2);
                 float percentage = (float) s / (float) customerList.size() * 100;
                 String result = numberFormat.format(percentage);
-                downloadProgressInfo.setDownloadProgress(result);
-                customerService.updateDownloadProgressInfo(downloadProgressInfo);
+                if(s == 1){
+                    cycleOne = endTime - startTime;
+
+                    SimpleDateFormat sdf3=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    cycleOnes = cycleOne * customerList.size();
+                    //修改预计下载完成时间
+                    downloadProgressInfo.setDownloadDate(sdf3.format(new Date().getTime()+cycleOnes));
+                    downloadProgressInfo.setDownloadProgress(result);
+                    customerService.updateDownloadProgressInfo(downloadProgressInfo);
+                }else{
+                    numberFormat.setMaximumFractionDigits(2);
+                    downloadProgressInfo.setDownloadProgress(result);
+                    customerService.updateDownloadProgressInfo(downloadProgressInfo);
+                }
+            }
+                //导出订单Excel并下载
+            try {
+                customerExcel(cells,customerStatisticalInfoList,downloadProgressInfo,path);
+            } catch (Exception e) {
+                e.printStackTrace();
             }
 
         }
-            //导出订单Excel并下载
-            customerExcel(request,res,cells,customerStatisticalInfoList,downloadProgressInfo);
-
         }
 
 
     /**
      * 导出订单Excel并下载
-     * @param request
-     * @param res
      * @param cells
      * @throws Exception
      */
-    public void customerExcel(HttpServletRequest request,HttpServletResponse res,
-                                String[] cells,List<CustomerStatisticalInfo> customerList,
-                              DownloadProgressInfo downloadProgressInfo) throws Exception {
+    public void customerExcel(String[] cells,List<CustomerStatisticalInfo> customerList,
+                              DownloadProgressInfo downloadProgressInfo,String path) throws Exception {
 
         //创建一个workbook，对应一个Excel文件
         HSSFWorkbook wb = new HSSFWorkbook();
@@ -1918,7 +1987,7 @@ public class AdminCustomerController {
 
         }
         //下载导出订单Excel
-       downloadCustomerExcel(wb,downloadProgressInfo);
+       downloadCustomerExcel(wb,downloadProgressInfo,path);
     }
 
     /**
@@ -1926,18 +1995,19 @@ public class AdminCustomerController {
      * @param wb
      * @throws Exception
      */
-    public void downloadCustomerExcel(HSSFWorkbook wb,DownloadProgressInfo downloadProgressInfo) throws Exception{
+    public void downloadCustomerExcel(HSSFWorkbook wb,DownloadProgressInfo downloadProgressInfo,String path) throws Exception{
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         String fileName = format.format(new Date()) + "客诉报表";
         try {
-        FileOutputStream fout = new FileOutputStream("/common/customerExcel/"+fileName+downloadProgressInfo.getDownloadId()+".xls");
+        FileOutputStream fout = new FileOutputStream(path+"/common/customerExcel/"+fileName+downloadProgressInfo.getDownloadId()+".xls");
         wb.write(fout);
         fout.close();
         } catch (Exception e) {
             e.printStackTrace();
         }
         downloadProgressInfo.setDownloadStatus(2);
-        downloadProgressInfo.setDownloadUrl("/common/customerExcel/"+fileName+downloadProgressInfo.getDownloadId()+".xls");
+        downloadProgressInfo.setDownloadUrl("\\common\\customerExcel\\"+fileName+downloadProgressInfo.getDownloadId()+".xls");
+        customerService.updateDownloadProgressInfo(downloadProgressInfo);
     }
 
     /**

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -266,9 +266,9 @@ public class AwaitSendController {
         }
         LOGGER.info( "===salesId:" + salesId + "快递方式：" + post+ "订单编号:"+ orderId);
         // 收件人信息
-        String[] addrs = salesOrderInfo.getSalesAddressInfo().split("-");
+        String[] addrs = salesOrderInfo.getSalesAddressInfo().split(" ");
         if (addrs.length <= 3) {
-            addrs = salesOrderInfo.getSalesAddressInfo().split(" ");
+            addrs = salesOrderInfo.getSalesAddressInfo().split("-");
         }
         // 获取收件人邮编
         String postCode = AddrUtil.getPostCode(addrs[2]);

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -4,6 +4,7 @@ import com.iamberry.rst.core.order.EfastOrder;
 import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.pts.PtsBomComponents;
 import com.iamberry.rst.faces.cm.SalesOrderService;
+import com.iamberry.wechat.tools.AddrUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
@@ -470,14 +471,16 @@ public class ExcelUtil {
                     break;
                 }
                 EfastOrder order = new EfastOrder();
-
-                String nameValue = getValue(temp.getCell(nameColumnIndex));  // 读取name
-                String platformOrderIdValue = getValue(temp.getCell(platformOrderColumnIndex));  // 读取平台id
+                // 读取name
+                String nameValue = getValue(temp.getCell(nameColumnIndex));
+                // 读取平台id
+                String platformOrderIdValue = getValue(temp.getCell(platformOrderColumnIndex));
                 //获取手机号码
                 //String userTel = getValue(temp.getCell(telColumnIndex)).trim();   // 读取tel
                 Cell telCell = temp.getCell(telColumnIndex);
                 String userTel = String.valueOf(getExcelCell(telCell));
-                String OrderProductBarCodeValue = map.get(getValue(temp.getCell(productColumnIndex)).trim()); // 读取对应的产品id
+                // 读取对应的产品id
+                String OrderProductBarCodeValue = map.get(getValue(temp.getCell(productColumnIndex)).trim());
                 if(StringUtils.isEmpty(nameValue)){
                     errorNum ++;
                     order.setReturnStatus("error");
@@ -519,7 +522,6 @@ public class ExcelUtil {
 
                 // 如果手机号码校验不通过，则应该不录入
                 if (userTel.trim().length() < 11 || userTel.trim().length() > 15) {
-                    //temp.getCell(telColumnIndex).setCellStyle(cellStyle);
                     order.setReturnStatus("error");
                     order.setReturnMsg("手机号码不正确");
                     order.setPlatformOrderId("1");
@@ -535,9 +537,11 @@ public class ExcelUtil {
                 if(orderNum == null || "".equals(orderNum) || Integer.valueOf(orderNum) == 0){
                     order.setReturnStatus("error");
                     order.setReturnMsg("数量不正确");
-                    order.setOrderNum(0);               // 读取购买数量
+                    // 读取购买数量
+                    order.setOrderNum(0);
                 }else{
-                    order.setOrderNum(Integer.valueOf(orderNum));               // 读取购买数量
+                    // 读取购买数量
+                    order.setOrderNum(Integer.valueOf(orderNum));
                 }
                 order.setOrderRemark(orderRemark);
                 if (infoColumnIndex.length == 1){
@@ -585,7 +589,7 @@ public class ExcelUtil {
                     continue;
                 }
                 // 支付方式
-                order.setOrderPayType(1);               // 微信支付
+                order.setOrderPayType(1);
                 order.setOrderPayMoney(price.get(order.getOrderProductBarCode()).getColorDiscount() * order.getOrderNum());
                 order.setOrderAmount(price.get(order.getOrderProductBarCode()).getColorDiscount() * order.getOrderNum());
                 order.setOrderOpenId(order.getOrderAddressTel());
@@ -593,17 +597,20 @@ public class ExcelUtil {
                 order.setOrderId(OrderNoUtil.createOrderCode(Math.abs(new Random().nextInt(1000))));
 
                 if(isOtherStore == 2){
-                    String storeValue = getValue(temp.getCell(orderStoreInfoStColumnIndex)).trim();  // 读取店铺
+                    // 读取店铺
+                    String storeValue = getValue(temp.getCell(orderStoreInfoStColumnIndex)).trim();
                     for (int k=0;k<storeArray.length;k++){
                        String[] stores = storeArray[k].split("_");
                        if(stores[0].trim().equals(storeValue.trim())){
-                           order.setStoreId(Integer.valueOf(stores[1]));           //店铺
+                           //店铺
+                           order.setStoreId(Integer.valueOf(stores[1]));
                        }
                     }
                 }else{
-                    order.setStoreId(Integer.valueOf(storeArray[0]));           //店铺
+                    //店铺
+                    order.setStoreId(Integer.valueOf(storeArray[0]));
                 }
-                order.setOid(oid);                       // oid
+                order.setOid(oid);
                 try{
                     if (postType.equals("ems")) {
                         if (order.getOrderProvince().contains("广东")) {
@@ -706,23 +713,29 @@ public class ExcelUtil {
         Object obj;
         if (null != cell) {
             switch (cell.getCellType()) {
-                case HSSFCell.CELL_TYPE_NUMERIC: // 数字
+                // 数字
+                case HSSFCell.CELL_TYPE_NUMERIC:
                     double cellValue = cell.getNumericCellValue();
                     obj = new DecimalFormat("#").format(cellValue);
                     break;
-                case HSSFCell.CELL_TYPE_STRING: // 字符串
+                // 字符串
+                case HSSFCell.CELL_TYPE_STRING:
                     obj = cell.getStringCellValue();
                     break;
-                case HSSFCell.CELL_TYPE_BOOLEAN: // Boolean
+                // Boolean
+                case HSSFCell.CELL_TYPE_BOOLEAN:
                     obj = cell.getBooleanCellValue();
                     break;
-                case HSSFCell.CELL_TYPE_FORMULA: // 公式
+                // 公式
+                case HSSFCell.CELL_TYPE_FORMULA:
                     obj = cell.getCellFormula();
                     break;
-                case HSSFCell.CELL_TYPE_BLANK: // 空值
+                // 空值
+                case HSSFCell.CELL_TYPE_BLANK:
                     obj = "";
                     break;
-                case HSSFCell.CELL_TYPE_ERROR: // 故障
+                // 故障
+                case HSSFCell.CELL_TYPE_ERROR:
                     obj = "";
                     break;
                 default:
@@ -785,10 +798,11 @@ public class ExcelUtil {
      */
     private static String[] splitAddress(String addrInfo) {
         String[] addrs = null;
-
+        String splitCharTemp = null;
         // 首先通过整体切割符合切割
         for (String charSplit : ENTIRETY_SPLIT) {
             addrs = StringUtils.split(addrInfo, charSplit);
+            splitCharTemp = charSplit;
             if (addrs != null && addrs.length >= 4) {
                 break;
             } else if (addrs != null && addrs.length == 3 && !addrs[0].contains("省")) {
@@ -800,18 +814,18 @@ public class ExcelUtil {
         if (addrs != null && addrs.length >= 4) {
             // 防止区域数据出现小区 扰乱数据
             if (!addrs[2].contains("小区")) {
-                return new String[]{addrs[0], addrs[1], addrs[2], addrInfo};
+                String address = AddrUtil.dealAddress(addrs[0].trim(), addrs[1].trim(), addrs[2].trim(), addrInfo, splitCharTemp, false);
+                return new String[]{addrs[0].trim(), addrs[1].trim(), addrs[2].trim(), address};
             }
-
         } else if (addrs != null && addrs.length == 3) {
             // 防止区域数据出现小区 扰乱数据
             if (!addrs[1].contains("小区")) {
-                return new String[]{addrs[0], addrs[0], addrs[1], addrInfo};
+                String address = AddrUtil.dealAddress(addrs[0].trim(), addrs[0].trim(), addrs[1].trim(), addrInfo, splitCharTemp, true);
+                return new String[]{addrs[0].trim(), addrs[0].trim(), addrs[1].trim(), address};
             }
         }
 
         for (String[] splits : PROVINCE_CITY_AERA_SPLIT) {
-
             // 每组独立切割字符单独循环
             String tempInfo = addrInfo;
             addrs = new String[splits.length + 1];
@@ -837,14 +851,16 @@ public class ExcelUtil {
                         continue;
                     }
                     // 只有两级地址
-                    return new String[]{addrs[0], addrs[0], addrs[1], addrInfo};
+                    String address = AddrUtil.dealAddress(addrs[0].trim(), addrs[0].trim(), addrs[1].trim(), addrInfo, null, true);
+                    return new String[]{addrs[0].trim(), addrs[0].trim(), addrs[1].trim(), address};
                 } else if ((addrs.length - 1) == 3) {
                     // 防止区域数据出现小区 扰乱数据
                     if (addrs[2].contains("小区")) {
                         continue;
                     }
                     // 三级地址
-                    return new String[]{addrs[0], addrs[1], addrs[2], addrInfo};
+                    String address = AddrUtil.dealAddress(addrs[0].trim(), addrs[1].trim(), addrs[2].trim(), addrInfo, null, false);
+                    return new String[]{addrs[0].trim(), addrs[1].trim(), addrs[2].trim(), address};
                 }
             }
         }
@@ -853,7 +869,7 @@ public class ExcelUtil {
     }
 
     public static void main(String[] args) throws IOException {
-        String[] add = splitAddress("海南省 临高县 博厚镇衍宏海港小镇（303县道西）衍宏海港小镇37栋602");
+        String[] add = splitAddress("北京 北京市 昌平区 回龙观街道回龙观 冠庭园5号楼2单元502");
         if (add == null) {
             System.out.println("切割失败...");
         }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -14,8 +14,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #0000FF;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         #suggest, #suggest2 {width:200px}
@@ -89,8 +89,8 @@
                 </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>客服：</label>
-                <div class="formControls col-4 col-sm-4"> <span class="select-box" >
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>创建客服：</label>
+                <div class="formControls col-2 col-sm-2"> <span class="select-box" >
                     <select name="adminId" id="adminId" class="select">
                     </select>
 				</span>
@@ -145,11 +145,11 @@
                 <div class="formControls col-10 col-sm-10 skin-minimal">
                     <div class="radio-box">
                         <input type="radio" class="customerCounselType" id="customer-type-1" name="customerCounselType" value="1"  >
-                        <label for="customer-type-1">售前咨询</label>
+                        <label for="customer-type-1">售前</label>
                     </div>
                     <div class="radio-box">
                         <input type="radio" class="customerCounselType" id="customer-type-2" name="customerCounselType" value="2"  checked>
-                        <label for="customer-type-2">售后咨询</label>
+                        <label for="customer-type-2">售后</label>
                     </div>
                 </div>
             </div>
@@ -599,10 +599,10 @@
             <div class="row cl sendAddressInfo" id="" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text associated-phone" value="" placeholder="请输入手机号" id="m-phone" name="">
+                    <input type="text" class="input-text associated-phone" value="" placeholder="输入用户手机号（发送问题回复）" id="m-phone" name="">
                 </div>
                 <div class="formControls col-2 col-sm-2" style="width: 10%">
-                    <input type="button" class="btn btn-primary" value="发短信给用户" onclick="sendPhone('m','m-msg');">
+                    <input type="button" class="btn btn-primary" value="发送短信" onclick="sendPhone('m','m-msg');">
                 </div>
                 <div class="formControls col-2 col-sm-2 msg-phone">
                     <div id="m-msg" style="color: #e00"></div>
@@ -671,9 +671,9 @@
                  </div>
             </div>
              <div class="row cl" id="customerDescDiv">
-                 <label class="form-label col-1 col-sm-1"></label>
+                 <label class="form-label col-1 col-sm-1">客诉备注：</label>
                  <div class="col-9 col-sm-9">
-                     <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 100%;height: 80px;"></textarea>
+                     <textarea style="padding: 5px" type="text" placeholder="请输入客诉备注信息，最多支持50字" id="customerDesc" name="customerDesc" style="width: 100%;height: 80px;"></textarea>
                  </div>
               </div>
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl

@@ -13,8 +13,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         #suggest, #suggest2 {width:200px}
@@ -43,15 +43,17 @@
         .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
         .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
         .time-line-list>li:first-child .arrow{display: none;}
-        .table-bg th{background-color: #e2f6ff;}
+        .table-bg th{background-color: #e2f6ff;padding: 15px 8px;}
+        .table-bg td{padding: 15px 8px;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
         .txt-red{color:red}
         .thString {font-weight: normal;}
         .clearfix:after{content:"\20";display:block;height:0;clear:both;visibility:hidden}.clearfix{zoom:1}
-        .tabBar {border-bottom: 2px solid #222}
-        .tabBar span {background-color: #e8e8e8;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px}
-        .tabBar span.current{background-color: #222;color: #fff}
+        .tabBar {display: inline-block; border-bottom: 2px solid #cfd9e4;position: relative}
+        .tabBar span {background-color: #fff;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px}
+        .tabBar span.current{background-color: #fff;color: #50a2ea;position: relative;}
+        .tabBar span.current:after{content: ''; position: absolute;left: 50%;bottom: 0;width: 30px;height: 2px;background: #50a2ea;margin-left: -15px;}
         .tabCon {display: none}
     </style>
     <title>客诉基本信息</title>
@@ -59,10 +61,8 @@
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="cl pd-20">
@@ -188,7 +188,7 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered"   id="tableHtml">
+        <table class="table table-border table-bg table-bordered"   id="tableHtml" style="margin-top: 15px;">
             <thead>
             <tr>
                 <th>销售</th>
@@ -217,7 +217,7 @@
 
         <div class="row cl">
             <label class="form-label col-3">
-                <div class="tit-2">处理结果(<span id="customerIsSolve" style="color: red"></span>)</div>
+                <div class="tit-2">处理结果：<span id="customerIsSolve" style="color: red"></span></div>
             </label>
             <div class="formControls col-9">
             </div>
@@ -235,7 +235,7 @@
             </thead>
         </table>-->
 
-        <div id="tab_demo" class="HuiTab">
+        <div id="tab_demo" class="HuiTab" style="margin-top: 20px;">
             <div class="tabBar clearfix">
             <#if procMethod.procMethodIsBack == 1>
                 <span>寄回信息</span>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

@@ -13,8 +13,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         #suggest, #suggest2 {width:200px}

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -14,8 +14,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         #suggest, #suggest2 {width:200px}
@@ -60,13 +60,11 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 客诉管理
-    <span class="c-gray en">&gt;</span> 修改客诉
+    <span class="c-gray en">/</span> 客诉管理
+    <span class="c-gray en">/</span> 修改客诉
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventory_list.ftl

@@ -33,9 +33,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 库存管理
-    <span class="c-gray en">&gt;</span> 库存列表
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 库存管理
+    <span class="c-gray en">/</span> 库存列表
+    <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="page-container">
     <div class="text-c">

watero-rst-web/src/main/webapp/WEB-INF/views/customer/custome_basic_detail.ftl

@@ -13,8 +13,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         #suggest, #suggest2 {width:200px}
@@ -55,7 +55,7 @@
 <article class="cl pd-20">
     <form action="" method="post" class="form form-horizontal" id="form-article-add">
         <div  class="row cl">
-                <span class="c-red"><button type="button" style="cursor:pointer; float: left;margin-left: 20px;" class="my-btn-search" onclick="window.history.back()">返回</button></span>
+                <span class="c-red"><button type="button"  class="my-btn-search" onclick="window.history.back()">返回</button></span>
         </div>
 
 

watero-rst-web/src/main/webapp/WEB-INF/views/customer/save_customer_info.ftl

@@ -14,8 +14,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         #suggest, #suggest2 {width:200px}
@@ -54,9 +54,9 @@
 </head>
 <body style="overflow-x:hidden">
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 客户信息管理
-    <span class="c-gray en">&gt;</span> 增加客户信息
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 客户信息管理
+    <span class="c-gray en">/</span> 增加客户信息
+    <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="pd-20 cl">
     <form action="${path}/admin/customerBasic/saveCustomerInfo" method="post">

watero-rst-web/src/main/webapp/WEB-INF/views/customer/update_customer_info.ftl

@@ -14,8 +14,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         #suggest, #suggest2 {width:200px}
@@ -53,9 +53,9 @@
 </head>
 <body  style="overflow-x:hidden">
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 客户信息管理
-    <span class="c-gray en">&gt;</span> 修改客户信息
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 客户信息管理
+    <span class="c-gray en">/</span> 修改客户信息
+    <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="pd-20 cl">
     <form action="${path}/admin/customerBasic/updateCustomerInfo" method="post">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -12,7 +12,7 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
         .tit-2:after{content: '';position: absolute;left: 0;top: 45%;height: 6px;width: 6px;border-radius: 6px;background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/correct_order.ftl

@@ -12,8 +12,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
@@ -42,13 +42,11 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 订单管理
-    <span class="c-gray en">&gt;</span> 更正订单
+    <span class="c-gray en">/</span> 订单管理
+    <span class="c-gray en">/</span> 更正订单
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_list.ftl

@@ -13,8 +13,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
@@ -42,9 +42,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 仓库管理
-    <span class="c-gray en">&gt;</span> 出库列表
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 仓库管理
+    <span class="c-gray en">/</span> 出库列表
+    <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_statistics.ftl

@@ -13,8 +13,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
@@ -44,9 +44,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 仓库管理
-    <span class="c-gray en">&gt;</span> 出库统计
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 仓库管理
+    <span class="c-gray en">/</span> 出库统计
+    <a class="btn radius r"  href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -13,8 +13,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         #suggest, #suggest2 {width:200px}
@@ -54,13 +54,11 @@
 <body>
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 订单管理
-    <span class="c-gray en">&gt;</span> 订单详细信息
+    <span class="c-gray en">/</span> 订单管理
+    <span class="c-gray en">/</span> 订单详细信息
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_split.ftl

@@ -13,8 +13,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         #suggest, #suggest2 {width:200px}
@@ -54,13 +54,11 @@
 <body>
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 订单管理
-    <span class="c-gray en">&gt;</span> 拆分订单
+    <span class="c-gray en">/</span> 订单管理
+    <span class="c-gray en">/</span> 拆分订单
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/send_sms.ftl

@@ -12,8 +12,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/update_order.ftl

@@ -12,8 +12,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
@@ -42,13 +42,11 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 订单管理
-    <span class="c-gray en">&gt;</span> 修改订单
+    <span class="c-gray en">/</span> 订单管理
+    <span class="c-gray en">/</span> 修改订单
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/deliver_statistics.ftl

@@ -13,8 +13,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
@@ -44,9 +44,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 仓库管理
-    <span class="c-gray en">&gt;</span> 出库统计
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 仓库管理
+    <span class="c-gray en">/</span> 出库统计
+    <a class="btn radius r"  href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/product/add_product.ftl

@@ -12,8 +12,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
@@ -42,13 +42,11 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 产品管理
-    <span class="c-gray en">&gt;</span> 添加产品
+    <span class="c-gray en">/</span> 产品管理
+    <span class="c-gray en">/</span> 添加产品
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/scm/scm_add_order.ftl

@@ -12,8 +12,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
@@ -42,13 +42,11 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 上朵牙刷定制管理
-    <span class="c-gray en">&gt;</span> 添加订单
+    <span class="c-gray en">/</span> 上朵牙刷定制管理
+    <span class="c-gray en">/</span> 添加订单
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/scm/scm_send_order.ftl

@@ -12,8 +12,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
@@ -42,10 +42,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 上朵牙刷定制管理
-    <span class="c-gray en">&gt;</span> 订单发货
+    <span class="c-gray en">/</span> 上朵牙刷定制管理
+    <span class="c-gray en">/</span> 订单发货
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/WEB-INF/views/scm/scm_update_order.ftl

@@ -12,8 +12,8 @@
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
@@ -42,13 +42,11 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 上朵牙刷定制管理
-    <span class="c-gray en">&gt;</span> 修改订单
+    <span class="c-gray en">/</span> 上朵牙刷定制管理
+    <span class="c-gray en">/</span> 修改订单
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">

watero-rst-web/src/main/webapp/common/static/h-ui.admin/css/H-ui.admin.css

@@ -84,7 +84,7 @@ h4{line-height:30px}
 .Hui-tabNav-more {position: absolute;right:0px;width:70px;top:4px;display: none}
 
 /*面包屑导航*/
-.breadcrumb{background-color:#fff; padding:0 20px; position:relative; z-index:99;color: #333;}
+.breadcrumb{background-color:#fff; padding:0; position:relative; z-index:99;color: #333;margin: 0 20px;}
 .breadcrumb .btn{ line-height: 1.2em;margin-top: 3px;background: #fff;color: #32a3d8;border: 1px solid #fff;font-size: 1.2rem;}
 @media (max-width: 767px) {
 	.breadcrumb{ padding:0 15px;}