Merge remote-tracking branch 'origin/master'

src/main/java/com/yc/education/controller/ProviderSearchController.java

@@ -313,7 +313,7 @@ public class ProviderSearchController extends BaseController {
 
             // 生成小程序二维码
 
-
+            //个人信息 查询 展示
             // lc 2019.9.20 店铺是否认证
             UserInfo userinfo = getUserInfo(token);
             Provider providerInfo = providerMapper.getProviderByUserId(userinfo.getId(), null);
@@ -357,7 +357,7 @@ public class ProviderSearchController extends BaseController {
             if (myCollection != null) {
                 pVo.setIsCollection("1");
             }
-
+            //个人信息 查询 展示 --  end
             //商家信息
             Provider provider = providerMapper.selectByPrimaryKey(StoreId);
 
@@ -455,21 +455,23 @@ public class ProviderSearchController extends BaseController {
                 }
             } else {
                 // 经销商
-                String paramType = providerInfo.getParamType();
-                if (StringUtils.isNotBlank(paramType)) {
-                    Long storeId = provider.getId();
-                    List<Product> productListType = iProductService.getListByGroupsName(storeId);
-                    if (CollectionUtils.isNotEmpty(productListType)) {
-                        Product product = new Product();
-                        product.setName("全部");
-                        product.setfName("全部");
-                        product.setsName("全部");
-                        productListType.add(0, product);
-                        pVo.setServieItemType(productListType.toArray());
-                    }
-                    List<Product> productList = iProductService.getListByfNamedAndsName(storeId, null, null);
-                    if (CollectionUtils.isNotEmpty(productList)) {
-                        pVo.setServiceItemDetail(productList.toArray());
+                if(provider != null){
+                    String paramType = provider.getParamType();
+                    if (StringUtils.isNotBlank(paramType)) {
+                        Long storeId = provider.getId();
+                        List<Product> productListType = iProductService.getListByGroupsName(storeId);
+                        if (CollectionUtils.isNotEmpty(productListType)) {
+                            Product product = new Product();
+                            product.setName("全部");
+                            product.setfName("全部");
+                            product.setsName("全部");
+                            productListType.add(0, product);
+                            pVo.setServieItemType(productListType.toArray());
+                        }
+                        List<Product> productList = iProductService.getListByfNamedAndsName(storeId, null, null);
+                        if (CollectionUtils.isNotEmpty(productList)) {
+                            pVo.setServiceItemDetail(productList.toArray());
+                        }
                     }
                 }
             }

src/main/java/com/yc/education/controller/admin/HelpInfoAdminController.java

@@ -0,0 +1,172 @@
+package com.yc.education.controller.admin;
+
+import com.github.pagehelper.PageInfo;
+import com.yc.education.model.HelpInfo;
+import com.yc.education.model.HelpType;
+import com.yc.education.service.IHelpInfoService;
+import com.yc.education.service.IHelpTypeService;
+import com.yc.education.util.AjaxMessage;
+import com.yc.education.util.ViewUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.ViewRendererServlet;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wuzhiqiang
+ * @create 2019-10-16 11:42
+ * @Description  帮助中心  帮助信息后台管理
+ */
+@Controller
+@RequestMapping("admin")
+public class HelpInfoAdminController {
+
+    @Autowired
+    private IHelpInfoService iHelpInfoService;//帮助信息
+
+    @Autowired
+    private IHelpTypeService iHelpTypeService;//帮助类型
+
+
+    /***
+     * 帮助中心后台列表
+     * @param title
+     * @param typeId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping("helpInfoList.html")
+    public ModelAndView  helpInfoList(
+            @RequestParam(defaultValue = "")String title,
+            @RequestParam(defaultValue = "") Integer typeId,
+            @RequestParam(defaultValue = "1")Integer pageNum,
+            @RequestParam(defaultValue = "10")Integer pageSize
+    ){
+        ModelAndView mav = new ModelAndView();
+
+        List<HelpType> listAllHelpType = iHelpTypeService.listAllType();//查询帮助类型
+        mav.addObject("allType",listAllHelpType);
+
+        List<HelpInfo> listAllHelpInfo = iHelpInfoService.listAllHelpInfo(title,typeId,pageNum,pageSize);
+
+        if (listAllHelpType != null && listAllHelpInfo != null){
+            for (HelpInfo helpInfo : listAllHelpInfo){
+                for (HelpType helpType : listAllHelpType){
+                    if (helpInfo.getHelptypeid() == helpType.getId()){
+                        helpInfo.setTypeName(helpType.getTitle());
+                    }
+                }
+            }
+        }
+
+        mav.addObject("pageInfo",new PageInfo<HelpInfo>(listAllHelpInfo));
+        mav.addObject("title",title);
+        mav.addObject("typeId",typeId);
+        mav.addObject("pageNum",pageNum);
+        mav.addObject("pageSize",pageSize);
+
+        return mav;
+    }
+
+    /**
+     * 添加 跳转
+     * @return
+     */
+    @RequestMapping("helpInfoAdd.html")
+    public ModelAndView helpInfoAdd(){
+        ModelAndView mav = new ModelAndView();
+        List<HelpType> listAllHelpType = iHelpTypeService.listAllType();//查询帮助类型
+        mav.addObject("allType",listAllHelpType);
+        return mav;
+    }
+
+    @RequestMapping("helpInfoAdds.html")
+    public ModelAndView helpInfoAdds(HelpInfo helpInfo){
+
+         helpInfo.setReleasetime(new Date());
+         int  row = iHelpInfoService.save(helpInfo);
+
+        if (row == 0){
+            return ViewUtil.returnview(row,"helpInfoList.html","帮助中心列表");
+        }
+
+        return ViewUtil.returnview(row,"helpInfoList.html","帮助中心列表");
+    }
+
+    /**
+     *修改 跳转
+     * @param id
+     * @return
+     */
+    @RequestMapping("helpInfoUpdate.html")
+    public ModelAndView helpInfoUpdate(Integer id){
+
+        ModelAndView mav = new ModelAndView();
+
+        List<HelpType> listAllHelpType = iHelpTypeService.listAllType();//查询帮助类型
+        mav.addObject("allType",listAllHelpType);
+
+        HelpInfo helpInfo = iHelpInfoService.selectByKey(id);
+        mav.addObject("helpInfo",helpInfo);
+
+        return mav;
+
+    }
+
+    /**
+     * 修改  实现
+     * @return
+     */
+    @RequestMapping("helpInfoUpdates.html")
+    public ModelAndView helpInfoUpdates(HelpInfo helpInfo){
+
+
+        helpInfo.setReleasetime(new Date());
+
+        int row = iHelpInfoService.updateNotNull(helpInfo);
+
+        if (row == 0){
+            return ViewUtil.returnview(row,"helpInfoList.html","帮助中心列表");
+        }
+
+        return ViewUtil.returnview(row,"helpInfoList.html","帮助中心列表");
+
+    }
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("helpInfoDel.html")
+    public AjaxMessage<Object> providerDel(String id) {
+
+        AjaxMessage<Object> am = new AjaxMessage();
+        String[] idlist = id.split(",");
+
+        int row = 0;
+
+        for (String string : idlist) {
+            row += iHelpInfoService.delete(Integer.valueOf(string));
+        }
+        if (row > 0) {
+            am.setIs(true);
+            am.setMsg(" 删除成功  ");
+        } else {
+            am.setIs(false);
+            am.setMsg("删除失败");
+        }
+
+        return am;
+    }
+
+
+}

src/main/java/com/yc/education/mapper/HelpInfoMapper.java

@@ -16,4 +16,6 @@ public interface HelpInfoMapper extends MyMapper<HelpInfo> {
 
 
     List<HelpInfo> selectAllByMyself();
+
+    List<HelpInfo> listAllHelpInfo(@Param("title") String title, @Param("typeId") Integer typeId);
 }

src/main/java/com/yc/education/model/HelpInfo.java

@@ -3,6 +3,7 @@ package com.yc.education.model;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Transient;
 import java.util.Date;
 
 /**
@@ -44,6 +45,20 @@ public class HelpInfo {
      */
     private Integer helptypeid;
 
+    /**
+     * 类型名称
+     */
+    @Transient
+    private String typeName;//wzq 2019/10/16
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
     /**
      * 获取id
      * @return

src/main/java/com/yc/education/model/Provider.java

@@ -251,14 +251,14 @@ public class Provider implements Serializable {
      * 在线状态 （0下线  1 在线）
      */
     @Column(name = "is_line")
-     private String isLine;
+    private String isLine;
 
     /*                            添加字段        wzq  2019/10/15                          */
     /**
      * 五个大类型（维修保养，美容洗车，4s店deng）
      */
     @Column(name = "five_type")
-    private  String fiveType;
+    private String fiveType;
     /**
      * 维修
      */
@@ -290,13 +290,13 @@ public class Provider implements Serializable {
     /**
      * 企业类型
      */
-    @Column(name="company_type")
+    @Column(name = "company_type")
     private String companyType;
 
     /**
      * 主营品牌
      */
-    @Column(name="main_brand")
+    @Column(name = "main_brand")
     private String mainBrand;
     /**
      * 经营资质
@@ -306,6 +306,18 @@ public class Provider implements Serializable {
      * 经营范围
      */
     private String scale;
+
+
+    /**
+     * 是否是导入数据(0否,1是)
+     */
+    private String isImport;
+
+    /**
+     * 导入父类  主营信息
+     */
+    private String pMainBusiness;
+
     /**
      * 获取主键id
      *
@@ -1095,4 +1107,20 @@ public class Provider implements Serializable {
     public void setScale(String scale) {
         this.scale = scale;
     }
+
+    public String getIsImport() {
+        return isImport;
+    }
+
+    public void setIsImport(String isImport) {
+        this.isImport = isImport;
+    }
+
+    public String getpMainBusiness() {
+        return pMainBusiness;
+    }
+
+    public void setpMainBusiness(String pMainBusiness) {
+        this.pMainBusiness = pMainBusiness;
+    }
 }

src/main/java/com/yc/education/service/IHelpInfoService.java

@@ -12,4 +12,6 @@ public interface IHelpInfoService extends IService<HelpInfo> {
 
 //    List<HelpInfo> listAllInfo();
     List<HelpInfo> listAllInfo(Integer typeId);
+
+    List<HelpInfo> listAllHelpInfo(String title, Integer typeId, Integer pageNum, Integer pageSize);
 }

src/main/java/com/yc/education/service/impl/HelpInfoService.java

@@ -1,5 +1,6 @@
 package com.yc.education.service.impl;
 
+import com.github.pagehelper.PageHelper;
 import com.yc.education.mapper.HelpInfoMapper;
 import com.yc.education.model.HelpInfo;
 import com.yc.education.service.IHelpInfoService;
@@ -21,4 +22,18 @@ public class HelpInfoService extends BaseService<HelpInfo> implements IHelpInfoS
     public List<HelpInfo> listAllInfo(Integer typeId){
         return mapper.listAllInfo(typeId);
     }
+
+    /**
+     * 后台 查询列表分页
+     * @param title
+     * @param typeId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<HelpInfo> listAllHelpInfo(String title, Integer typeId, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
+        return mapper.listAllHelpInfo(title,typeId);
+    }
 }

src/main/resources/mapper/HelpInfoMapper.xml

@@ -20,6 +20,20 @@
         order by infosort
     </select>
 
+    <!--后台帮助中心管理-->
+    <select id="listAllHelpInfo" resultMap="HelpInfoResultMap">
+        select * from helpinfo
+        <where>
+            <if test="title != null and title != ''">
+                infotitle like concat ('%',#{title},'%')
+            </if>
+            <if test="typeId != null and typeId != ''">
+               and  helptypeid=#{typeId}
+            </if>
+        </where>
+        order by infosort
+    </select>
+
     <select id="selectAllByMyself" resultMap="HelpInfoResultMap">
         select * from helpinfo
     </select>

src/main/resources/mapper/HelpTypeMapper.xml

@@ -10,6 +10,6 @@
 
     <!--查询帮助类别-->
     <select id="listAllType" resultMap="HelpTypeResultMap" >
-        select * from helptype
+        select * from helptype order by sort
     </select>
 </mapper>

src/main/resources/mapper/ProviderMapper.xml

@@ -44,17 +44,20 @@
         <result column="is_use" property="isUse" jdbcType="CHAR"/> <!--店铺状态-->
         <result column="is_line" property="isLine" jdbcType="CHAR"/> <!--在线状态-->
         <!--新增  2019、10、15-->
-        <result column="five_type" property="fiveType" jdbcType="VARCHAR" />
-        <result column="repair" property="repair" jdbcType="VARCHAR" />
-        <result column="maintain" property="maintain" jdbcType="VARCHAR" />
-        <result column="consmetology" property="consmetology" jdbcType="VARCHAR" />
-        <result column="wash_car" property="washCar" jdbcType="VARCHAR" />
-        <result column="refit" property="refit" jdbcType="VARCHAR" />
-        <result column="road_rescue" property="roadRescue" jdbcType="VARCHAR" />
-        <result column="company_type" property="companyType" jdbcType="VARCHAR" />
-        <result column="intelligence" property="intelligence" jdbcType="VARCHAR" />
-        <result column="scale" property="scale" jdbcType="VARCHAR" />
-        <result column="main_brand" property="mainBrand" jdbcType="VARCHAR" />
+        <result column="five_type" property="fiveType" jdbcType="VARCHAR"/>
+        <result column="repair" property="repair" jdbcType="VARCHAR"/>
+        <result column="maintain" property="maintain" jdbcType="VARCHAR"/>
+        <result column="consmetology" property="consmetology" jdbcType="VARCHAR"/>
+        <result column="wash_car" property="washCar" jdbcType="VARCHAR"/>
+        <result column="refit" property="refit" jdbcType="VARCHAR"/>
+        <result column="road_rescue" property="roadRescue" jdbcType="VARCHAR"/>
+        <result column="company_type" property="companyType" jdbcType="VARCHAR"/>
+        <result column="intelligence" property="intelligence" jdbcType="VARCHAR"/>
+        <result column="scale" property="scale" jdbcType="VARCHAR"/>
+        <result column="main_brand" property="mainBrand" jdbcType="VARCHAR"/>
+
+        <result column="is_import" property="isImport" jdbcType="VARCHAR"/>
+        <result column="p_main_business" property="pMainBusiness" jdbcType="VARCHAR"/>
 
     </resultMap>
 
@@ -107,7 +110,7 @@
         </where>
 
     </select>
-<!--查询所有商家信息-->
+    <!--查询所有商家信息-->
     <select id="listAllBusinessInfo" resultMap="BaseResultMap">
         select * from provider
         <where>
@@ -118,19 +121,19 @@
                 and city = #{city}
             </if>
             <if test="district != null and '' !=district">
-               and  district = #{district}
+                and district = #{district}
             </if>
             <if test="role != null and '' !=role">
-                and  role_type = #{role}
+                and role_type = #{role}
             </if>
             <if test="name != null and '' !=name">
-                and  `name` like concat ('%',#{name},'%')
+                and `name` like concat ('%',#{name},'%')
             </if>
             <if test="id != null and '' !=id">
-                and  id = #{id}
+                and id = #{id}
             </if>
             <if test="phone != null and '' !=phone">
-                and  auth_phone = #{phone}
+                and auth_phone = #{phone}
             </if>
         </where>
         order by status desc,enter_date desc
@@ -149,13 +152,13 @@
             </if>
 
             <if test="status != null and status != ''">
-                and status = #{status}
+                and `status` = #{status}
             </if>
             <if test="isUse != null and isUse != ''">
                 and is_use =#{isUse}
             </if>
         </where>
-        order by status desc,enter_date desc
+        order by  `status` desc,enter_date desc
     </select>
     <!--查询所有供应商信息 分页-->
     <select id="listAllSupplierInfo" resultMap="BaseResultMap">
@@ -210,7 +213,7 @@
     </insert>
     <!-- 查询重复 -->
     <select id="queryId" resultType="java.lang.String">
-  	select min(id) from provider group by `name`,company_name,address desc order by id desc
+  	select min(id) from provider group by `name`,company_name,address,auth_phone desc order by id desc
   </select>
     <!--删除集合数据-->
     <delete id="deleteByRepeat" parameterType="java.util.List">

src/main/webapp/WEB-INF/jsp/admin/carProductionsTypeList.jsp

@@ -66,6 +66,7 @@
                 <th width="120">图标</th>
                 <%-- <th width="120">服务类型</th>--%>
                 <th width="120">图标地址</th>
+                <th width="120">服务类型</th>
                 <th width="120">所属类别</th>
                 <th width="120">名称</th>
                 <th width="120">排序</th>
@@ -80,6 +81,7 @@
                     <th><input   name="ck_pro"    value="${car.id }"   type="checkbox"  ></th>
                     <td><img src="${car.img}" style="width: 50px;height: 50px"></td>
                     <td class="text-l">${car.img}</td>
+                    <td class="text-l">${car.type == 0 ? '汽车用品' : '汽保设备与工具'}</td>
                     <td class="text-l">${car.typeStr}</td>
                     <td class="text-l">${car.name}</td>
                     <td class="text-l">${car.sort}</td>

src/main/webapp/WEB-INF/jsp/admin/providerAdd.jsp

@@ -161,7 +161,7 @@
             <div class="formControls col-xs-8 col-sm-9">
                 <div class="formControls col-xs-8 col-sm-9">
                     <label><input type="radio" class="radio-box" name="companyType" value="快修连锁店" checked="checked">快修连锁店</label>
-                    <label><input type="radio" class="radio-box" name="companyType" value="品牌4s店">品牌4s店</label>
+                    <label><input type="radio" class="radio-box" name="companyType" value="品牌4S店">品牌4S店</label>
                     <label><input type="radio" class="radio-box" name="companyType" value="专项修理">专项修理</label>
                     <label><input type="radio" class="radio-box" name="companyType" value="综合修理厂">综合修理厂</label>
                 </div>
@@ -299,7 +299,7 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>服务项目：</label>
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>服务项目(个)：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <div class="formControls col-xs-8 col-sm-9">
                     <input type="text" class="input-text" name="serviceIteam">
@@ -345,26 +345,26 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>营业开始日期：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" name="businessSdate" required="required"/>
+                <input type="text" class="input-text" name="businessSdate" required="required" value="周一"/>
             </div>
         </div>
            <div class="row cl">
                <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>营业结束日期：</label>
                <div class="formControls col-xs-8 col-sm-9">
-                   <input type="text" class="input-text" name="businessEdate" required="required" />
+                   <input type="text" class="input-text" name="businessEdate" required="required" value="周日"/>
                </div>
            </div>
 
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>开始营业时间：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="time" class="input-text" name="businessStime" required="required" />
+                <input type="time" class="input-text" name="businessStime" required="required" value="09:00" />
             </div>
         </div>
            <div class="row cl">
                <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>结束营业时间：</label>
                <div class="formControls col-xs-8 col-sm-9">
-                   <input type="time" class="input-text" name="businessEtime" required="required"/>
+                   <input type="time" class="input-text" name="businessEtime" required="required" value="18:00"/>
                </div>
            </div>
 

src/main/webapp/WEB-INF/jsp/admin/providerUpdate.jsp

@@ -170,11 +170,10 @@
             <div class="formControls col-xs-8 col-sm-9">
 
                 <div class="formControls col-xs-8 col-sm-9">
-                    <label><input type="radio" class="radio-box" name="companyType" value="快修连锁店" <c:if test="${provider.scale =='快修连锁店'}">checked="checked"</c:if>>快修连锁店</label>
-                    <label><input type="radio" class="radio-box" name="companyType" value="品牌4s店" <c:if test="${provider.scale =='品牌4s店'}">checked="checked"</c:if>>品牌4s店</label>
-                    <label><input type="radio" class="radio-box" name="companyType" value="专项修理"  <c:if test="${provider.scale =='专项修理'}">checked="checked"</c:if> >专项修理</label>
-                    <label><input type="radio" class="radio-box" name="companyType" value="综合修理厂" <c:if test="${provider.scale =='综合修理厂'}">checked="checked"</c:if> >综合修理厂</label>
-                    <input type="hidden" class="input-text" name="id" value="${provider.id}">
+                    <label><input type="radio" class="radio-box" name="companyType" value="快修连锁店" <c:if test="${provider.companyType =='快修连锁店'}">checked="checked"</c:if>>快修连锁店</label>
+                    <label><input type="radio" class="radio-box" name="companyType" value="品牌4s店" <c:if test="${provider.companyType =='品牌4S店'}">checked="checked"</c:if>>品牌4s店</label>
+                    <label><input type="radio" class="radio-box" name="companyType" value="专项修理"  <c:if test="${provider.companyType =='专项修理'}">checked="checked"</c:if> >专项修理</label>
+                    <label><input type="radio" class="radio-box" name="companyType" value="综合修理厂" <c:if test="${provider.companyType =='综合修理厂'}">checked="checked"</c:if> >综合修理厂</label>
                 </div>
             </div>
         </div>

src/main/webapp/WEB-INF/jsp/admin/supplierAdd.jsp

@@ -114,7 +114,7 @@
             </div>
         </div>
 
-           <div class="row cl">
+           <%--<div class="row cl">
                <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>品牌名称：</label>
                <div class="formControls col-xs-8 col-sm-9">
                    <select name="brandId"  class="input-text">
@@ -124,7 +124,7 @@
                        </c:forEach>
                    </select>
                </div>
-           </div>
+           </div>--%>
 
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>店铺名称：</label>
@@ -133,7 +133,7 @@
             </div>
         </div>
 
-        <div class="row cl">
+       <%-- <div class="row cl">
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>认证状态：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <select name="status"  class="input-text">
@@ -141,8 +141,8 @@
                         <option value="1" >已认证</option>
                 </select>
             </div>
-        </div>
-
+        </div>--%>
+<%--
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>店铺状态：</label>
             <div class="formControls col-xs-8 col-sm-9">
@@ -153,8 +153,8 @@
 
                 </select>
             </div>
-        </div>
-        <div class="row cl">
+        </div>--%>
+        <%--<div class="row cl">
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>推荐热门：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <select name="isHot"  class="input-text">
@@ -163,7 +163,7 @@
 
                 </select>
             </div>
-        </div>
+        </div>--%>
            <div class="row cl">
                <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>省,市,区：</label>
                <div class="formControls col-xs-8 col-sm-9">
@@ -199,12 +199,18 @@
             </div>
         </div>
 
-        <div class="row cl">
+     <%--   <div class="row cl">
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>主营业务：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <input type="text" class="input-text" name="mianBusiness" required="required" />
             </div>
-        </div>
+        </div>--%>
+           <div class="row cl">
+               <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>优势项目：</label>
+               <div class="formControls col-xs-8 col-sm-9">
+                   <input type="text" class="input-text" name="serviceItem" required="required"  value="0条"/>
+               </div>
+           </div>
          <%--  <textarea name="businessIntroduce" cols="" rows="" class="textarea"  placeholder="说点什么...最少输入10个字符" datatype="*10-100" dragonfly="true" nullmsg="备注不能为空！" onKeyUp="$.Huitextarealength(this,200)">
                ${provider.businessIntroduce}
            </textarea>
@@ -237,26 +243,26 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>营业开始日期：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="text" class="input-text" name="businessSdate" required="required"/>
+                <input type="text" class="input-text" name="businessSdate" required="required" value="周一"/>
             </div>
         </div>
            <div class="row cl">
                <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>营业结束日期：</label>
                <div class="formControls col-xs-8 col-sm-9">
-                   <input type="text" class="input-text" name="businessEdate" required="required" />
+                   <input type="text" class="input-text" name="businessEdate" required="required" value="周日"/>
                </div>
            </div>
 
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>开始营业时间：</label>
             <div class="formControls col-xs-8 col-sm-9">
-                <input type="time" class="input-text" name="businessStime" required="required" />
+                <input type="time" class="input-text" name="businessStime" required="required" value="09:00" />
             </div>
         </div>
            <div class="row cl">
                <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>结束营业时间：</label>
                <div class="formControls col-xs-8 col-sm-9">
-                   <input type="time" class="input-text" name="businessEtime" required="required"/>
+                   <input type="time" class="input-text" name="businessEtime" required="required" value="18:00"/>
                </div>
            </div>
 

src/main/webapp/WEB-INF/jsp/admin/supplierUpdate.jsp

@@ -238,6 +238,12 @@
                 <input type="text" class="input-text" name="mianBusiness" value="${provider.mianBusiness}">
             </div>
         </div>
+           <div class="row cl">
+               <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>优势项目：</label>
+               <div class="formControls col-xs-8 col-sm-9">
+                   <input type="text" class="input-text" name="serviceItem" value="${provider.serviceItem}">
+               </div>
+           </div>
          <%--  <textarea name="businessIntroduce" cols="" rows="" class="textarea"  placeholder="说点什么...最少输入10个字符" datatype="*10-100" dragonfly="true" nullmsg="备注不能为空！" onKeyUp="$.Huitextarealength(this,200)">
                ${provider.businessIntroduce}
            </textarea>

src/main/webapp/WEB-INF/jsp/helpInfoAdd.jsp

@@ -0,0 +1,347 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%
+    String base = pageContext.getServletContext().getContextPath();
+%>
+<!--_meta 作为公共模版分离出去-->
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <script type="text/javascript">
+        window.UEDITOR_SERVER_URL = '<%=base%>';
+    </script>
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <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 rel="Bookmark" href="/favicon.ico">
+    <LINK rel="Shortcut Icon" href="/favicon.ico"/>
+
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui/css/H-ui.min.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/H-ui.admin.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/Hui-iconfont/1.0.8/iconfont.css"/>
+    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/admin/icheck/icheck.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/skin/default/skin.css" id="skin"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/style.css"/>
+
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/index/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/layer/layer.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/js/jquery.validate.min.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/js/validate-methods.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/js/messages_zh.min.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/icheck/jquery.icheck.min.js"></script>
+    <script src="${pageContext.request.contextPath}/static/admin/manage/js/WdatePicker.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/js/ajaxfileupload.js"></script>
+
+    <script type="text/javascript">
+        $(function () {
+            $("#sub").click(function () {
+
+                var typeid = $('#pId option:selected').val();
+
+                var tagid = $('#gId option:selected').val();
+                var istop = $('#zId option:selected').val();
+                var name = $("input[name='title']").val();
+                if (typeid ==null || typeid == '') {
+                    layer.msg("资讯类型不能为空~");
+                    return false;
+                }
+                if (tagid == null || tagid == '') {
+                    layer.msg("标签名称不能为空~");
+                    return false;
+                }
+                if (istop == null || istop == '') {
+                    layer.msg("是否置顶不能为空~");
+                    return false;
+                }
+                if(name == null || name == ''){
+                    layer.msg("资讯名称不能为空~");
+                    return false;
+                }
+                // var files = document.querySelector('input[name="photo"]').files;
+                // if(files.length>3){
+                //     layer.msg("最多上传三张图片");
+                //     return false;
+                // }
+                var str = "";
+                $("input[name='eachImg']").each(function(){
+                    str += $(this).val()+",";
+                });
+                var substr = str.substring(0,str.length-1)
+                $("#morePhoto").val(substr)
+
+                console.log($("#morePhoto").val(substr))
+                $('#subform').submit();
+            });
+        });
+    </script>
+    <style>
+        .selfprozslidim dd {
+            border: 1px solid #ccc;
+            display: inline-block;
+            height: 68px;
+            margin: 0 0 10px 10px ;
+            position: relative;
+            width: 68px;
+        }
+        .selfprozslidim dd img {
+            display: block;
+            height: 68px;
+            width: 68px;
+        }
+        .selfprozslidim dd i {
+            background: #999;
+            border: 1px solid #ccc;
+            cursor: pointer;
+            display: none;
+            height: 13px;
+            position: absolute;
+            right: 3px;
+            top: 3px;
+            width: 13px;
+        }
+        #albummore a{cursor:pointer;}
+        .selfprozslidim dd:hover i {
+            display: block;
+        }
+        .selfprozslidim dd i:hover {
+            background-color: #3388ff;
+        }
+        .delwarp {
+            display:none;
+
+            padding: 5px 7px;
+            position: absolute;
+            right: 0;
+            top: 0;
+            z-index: 2;
+        }
+        .delete {
+            background: rgba(0, 0, 0, 0) url("${pageContext.request.contextPath}/static/images/del.png") no-repeat scroll 0 0 / 15px 19px;
+            display: block;
+            height: 19px;
+            text-indent: -9999px;
+            width: 15px;
+        }
+        .selfprozslidim dd.del:hover .delwarp {
+            display: block;
+        }
+    </style>
+    <title>管理员管理</title>
+</head>
+<body>
+<nav class="breadcrumb">
+    <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px"
+       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<article class="page-container">
+    <form action="activityNewsAdds.html" method="post" enctype="multipart/form-data" class="form form-horizontal" id="subform">
+
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>资讯类型：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <select name="typeid" id = "pId"  class="input-text">
+                    <option value="">请选择</option>
+                    <c:forEach items="${typeInfo}" var="type">
+                        <option value="${type.id}">${type.typename}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>资讯标签：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <select name="tagid" id = "gId" class="input-text">
+                    <option value="">请选择</option>
+                    <c:forEach items="${tagInfo}" var="type">
+                        <option value="${type.id}">${type.tagname}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>资讯名称：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <input type="text" class="input-text" name="title">
+            </div>
+        </div>
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1">广告图：</br><span class="c-red">*不超过三张</span></label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <div style="width:100%;height:auto;border:1px solid #DDDDDD;padding:8px 5px 0 0;" class="selfprozslidim">
+                    <dl>
+                        <input type="file" style="display: none;" name="fileToUpload" class="selfbasetlimgedup" id="fileToUpload">
+                        <dd id="albummore"><a onclick="$('#fileToUpload').click();"><img src="${pageContext.request.contextPath}/static/images/addmore.jpg" alt="" id="img"></a></dd>
+                    </dl>
+                </div>
+            </div>
+        </div>
+
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>是否置顶：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <select name="istop"  id="zId" class="input-text">
+                    <option value="0">否</option>
+                    <option value="1">是</option>
+                </select>
+            </div>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>广告设置：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <select name="isAd"   class="input-text">
+                    <option value="0">否</option>
+                    <option value="1">是</option>
+                </select>
+            </div>
+        </div>
+
+
+        <%--编辑器--%>
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>资讯详情：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <script id="introduction" name="detailinfo" style="width:100%;height:200px;" type="text/plain"></script>
+            </div>
+
+        </div>
+                <%--<div class="row cl">
+                    <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-1">
+                    <button type="submit" class="btn btn-success radius" >提交</button>
+                    </div>
+                </div>--%>
+        <div class="row cl">
+            <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-1">
+                <button type="button" class="btn btn-primary radius" id="sub" name="admin-role-save"><i class="Hui-iconfont">&#xe632;</i> 提交</button>
+            </div>
+        </div>
+    </form>
+</article>
+
+<!--请在下方写此页面业务相关的脚本-->
+<!-- 百度文本编辑器   引用文件 -->
+<link href="<%=base%>/static/ue/themes/default/css/ueditor.css" type="text/css" rel="stylesheet">
+<script src="<%=base%>/static/ue/ueditor.config.js" type="text/javascript"></script>
+<script src="<%=base%>/static/ue/ueditor.all.js" type="text/javascript"></script>
+<script type="text/javascript" src="<%=base%>/static/ue/lang/zh-cn/zh-cn.js"></script>
+
+<script type="text/javascript">
+
+
+    <!-- 百度文本编辑器   js -->
+    $(function () {
+        var ue = UE.getEditor('introduction', {
+            //关闭字数统计
+            wordCount: false,
+            toolbars: [['fullscreen', 'source', '|', 'undo', 'redo', '|',
+                'bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|',
+                'rowspacingtop', 'rowspacingbottom', 'lineheight', '|',
+                'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|',
+                'directionalityltr', 'directionalityrtl', 'indent', '|',
+                'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|',
+                'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|',
+                'insertimage', 'emotion', 'insertvideo', 'attachment', 'map', 'template', 'background', '|',
+                'horizontal', 'date', 'time', 'spechars', 'wordimage', '|',
+                'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|',
+                'print', 'preview', 'searchreplace', 'help'
+            ]],
+            //关闭elementPath
+            elementPathEnabled: false,
+        });
+    });
+
+
+    var currentBrowserId;
+
+    function browserImage(targetId) {
+        currentBrowserId = targetId;
+        var weboxTemp = $.webox({
+            height: 600,
+            width: 1024,
+            bgvisibel: true,
+            title: '图片管理',
+            iframe: '<%=base%>/admin/image/imgbox.html?' + Math.random()
+        });
+    }
+
+    function setImagepath(imgPath) {
+        $('#' + currentBrowserId).val(imgPath);
+    }
+
+    function closeFrame() {
+        $('#locked .span').click();
+    }
+</script>
+
+
+<%-- 多图上传 --%>
+<script type="text/javascript">
+    $(function(){
+        $("#fileToUpload").change(function(){
+            var f = document.getElementById('fileToUpload').files[0];
+            $.ajaxFileUpload({
+                fileElementId : 'fileToUpload',
+                url : 'uploadImages.html',
+                dataType : 'text',
+                data : {},
+                async : true,
+                error : function(data) {
+                    alert("网络异常，请重试");
+                },
+                success : function(message) {
+                    $("#albummore").before('<dd class="del"><img src="'+message+'" width="68" height="68" /><input type="hidden" name="activityimage" value="'+message+'"/><div class="delwarp"><a class="delete" onclick="delalbum(this)">删除</a></div></dd>');
+                    chens();
+
+                }
+            });
+        });
+    });
+    function chens(){
+        $("#fileToUpload").change(function(){
+            var f = document.getElementById('fileToUpload').files[0];
+            $.ajaxFileUpload({
+                fileElementId : 'fileToUpload',
+                url : 'uploadImages.html',
+                dataType : 'text',
+                data : {},
+                async : true,
+                error : function(data) {
+                    alert("网络异常，请重试");
+                },
+                success : function(message) {
+                    $("#albummore").before('<dd class="del"><img src="'+message+'" width="68" height="68" /><input type="hidden" name="activityimage" value="'+message+'"/><div class="delwarp"><a class="delete" onclick="delalbum(this)">删除</a></div></dd>');
+                    chens();
+                }
+            });
+        });
+    }
+
+    function delalbum(obj){
+        $(obj).parents(".del").remove();
+    }
+
+</script>
+<!--请在下方写此页面业务相关的脚本-->
+<script type="text/javascript">
+</script>
+<!--/请在上方写此页面业务相关的脚本-->
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/helpInfoList.jsp

@@ -0,0 +1,225 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>后台管理</title>
+
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui/css/H-ui.min.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/H-ui.admin.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/Hui-iconfont/1.0.8/iconfont.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/skin/default/skin.css" id="skin"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/style.css"/>
+    <link href="${pageContext.request.contextPath}/static/admin/css/page.css" rel="stylesheet" type="text/css"/>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/index/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/layer/layer.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/index/h-ui/js/H-ui.min.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/js/H-ui.admin.js"></script>
+</head>
+<body>
+<nav class="breadcrumb">
+    <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px"
+       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+    <form action="helpInfoList.html" method="post"   enctype="multipart/form-data">
+        <div class="text-c">
+       <%-- <span class="select-box inline">
+            <select name="typeId" class="select">
+                <option value="">资讯类别</option>
+                <c:forEach items="${typeInfo}" var="item">
+                     <option value="${item.id}"
+                             <c:if test="${item.id == typeId}">selected</c:if> >${item.typename}</option>
+                </c:forEach>
+            </select>
+		</span>--%>
+            <span class="select-box inline">
+            <select name="typeId" class="select">
+                <option value="">帮助类型</option>
+                <c:forEach items="${allType}" var="item">
+                     <option value="${item.id}"
+                             <c:if test="${item.id == typeId}">selected</c:if> >${item.title}</option>
+                </c:forEach>
+            </select>
+		</span>
+            <input type="text" name="title" id="title" value="${title}" placeholder="标题" style="width:250px" class="input-text">
+            <button class="btn btn-success" type="submit"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+        </div>
+    </form>
+    <div class="cl pd-5 bg-1 bk-gray mt-20">
+			<span class="l">
+                <a class="btn btn-danger radius"  href="javascript:;"  id="delete"    ><i class="Hui-iconfont">&#xe6e2;</i>批量删除</a>
+				<a class="btn btn-primary radius" href="helpInfoAdd.html"><i
+                        class="Hui-iconfont">&#xe600;</i> 添加帮助信息</a>
+               <%-- <i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</i>
+                <c:forEach items="${typeInfo}" var="typeInfo">
+                    <a class="btn btn-primary radius" <c:if test="${typeInfo.id==typeId}">style="background-color:#0a6999"</c:if>  href="helpInfoList.html?typeId=${typeInfo.id}">${typeInfo.typename}</a>
+                </c:forEach>--%>
+			</span>
+        <span class="r">共有数据：<strong>${pageInfo.total}</strong> 条</span>
+    </div>
+
+
+    <div class="mt-20">
+        <table class="table table-border table-bordered table-bg table-hover table-sort" style="table-layout:fixed">
+            <thead>
+            <tr class="text-c" >
+                <th width="80" ><input  id="checked_all"   type="checkbox"  >全选</th>
+                <th width="120">编号</th>
+                <th width="120">类型</th>
+                <th width="120">名称</th>
+                <th width="100">排序</th>
+                <th width="150">发布时间</th>
+                <th width="200">操作</th>
+            </tr>
+            </thead>
+            <tbody>
+            <c:forEach items="${pageInfo.list}" var="help">
+                <tr class="text-c">
+                    <th><input   name="ck_pro"    value="${help.id }"   type="checkbox"  ></th>
+                    <td class="text-l">
+                            ${help.id}
+                    </td>
+                    <td class="text-l">
+                            ${help.typeName}
+                    </td>
+
+                    <td class="text-l">
+                        <div style="overflow: hidden;-o-text-overflow: ellipsis;
+                        text-overflow: ellipsis;white-space: nowrap;display: block"><%--将超出字体用....代替--%>
+                                ${help.infotitle}
+                        </div>
+                    </td>
+                    <td class="text-l">
+                            ${help.infosort}
+                    </td>
+                    
+
+                    <td><fmt:formatDate value="${help.releasetime}" pattern="yyyy-MM-dd"></fmt:formatDate></td>
+
+
+                    <td class="f-14 td-manage">
+                        <a style="text-decoration:none" class="ml-5" href="helpInfoUpdate.html?id=${activity.id }" title="查看"><i
+                                class="Hui-iconfont">&#xe6df;</i></a>
+                        <a href="javascript:del(${help.id })"><i class="Hui-iconfont">&#xe6e2;</i></a>
+                    </td>
+                </tr>
+            </c:forEach>
+            </tbody>
+        </table>
+    </div>
+
+    <div id="PageNum">
+        <section>
+            <div class="bd points-goods-list">
+                <ul class="pages">
+                    <li><a href="helpInfoList.html?typeId=${typeId}&title=${title}&pageNum=1&pageSize=${pageInfo.pageSize}">首页</a></li>
+                    <li class="prev"><a
+                            href="helpInfoList.html?typeId=${typeId}&title=${title}&pageNum=${pageInfo.prePage}&pageSize=${pageInfo.pageSize}">上一页</a>
+                    </li>
+                    <c:forEach items="${pageInfo.navigatepageNums}" var="nav">
+                        <c:if test="${nav == pageInfo.pageNum}">
+                            <li><a href="helpInfoList.html?typeId=${typeId}&title=${title}&pageNum=${nav}&pageSize=${pageInfo.pageSize}"
+                                   class="active">${nav}</a></li>
+                        </c:if>
+                        <c:if test="${nav != pageInfo.pageNum}">
+                            <li>
+                                <a href="helpInfoList.html?typeId=${typeId}&title=${title}&pageNum=${nav}&pageSize=${pageInfo.pageSize}">${nav}</a>
+                            </li>
+                        </c:if>
+                    </c:forEach>
+                    <li class="next"><a
+                            href="helpInfoList.html?typeId=${typeId}&title=${title}&pageNum=${pageInfo.nextPage}&pageSize=${pageInfo.pageSize}">下一页</a>
+                    </li>
+                    <li>
+                        <a href="helpInfoList.html?typeId=${typeId}&title=${title}&pageNum=${pageInfo.pages }&pageSize=${pageInfo.pageSize}">末页</a>
+                    </li>
+                </ul>
+            </div>
+        </section>
+    </div>
+</div>
+</div>
+<script type="text/javascript">
+    //全选与反选
+    $("#sltall").click(function () {
+        if ($(this).prop("checked")) {
+            $("[name='id']").prop("checked", true);//全选
+        } else {
+            $("[name='id']").prop("checked", false);//取消全选
+        }
+    });
+
+
+    function downs() {
+        var chkvalue = "";//定义一个数组
+        $("input[name='id']:checked").each(function () {
+            chkvalue += $(this).val() + ",";
+        });
+        window.location.href = "signexcels.html?chkvalue=" + chkvalue;
+    };
+
+    function del(id) {
+        layer.confirm('确认要删除吗？', function (index) {
+            $.post("activityNewsDel.html", {id: id}, function (data) {
+                if (data.is) {
+                    layer.alert(data.msg, {skin: 'layui-layer-molv', closeBtn: 0, anim: 4}, function () {
+                        window.location = window.location;
+                    });
+                } else {
+                    layer.msg(data.msg, {icon: 2, time: 1000});
+                }
+            }, "json");
+        });
+    }
+
+    $("#delete").click(function(){
+        //判断是否至少选择一项
+        var checkedNum =$("input[name='ck_pro']:checked").length;
+        if(checkedNum==0){
+            layer.msg("请至少选择一个！",{icon:2,time:1000});
+            return;
+        }
+        layer.confirm('确认要删除所选项吗？',function(index){
+            var checkList= new Array();
+            $("input[name='ck_pro']:checked").each(function(){
+                checkList.push($(this).val());
+            });
+            $.ajax({
+                type:"POST",
+                url:"activityNewsDel.html",
+                data:{
+                    "id":checkList.toString()
+                },
+                dataType:"json",
+                success:function(ajax){
+                    if(ajax.is){
+                        layer.alert(ajax.msg, {skin: 'layui-layer-molv', closeBtn: 0, anim: 4}, function () {
+                            window.location = window.location;
+                        });
+                        $(":checkbox").prop("checked", false);
+                    }else{
+                        layer.msg(ajax.msg,{icon:2,time:1000});
+                    }
+                }
+            })
+        })
+    });
+    $("#checked_all").click(function(){
+        $("input[name='ck_pro']").prop("checked",this.checked);
+
+    })
+</script>
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/helpInfoUpdate.jsp

@@ -0,0 +1,346 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%
+    String base = pageContext.getServletContext().getContextPath();
+%>
+<!--_meta 作为公共模版分离出去-->
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <script type="text/javascript">
+        window.UEDITOR_SERVER_URL = '<%=base%>';
+    </script>
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <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 rel="Bookmark" href="/favicon.ico">
+    <LINK rel="Shortcut Icon" href="/favicon.ico"/>
+
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui/css/H-ui.min.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/H-ui.admin.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/Hui-iconfont/1.0.8/iconfont.css"/>
+    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/admin/icheck/icheck.css"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/skin/default/skin.css" id="skin"/>
+    <link rel="stylesheet" type="text/css"
+          href="${pageContext.request.contextPath}/static/admin/index/h-ui.admin/css/style.css"/>
+
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/index/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/index/layer/layer.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/js/jquery.validate.min.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/js/validate-methods.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/js/messages_zh.min.js"></script>
+    <script type="text/javascript"
+            src="${pageContext.request.contextPath}/static/admin/icheck/jquery.icheck.min.js"></script>
+    <script src="${pageContext.request.contextPath}/static/admin/manage/js/WdatePicker.js"></script>
+    <style>
+        .selfprozslidim dd {
+            border: 1px solid #ccc;
+            display: inline-block;
+            height: 68px;
+            margin: 0 0 10px 10px ;
+            position: relative;
+            width: 68px;
+        }
+        .selfprozslidim dd img {
+            display: block;
+            height: 68px;
+            width: 68px;
+        }
+        .selfprozslidim dd i {
+            background: #999;
+            border: 1px solid #ccc;
+            cursor: pointer;
+            display: none;
+            height: 13px;
+            position: absolute;
+            right: 3px;
+            top: 3px;
+            width: 13px;
+        }
+        #albummore a{cursor:pointer;}
+        .selfprozslidim dd:hover i {
+            display: block;
+        }
+        .selfprozslidim dd i:hover {
+            background-color: #3388ff;
+        }
+        .delwarp {
+            display:none;
+
+            padding: 5px 7px;
+            position: absolute;
+            right: 0;
+            top: 0;
+            z-index: 2;
+        }
+        .delete {
+            background: rgba(0, 0, 0, 0) url("${pageContext.request.contextPath}/static/images/del.png") no-repeat scroll 0 0 / 15px 19px;
+            display: block;
+            height: 19px;
+            text-indent: -9999px;
+            width: 15px;
+        }
+        .selfprozslidim dd.del:hover .delwarp {
+            display: block;
+        }
+    </style>
+    <script type="text/javascript">
+        $(function () {
+            $("#sub").click(function () {
+               /* var name = $("input[name='articleTitle']").val();
+                var typeid = $('#pId option:selected').val();
+                if (typeid == 0) {
+                    layer.msg("服务类别不能为空~");
+                    return false;
+                }
+                if (name == null || name == '') {
+                    layer.msg("服务名称不能为空~");
+                    return false;
+                }*/
+                var str = "";
+                $("input[name='eachImg']").each(function(){
+                    str += $(this).val()+",";
+                });
+                var substr = str.substring(0,str.length-1)
+                $("#morePhoto").val(substr)
+
+
+                $('#subform').submit();
+            });
+        });
+    </script>
+
+    <title>管理员管理</title>
+</head>
+<body>
+<nav class="breadcrumb">
+    <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px"
+       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<article class="page-container">
+    <form action="activityNewsUpdates.html" method="post" enctype="multipart/form-data" class="form form-horizontal" id="subform">
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>资讯类型：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <select name="typeid" id="pId" class="input-text">
+                    <c:forEach items="${typeInfo}" var="type">
+                        <option value="${type.id}"
+                                <c:if test="${type.id == activityNews.typeid}">selected</c:if> >${type.typename}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>资讯类型：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <select name="typeid"  class="input-text">
+                    <c:forEach items="${tagInfo}" var="tag">
+                        <option value="${tag.id}"
+                                <c:if test="${tag.id == activityNews.tagid}">selected</c:if> >${tag.tagname}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>资讯名称：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <input type="text" class="input-text" name="title" value="${activityNews.title}">
+                <input type="hidden" class="input-text" name="id" value="${activityNews.id}">
+            </div>
+        </div>
+
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1">广告图：</br><span class="c-red">*不超过三张</span></label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <div style="width:100%;height:auto;border:1px solid #DDDDDD;padding:8px 5px 0 0;" class="selfprozslidim">
+                    <dl>
+                        <input type="file" style="display: none;" name="fileToUpload" class="selfbasetlimgedup" id="fileToUpload">
+                        <c:forEach items="${list }" var="pics">
+                            <dd class="del"><img src="${pics}" width="68" height="68" /><input type="hidden" name="activityimage" value="${pics }"/><div class="delwarp"><a class="delete"  onclick="delalbum(this)"></a></div></dd>
+                        </c:forEach>
+                        <dd id="albummore"><a onclick="$('#fileToUpload').click();"><img src="${pageContext.request.contextPath}/static/images/addmore.jpg" alt="" id="img"></a></dd>
+                    </dl>
+                </div>
+            </div>
+        </div>
+
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>是否置顶：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <select name="istop"  class="input-text">
+                    <c:if test="${activityNews.istop == 0}" >
+                        <option value="0" selected>否</option>
+                        <option value="1" >是</option>
+                    </c:if>
+                    <c:if test="${activityNews.istop ==1}">
+                        <option value="0" >否</option>
+                        <option value="1" selected>是</option>
+                    </c:if>
+                </select>
+            </div>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red">*</span>广告设置：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <select name="isAd"  class="input-text">
+                    <c:if test="${activityNews.isAd == 0}" >
+                        <option value="0" selected>否</option>
+                        <option value="1" >是</option>
+                    </c:if>
+                    <c:if test="${activityNews.isAd == 1}">
+                        <option value="0" >否</option>
+                        <option value="1" selected>是</option>
+                    </c:if>
+                </select>
+            </div>
+        </div>
+
+
+
+        <%--编辑器--%>
+        <div class="row cl">
+            <label class="form-label col-xs-4 col-sm-1"><span class="c-red"></span>资讯详情：</label>
+            <div class="formControls col-xs-8 col-sm-9">
+                <script id="introduction" name="detailinfo" style="width:100%;height:200px;" type="text/plain">${activityNews.detailinfo}</script>
+                </div>
+                </div>
+
+        <div class="row cl">
+            <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-1">
+                <%--<button type="button" class="btn btn-success radius" id="sub" name="admin-role-save"><i class="icon-ok"></i> 确定</button>--%>
+                <button type="button" class="btn btn-primary radius" id="sub" name="admin-role-save"><i class="Hui-iconfont">&#xe632;</i> 提交</button>
+            </div>
+        </div>
+    </form>
+</article>
+
+<!--请在下方写此页面业务相关的脚本-->
+<!-- 百度文本编辑器   引用文件 -->
+<link href="<%=base%>/static/ue/themes/default/css/ueditor.css" type="text/css" rel="stylesheet">
+<script src="<%=base%>/static/ue/ueditor.config.js" type="text/javascript"></script>
+<script src="<%=base%>/static/ue/ueditor.all.js" type="text/javascript"></script>
+<script type="text/javascript" src="<%=base%>/static/ue/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/static/js/ajaxfileupload.js"></script>
+
+
+<script type="text/javascript">
+
+
+
+    <!-- 百度文本编辑器   js -->
+
+    $(function () {
+        var ue = UE.getEditor('introduction', {
+            //关闭字数统计
+            wordCount: false,
+            toolbars: [['fullscreen', 'source', '|', 'undo', 'redo', '|',
+                'bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|',
+                'rowspacingtop', 'rowspacingbottom', 'lineheight', '|',
+                'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|',
+                'directionalityltr', 'directionalityrtl', 'indent', '|',
+                'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|',
+                'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|',
+                'insertimage', 'emotion', 'insertvideo', 'attachment', 'map', 'template', 'background', '|',
+                'horizontal', 'date', 'time', 'spechars', 'wordimage', '|',
+                'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|',
+                'print', 'preview', 'searchreplace', 'help'
+            ]],
+            //关闭elementPath
+            elementPathEnabled: false,
+        });
+    });
+
+
+    var currentBrowserId;
+
+    function browserImage(targetId) {
+        currentBrowserId = targetId;
+        var weboxTemp = $.webox({
+            height: 600,
+            width: 1024,
+            bgvisibel: true,
+            title: '图片管理',
+            iframe: '<%=base%>/admin/image/imgbox.html?' + Math.random()
+        });
+    }
+
+    function setImagepath(imgPath) {
+        $('#' + currentBrowserId).val(imgPath);
+    }
+
+    function closeFrame() {
+        $('#locked .span').click();
+    }
+</script>
+
+
+<%-- 多图上传 --%>
+<script type="text/javascript">
+    $(function(){
+        $("#fileToUpload").change(function(){
+            var f = document.getElementById('fileToUpload').files[0];
+            $.ajaxFileUpload({
+                fileElementId : 'fileToUpload',
+                url : 'uploadImages.html',
+                dataType : 'text',
+                data : {},
+                async : true,
+                error : function(data) {
+                    alert("网络异常，请重试");
+                },
+                success : function(message) {
+                    $("#albummore").before('<dd class="del"><img src="'+message+'" width="68" height="68" /><input type="hidden" name="activityimage" value="'+message+'"/><div class="delwarp"><a class="delete" onclick="delalbum(this)">删除</a></div></dd>');
+                    chens();
+
+                }
+            });
+        });
+    });
+    function chens(){
+        $("#fileToUpload").change(function(){
+            var f = document.getElementById('fileToUpload').files[0];
+            $.ajaxFileUpload({
+                fileElementId : 'fileToUpload',
+                url : 'uploadImages.html',
+                dataType : 'text',
+                data : {},
+                async : true,
+                error : function(data) {
+                    alert("网络异常，请重试");
+                },
+                success : function(message) {
+                    $("#albummore").before('<dd class="del"><img src="'+message+'" width="68" height="68" /><input type="hidden" name="activityimage" value="'+message+'"/><div class="delwarp"><a class="delete" onclick="delalbum(this)">删除</a></div></dd>');
+                    chens();
+                }
+            });
+        });
+    }
+
+    function delalbum(obj){
+        $(obj).parents(".del").remove();
+    }
+
+</script>
+
+<!--请在下方写此页面业务相关的脚本-->
+<script type="text/javascript">
+</script>
+<!--/请在上方写此页面业务相关的脚本-->
+</body>
+</html>