git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@681 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/EnterpriseController.java

@@ -3,9 +3,20 @@ package com.uas.platform.b2b.controller;
 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.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.service.EnterpriseService;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.SystemSession;
 
+/**
+ * 账户管理--企业信息管理
+ * 
+ * @author yingp
+ *
+ */
 @Controller
 @RequestMapping(value = "/account/enterprise")
 public class EnterpriseController {
@@ -13,4 +24,31 @@ public class EnterpriseController {
 	@Autowired
 	private EnterpriseService enterpriseService;
 
+	@Autowired
+	private UserService userService;
+
+	/**
+	 * 取企业基本资料
+	 * 
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	@ResponseBody
+	public Enterprise getEnterprise() {
+		Enterprise enterprise = SystemSession.getUser().getEnterprise();
+		enterprise.setAdmin(userService.findUserByUserUU(enterprise.getEnAdminuu()));
+		return enterprise;
+	}
+
+	/**
+	 * 企业成长历程
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/growth", method = RequestMethod.GET)
+	@ResponseBody
+	public void getGrowth() {
+
+	}
+
 }

src/main/java/com/uas/platform/b2b/service/EnterpriseService.java

@@ -5,23 +5,39 @@ import org.apache.http.HttpResponse;
 import com.uas.platform.b2b.model.Enterprise;
 
 public interface EnterpriseService {
-	
+
 	public String bussinessCodeEnable(String code);
+
 	public Enterprise registerEnterprise(Enterprise enterprise);
+
 	/**
 	 * 将注册的企业发送后台管理项目审核
+	 * 
 	 * @param enterprise
 	 * @return
 	 */
 	public HttpResponse sendToAduit(Enterprise enterprise);
+
 	public String audit(Long uu, String result, String reason);
+
 	public String activateCheck(Long uu, String checkcode);
+
 	/**
 	 * 发送激活邮件
+	 * 
 	 * @param enuu
 	 * @return
 	 */
 	public String sendActivateEmail(Long enuu);
+
 	public String setAdminPassword(Long enuu, String password);
-	
+
+	/**
+	 * 企业ID查找企业信息
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public Enterprise findById(Long id);
+
 }

src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -165,4 +165,9 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		return "SUCCESS";
 	}
 
+	@Override
+	public Enterprise findById(Long id) {
+		return enterpriseDao.findOne(id);
+	}
+
 }

src/main/webapp/resources/css/index.css

@@ -1153,13 +1153,14 @@ a {
 
 .base-info .content {
 	float: left;
+	white-space: nowrap;
 }
 
 .events {
 	position: relative;
 	margin: 5px 0 60px 148px;
 	padding-top: 40px;
-	width: 550px;
+	width: 650px;
 }
 
 .events dd {
@@ -1186,7 +1187,7 @@ a {
   	height: 25px;
   	line-height: 25px;
   	font-size: 16px;
-  	color: #333;
+  	color: #9ea9c0;
   	text-align: right;
 }
 
@@ -1255,6 +1256,10 @@ a {
   	color: #999;
 }
 
+.events dd .event a {
+	color: #56a022;
+}
+
 .events dd .event {
   	padding-top: 12px;
 }

src/main/webapp/resources/js/index/app.js

@@ -1,6 +1,6 @@
-define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.router', 'ui.bootstrap' , 'file-upload'], function() {
+define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'service/Account', 'ui.router', 'ui.bootstrap' , 'file-upload'], function() {
 	'use strict';
-	var app = angular.module('myApp', [ 'toaster', 'angularCharts', 'ngTable', 'ui.router', 'common.services', 'PurcServices', 'ui.bootstrap', 'angularFileUpload']);
+	var app = angular.module('myApp', [ 'toaster', 'angularCharts', 'ngTable', 'ui.router', 'common.services', 'PurcServices', 'AccountServices', 'ui.bootstrap', 'angularFileUpload']);
 	app.init = function() {
 		angular.bootstrap(document, [ 'myApp' ]);
 	};
@@ -1373,8 +1373,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 		
 	});
 	
-	app.controller('EnterpriseCtrl', function($scope, $rootScope){
+	app.controller('EnterpriseCtrl', function($scope, $rootScope, AccountEnterprise){
 		$rootScope.active = 'enterprise';
+		AccountEnterprise.get({}, function(data){
+			$scope.enterprise = data;
+		});
 	});
 	
 	app.controller('UserCtrl', function($scope, $rootScope){

src/main/webapp/resources/js/index/services/Account.js

@@ -0,0 +1,5 @@
+define([ 'ngResource' ], function() {
+	angular.module('AccountServices', [ 'ngResource' ]).factory('AccountEnterprise', function($resource) {
+		return $resource('account/enterprise', {});
+	});
+});

src/main/webapp/resources/tpl/index/account/enterprise.html

@@ -7,21 +7,21 @@
 		<div class="row row-sm item">
 			<div class="col-xs-6">
 				<span class="title">企业名称</span>
-				<div class="content">1234</div>
+				<div class="content" ng-bind="::enterprise.enName"></div>
 			</div>
 			<div class="col-xs-6">
 				<span class="title">企业简称</span>
-				<div class="content">1234</div>
+				<div class="content" ng-bind="::enterprise.enShortname"></div>
 			</div>
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-6">
 				<span class="title">营业执照</span>
-				<div class="content">1234</div>
+				<div class="content" ng-bind="::enterprise.enBussinessCode"></div>
 			</div>
 			<div class="col-xs-6">
-				<span class="title">注册地区</span>
-				<div class="content">1234</div>
+				<span class="title">注册地址</span>
+				<div class="content" ng-bind="::enterprise.enAddress"></div>
 			</div>
 		</div>
 	</div>
@@ -30,30 +30,27 @@
 	<div class="col-xs-6">
 		<div class="pane base-info">
 			<div class="pane-header">
-				其他信息<a href="#" class="pull-right text-simple"><i
+				联系方式<a href="#" class="pull-right text-simple"><i
 					class="fa fa-pencil fa-fw"></i>编辑</a>
 			</div>
 			<div class="pane-body">
 				<div class="row row-sm item">
-					<div class="col-xs-6">
-						<span class="title">企业类型</span>
-						<div class="content">1234</div>
-					</div>
-					<div class="col-xs-6">
+					<div class="col-xs-12">
 						<span class="title">企业官网</span>
-						<div class="content">1234</div>
+						<a class="content" ng-bind="::enterprise.enUrl" href="{{::enterprise.enUrl}}" target="_blank"></a>
 					</div>
 				</div>
 				<div class="row row-sm item">
-					<div class="col-xs-6">
+					<div class="col-xs-12">
 						<span class="title"><i class="fa fa-fw fa-phone"></i>&nbsp;电&nbsp;话</span>
-						<div class="content">1234</div>
+						<div class="content" ng-bind="::enterprise.enTel"></div>
 					</div>
-					<div class="col-xs-6">
+				</div>
+				<div class="row row-sm item">
+					<div class="col-xs-12">
 						<span class="title"><i class="fa fa-fw fa-fax"></i>&nbsp;传&nbsp;真</span>
-						<div class="content">1234</div>
+						<div class="content" ng-bind="::enterprise.enFax"></div>
 					</div>
-
 				</div>
 			</div>
 		</div>
@@ -68,21 +65,23 @@
 				<div class="row row-sm item">
 					<div class="col-xs-6">
 						<span class="title">姓名</span>
-						<div class="content">1234</div>
+						<div class="content" ng-bind="::enterprise.admin.userName"></div>
 					</div>
 					<div class="col-xs-6">
 						<span class="title">性别</span>
-						<div class="content">1234</div>
+						<div class="content" ng-bind="::enterprise.admin.userSex == 'F' ? '女' : '男'"></div>
 					</div>
 				</div>
 				<div class="row row-sm item">
-					<div class="col-xs-6">
+					<div class="col-xs-12">
 						<span class="title">电话</span>
-						<div class="content">1234</div>
+						<div class="content" ng-bind="::enterprise.admin.userTel"></div>
 					</div>
-					<div class="col-xs-6">
+				</div>
+				<div class="row row-sm item">
+					<div class="col-xs-12">
 						<span class="title">邮箱</span>
-						<div class="content">1234</div>
+						<div class="content" ng-bind="::enterprise.admin.userEmail"></div>
 					</div>
 				</div>
 			</div>
@@ -100,39 +99,47 @@
 				<div class="icon year-icon"></div>
 			</dd>
 			<dd>
-				<div class="date">
-					8月11日
-				</div>
+				<div class="date">8月11日</div>
 				<div class="icon">
 					<i class="fa fa-user"></i>
 				</div>
 				<div class="event">
 					<div class="event_tit-wrapper">
-						<div class="event_tit">
-							注册加入到优软商务平台
-						</div>
+						<div class="event_tit">注册加入到优软商务平台</div>
 					</div>
 				</div>
 			</dd>
 			<dd>
-				<div class="date">
-					8月15日
-				</div>
+				<div class="date">8月15日</div>
 				<div class="icon">
-					<i class="fa fa-phone"></i>
+					<i class="fa fa-shopping-cart"></i>
 				</div>
 				<div class="event">
 					<div class="event_tit-wrapper">
 						<div class="event_tit">
-							北宋皇帝宋太宗<a href="http://baike.baidu.com/view/8092.htm"
-								target="_blank">赵光义</a>逝世
+							收到了第一份客户采购单<a href="#" target="_blank">MP14080001</a>
 						</div>
 					</div>
 					<div class="event_cnt">
-						宋太宗赵光义（公元939年－公元997年），字廷宜，<a target="_blank"
-							href="/view/23604.htm">宋朝</a>的第二位皇帝。本名赵匡义，后因避其兄<a target="_blank"
-							href="/view/23700.htm">宋太祖</a>名讳改名赵光义，即位后又改...<a
-							href="http://baike.baidu.com/view/8092.htm" target="_blank">更多&gt;&gt;</a>
+						采购单<a href="#" target="_blank">MP14080001</a>，客户：天派电子(深圳)有限公司，币别：RMB，付款方式：货到付款<a
+							href="#" target="_blank" class="pull-right">详细&gt;&gt;</a>
+					</div>
+				</div>
+			</dd>
+			<dd>
+				<div class="date">9月11日</div>
+				<div class="icon">
+					<i class="fa fa-line-chart"></i>
+				</div>
+				<div class="event">
+					<div class="event_tit-wrapper">
+						<div class="event_tit">
+							销售额突破<span class="text-inverse">1,000</span>万元
+						</div>
+						<div class="event_cnt">
+							截止2014年9月11日，统计平台的发货单金额累计达到1,200万元<a href="#" target="_blank"
+								class="pull-right">详细&gt;&gt;</a>
+						</div>
 					</div>
 				</div>
 			</dd>
@@ -143,27 +150,19 @@
 				<div class="icon year-icon"></div>
 			</dd>
 			<dd>
-				<div class="date">
-					8月11日
-				</div>
+				<div class="date">5月11日</div>
 				<div class="icon">
-					<i class="fa fa-phone"></i>
+					<i class="fa fa-line-chart"></i>
 				</div>
 				<div class="event">
 					<div class="event_tit-wrapper">
 						<div class="event_tit">
-							北京奥运会奥林匹克圣火登上<a
-								href="http://baike.baidu.com/subview/2322/5098092.htm"
-								target="_blank">珠穆朗玛峰</a>
+							销售额突破<span class="text-inverse">10,000</span>万元
+						</div>
+						<div class="event_cnt">
+							截止2015年9月11日，统计平台的发货单金额累计达到10,800万元<a href="#" target="_blank"
+								class="pull-right">详细&gt;&gt;</a>
 						</div>
-					</div>
-					<div class="event_cnt">
-						<b>珠穆朗玛峰</b>（Qomolangma）简称珠峰，又意译作圣母峰，<a target="_blank"
-							href="/view/2173.htm">尼泊尔</a>称为萨加马塔峰，<a target="_blank"
-							href="/view/20007.htm">藏语</a>的“珠穆朗玛”意为“第三女神”。该峰位于<a
-							target="_blank" href="/view/61891.htm">中...</a><a
-							href="http://baike.baidu.com/subview/2322/5098092.htm"
-							target="_blank">更多&gt;&gt;</a>
 					</div>
 				</div>
 			</dd>