一元捐项目样式修改

donate-console/src/main/webapp/WEB-INF/views/userList.html

@@ -179,6 +179,7 @@
             font-size: 40px;
         }
         .right-nav{
+            padding-left: 50px;
             margin-bottom: 14px;
             width: 100%;
             height: 34px;

donate-console/src/main/webapp/resources/css/base.css

@@ -77,8 +77,8 @@ input,button,select,textarea{outline:none}
 /*分页效果*/
 #form .ng-isolate-scope{
 	position: absolute;
-	bottom: 50px;
-	left: 50px;
+	bottom: 0;
+	left: 0;
 	width: 100%;
 }
 .ng-table-pager .ng-table-counts{

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

@@ -178,6 +178,7 @@
         font-size: 40px;
     }
     .right-nav{
+        padding-left: 50px;
         margin-bottom: -3px;
         width: 100%;
         height: 34px;

donate-console/src/main/webapp/resources/view/project/project_detail.html

@@ -18,7 +18,9 @@
         </p>
     </div>
     <div class="right-nav">
-        <span class="active" style="margin-left:-173px;">详细信息</span>
+        <span class="active"  ng-if="project.status== 1" style="margin-left: -122px;">详细信息</span>
+        <span class="active"  ng-if="project.status== 0"  style="margin-left: -182px;">详细信息</span>
+        <span class="active"  ng-if="project.status== 2" style="margin-left: 75px;">详细信息</span>
         <span>图片信息</span>
         <span>机构信息</span>
         <!-- 修改时先不隐藏 -->
@@ -27,7 +29,8 @@
         <!--<span>财务披露</span></div>-->
         <span ng-if="project.status== 1">项目进度</span>
         <span ng-if="project.status== 1">捐款明细</span>
-        <span ng-if="project.status== 1">财务披露</span></div>
+        <span ng-if="project.status== 1">财务披露</span>
+    </div>
     <!--详细信息-->
     <div class="right-list show">
         <div class="list-message">

donate-console/src/main/webapp/resources/view/project/project_finance.html

@@ -5,7 +5,7 @@
         <div class="fl"><span>{{project.name}}</span></div>
         <div class="fr close" ng-click="cancel()">&times;</div>
     </div>
-    <div class="right-nav"><span class="active">财务信息</span><span>披露录入</span></div>
+    <div class="right-nav"><span class="active" style="margin-left: -62px;">财务信息</span><span>披露录入</span></div>
     <!--财务披露-->
     <div class="right-list show">
         <div class="list-message">

donate-console/src/main/webapp/resources/view/project/project_report.html

@@ -6,7 +6,7 @@
         <div class="fl"><span>{{project.name}}</span></div>
         <div class="fr close" ng-click="cancel()">&times;</div>
     </div>
-    <div class="right-nav"><span class="active">项目进度</span><span>进度录入</span></div>
+    <div class="right-nav"><span class="active" style="margin-left: -70px;">项目进度</span><span>进度录入</span></div>
     <!--项目进度-->
     <div class="right-list show">
         <div ng-if="schedules == null" class="list-message">

donate-service/pom.xml

@@ -48,11 +48,11 @@
     </profiles>
     <dependencies>
 
-        <dependency>
-            <groupId>com.uas.account</groupId>
-            <artifactId>account-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
+      <!--  <dependency>
+        <groupId>com.uas.account</groupId>
+        <artifactId>account-common</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </dependency>-->
 
         <dependency>
             <groupId>junit</groupId>
@@ -196,6 +196,45 @@
             <artifactId>weixin-java-mp</artifactId>
             <version>2.8.9.BETA</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>4.3.9.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.3.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>4.3.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.uas.account</groupId>
+            <artifactId>sso-core</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
+
+
         <!--        <dependency>
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-lang3</artifactId>

donate-service/src/main/java/com/uas/service/donate/controller/UserController.java

@@ -3,11 +3,7 @@ package com.uas.service.donate.controller;
 import com.uas.service.donate.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 @RequestMapping("/user")
@@ -16,11 +12,11 @@ public class UserController {
     @Autowired
     private UserService userService;
 
-    @RequestMapping(value = "/getUserUUByImId/{imId}", method = RequestMethod.GET)
+   /* @RequestMapping(value = "/getUserUUByImId/{imId}", method = RequestMethod.GET)
     @ResponseBody
     public ModelMap getUserUUByImId (@PathVariable("imId") Long imId) {
         return new ModelMap("userUU", userService.getUserByImId(imId));
-    }
+    }*/
 
 
 }

donate-service/src/main/java/com/uas/service/donate/model/User.java

@@ -1,5 +1,6 @@
 package com.uas.service.donate.model;
 
+
 import com.uas.account.entity.UserView;
 
 import javax.persistence.*;

donate-service/src/main/java/com/uas/service/donate/service/UserService.java

@@ -1,5 +1,6 @@
 package com.uas.service.donate.service;
 
+
 import com.uas.service.donate.model.User;
 
 public interface UserService {

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

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class UserServiceImpl implements UserService{
+public class UserServiceImpl implements UserService {
 
     @Autowired
     private UserDao userDao;

donate-service/src/main/java/com/uas/service/donate/web/filter/AbstractSSOInterceptor.java

@@ -40,9 +40,9 @@ public abstract class AbstractSSOInterceptor extends HandlerInterceptorAdapter {
 
 	/**
 	 * 跳转登录
-	 * 
 	 * @param request
-	 * @param response
+     *
+     * @param response
 	 * @throws IOException
 	 */
 	protected void sendRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException {

donate-service/src/main/java/com/uas/service/donate/web/filter/SSOInterceptor.java

@@ -5,11 +5,10 @@ import com.uas.service.donate.core.support.SystemSession;
 import com.uas.service.donate.dao.UserDao;
 import com.uas.service.donate.model.User;
 import com.uas.service.donate.util.FastjsonUtils;
+import com.uas.service.donate.util.StringUtils;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
-import com.uas.sso.web.spring.AbstractSSOInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

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

@@ -393,7 +393,7 @@
 <div ng-include src="'static/view/common/nav.html'"></div>
 <div id="nav">
     <div class="container clearfix">
-        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span>一元捐</span></div>
+        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span style="font-size: 18px;font-weight: bold;">一元捐</span></div>
         <div class="fr">
             <a href="https://account.ubtob.com/sso/login">登录</a>
             <a href="javascript:void(0)">注册</a>

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

@@ -669,7 +669,7 @@
 <body ng-app="index">
 <div id="nav">
     <div class="container clearfix">
-        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span>一元捐</span></div>
+        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span style="font-size: 18px;font-weight: bold;">一元捐</span></div>
         <div class="fr">
             <a href="https://account.ubtob.com/sso/login">登录</a>
             <a href="javascript:void(0)">注册</a>

donate-service/src/main/webapp/WEB-INF/views/institutionsToIntroduce.html

@@ -429,7 +429,7 @@
 <body>
 <div id="nav">
     <div class="container clearfix">
-        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span>一元捐</span><a href="/" class="return">返回首页</a></div>
+        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span style="font-size: 18px;font-weight: bold;">一元捐</span><a href="/" class="return">返回首页</a></div>
         <div class="fr"><a href="">登录</a><a href="">注册</a><a href="">进入优软云</a></div>
     </div>
 </div>

donate-service/src/main/webapp/WEB-INF/views/personalCenter.html

@@ -801,7 +801,7 @@
 <body>
 <div id="nav">
     <div class="container clearfix">
-        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span>一元捐</span><a href="/" class="return">返回首页</a></div>
+        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span style="font-size: 18px;font-weight: bold;">一元捐</span><a href="/" class="return">返回首页</a></div>
         <div class="fr"><a href="" data-target="#login" data-toggle="modal">登录</a><a href="">注册</a><a href="">进入优软云</a></div>
     </div>
 </div>

donate-service/src/main/webapp/WEB-INF/views/projectDetailsAndProgress.html

@@ -695,7 +695,7 @@
 <body>
 <div id="nav">
     <div class="container clearfix">
-        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span>一元捐</span><a href="/" class="return">返回首页</a></div>
+        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span style="font-size: 18px;font-weight: bold;">一元捐</span><a href="/" class="return">返回首页</a></div>
         <div class="fr"><a href="">登录</a><a href="">注册</a><a href="">进入优软云</a></div>
     </div>
 </div>

donate-service/src/main/webapp/resources/view/common/nav.html

@@ -5,7 +5,7 @@
                 <img src="static/images/uas.png" alt=""/>
             </a>
             <span>
-                <a href="/" title="返回首页" style="color: #fff;">一元捐</a>
+                <a href="/" title="返回首页" style="color: #fff;font-size: 18px;font-weight: bold;">一元捐</a>
                  <!--<a href="/project" title="返回首页" style="color: #fff;">一元捐</a>-->
             </span>
         </div>