Merge remote-tracking branch 'origin/dev' into dev

donate-service/src/main/java/com/uas/service/donate/service/impl/UserServiceImpl.java

@@ -29,7 +29,7 @@ public class UserServiceImpl implements UserService {
         com.uas.account.entity.User accountUser = null;
         try {
             accountUser = AccountUtils.getUserByImId(imId);
-            if (null != accountUser) {
+            if (null != accountUser && null != accountUser.getDialectUID()) {
                 User user = userDao.findOne(Long.valueOf(accountUser.getDialectUID()));
                 if (null == user) {
                     user = new User(accountUser);

donate-service/src/main/resources/templates/activeCenter.ftl

@@ -509,10 +509,10 @@
             <#list page.content as activity>
             <div class="list-item clearfix">
                 <div class="project-img fl">
-                    <a href="/activity#/detail/${activity.id}""><img src="static/images/activeCenter/reward.png" alt=""/></a>
+                    <a href="/activity#/detail/${activity.id}"><img src="static/images/activeCenter/reward.png" alt=""/></a>
                 </div>
                 <div class="project-detail fl">
-                    <p><a href="activeDetail">${activity.name!''}</a></p>
+                    <p><a href="/activity#/detail/${activity.id}">${activity.name!''}</a></p>
                     <div class="clearfix">
                         <span class="fl">活动奖品：</span>
                         <div class="fl">

donate-service/src/main/webapp/resources/view/activity/activity_list.html

@@ -1,3 +1,4 @@
+<!-- 已弃用，前台列表在main/resources/templates -->
 <style>
     body{
         font-family: "Microsoft Yahei", "微软雅黑";

donate-service/src/main/webapp/resources/view/project/project_list.html

@@ -1,3 +1,4 @@
+<!-- 已弃用，前台列表在main/resources/templates -->
 <style>
     body{
         font-family: "Microsoft Yahei", "微软雅黑";