Home Explore Help
Register Sign In
usoft
/
donate-parent
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

huangct 8 years ago
parent
0209d001bb b690a67094
commit
0e64a56b1e
7 changed files with 50 additions and 8 deletions
Split View Show Diff Stats
  1. 0 0
      donate-console/src/main/webapp/resources/jsondata/city.json
  2. 0 1
      donate-service/src/main/java/com/uas/service/donate/dao/ProjectDao.java
  3. 2 2
      donate-service/src/main/java/com/uas/service/donate/dao/ProjectRecodeDao.java
  4. 1 1
      donate-service/src/main/java/com/uas/service/donate/service/impl/UserServiceImpl.java
  5. 45 4
      donate-service/src/main/resources/templates/activeCenter.ftl
  6. 1 0
      donate-service/src/main/webapp/resources/view/activity/activity_list.html
  7. 1 0
      donate-service/src/main/webapp/resources/view/project/project_list.html

File diff suppressed because it is too large
+ 0 - 0
donate-console/src/main/webapp/resources/jsondata/city.json


+ 0 - 1
donate-service/src/main/java/com/uas/service/donate/dao/ProjectDao.java
View File 

@@ -1,7 +1,6 @@
 
 package com.uas.service.donate.dao;
 
 
 
-import com.uas.service.donate.model.Activity;
 
 import com.uas.service.donate.model.Project;
 
 import org.springframework.data.domain.Page;
 
 import org.springframework.data.domain.Pageable;

+ 2 - 2
donate-service/src/main/java/com/uas/service/donate/dao/ProjectRecodeDao.java
View File 

@@ -25,11 +25,11 @@ public interface ProjectRecodeDao extends JpaRepository<ProjectRecode,Long>,JpaS
 
     Long sumMoney(@Param("uuid")Long uuid);
 
 
     //查询所有项目已筹集金额
 
-    @Query("select  sum(amount) from ProjectRecode ")
 
+    @Query("select  sum(amount) from ProjectRecode where status=2")
 
     Double totality();
 
 
     //查询所有的项目历史总参与人数
 
-    @Query("select count(*) from ProjectRecode")
 
+    @Query("select count(*) from ProjectRecode where status=2")
 
     Long historyPerson();
 
 
     //查询某项目参与总人数

+ 1 - 1
donate-service/src/main/java/com/uas/service/donate/service/impl/UserServiceImpl.java
View File 

@@ -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);

+ 45 - 4
donate-service/src/main/resources/templates/activeCenter.ftl
View File 

@@ -383,6 +383,32 @@
 
         .show{
 
             display: block;
 
         }
 
+        /*搜索无结果*/
 
+        .noSearch .img{
 
+            margin: 50px auto 26px;
 
+        }
 
+        .noSearch .img img{
 
+            width: 80px;
 
+            height: 80px;
 
+        }
 
+        .noSearch .txt{
 
+            margin: 0 auto;
 
+            text-align: center;
 
+        }
 
+        .noSearch .txt p{
 
+            margin-bottom: 54px;
 
+            font-size: 18px;
 
+            color: #8c8c8c;
 
+        }
 
+        .noSearch .txt a{
 
+            display: inline-block;
 
+            width: 140px;
 
+            height: 36px;
 
+            line-height: 36px;
 
+            font-size: 16px;
 
+            color: #ef613b;
 
+            border: 1px solid #dcdcdc;
 
+        }
 
     </style>
 
 </head>
 
 <body>
 
@@ -478,14 +504,15 @@
 
                     <img src="static/images/index/search.png" alt="" id="searchButton"/>
 
                 </div>
 
             </div>
 
+            <div>
 
             <#if page?exists>
 
             <#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">
 
@@ -506,9 +533,23 @@
 
             </div>
 
             </#list>
 
             </#if>
 
+            <#--搜索无结果页面-->
 
+            <#if page.totalElements==0>
 
+                <div class="section noSearch">
 
+                    <div class="img">
 
+                        <img src="static/images/noSearch.png" alt=""/>
 
+                    </div>
 
+                    <div class="txt">
 
+                        <p>未找到相关内容..</p>
 
+                        <a href="http://lj.ubtob.com/activeCenter">返回</a>
 
+                    </div>
 
+                </div>
 
+            </#if>
 
             <#-- 分页按钮-->
 
-            <div id="kkpager"></div>
 
-
 
+            <#if (page.totalElements>0)>
 
+                <div id="kkpager"></div>
 
+            </#if>
 
+            </div>
 
         </div>
 
     </div>
 
 </div>

+ 1 - 0
donate-service/src/main/webapp/resources/view/activity/activity_list.html
View File 

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

+ 1 - 0
donate-service/src/main/webapp/resources/view/project/project_list.html
View File 

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

Some files were not shown because too many files changed in this diff