Przeglądaj źródła

活动策划开发

anderx 3 lat temu
rodzic
commit
442d927f95

+ 56 - 46
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -14,6 +14,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.goafanti.common.model.JtNews;
+import com.goafanti.news.bo.InputJtNews;
+import com.goafanti.news.service.EventPlanningService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -83,7 +86,7 @@ public class PublicController extends BaseController {
 
 	@Resource
 	private FieldGlossoryService			fieldGlossoryService;
-	
+
 	@Resource
 	private CommentService commentService;
 
@@ -92,35 +95,35 @@ public class PublicController extends BaseController {
 
 	@Autowired
 	private DistrictGlossoryService	districtGlossoryService;
-	
+
 	@Autowired
 	private UserIdentityService userIdentityService;
-	
+
 	@Autowired
 	private AchievementService achievementService;
-	
+
 	@Autowired
 	private DemandService demandService;
-	
+
 	@Autowired
 	private JtBusinessService jtBusinessService;
-	
+
 	@Value(value = "${patentTemplate}")
 	private String					patentTemplate		= null;
 
 	@Resource(name = "passwordUtil")
 	private PasswordUtil			passwordUtil;
-	
+
 	@Resource
 	private	VoucherDetailService	voucherDetailService;
 	@Resource
 	private VoucherService		voucherService;
 	@Resource
-	private JDBCIdGenerator	jDBCIdGenerator;
+	private EventPlanningService	eventPlanningService;
 
 	/**
 	 * 获取验证码
-	 * 
+	 *
 	 * @param response
 	 */
 	@RequestMapping(value = "/getVCode", method = RequestMethod.GET)
@@ -145,11 +148,10 @@ public class PublicController extends BaseController {
 
 	/**
 	 * 手机验证码
-	 * 
+	 *
 	 * @param mobile
 	 * @param sign
 	 *            是否用与找回密码
-	 * @param type
 	 * @return
 	 */
 	@RequestMapping(value = "/getMCode", method = RequestMethod.GET)
@@ -189,7 +191,7 @@ public class PublicController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param mobile
 	 * @param res
 	 * @return
@@ -213,7 +215,7 @@ public class PublicController extends BaseController {
 
 	/**
 	 * 下载图片
-	 * 
+	 *
 	 * @param response
 	 * @param path
 	 * @param request
@@ -268,7 +270,7 @@ public class PublicController extends BaseController {
 
 	/**
 	 * 删除图片文件(public图片)
-	 * 
+	 *
 	 * @param path
 	 * @return
 	 */
@@ -300,12 +302,10 @@ public class PublicController extends BaseController {
 
 	/**
 	 * 下载文件
-	 * 
-	 * @param res
+	 *
 	 * @param fileName
 	 * @param response
 	 * @param path
-	 * @param request
 	 * @return
 	 */
 	@RequestMapping(value = "/downloadFile", method = RequestMethod.GET)
@@ -386,7 +386,7 @@ public class PublicController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param mobileCode
 	 * @return
 	 */
@@ -422,7 +422,7 @@ public class PublicController extends BaseController {
 
 	/**
 	 * 重置密码
-	 * 
+	 *
 	 * @param resetCode
 	 * @param mobile
 	 * @param type
@@ -474,7 +474,7 @@ public class PublicController extends BaseController {
 		VerifyCodeUtils.clearResetCodeTime();
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/resetPassword", method = RequestMethod.POST)
 	@ResponseBody
 	public Result resetPassword(String mobile,Integer type,String newPwd,String resetCode) {
@@ -493,7 +493,7 @@ public class PublicController extends BaseController {
 			cleanCodeSession();
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(newPwd)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新密码"));
 			return res;
@@ -512,11 +512,11 @@ public class PublicController extends BaseController {
 		user.setPassword(passwordUtil.getEncryptPwd(user));
 		userService.updateByPrimaryKeySelective(user);
 		return res;
-		
+
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * @param mobileCode
 	 * @return
 	 */
@@ -565,7 +565,7 @@ public class PublicController extends BaseController {
 		VerifyCodeUtils.clearMobileCode();
 		VerifyCodeUtils.clearMobileCodeTime();
 	}
-	
+
 	@RequestMapping(value = "/getRegisterMCode", method = RequestMethod.GET )
 	@ResponseBody
 	public Result getRegisterMCode(String mobile){
@@ -582,7 +582,7 @@ public class PublicController extends BaseController {
 		}
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/getResetMCode", method = RequestMethod.GET )
 	@ResponseBody
 	public Result getResetMCode(String mobile) {
@@ -603,7 +603,7 @@ public class PublicController extends BaseController {
 		}
 		return res;
 	}
-	
+
 	/** 省市区查询 **/
 	@RequestMapping(value = "/listAllProvince" , method = RequestMethod.POST)
 	@ResponseBody
@@ -612,33 +612,33 @@ public class PublicController extends BaseController {
 		res.setData(districtGlossoryService.getProvince());
 		return res;
 	}
-	
+
 	@RequestMapping(value="/industryList", method = RequestMethod.GET)
 	@ResponseBody
 	public Result getIndustryList() {
 		Result result=new Result();
 		result.setData(userIdentityService.selectIndustryReletively());
 		return result;
-		
+
 	}
-	
+
 	@RequestMapping(value="/achievementList", method = RequestMethod.GET)
 	@ResponseBody
 	public Result getAchievements(AchievementObject achievementObject,Integer pageNo,Integer pageSize) {
 		Result result=new Result();
 		result.setData(achievementService.getAchievementObjects(achievementObject, pageNo, pageSize));
-		return result;  
+		return result;
 	}
-	
+
 	@RequestMapping(value="/demandList", method = RequestMethod.GET)
 	@ResponseBody
 	public Result getDemands(DemandListBo demandListBo,Integer pageNo,Integer pageSize) {
-		Result result=new Result();   
+		Result result=new Result();
 		result.setData(demandService.getDemandObjects(demandListBo, pageNo, pageSize));
 		return result;
 	}
-	
-	
+
+
 	@RequestMapping(value = "/comment/list", method = RequestMethod.GET)
 	@ResponseBody
 	public Result listComment(String commodityId,Integer pageNo,Integer pageSize) {
@@ -653,7 +653,7 @@ public class PublicController extends BaseController {
 		commentResult.setComments(commentService.searchComment(commodityId, pageNo, pageSize));
 		result.setData(commentResult);
 		return result;
-		
+
 	}
 
 	/**
@@ -706,7 +706,7 @@ public class PublicController extends BaseController {
 		VerifyCodeUtils.clearResetCodeTime();
 		return res;
 	}
-	
+
 	/**
 	 * 新增评价
 	 */
@@ -727,7 +727,7 @@ public class PublicController extends BaseController {
 		if(null == commentInput.getCommodityType() || commentInput.getCommodityType()<0 || commentInput.getCommodityType() > 5) {
 			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","产品类型"));return result;
 		}
-		
+
 		int res=commentService.addNewComment(commentInput,ip);
 		if(res ==-1) {
 			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","提交失败"));return result;
@@ -735,9 +735,9 @@ public class PublicController extends BaseController {
 		result.setData(res);
 		return result;
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * @param commodityId
 	 * @param pageNo
 	 * @param pageSize
@@ -757,7 +757,7 @@ public class PublicController extends BaseController {
 		commentResult.setComments(commentService.searchUnlandedCommentList(commodityId, pageNo, pageSize));
 		result.setData(commentResult);
 		return result;
-		
+
 	}
 	/**
 	 * 服务商项目列表
@@ -779,7 +779,7 @@ public class PublicController extends BaseController {
 		res.setData(pagination);
 		return res;
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/getUserVoucher", method = RequestMethod.GET)
 	@ResponseBody
@@ -794,7 +794,7 @@ public class PublicController extends BaseController {
 				if (s.equals(jt.getId())) {
 					jt.setIsGet(1);
 				}
-				
+
 			}
 		}
 		return 	res.data(p);
@@ -813,7 +813,7 @@ public class PublicController extends BaseController {
 		res.data(voucherDetailService.saveUserGetVoucher(uid,vid));
 		return res;
 	}
-	
+
 	/**
 	 * 服务商列表
 	 * @param user
@@ -828,7 +828,7 @@ public class PublicController extends BaseController {
 		res.setData(userService.selectOrganizationList(user, pageNo, pageSize));
 		return res;
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value="/invRegister",method = RequestMethod.GET)
 	@ResponseBody
@@ -886,5 +886,15 @@ public class PublicController extends BaseController {
 		map.put( "zffc",zfList);
 		return res.data(map);
 	}
-	
+
+
+	@RequestMapping(value = "/getEventPlanningList",method = RequestMethod.GET)
+	@ResponseBody
+	public  Result getEventPlanningList(InputJtNews inputJtNews){
+		Result res = new Result();
+		inputJtNews.setReleaseStatus(1);
+		res.setData(eventPlanningService.listnewsDetails(inputJtNews));
+		return  res;
+	}
+
 }

+ 2 - 10
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -11,6 +11,8 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.goafanti.common.model.*;
+import com.goafanti.news.bo.InputJtNews;
 import com.goafanti.news.service.EventPlanningService;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Controller;
@@ -36,15 +38,6 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.JtBusinessCategoryMapper;
 import com.goafanti.common.dao.ProjectInterestMapper;
 import com.goafanti.common.enums.ConsultantType;
-import com.goafanti.common.model.AchievementInterest;
-import com.goafanti.common.model.Banners;
-import com.goafanti.common.model.DemandInterest;
-import com.goafanti.common.model.JtBusinessCategory;
-import com.goafanti.common.model.JtBusinessProject;
-import com.goafanti.common.model.News;
-import com.goafanti.common.model.Policy;
-import com.goafanti.common.model.User;
-import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.service.GlobalSearchService;
 import com.goafanti.common.utils.LimitLengthUtil;
 import com.goafanti.common.utils.StringUtils;
@@ -1641,7 +1634,6 @@ public class WebpageController extends BaseController {
 	@RequestMapping("/portal/eventPlanning")
 	public ModelAndView eventPlanning(ModelAndView modelAndView){
 		modelAndView.setViewName("/portal/eventPlanning");
-		eventPlanningService.getList();
 		return modelAndView;
 	}
 

+ 4 - 1
src/main/java/com/goafanti/common/dao/JtNewsMapper.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.JtNews;
+import com.goafanti.news.bo.OutJtNews;
 
 public interface JtNewsMapper {
     int deleteByPrimaryKey(Integer id);
@@ -14,4 +15,6 @@ public interface JtNewsMapper {
     int updateByPrimaryKeySelective(JtNews record);
 
     int updateByPrimaryKey(JtNews record);
-}
+
+    OutJtNews selectByid(Integer id);
+}

+ 49 - 6
src/main/java/com/goafanti/common/mapper/JtNewsMapper.xml

@@ -162,13 +162,56 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="JtNewsList" resultType="com.goafanti.common.model.JtNews">
+
+  <select id="findNewsList" resultType="com.goafanti.news.bo.OutJtNews">
     select id,title,publisher,`type`,picture_url pictureUrl,status,sort,content,release_status releaseStatus,
-           date_format(create_time,'%Y-%m-%d' ) as createTimes,date_format(release_time,'%Y-%m-%d' ) as releaseTimes
-    from jt_news
+    date_format(create_time,'%Y-%m-%d %H:%i:%S' ) as createTimes,date_format(release_time,'%Y-%m-%d %H:%i:%S' ) as releaseTimes,
+    create_time createTime ,release_time releaseTime
+    from jt_news where 1=1
+    <if test="n.id!=null">
+      and id = #{n.id}
+    </if>
+    <if test="n.title!=null">
+      and title like concat('%',#{n.title},'%')
+    </if>
+    <if test="n.releaseStatus!=null">
+      and release_status = #{n.releaseStatus}
+    </if>
+    <if test="n.status!=null">
+      and status = #{n.status}
+    </if>
+    <if test="n.type!=null">
+      and type = #{n.type}
+    </if>
+    order by releaseStatus desc,sort desc,id desc
+    <if test="page_sql!=null">
+      ${page_sql}
+    </if>
   </select>
-  <select id="JtNewsCount">
+
+  <select id="findNewsCount" resultType="java.lang.Integer">
     select count(*)
-    from jt_news
- </select>
+    from jt_news where 1=1
+    <if test="n.id!=null">
+      and id = #{n.id}
+    </if>
+    <if test="n.title!=null">
+      and title like concat('%',#{n.title},'%')
+    </if>
+    <if test="n.releaseStatus!=null">
+      and release_status = #{n.releaseStatus}
+    </if>
+    <if test="n.status!=null">
+      and status = #{n.status}
+    </if>
+    <if test="n.type!=null">
+      and type = #{n.type}
+    </if>
+  </select>
+  <select id="selectByid" resultType="com.goafanti.news.bo.OutJtNews">
+    select id, title, publisher, type, picture_url pictureUrl, status, sort, release_status releaseStatus,content,
+           date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTimes,create_time createTime,
+           date_format(release_time,'%Y-%m-%d %H:%i:%S') as releaseTimes ,release_time releaseTime
+    from jt_news where id = #{id,jdbcType=INTEGER}
+  </select>
 </mapper>

+ 53 - 0
src/main/java/com/goafanti/news/bo/InputJtNews.java

@@ -0,0 +1,53 @@
+package com.goafanti.news.bo;
+
+import com.goafanti.common.model.JtNews;
+
+import java.util.Date;
+
+public class InputJtNews extends JtNews {
+
+    private Integer pageSize;
+    private Integer pageNo;
+
+    /**
+     * 创建时间
+     */
+    private String createTimes;
+
+    /**
+     * 发布时间
+     */
+    private String releaseTimes;
+
+    public String getCreateTimes() {
+        return createTimes;
+    }
+
+    public void setCreateTimes(String createTimes) {
+        this.createTimes = createTimes;
+    }
+
+    public String getReleaseTimes() {
+        return releaseTimes;
+    }
+
+    public void setReleaseTimes(String releaseTimes) {
+        this.releaseTimes = releaseTimes;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+}

+ 36 - 0
src/main/java/com/goafanti/news/bo/OutJtNews.java

@@ -0,0 +1,36 @@
+package com.goafanti.news.bo;
+
+import com.goafanti.common.model.JtNews;
+
+public class OutJtNews extends JtNews {
+
+
+
+    /**
+     * 创建时间
+     */
+    private String createTimes;
+
+    /**
+     * 发布时间
+     */
+    private String releaseTimes;
+
+    public String getCreateTimes() {
+        return createTimes;
+    }
+
+    public void setCreateTimes(String createTimes) {
+        this.createTimes = createTimes;
+    }
+
+    public String getReleaseTimes() {
+        return releaseTimes;
+    }
+
+    public void setReleaseTimes(String releaseTimes) {
+        this.releaseTimes = releaseTimes;
+    }
+
+
+}

+ 70 - 0
src/main/java/com/goafanti/news/controller/AdminEventPlanningApiController.java

@@ -1,11 +1,18 @@
 package com.goafanti.news.controller;
 
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.news.bo.InputJtNews;
 import com.goafanti.news.service.EventPlanningService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 
 /**
  * 新闻
@@ -16,4 +23,67 @@ public class AdminEventPlanningApiController extends BaseApiController {
 	@Autowired
 	private EventPlanningService eventPlanningService;
 
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public Result addNews(InputJtNews in) {
+		Result res =new Result();
+		inputcheke(in, res);
+		if(!res.getError().isEmpty())return res;
+		res.data(eventPlanningService.add(in));
+		return res;
+	}
+
+	@RequestMapping(value = "/update", method = RequestMethod.POST)
+	public Result update(InputJtNews in) {
+		Result res =new Result();
+		res.data(eventPlanningService.update(in));
+		return res;
+	}
+
+	@RequestMapping(value = "/list", method = RequestMethod.GET)
+	public Result listNews(InputJtNews in) {
+		Result res =new Result();
+		res.data(eventPlanningService.listnewsDetails(in));
+		return res;
+	}
+
+	@RequestMapping(value = "/selectNews", method = RequestMethod.GET)
+	public Result selectNews(InputJtNews in) {
+		Result res =new Result();
+		if(in.getId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"ID","ID"));
+			return res;
+		}
+		if (!res.getError().isEmpty()) return res;
+		res.data(eventPlanningService.selectNews(in));
+		return res;
+	}
+
+	private Result inputcheke(InputJtNews in, Result res) {
+		if(StringUtils.isBlank(in.getContent())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"内容","内容"));
+			return res;
+		}
+		if(StringUtils.isBlank(in.getTitle())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"标题","标题"));
+			return res;
+		}
+		if(StringUtils.isBlank(in.getPublisher())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"发布人","发布人"));
+			return res;
+		}
+		if(null==in.getType()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"类型","类型"));
+			return res;
+		}
+		return res;
+	}
+
+	/** 上传图片 **/
+	@RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+	public Result uploadOrderInvoiceFile(HttpServletRequest req){
+		Result res = new Result();
+		res.setData(handleFile(res, "/eventPlanning/", false, req, "eventPlanning"));
+		return res;
+	}
+
 }

+ 11 - 2
src/main/java/com/goafanti/news/service/EventPlanningService.java

@@ -2,9 +2,18 @@ package com.goafanti.news.service;
 
 import com.goafanti.common.model.JtNews;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.news.bo.InputJtNews;
+import com.goafanti.news.bo.OutJtNews;
 
-import java.util.List;
 
 public interface EventPlanningService {
-    Pagination<JtNews> getList();
+
+
+    int add(InputJtNews in);
+
+    int update(InputJtNews in);
+
+    Pagination<OutJtNews> listnewsDetails(InputJtNews in);
+
+    OutJtNews selectNews(InputJtNews in);
 }

+ 53 - 4
src/main/java/com/goafanti/news/service/impl/EventPlanningServiceImpl.java

@@ -1,12 +1,20 @@
 package com.goafanti.news.service.impl;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.JtNewsMapper;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.JtNews;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.news.bo.InputJtNews;
+import com.goafanti.news.bo.OutJtNews;
 import com.goafanti.news.service.EventPlanningService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -14,11 +22,52 @@ import java.util.Map;
 @Service
 public  class EventPlanningServiceImpl extends BaseMybatisDao<JtNewsMapper> implements EventPlanningService {
 
+    @Autowired
+    private JtNewsMapper    jtNewsMapper;
 
     @Override
-    public Pagination<JtNews> getList() {
-        Map<String ,Object>param = new HashMap<>();
-        Pagination<JtNews> p= (Pagination<JtNews>) findPage("JtNewsList","JtNewsCount",param,1,10);
-        return p;
+    public int add(InputJtNews in) {
+        if (in.getReleaseTimes()!=null) {
+            try {
+                in.setReleaseTime(DateUtils.parseDate(in.getReleaseTimes(), AFTConstants.YYYYMMDDHHMMSS));
+            } catch (ParseException e) {
+                throw new BusinessException("转换异常");
+            }
+        }
+        if (in.getReleaseStatus()==1&&in.getReleaseTime()==null) {
+            in.setReleaseTime(new Date());
+        }
+
+        return jtNewsMapper.insertSelective(in);
+    }
+
+    @Override
+    public int update(InputJtNews in) {
+        if (in.getReleaseTimes()!=null) {
+            try {
+
+                in.setReleaseTime(DateUtils.parseDate(in.getReleaseTimes(), AFTConstants.YYYYMMDDHHMMSS));
+            } catch (ParseException e) {
+                throw new BusinessException("转换异常");
+            }
+        }
+
+        if (in.getReleaseStatus()!=null&&in.getReleaseStatus()==1&&in.getReleaseTime()==null) {
+            in.setReleaseTime(new Date());
+        }
+
+        return jtNewsMapper.updateByPrimaryKeySelective(in);
+    }
+
+    @Override
+    public Pagination<OutJtNews> listnewsDetails(InputJtNews in) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("n", in);
+        return (Pagination<OutJtNews>) findPage("findNewsList", "findNewsCount", params, in.getPageNo(),in.getPageSize());
+    }
+
+    @Override
+    public OutJtNews selectNews(InputJtNews in) {
+        return jtNewsMapper.selectByid(in.getId());
     }
 }

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -39,14 +39,14 @@ app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
 static.host=//ss.jishutao.com/client/1.2.8
-portal.host=//ss.jishutao.com/portal/1.2.11
+#portal.host=//ss.jishutao.com/portal/1.2.11
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 
 #本地
 #static.host=//172.16.0.255/client/1.2.8
 #static.host=//172.16.0.255:3000/jitao/client/1.2.9
-#portal.host=//172.16.0.255:3000/jitao/portal/1.2.11
+portal.host=//172.16.1.187/portal/1.2.11
 
 #avatar.host=//ss.jishutao.com
 #avatar.upload.host=//ss.jishutao.com/upload

+ 2 - 2
src/main/webapp/WEB-INF/views/common.html

@@ -51,7 +51,7 @@
 					</li>
 				</ul>
 			</div>
-			<div class="technology"><a href="javascript:;">技术创业</a><a href="javascript:;">技术评估</a></div>
+			<div class="technology"><a class="technology_login" th:href="@{/portal/evaluation/evaluate}">技术创业</a><a class="technology_estimate" href="javascript:;">技术评估</a></div>
 			<div class="APP">
 				<img th:src="${portalHost+'/img/indedImg/inded30.png'}" alt="" />
 				<a>APP下载<span class="webkitDown"></span>
@@ -321,7 +321,7 @@
 							<p>Android版</p>
 						</div>
 						<div class="cont_right ios">
-						<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt=""/>
+						<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="" style="width: 81px;height: 81px"/>
 						<p>ios版</p >
 						</div>
 						<div class="cont_right">

+ 3 - 0
src/main/webapp/WEB-INF/views/portal/eventPlanning.html

@@ -7,6 +7,8 @@
     <title>技淘网-活动策划</title>
     <link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
     <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+    <link th:href="${portalHost + '/eventPlanning.css'}" rel="stylesheet">
+
 </head>
 
 <body>
@@ -34,6 +36,7 @@
         <div th:replace="common::footer(~{::script})">
             <script type="text/javascript" th:src="${portalHost + '/dll/dll.js'}"></script>
             <script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+            <script type="text/javascript" th:src="${portalHost + '/eventPlanning.js'}"></script>
         </div>
 </body>
 </html>