Merge remote-tracking branch 'origin/master' into hotfix-686-wangmh

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

@@ -888,4 +888,16 @@ public class SaleInquiryController {
         modelMap.putAll(map);
 		return modelMap;
 	}
+
+    /**
+     * 通过物料id查询该条物料最新的采纳价格
+     *
+     * @param prid 物料id
+     * @return
+     */
+	@RequestMapping(value = "/recentPrice/{prId}", method = RequestMethod.GET)
+    @ResponseBody
+    public ModelMap getRecentPrice(@PathVariable("prId") Long prid) {
+        return purchaseInquiryService.getRecentPrice(prid);
+    }
 }

src/main/java/com/uas/platform/b2b/dao/ProductDao.java

@@ -232,4 +232,12 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
 	 * @return
 	 */
 	Long countByEnUU(Long enUU);
+
+	/**
+	 * 通过
+	 * @param enUU
+	 * @param cmpCode
+	 * @return
+	 */
+	List<Product> findByEnUUAndCmpCode(Long enUU, String cmpCode);
 }

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseNotifyController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -57,8 +58,8 @@ public class PurchaseNotifyController {
 	public void saveNotifies(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseNotify> notifies = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
-		List<PurchaseNotice> notices = purchaseNotifyService.convertPurchaseNotify(notifies);
-		purchaseNoticeService.save(notices);
+		List<PurchaseNotice> lists = purchaseNotifyService.convertPurchaseNotify(notifies);
+		purchaseNoticeService.save(lists);
 		logger.log("送货提醒", "上传送货提醒", notifies.size());
 	}
 

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

@@ -304,4 +304,12 @@ public interface PurchaseInquiryService {
     void coverInquiryItemProdToUser(Long enUU) throws Exception;
 
     void saveList(List<PurchaseInquiryItemTemp> purchaseInquiryItemTemps);
+
+	/**
+	 * 根据供应商物料id获取最新采纳的价格信息
+	 *
+	 * @param prid 供应商物料id
+	 * @return
+	 */
+	ModelMap getRecentPrice(Long prid);
 }

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

@@ -503,46 +503,33 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 
 	@Override
 	public SPage<UserSpaceDetail> getUserSpaceDetails(com.uas.search.b2b.model.PageParams  params, String keyword) throws Exception {
-
-//		SPage<UserSpaceView> details = searchService.searchUserSpaceDetailCheckIds(keyword,
-//				pageParams);
 		Page<UserSpaceView> details = AccountUtils.getUserSpacesByKeyword(keyword, params.getPage(), params.getSize());
-				SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
+		SPage<UserSpaceDetail> userSpaceDetails = new SPage<UserSpaceDetail>();
 		List<UserSpaceDetail> spaceDetails = new ArrayList<UserSpaceDetail>();
-
 		if (!CollectionUtils.isEmpty(details.getContent())) {
+			Long enUU = SystemSession.getUser().getEnterprise().getUu();
 			for (UserSpaceView detail : details.getContent()) {
-				UserSpaceDetail spacetDetail = new UserSpaceDetail();
-				if (null != detail.getBusinessCode() && !"None".equals(detail.getBusinessCode())) {
-					List<Enterprise> enterprises = enterpriseDao.findByEnBussinessCodeAndEnName(detail.getBusinessCode(), detail.getSpaceName());
-					// 根据营业执照和企业名找到唯一企业时，才设置
-					if (enterprises.size() == 1) {
-						spacetDetail.setUu(enterprises.get(0).getUu());
-					}
+				UserSpaceDetail spaceDetail = new UserSpaceDetail();
+				BeanUtils.copyProperties(detail, spaceDetail);
+				spaceDetail.setUu(detail.getSpaceUU());
+				spaceDetail.setAddress(detail.getRegAddress());
+				spaceDetail.setName(detail.getSpaceName());
+                spaceDetail.setCurrent(Constant.NO);
+				if (spaceDetail.getUu().equals(enUU)) {
+					spaceDetail.setCurrent(Constant.YES);
 				}
-				BeanUtils.copyProperties(detail, spacetDetail);
-				RequestStatus request = AccountUtils.getStatusByCustUidAndVendUid(spacetDetail.getBusinessCode(),
-						SystemSession.getUser().getEnterprise().getEnBussinessCode());
-				if (request != null) {
-					spacetDetail.setRequestStatus(request.getStatusCode());
-					spacetDetail.setMethod(request.getMethod());
-				}
-				if (spacetDetail.getBusinessCode() != null) {
-					if (spacetDetail.getBusinessCode()
-						.equals(SystemSession.getUser().getEnterprise().getEnBussinessCode())) {
-					spacetDetail.setCurrent(Constant.YES);
-					}
+				if (null != detail.getAdmin()) {
+					spaceDetail.setAdminEmail(detail.getAdmin().getEmail());
+					spaceDetail.setAdminName(detail.getAdmin().getVipName());
+					spaceDetail.setAdminTel(detail.getAdmin().getMobile());
 				}
-                spacetDetail.setAddress(detail.getRegAddress());
-				spacetDetail.setName(detail.getSpaceName());
-				spacetDetail.setBusinessCode(detail.getBusinessCode());
-				spacetDetail.setBusinessCodeImage(detail.getBusinessCodeImage());
-                spaceDetails.add(spacetDetail);
-                if (null != detail.getAdmin()) {
-					spacetDetail.setAdminEmail(detail.getAdmin().getEmail());
-					spacetDetail.setAdminName(detail.getAdmin().getVipName());
-					spacetDetail.setAdminTel(detail.getAdmin().getMobile());
+				if (!spaceDetail.getCurrent().equals(Constant.YES)) {
+					List<Vendor> vendorList = vendorDao.findByMyEnUUAndVendUU(enUU, spaceDetail.getUu());
+					spaceDetail.setIsVendor(CollectionUtils.isEmpty(vendorList) ? Constant.NO : Constant.YES);
+					List<Vendor> customerList = vendorDao.findByMyEnUUAndVendUU(spaceDetail.getUu(), enUU);
+					spaceDetail.setIsCustomer(CollectionUtils.isEmpty(customerList) ? Constant.NO : Constant.YES);
 				}
+                spaceDetails.add(spaceDetail);
 			}
 			userSpaceDetails.setContent(spaceDetails);
 			userSpaceDetails.setTotalElement(details.getTotalElements());

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

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.service.impl;
 
+import com.google.common.collect.Lists;
 import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2b.core.util.*;
 import com.uas.platform.b2b.dao.*;
@@ -18,6 +19,7 @@ import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.PurchaseInquiryService;
 import com.uas.platform.b2b.support.MessageConf;
+import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.XingePusher;
 import com.uas.platform.b2b.temporary.model.InquiryMessage;
@@ -172,6 +174,42 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		}
     }
 
+	/**
+	 * 根据供应商物料id获取最新采纳的价格信息
+	 *
+	 * @param prid 供应商物料id
+	 * @return
+	 */
+	@Override
+	public ModelMap getRecentPrice(Long prid) {
+		// 先找到对应的当前企业的物料信息
+		Product originProduct = productDao.findOne(prid);
+		if (null != originProduct && null != originProduct.getCode()) {
+		    Long enUU = SystemSession.getUser().getEnterprise().getUu();
+			List<Product> productList = productDao.findByEnUUAndCode(enUU, originProduct.getCode());
+			if (!CollectionUtils.isEmpty(productList)) {
+                PageInfo pageInfo = new PageInfo(1, 1);
+                pageInfo.filter("inquiry.enUU", enUU);
+                pageInfo.filter("productId", productList.get(0).getId());
+                pageInfo.filter("agreed", Constant.YES);
+                pageInfo.setSort(new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, "id"));
+                SPage<PurchaseInquiryItem> itemSPage = findByPageInfo(pageInfo, null, null);
+                if (!CollectionUtils.isEmpty(itemSPage.getContent())) {
+                	ModelMap map = new ModelMap();
+					PurchaseInquiryItem item = itemSPage.getContent().get(0);
+                    Set<PurchaseInquiryReply> replySet = item.getReplies();
+                    List<PurchaseInquiryReply> replyList = Lists.newArrayList(replySet);
+                    PurchaseInquiryReply reply = replyList.get(0);
+                    map.put("taxRate", item.getTaxrate());
+                    map.put("qty", item.getMinOrderQty());
+                    map.put("price", reply.getPrice());
+                    return map;
+                }
+            }
+		}
+		return null;
+	}
+
 	/**
 	 * 保存至用户单据表
 	 *
@@ -587,7 +625,6 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
     @Override
 	public SPage<PurchaseInquiryItem> findByPageInfo(final PageInfo pageInfo, final String keyword,
 			final SearchFilter filter) {
-		SPage<PurchaseInquiryItem> items = new SPage<PurchaseInquiryItem>();
 		Page<PurchaseInquiryItem> inquiryitems = purchaseInquiryItemDao
 				.findAll(new Specification<PurchaseInquiryItem>() {
 			public Predicate toPredicate(Root<PurchaseInquiryItem> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
@@ -613,12 +650,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
-		items.setContent(inquiryitems.getContent());
-		items.setPage(inquiryitems.getNumber());
-		items.setSize(inquiryitems.getSize());
-		items.setTotalElement(inquiryitems.getTotalElements());
-		items.setTotalPage(inquiryitems.getTotalPages());
-		return items;
+		return SPageUtils.covertSPage(inquiryitems);
 	}
 
 	@Override

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

@@ -574,7 +574,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 			if (item.getNoticeId() != null) {
 				purchaseNoticeDao.updateBySend(item.getNoticeId());
                 PurchaseNotice notice = purchaseNoticeDao.findOne(item.getNoticeId());
-                if (notice.getEndQty() < notice.getQty() && notice.getStatus().equals(Status.REPLIED.value())) {
+                if (notice.getEndQty() < notice.getQty() && notice.getStatus() == Status.REPLIED.value()) {
                     purchaseNoticeDao.updateStatus(item.getNoticeId(), Status.NOT_REPLY.value());
                 }
 				ids.add(item.getNoticeId());

src/main/java/com/uas/platform/b2b/temporary/model/UserSpaceDetail.java

@@ -2,9 +2,6 @@ package com.uas.platform.b2b.temporary.model;
 
 import java.io.Serializable;
 
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.NotEmpty;
-
 /**
  * 详细企业资料
  * 
@@ -26,10 +23,8 @@ public class UserSpaceDetail implements Serializable {
 
 	private String name;
 
-	@NotEmpty(message = "{us.shortName.null}")
 	private String shortName;
 
-	@Length(max = 50, message = "{us.businessCode.length.illegal}")
 	private String businessCode;
 
 	private String businessCodeImage;
@@ -53,30 +48,19 @@ public class UserSpaceDetail implements Serializable {
 	private String contactEmail;
 	private String profession;
 	private String tags;
-
 	private Long uu;
-
-	@NotEmpty(message = "{us.admin.name.null}")
 	private String adminName;
-
 	private String adminTel;
-
-	@NotEmpty(message = "{us.admin.email.null}")
 	private String adminEmail;
-
 	private Integer status;
-
 	private Integer approveStatus;
-
 	private String applyApps;
-
 	private String errMsg;
-
 	private String logoImage;
-
 	private Integer requestStatus;
-
 	private Integer method;
+	private Short isVendor;
+	private Short isCustomer;
 
 	/**
 	 * 是否是当前企业
@@ -446,7 +430,7 @@ public class UserSpaceDetail implements Serializable {
 	 * 1: 主动发出 <br>
 	 * 0： 对方发出
 	 * 
-	 * @param method
+	 * @param
 	 */
 	public Integer getMethod() {
 		return method;
@@ -511,4 +495,30 @@ public class UserSpaceDetail implements Serializable {
 	public void setUu(Long uu) {
 		this.uu = uu;
 	}
+
+    /**
+     * 是否是供应商
+     *
+     * @return
+     */
+    public Short getIsVendor() {
+        return isVendor;
+    }
+
+    public void setIsVendor(Short isVendor) {
+        this.isVendor = isVendor;
+    }
+
+    /**
+     * 是否是客户
+     *
+     * @return
+     */
+    public Short getIsCustomer() {
+        return isCustomer;
+    }
+
+    public void setIsCustomer(Short isCustomer) {
+        this.isCustomer = isCustomer;
+    }
 }

src/main/java/com/uas/platform/b2b/v2/controller/UserController.java

@@ -3,14 +3,14 @@ package com.uas.platform.b2b.v2.controller;
 import com.uas.platform.b2b.model.User;
 import com.uas.sso.entity.UserView;
 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.v2.service.UserService;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller("v2.UserController")
+@RestController("v2.UserController")
 @RequestMapping(value = "/public/user")
 public class UserController {
 

src/main/resources/META-INF/persistence.xml

@@ -28,6 +28,9 @@
 			<!-- <property name="hibernate.transaction.jta.platform"
 				value="org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform" /> -->
 			<property name="jboss.as.jpa.managed" value="false" />
+			<property name="eclipselink.jdbc.cache-statements" value="true" />
+			<property name="eclipselink.jdbc.batch-writing" value="JDBC" />
+			<property name="eclipselink.jdbc.batch-writing.size" value="10000" />
 		</properties>
 	</persistence-unit>
 </persistence>

src/main/webapp/WEB-INF/views/normal/index.html

@@ -27,7 +27,7 @@
 			<div class="navbar-header">
 				<span class="navbar-brand">
 					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"></a>
-					<a href="#/index" title="B2B商务首页"></a>
+					<a href="http://www.usoftmall.com" title="优软商城" target="_blank">优软商城</a>
 				</span>
 			</div>
 			<nav class="navbar-collapse">
@@ -44,7 +44,7 @@
 					</div>
 				</ul>
 				<div id="home-headerName">
-					<a ui-sref="approvalflow.enterprise"><span ng-bind="userInfo.enterprise.enName"></span> <i ng-if="userInfo.enSelect.length !== 0" class="fa fa-chevron-down"></i></a>
+					<a ui-sref="approvalflow.enterprise"><span ng-bind="userInfo.enterprise.enName"></span> <i ng-if="userInfo.enSelect.length !== 0" class="fa fa-angle-down"></i></a>
 				</div>
 				<div class="name-tk">
 					<div>
@@ -58,7 +58,7 @@
 					</div>
 				</div>
 				<div id="home-headerBtns" ng-controller="HeaderCtrl">
-					<a href="javascript:void(0);" class="user-btn" ui-sref="approvalflow.user"><i class="fa fa-user fa-lg"></i><span ng-bind="userInfo.userName"></span><i class="fa fa-chevron-down"></i></a>
+					<a href="javascript:void(0);" class="user-btn" ui-sref="approvalflow.user"><img src="static/img/home/user.png" alt="" style="margin-right: 5px;"/><span ng-bind="userInfo.userName"></span><i class="fa fa-angle-down"></i></a>
 				</div>
 				<div class="user-tk">
 					<div>

src/main/webapp/WEB-INF/views/normal/public.html

@@ -23,7 +23,7 @@
 			<div class="navbar-header">
 				<span class="navbar-brand">
 					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"></a>
-					<a href="http://uas.ubtob.com/#/index" title="B2B商务首页"></a>
+					<a href="http://www.usoftmall.com" title="优软商城" target="_blank">优软商城</a>
 				</span>
 			</div>
 			<div class="navbar-right">

src/main/webapp/WEB-INF/views/normal/serve.html

@@ -25,7 +25,7 @@
 			<div class="navbar-header">
 				<span class="navbar-brand">
 					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"></a>
-					<a href="http://uas.ubtob.com/#/index" title="B2B商务首页"></a>
+					<a href="http://www.usoftmall.com" title="优软商城" target="_blank">优软商城</a>
 				</span>
 			</div>
 			<nav class="navbar-collapse">

src/main/webapp/resources/css/add.css

@@ -120,7 +120,7 @@ input:focus, select:focus {
 }
 
 .com_title font {
-    color: #327ebe;
+    color: #3f84f6;
 }
 
 .search {
@@ -217,7 +217,7 @@ input:focus, select:focus {
 .public-01-btn, .public-01-btn a {
     width: 104px;
     height: 44px;
-    color: #327ebe;
+    color: #3f84f6;
     text-align: center;
     background: #fff;
     display: inline-block;
@@ -521,12 +521,12 @@ input:focus, select:focus {
 
 .per-data ul li a.save {
     margin-left: 60px;
-    background: #327ebe;
+    background: #3f84f6;
 }
 
 .per-data ul li button.save {
     margin-left: 60px;
-    background: #327ebe;
+    background: #3f84f6;
     border: 1px;
 }
 
@@ -563,22 +563,8 @@ input:focus, select:focus {
     text-align: left;
 }
 /*产品资料-价格-新增*/
-.com_head {
-    width: 100%;
-    height: 40px;
-    line-height: 43px;
-    background: url(../img/purc/comm_bg01.png) no-repeat center;
-    background-size: 100%;
-}
-
-.com_head span {
-    margin-left: 20px;
-    color: #000;
-    font-size: 14px;
-}
-
 .com_head a {
-    color: #327ebe;
+    color: #fff;
     float: right;
     margin-right: 40px;
     font-size: 14px;
@@ -866,7 +852,7 @@ input:focus, select:focus {
 }
 
 .bomb-box .box02 .many-file-btn a.btn01 {
-    background: #327ebe;
+    background: #3f84f6;
     color: #fff;
 }
 
@@ -875,8 +861,8 @@ input:focus, select:focus {
 }
 
 .bomb-box .box02 .many-file-btn a.btn02 {
-    border: #327ebe 1px solid;
-    color: #327ebe;
+    border: #3f84f6 1px solid;
+    color: #3f84f6;
     margin-left: 45px;
 }
 
@@ -1069,7 +1055,7 @@ input:focus, select:focus {
 }
 
 .supply-list dl dd span a {
-    color: #327ebe;
+    color: #3f84f6;
 }
 
 .supply-list dl dd span a.buy-btn {
@@ -1230,12 +1216,12 @@ input:focus, select:focus {
 
 .bomb-box .box04 .many-file-btn button.btn01 {
     border: 1px;
-    background: #327ebe;
+    background: #3f84f6;
     color: #fff;
 }
 
 .bomb-box .box04 .many-file-btn a.btn01 {
-    background: #327ebe;
+    background: #3f84f6;
     color: #fff;
 }
 
@@ -1244,8 +1230,8 @@ input:focus, select:focus {
 }
 
 .bomb-box .box04 .many-file-btn a.btn02 {
-    border: #327ebe 1px solid;
-    color: #327ebe;
+    border: #3f84f6 1px solid;
+    color: #3f84f6;
     margin-left: 45px;
 }
 
@@ -1281,12 +1267,13 @@ input:focus, select:focus {
 
 .com_head span.fr {
     margin-right: 20px;
-    color: #959595;
+    color: #fff;
 }
 
 .com_head span.fr em {
     margin-right: 50px;
     font-size: 14px;
+    color:#fff;
 }
 
 .pro-add-tab dl dd select {
@@ -1298,7 +1285,7 @@ input:focus, select:focus {
     -o-appearance: none;
     -moz-appearance: none;
     -ms-appearance: none;
-    border: #327ebe 1px solid;
+    border: #3f84f6 1px solid;
     position: relative;
     font-size: 14px;
     padding-left: 10px;
@@ -1370,7 +1357,7 @@ input:focus, select:focus {
     top: 0;
     padding-left: 15px;
     z-index: 1;
-    color: #327ebe !important;
+    color: #3f84f6 !important;
 }
 
 .pro-add-tab .fj-file i {
@@ -1422,7 +1409,7 @@ input:focus, select:focus {
 }
 
 .pro-add-tab .many-file-btn button.btn01 {
-    background: #327ebe;
+    background: #3f84f6;
     color: #fff;
 }
 
@@ -1431,8 +1418,8 @@ input:focus, select:focus {
 }
 
 .pro-add-tab .many-file-btn a.btn02 {
-    border: #327ebe 1px solid;
-    color: #327ebe;
+    border: #3f84f6 1px solid;
+    color: #3f84f6;
     margin-left: 25px;
 }
 
@@ -1442,8 +1429,8 @@ input:focus, select:focus {
 }
 
 .pro-add-tab .many-file-btn button.btn02 {
-    border: #327ebe 1px solid;
-    color: #327ebe;
+    border: #3f84f6 1px solid;
+    color: #3f84f6;
     margin-left: 25px;
     background-color: #fff;
 }
@@ -1460,7 +1447,7 @@ input:focus, select:focus {
 .pro-add-tab #proText {
     position: absolute;
     border: none !important;
-    color: #327ebe !important;
+    color: #3f84f6 !important;
     top: 30px;
     left: 110px;
     width: 600px !important;
@@ -1714,7 +1701,7 @@ option {
 }
 
 .oder-change dl dd:hover {
-    border: #d32526 1px solid;
+    border: #3f84f6 1px solid;
 }
 
 .oder-change dl dd:hover b.wid02 a {
@@ -2206,13 +2193,13 @@ option {
 }
 
 .add-tanchuang ul li div.fr a.off {
-    border: #327ebe 1px solid;
-    color: #327ebe;
+    border: #3f84f6 1px solid;
+    color: #3f84f6;
     float: left;
 }
 
 .add-tanchuang ul li div.fr a.ok {
-    background: #327ebe;
+    background: #3f84f6;
     color: #fff;
     float: right;
 }

src/main/webapp/resources/css/deputyOrder/order.css

@@ -27,24 +27,11 @@ body {
     background:#f5f5f5;
 }
 .com_title font {
-    color:#327ebe;
-}
-.com_head {
-    width:100%;
-    height:40px;
-    line-height:44px;
-    background:url("../../img/deputyOrder/comm_bg01.png") no-repeat center;
-    background-color:#f5f5f5;
-    background-size: 100%;
-    margin-bottom: -11px;
-}
-.com_head span {
-    margin-left:20px;
-    color:#000;
-    font-size:14px;
+    color:#3f84f6;
 }
+
 .com_head a {
-    color:#327ebe;
+    color:#fff;
     float:right;
     margin-right:40px;
 }
@@ -125,7 +112,7 @@ body {
 .purchase_btn01,.purchase_btn01 a {
     width:104px;
     height:40px;
-    color: #327ebe;
+    color: #3f84f6;
     text-align: center;
     background:#fff;
     display: inline-block;

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

@@ -8,7 +8,7 @@ default-color: #56a022; 绿色
 body {
 	line-height: 1.6;
 	font-family: "Microsoft YaHei", "微软雅黑" !important;
-	color: #222;
+	color: #333;
 	font-size: 14px;
 	background-color: #f5f5f5;
 }
@@ -35,7 +35,7 @@ table {
 	outline: none
 }
 a {
-	color: #333;
+	color: #666;
 	text-decoration: none;
 }
 
@@ -95,7 +95,7 @@ a.none:hover {
 }
 
 .text-blue {
-	color: #327ebe;
+	color: #3f84f6;
 }
 
 .text-inverse {
@@ -211,7 +211,7 @@ a.none:hover {
 }
 
 .input-xs, .input-group-xs>.form-control, .input-group-xs>.input-group-addon, .input-group-xs>.input-group-btn>.btn {
-	border-color: #327ebe;
+	border-color: #3f84f6;
 }
 
 .form-group-sm .form-control-feedback {
@@ -690,11 +690,10 @@ ul>li.item-link>a {
 }
 
 #header.navbar-inverse {
+	position: relative;
 	background-color: #e8e8e8;
 	border: none;
-	border-top: 10px solid #d32526;
 	box-shadow: 0 0 10px #6f6f6f;
-	position: relative;
 }
 
 #header.navbar-inverse .navbar-brand {
@@ -715,39 +714,40 @@ ul>li.item-link>a {
 }
 
 #header.navbar-inverse .navbar-nav>li>a {
-	font-size: 20px;
-	font-famliy: Microsoft Yahei;
-	color: #000000;
+	font-size: 18px;
+	color: #fff;
 	width: 100px;
-	height: 50px;
+	height: 57px;
+	line-height: 27px;
 	text-align: center;
 }
 
 /** 顶部 start **/
 #home-search {
 	margin-left: 450px;
-	margin-top: 7px;
+	margin-top: 11px;
 	position: absolute;
 }
 
 #home-search a {
 	border-radius: 0;
 	width: 85px;
-	height: 36px;
+	height: 26px;
 	color: #ffffff !important;
-	background-color: #d32526;
-	border: 1px solid #d32526;
+	background-color: #ffa200;
 	font-size: 16px;
 }
 
 #home-search input {
-	border-radius: 0;
-	border: 1px solid #d32526;
-	width: 365px;
-	height: 36px;
+	padding-left: 10px;
+	width: 310px;
+	height: 30px;
+	background-color: #ffffff;
+	border-radius: 3px;
+	border: 1px solid #fff;
 	color: #000000;
-	text-align: center;
-	font-size: 16px;
+	text-align: left;
+	font-size: 13px;
 }
 @media screen and (max-width: 1199px) {
     #home-search input{
@@ -768,17 +768,17 @@ ul>li.item-link>a {
 	outline: none;
 }
 /** placeholder 格式 **/
-#home-search input::-webkit-input-placeholder{ /*WebKit browsers*/
-	padding-left: 10px;
-}
+/*#home-search input::-webkit-input-placeholder{ !*WebKit browsers*!*/
+	/*padding-left: 10px;*/
+/*}*/
 
-#home-search input::-moz-input-placeholder{ /*Mozilla Firefox*/
-	padding-left: 10px;
-}
+/*#home-search input::-moz-input-placeholder{ !*Mozilla Firefox*!*/
+	/*padding-left: 10px;*/
+/*}*/
 
-#home-search input::-ms-input-placeholder{ /*Internet Explorer*/
-	padding-left: 10px;
-}
+/*#home-search input::-ms-input-placeholder{ !*Internet Explorer*!*/
+	/*padding-left: 10px;*/
+/*}*/
 
 #home-headerName{
 	position: absolute;
@@ -788,13 +788,15 @@ ul>li.item-link>a {
 	padding-right: 20px;
 	height: 50px;
 	line-height: 50px;
-	color: #333333;
-	font-size: 14px;
+	color: #fff;
+	font-size: 18px;
 }
 #home-headerName span{
 	text-align: right;
 	display:inline-block;
 	width:100%;
+	font-size: 16px;
+	color: #fff;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
@@ -803,6 +805,8 @@ ul>li.item-link>a {
 	position:absolute;
 	top:15px;
 	right:0;
+	font-size: 21px;
+	color: #fff;
 }
 
 
@@ -813,28 +817,30 @@ ul>li.item-link>a {
     padding-right: 35px;
 	height: 50px;
 	line-height: 50px;
-	color: #333333;
-	font-size: 16px;
+	color: #fff;
+	font-size: 18px;
 }
 #home-headerBtns i {
-	padding:0 10px;
+	margin-left: 5px;
+	color: #fff;
+	font-size: 21px;
 }
 #home-headerBtns a{
 	display: inline-block;
 }
 #home-headerBtns a:first-child span{
-	font-size: 13px;
-	color: #52a9fa;
+	font-size: 16px;
+	color: #fff;
 	font-weight: bold;
 }
 #home-headerBtns a i.fa-user{
-	 color: #52a9fa;
+	 color: #fff;
  }
 #home-headerBtns a:first-child:hover span{
-	color: #d32526
+	color: #fff
 }
 #home-headerBtns a:hover i.fa-user{
-	color: #d32526;
+	color: #fff;
 }
 
 #home-headerBtns a span{
@@ -848,6 +854,13 @@ ul>li.item-link>a {
 /** 顶部 end **/
 
 /**dropdown-menu 样式 start **/
+#header.navbar-inverse {
+	position: relative;
+	height: 57px;
+	background-image: linear-gradient(180deg, #4392f7 0%, #366cf3 100%), linear-gradient( #0093e6, #0093e6);
+	border: none;
+	box-shadow: 0 0 10px #6f6f6f;
+}
 
 #dropdown-menu-sale {
 	color: #333333;
@@ -902,18 +915,21 @@ ul>li.item-link>a {
 }
 /**dropdown-menu 样式 end **/
 
-#header.navbar-inverse .navbar-nav>li>a:hover,#header.navbar-inverse .navbar-nav>li>a:focus
+#header.navbar-inverse .navbar-nav>li:hover>a,#header.navbar-inverse .navbar-nav>li:focus>a
 {
-	color: #d32526;
-	background-color: #e8e8e8;
+	color: #fff;
+	border-bottom: 2px solid #fff;
 }
 
 #header.navbar-inverse .navbar-nav>.active>a,#header.navbar-inverse .navbar-nav>.active>a:hover,#header.navbar-inverse .navbar-nav>.active>a:focus
+ {
+	 background: transparent ;
+	 border-bottom: 2px solid #fff;
+ }
+#header.navbar-inverse .navbar-nav>dropdown.active>a,#header.navbar-inverse .navbar-nav>dropdown.active>a:hover,#header.navbar-inverse .navbar-nav>dropdown.active>a:focus
 {
-	color: #d32526;
-	background-color: #e8e8e8;
-	font-color: #d32526;
-	border-bottom: 4px solid #d32526;
+	background: transparent ;
+	border-bottom: 2px solid transparent;
 }
 
 #header.navbar-inverse .navbar-nav>.disabled>a,#header.navbar-inverse .navbar-nav>.disabled>a:hover,#header.navbar-inverse .navbar-nav>.disabled>a:focus
@@ -978,17 +994,29 @@ ul>li.item-link>a {
 }
 
 #header .navbar-header .navbar-brand {
-	background: url("../img/logo/logo.png") no-repeat center;
+	position: relative;
+	background: url(../img/logo/logo01.png) no-repeat left center;
 	width: 218px;
 	margin: 0;
 	padding: 0;
-	line-height: 50px;
+	line-height: 57px;
+	height: 57px;
 }
 #header .navbar-header .navbar-brand a{
-	width: 44%;
 	float: left;
 	display: inline-block;
-	height: 50px;
+	height: 57px;
+	font-size: 16px;
+	color: #fff;
+}
+#header .navbar-header .navbar-brand a:before{
+	position: absolute;
+	top: 16px;
+	left: 105px;
+	content: '';
+	width: 2px;
+	height: 28px;
+	background-color: #fff;
 }
 #header .navbar-header .navbar-brand a:first-child{
 	width: 56%;
@@ -1011,17 +1039,16 @@ ul>li.item-link>a {
 }
 
 .body>.left {
-	width: 219px;
+	width: 185px;
 	float: left;
-	margin-right: 14px;
-	/* border-right: 1px solid #ddd; */
+	margin-right: 12px;
 }
 
 .body>.right {
-	width: 930px;
-	float: right;
+	width: 973px;
+	float: left;
 	font-size: 12px;
-	min-height: 718px;
+	min-height: 90vh;
 }
 @media ( max-height : 768px) {
 	.body>.right{
@@ -1149,27 +1176,38 @@ ul>li.item-link>a {
 
 .left-nav>ul>li>a {
 	display: block;
-	padding: 6px 20px;
+	padding-left:25px;
 	clear: both;
-	line-height: 1.42857143;
+	line-height: 40px;
 	/*white-space: nowrap;*/
 	font-size: 14px;
+	border-bottom:1px dashed #e1e1e1;
+	color:#666;
 }
 
-.use>ul>li:hover,.left-nav>ul>li:hover,.left-nav>ul>li.active {
+.use>ul>li:hover {
 	background-color: #6f6f6f;
 }
 
+.left-nav>ul>li:hover,.left-nav>ul>li.active {
+	background-color: #eee;
+}
+
 .left-nav>ul>li.active {
-	background-color: #6f6f6f;
+	background-color: #eee;
 }
 
-.use>ul>li:hover *,.left-nav>ul>li:hover *,.left-nav>ul>li.active * {
+.use>ul>li:hover *{
 	color: #fff;
 	text-decoration: none;
 	background-color: #6f6f6f;
 }
 
+.left-nav>ul>li:hover *,.left-nav>ul>li.active * {
+	text-decoration: none;
+	background-color: #eee;
+}
+
 .icon-right {
 	float: right;
 	color: #888;
@@ -1178,8 +1216,6 @@ ul>li.item-link>a {
 
 .left-nav {
 	/*margin-top: 10px;*/
-	padding-bottom: 10px;
-	border-bottom: 1px solid #e8e8e8;
 	background-color: #ffffff;
 }
 
@@ -1195,26 +1231,52 @@ ul>li.item-link>a {
 }
 
 .nav-label {
-	text-indent: 35px;
-	height: 40px;
-	line-height: 40px;
-	color: #333333;
+	height: 50px;
+	line-height: 50px;
+	color: #333;
+	font-weight:bold;
 	cursor: pointer;
-	position: relative;
-	background-color: #eaeaea;
-	font-size: 14px;
+	font-size: 16px;
+	padding:0 10px;
+	border-bottom:1px dashed #e1e1e1;
+}
+
+/*.nav-label>i {*/
+	/*position: absolute;*/
+	/*left: 15px;*/
+	/*top: 18px;*/
+	/*width: 0;*/
+	/*height: 0;*/
+	/*border-color: transparent;*/
+	/*border-style: solid;*/
+	/*border-width: 5px 5px 0 5px;*/
+	/*border-top-color: #9ea9c0;*/
+/*}*/
+
+.nav_icon{
+	display:inline-block;
+	width:30px;
+	height:20px;
+	vertical-align: middle;
+	position:relative;
+	top:-3px;
+}
+.nav1_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat 0 0;
 }
 
-.nav-label>i {
-	position: absolute;
-	left: 15px;
-	top: 18px;
-	width: 0;
-	height: 0;
-	border-color: transparent;
-	border-style: solid;
-	border-width: 5px 5px 0 5px;
-	border-top-color: #9ea9c0;
+.nav2_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -28px 0;
+}
+
+.nav3_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -58px 0;
+}
+.nav4_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -88px 0;
+}
+.nav5_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -118px 0;
 }
 
 .left-nav .icon-left {
@@ -1239,7 +1301,7 @@ ul>li.item-link>a {
 
 .right .data-wrap {
 	float: left;
-	width: 660px;
+	width: 755px;
 }
 
 .data-wrap .todo {
@@ -1277,8 +1339,7 @@ ul>li.item-link>a {
 
 .todo .todo-content {
 	clear: both;
-	background-color: #ffffff;
-	width: 660px;
+	width: 755px;
 	margin-left: 0px;
 	border-bottom: 1px solid #e8e8e8;
 	display: inline-block;
@@ -1363,11 +1424,11 @@ ul>li.item-link>a {
 
 /** left .feed-wrap start **/
 .left .feed-wrap {
-	float: right;
-	width: 218px;
+	/*float: right;*/
+	width: 185px;
 }
 .left .feed-wrap .notice:first-child {
-	margin-top: 3px;
+	margin-top: 0;
 }
 .pane {
 	/*margin-top: 20px;*/
@@ -1377,12 +1438,17 @@ ul>li.item-link>a {
 
 .pane .pane-header {
 	height: 40px;
-	background: #e8e8e8;
+	background: #fff;
 	line-height: 40px;
-	font-size: 14px;
+	font-size: 18px;
+    font-weight: bold;
 	padding: 0 15px;
 	border-bottom: 1px solid #e8e8e8;
-	color: #333;
+	color: #666;
+}
+
+.pane .pane-header .pull-right {
+	font-weight: normal;
 }
 
 .pane .pane-header .pull-right>a {
@@ -1408,28 +1474,6 @@ ul>li.item-link>a {
 	display: block;
 }
 
-.notice {
-	height: 244px;
-}
-
-.notice .detail>li {
-	clear: both;
-	display: block;
-	padding: 8px 10px 8px 15px;
-	position: relative;
-}
-
-
-.notice .detail>li:before {
-	position: absolute;
-	left: 0;
-	top: 5px;
-}
-
-.feed-wrap .service .detail>li {
-	height: 30px;
-	line-height: 30px;
-}
 
 .state-wrap {
 	position: relative;
@@ -1482,9 +1526,8 @@ ul>li.item-link>a {
 	/*margin-top: 20px;*/
 }
 
-.side-image  img {
-	margin-bottom: 15px;
-	/*cursor: pointer;*/
+.side-image img {
+	margin-bottom: 0 !important ;
 }
 
 .side-image  img:hover {
@@ -1501,15 +1544,15 @@ ul>li.item-link>a {
 	margin-left: 3px;
 }
 .feed-wrap .pane:first-child ,.feed-wrap .pane:nth-child(2){
-	height: 272px;
+	height: 275px;
 }
 .pane .pane-body {
 	padding: 10px;
 }
 .feed-wrap .pane-body{
-	height: 110px;
-	/*overflow-y: auto;
-	overflow-x: hidden;*/
+	height: 230px;
+	overflow-y: auto;
+	overflow-x: hidden;
 }
 .pane.addon {
 	height: 185px;
@@ -1552,15 +1595,6 @@ ul>li.item-link>a {
 	height: 154px;
 }
 
-.feed-wrap .service .detail>li {
-	height: 30px;
-	line-height: 30px;
-	padding: 0 10px 8px 15px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
 .state-wrap {
 	position: relative;
 	height: 40px;
@@ -1810,7 +1844,7 @@ ul>li.item-link>a {
 	width: 25px;
 	height: 24px;
 	line-height: 24px;
-	background: #327ebe;
+	background: #3f84f6;
 	color: #fff;
 	text-align: center;
 	border-radius: 0 2px 2px 0;
@@ -2659,11 +2693,10 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	border-bottom: none;
 }
 .feed-wrap .carousel-inner{
-	width: 246px;
-	height: 600px;
+	width: 206px;
 }
 .feed-wrap .carousel-inner .item img{
-	width: 246px;
+	width: 206px;
 	height: 568px;
 }
 .feed-wrap .carousel-indicators .active{
@@ -2683,7 +2716,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	border: none;
 }
 .pane-header img{
-	vertical-align: text-bottom;
+	vertical-align: middle;
 }
 .height6{
 	width: 100%;
@@ -2768,10 +2801,13 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	margin-bottom: 0;
 	list-style: none;
 	border: 1px solid #ccc;
+	border-radius: 6px;
 	overflow: hidden;
 	background: #fff;
 	max-height: 550px;
 	overflow-y: auto;
+	box-shadow: 0px 0px 6px 0px
+	rgba(120, 120, 120, 0.2);
 }
 .name-tk .user-message li{
 	height: 50px;
@@ -2840,6 +2876,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	box-shadow: 3px 3px 5px #ccc;
 	overflow: hidden;
 	background: #fff;
+	border-radius: 6px;
 }
 .user-tk .user-message li{
 	width: 100%;
@@ -2933,32 +2970,129 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 
 
 /*公共详情*/
-.pub-com_head {
+.pub-com_head, .com_head {
 	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("../img/approvalFlow/comm_bg01.png") no-repeat left;
-	background-color: #f5f5f5;
-	background-size: 100% 100%;
+	height: 50px;
+	line-height: 50px;
+	background: #3f84f6;
+	border-radius: 5px 5px 0 0 ;
+	/*background: url("../img/approvalFlow/comm_bg01.png") no-repeat left;*/
+	/*background-color: #f5f5f5;*/
+	/*background-size: 100% 100%;*/
 }
 
-.pub-com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
+.pub-com_head span, .com_head span{
+	margin-left: 10px;
+	color: #fff;
+	font-size: 16px;
 }
-.pub-com_head  .p-right{
+.pub-com_head .p-right{
 	float: right;
 }
-.pub-com_head  .p-right a{
-	color: #3a89d1;
+.pub-com_head .p-right a{
+	color: #fff !important ;
 	font-size: 14px;
 	margin-right: 20px;
 }
-.pub-com_head  .p-right a:hover{
-	color: #d32526;
+.pub-com_head .p-right a img{
+	margin-right: 3px;
+}
+.pub-com_head .p-right a:hover{
 	text-decoration: underline;
 }
+.pub-com_head .p-right em{
+	font-style:normal;
+	font-size: 14px;
+	margin-right: 20px;
+}
+.pub-com_head .p-right time{
+	font-size: 14px;
+	margin-right: 20px;
+}
+
+.com_head span.fr em{
+	font-style:normal;
+	font-size: 14px;
+	margin-right: 20px;
+}
+.com_head span.fr time{
+	font-size: 14px;
+	margin-right: 20px;
+}
+
+.load_icon {
+	display:inline-block;
+	width:14px;
+	height:14px;
+	margin-left:10px;
+	vertical-align:middle;
+	background: url("../img/empty/load.png")no-repeat;
+}
+.way_icon {
+	display:inline-block;
+	width:20px;
+	height:14px;
+	margin-right:10px;
+	vertical-align:middle;
+	background: url("../img/empty/way.png")no-repeat;
+}
+
+#empty{
+	padding: 70px 0;
+	margin: 0 auto;
+	text-align: center;
+}
+#empty .left_img{
+	display:inline-block;
+	color:#3f84f6;
+}
+#empty .left_img a{
+	font-size: 25px;
+	color:#3f84f6;
+}
+#empty .left_img a img{}
+#empty .left_img a:last-child:before{
+	content: '';
+	position:relative;
+	top:6px;
+	display:inline-block;
+	width:2px;
+	height:27px;
+	background: #3f84f6;
+	margin: 0 10px;
+}
+#empty .right_link{
+	display:inline-block;
+	vertical-align:top;
+	padding-left:10px;
+	text-align: left;
+}
+#empty .right_link p{
+	margin: 0;
+	font-size: 14px;
+	color:#666;
+}
+#empty .right_link a{
+	color:#3f84f6;
+	font-size: 14px;
+}
+
+#empty_info{
+	padding-left: 60px;
+	padding-bottom:40px;
+}
+#empty_info .empty_title{
+	color:#3f84f6;
+	font-size: 18px;
+}
+#empty_info .empty_explain{
+	font-size: 16px;
+	color:#999;
+}
+#empty_info .empty_explain .info{
+	text-indent: -22px;
+}
+
 .title-div {
 	font-size: 14px;
 	font-weight: 600;
@@ -2967,7 +3101,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	padding-top: 11px;
 }
 .com_title01,.title-div{
-	border-bottom: 1px dashed #327ebe !important;
+	border-bottom: 1px dashed #3f84f6 !important;
 }
 #order-detail-list{
 	font-size: 14px;
@@ -3033,7 +3167,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 #window-search .form-control{
 	height: 36px;
 	line-height: 36px;
-	border: #327ebe 1px solid;
+	border: #3f84f6 1px solid;
 	border-radius: 0px;
 	font-size: 14px;
 }
@@ -3041,7 +3175,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	width: 70px;
 	height: 36px;
 	display: inline-block;
-	background: #327ebe;
+	background: #3f84f6;
 	font-size: 16px;
 	text-align: center;
 	line-height: 36px;
@@ -3085,7 +3219,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 }
 /*所有hover边框颜色*/
 .sale-view .order-table>tbody:hover{
-	border: #d32526 2px solid !important;
+	border: #3f84f6 2px solid !important;
 }
 /*.sale-view .order-table>tbody:hover tr:first-child td{
 	border-top: #d32526 1px solid !important;
@@ -3162,8 +3296,8 @@ input::-webkit-clear{display:none;}
 }
 .enterprise-btn div{
 	position: absolute;
-	top: 45px;
-	left: 65px;
+	top: 30px;
+	left: 48px;
 }
 .enterprise-btn div a{
 	text-align: center;
@@ -3204,7 +3338,7 @@ input::-webkit-clear{display:none;}
 	margin-right: 5px;
 }
 #topSearch a:hover,#topSearch a.active{
-	background: #5078cb;
+	background: #3f84f6;
 	color: #fff;
 	text-decoration: none;
 }
@@ -3261,7 +3395,7 @@ input::-webkit-clear{display:none;}
 	line-height: 40px;
 }
 .wid_1170{
-	margin-left: -240px;
+	/*margin-left: -240px;*/
 	width: 1170px;
 }
 .myReuest .col-xs-4{
@@ -3360,19 +3494,19 @@ input::-webkit-clear{display:none;}
 	line-height: 22px;
 	border-radius: 4px;
 	text-align: center;
-	color: #327ebe;
+	color: #3f84f6;
 	font-size: 14px;
 	display: inline-block;
 	margin: 0 auto;
 	margin-left: 10px;
-	border: #327ebe 1px solid;
+	border: #3f84f6 1px solid;
 }
 #myquest-public  .all-btn a.btn01{
 /*	background: #27b6da;*/
 	margin-bottom: 5px;
 }
 #myquest-public  .all-btn a.btn02{
-	/*background: #327ebe;*/
+	/*background: #3f84f6;*/
 	border: #27b6da 1px solid;
 	color: #27b6da;
 }
@@ -3384,12 +3518,12 @@ input::-webkit-clear{display:none;}
 	background: #f5f5f5;
 	text-align: center;
 	width: 1170px;
-	margin-left: -240px;
+	/*margin-left: -240px;*/
 }
 .sreach-index .form-control{
 	height: 36px;
 	line-height: 36px;
-	border: #327ebe 1px solid;
+	border: #3f84f6 1px solid;
 	border-radius: 0px;
 	font-size: 14px;
 	text-align: center;
@@ -3403,7 +3537,7 @@ input::-webkit-clear{display:none;}
 	width: 85px;
 	height: 36px;
 	display: inline-block;
-	background: #327ebe;
+	background: #3f84f6;
 	font-size: 16px;
 	text-align: center;
 	line-height: 36px;
@@ -3422,10 +3556,10 @@ input::-webkit-clear{display:none;}
 	background: #ea5a60;
 	position: absolute;
 	border-radius: 100%;
-	top: 10px;
+	top: 15px;
 }
 .left-nav>ul>li.active .new-dot,.left-nav>ul>li:hover .new-dot{
-	background: #ea5a60 !important;
+	background: #3f84f6 !important;
 }
 .left-nav>ul>li a{
 	position: relative;
@@ -3504,15 +3638,13 @@ input::-webkit-clear{display:none;}
 
 /*hover移上去2px 2017-05-09*/
 .tender-list02 .comment-oder:hover,.tender-list dl dd:hover{
-	border: #d32526 2px solid !important;
+	border: #3f84f6 2px solid !important;
 }
 /*2017-05-10*/
 .unPrinted{
 	color: #5078cb !important;
 }
-.left-nav>ul>li:hover a{
-	background: #999;
-}
+
 .textmore{display: block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 #order-detail-list .table-default .header{
 	box-shadow: none;
@@ -3547,7 +3679,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	font-size: 14px;
 }
 .tender-content .tender-list02 dl dd:hover{
-	border: #d32526 2px solid;
+	border: #3f84f6 2px solid;
 }
 .no-record-tab{
 	background: #fff;
@@ -3663,8 +3795,8 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 }
 .ng-table-pager .btn-default.active,.ng-table-pager .btn-default:hover,.ng-table-pager .pagination>.disabled>a,.ng-table-pager .pagination>li>a:hover{
 	color: #fff;
-	background-color: #327ebe;
-	border-color: #327ebe;
+	background-color: #3f84f6;
+	border-color: #3f84f6;
 }
 .ng-table-pager .pagination>.disabled>a{
 	box-shadow: none;
@@ -4198,7 +4330,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	height: 26px;
 	text-align: center;
 	color: #fff;
-	background: #327ebe;
+	background: #3f84f6;
 	border: none;
 	border-radius: 5px;
 	margin: 0 5px;
@@ -4267,16 +4399,16 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	width: 110px;
 	height: 24px;
 	line-height: 22px;
-	border: #327ebe 1px solid;
+	border: #3f84f6 1px solid;
 	border-radius: 5px;
-	color: #327ebe;
+	color: #3f84f6;
 	font-size: 14px;
 	text-align: center;
 	padding: 0;
 	margin-top: 6px;
 }
 .com-tab-menu ul li a.add-btn:hover,.com-tab-menu ul li a.add-btn.active{
-	background:#327ebe;
+	background:#3f84f6;
 	color: #fff;
 	border-bottom: none !important;
 }
@@ -4287,7 +4419,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 .form-input .form-group-sm .form-control{
 	height: 36px;
 	line-height: 36px;
-	border: #327ebe 1px solid;
+	border: #3f84f6 1px solid;
 	border-radius: 0px;
 	font-size: 14px;
 }
@@ -4295,7 +4427,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	width: 85px;
 	height: 36px;
 	display: inline-block;
-	background: #327ebe;
+	background: #3f84f6;
 	font-size: 16px;
 	text-align: center;
 	line-height: 36px;
@@ -4344,7 +4476,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 }
 .form-input .col-xs-3 p em{
 	font-size: 14px;
-	color: #327ebe;
+	color: #3f84f6;
 	font-style: inherit;
 	margin: 0 2px;
 }
@@ -4514,7 +4646,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 }
 
 a.order-detail {
-	color: #327ebe !important;
+	color: #3f84f6 !important;
 }
 
 /*新手引导*/

src/main/webapp/resources/css/public.css

@@ -1,5 +1,5 @@
 #public .com_title{width: 100%;margin: 0px auto;height: 40px;line-height: 40px;font-size: 14px;color: #323232;background: #f5f5f5;}
-#public .com_title font{color: #327ebe;}
+#public .com_title font{color: #3f84f6;}
 #public .com_title .search{position: relative;}
 #public .com_title .search input{width: 300px;padding-left: 10px;height: 36px;background: #fff;float: left;vertical-align: middle;border: #3578ba 1px solid;font-size: 14px;text-align: center;padding-right: 85px;line-height: 36px;}
 #public .com_title .search a.seek{vertical-align: middle;display: inline-block;line-height: 36px;text-align: center;height: 36px;width: 85px;border-left: 0;background: #3578ba;color: #fff;text-align: center;font-size: 16px;float: right;border: #3578ba 1px solid;position: absolute;right: 0;}
@@ -17,9 +17,9 @@
 #public .menu .btn-group .btn em{color: #d32526;font-style: inherit;}
 #public .menu .btn-group .btn:hover{background: #fff;color: #d32526;}
 #public #topSearch{font-size: 16px;}
-#public .form-group-sm .form-control{height: 36px;/*line-height: 36px;*/border: #327ebe 1px solid;border-radius: 0px;font-size: 14px;}
+#public .form-group-sm .form-control{height: 36px;/*line-height: 36px;*/border: #3f84f6 1px solid;border-radius: 0px;font-size: 14px;}
 #public .search-bg .col-xs-6{/*margin-left: 90px;*/}
-#public .search-bg .input-group-addon{width: 70px;height: 36px;display: inline-block;background: #327ebe;font-size: 16px;text-align: center;line-height: 36px;color: #fff;padding: 0;border: none;border-radius: 0;position: absolute;top: 0;right: 0;}
+#public .search-bg .input-group-addon{width: 70px;height: 36px;display: inline-block;background: #3f84f6;font-size: 16px;text-align: center;line-height: 36px;color: #fff;padding: 0;border: none;border-radius: 0;position: absolute;top: 0;right: 0;}
 #public .order-table .header th,#public .inquiry-table .header th{height: 40px;line-height: 40px;background: none;font-size: 14px;}
 #public .order-table .order-hd,#public .inquiry-table .inquiry-hd{font-size: 14px;}
 #public .order-table .order-hd{ line-height: normal;}
@@ -41,35 +41,6 @@
     margin-left: 20px;
 }
 
-.pub-com_head {
-    width: 100%;
-    height: 40px;
-    line-height: 44px;
-    background: url("../img/approvalFlow/comm_bg01.png") no-repeat left;
-    background-color: #f5f5f5;
-    background-size: 100% 100%;
-}
-
-.pub-com_head span {
-    margin-left: 20px;
-    color: #000;
-    font-size: 14px;
-}
-.pub-com_head  .p-right{
-    float: right;
-}
-.pub-com_head  .p-right a{
-    color: #5078cb;
-    font-size: 14px;
-    margin-right: 20px;
-}
-.pub-com_head  .p-right a img{
-    margin-right: 3px;
-}
-.pub-com_head  .p-right a:hover{
-    color: #d32526;
-    text-decoration: underline;
-}
 #public .condition .toggle{
     font-size: 14px;
 }

src/main/webapp/resources/css/serve.css

@@ -72,7 +72,7 @@ a.none:hover {
 }
 /*inverse*/
 .text-default {
-	color: #56a022;
+	color: #3f84f6;
 }
 
 .text-inverse {
@@ -421,11 +421,11 @@ a.none:hover {
 }
 
 #header.navbar-inverse {
-    background-color: #e8e8e8;
-    border: none;
-    border-top: 10px solid #d32526;
-    box-shadow: 0 0 10px #6f6f6f;
-    position: relative;
+	position: relative;
+	height: 57px;
+	background-image: linear-gradient(180deg, #4392f7 0%, #366cf3 100%), linear-gradient( #0093e6, #0093e6);
+	border: none;
+	box-shadow: 0 0 10px #6f6f6f;
 }
 
 #header.navbar-inverse .navbar-brand {
@@ -439,22 +439,28 @@ a.none:hover {
 }
 
 #header.navbar-inverse .navbar-text {
-	color: #969696;
+	font-size: 16px;
+	color: #fff;
+}
+#header.navbar-inverse .navbar-text a{
+	color: #fff;
 }
 
 #header.navbar-inverse .navbar-nav>li>a {
-	color: #323232;
 	padding: 15px 40px;
+	height: 57px;
+	line-height: 25px;
+	color: #fff;
+	border-bottom: 2px solid transparent;
 }
 #header.navbar-inverse .navbar-nav>li>a:hover,#header.navbar-inverse .navbar-nav>li>a:focus
 	{
-	color: #d82128;
-	/*background-color: #4b8b1e;*/
+	border-bottom: 2px solid #fff;
 }
 
 #header.navbar-inverse .navbar-nav>.active>a,#header.navbar-inverse .navbar-nav>.active>a:hover,#header.navbar-inverse .navbar-nav>.active>a:focus
 	{
-	color: #d82128;
+	color: #fff;
 	background: none;
 }
 
@@ -520,17 +526,29 @@ a.none:hover {
 }
 
 #header .navbar-header .navbar-brand {
-	background: url("../img/logo/logo.png") no-repeat center;
+	position: relative;
+	background: url(../img/logo/logo01.png) no-repeat left center;
 	width: 218px;
 	margin: 0;
 	padding: 0;
-	line-height: 50px;
+	line-height: 57px;
+	height: 57px;
 }
 #header .navbar-header .navbar-brand a{
-	width: 44%;
 	float: left;
 	display: inline-block;
-	height: 50px;
+	height: 57px;
+	font-size: 16px;
+	color: #fff;
+}
+#header .navbar-header .navbar-brand a:before{
+	position: absolute;
+	top: 16px;
+	left: 105px;
+	content: '';
+	width: 2px;
+	height: 28px;
+	background-color: #fff;
 }
 #header .navbar-header .navbar-brand a:first-child{
 	width: 56%;
@@ -589,56 +607,61 @@ a.none:hover {
 }
 
 .left-nav {
-	margin-top: 10px;
-	padding-bottom: 10px;
-	border-bottom: 1px solid #e8e8e8;
+	/*margin-top: 10px;*/
+	background-color: #ffffff;
 }
-
 .left-nav>ul>li {
 	text-indent: 15px;
 }
 
 .left-nav>ul>li>a {
 	display: block;
-	padding: 6px 20px;
+	padding-left:25px;
 	clear: both;
-	line-height: 1.42857143;
-	white-space: nowrap;
+	line-height: 40px;
+	/*white-space: nowrap;*/
+	font-size: 14px;
+	border-bottom:1px dashed #e1e1e1;
+	color:#666;
 }
 
 .left-nav>ul>li:hover,.left-nav>ul>li.active {
-	background-color: #999;
+	background-color: #eee;
 }
 
 .left-nav>ul>li.active {
-	background-color: #6f6f6f;
+	text-decoration: none;
+	background-color: #eee;
 }
 
 .left-nav>ul>li:hover *,.left-nav>ul>li.active * {
 	color: #fff;
-	text-decoration: none
+	text-decoration: none;
+	background-color: #6f6f6f;
 }
 
 .nav-label {
-	text-indent: 35px;
-	height: 40px;
-	line-height: 40px;
-	color: #9ea9c0;
+	height: 50px;
+	line-height: 50px;
+	color: #333;
+	font-weight:bold;
 	cursor: pointer;
-	position: relative;
-}
-
-.nav-label>i {
-	position: absolute;
-	left: 15px;
-	top: 18px;
-	width: 0;
-	height: 0;
-	border-color: transparent;
-	border-style: solid;
-	border-width: 5px 5px 0 5px;
-	border-top-color: #9ea9c0;
-}
+	font-size: 16px;
+	padding:0 10px;
+	border-bottom:1px dashed #e1e1e1;
+}
+
+/*.nav-label>i {*/
+	/*position: absolute;*/
+	/*left: 15px;*/
+	/*top: 18px;*/
+	/*width: 0;*/
+	/*height: 0;*/
+	/*border-color: transparent;*/
+	/*border-style: solid;*/
+	/*border-width: 5px 5px 0 5px;*/
+	/*border-top-color: #9ea9c0;*/
+/*}*/
 
 .help-container,.contact-container,.new-container {
 	padding: 15px 10px;
@@ -652,7 +675,7 @@ a.none:hover {
 	line-height: 60px;
 	text-align: center;
 	margin: 5px auto;
-	color: #56a022;
+	color: #3f84f6;
 	font-size: 32px;
 	border: 1px solid #eee;
 	-webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
@@ -661,15 +684,26 @@ a.none:hover {
 	background-color: #f3f3f4;
 	display: block;
 }
-
-.icon-circle:hover {
+.icon-lg:hover{
 	color: #fff;
-	background-color: #56a022;
+	background-color: #3f84f6;
 	cursor: pointer;
 	-webkit-transition: all 0.2s ease-in-out;
 	-moz-transition: all 0.2s ease-in-out;
 	transition: all 0.2s ease-in-out;
 }
+ a:hover .icon-circle {
+	color: #fff;
+	background-color: #3f84f6;
+	cursor: pointer;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
+}
+ a:hover span{
+	 text-decoration: underline;
+	 color: #333;
+ }
 
 .icon-circle.icon-lg {
 	width: 120px;
@@ -793,7 +827,7 @@ a.none:hover {
 }
 
 .contact-container .tab-content {
-	border: 1px solid #d32526;
+	border: 1px solid #3f84f6;
 	border-top: none;
 }
 
@@ -834,7 +868,7 @@ a.none:hover {
 	display: block;
 	margin-bottom: 20px;
 	font-size: 60px;
-	color: #56a022;
+	color: #3f84f6;
 }
 
 .online-list .title {
@@ -1029,7 +1063,7 @@ a.none:hover {
 
 .nav-tabs>li {
 	background: #f9f9f9;
-	border-bottom: 1px solid #d32526;
+	border-bottom: 1px solid #3f84f6;
 	border-right: 1px solid #e2e2e2;
 }
 
@@ -1046,13 +1080,14 @@ a.none:hover {
 
 .nav-tabs>li>a:hover {
 	background-color: transparent;
+	color: #666;
 }
 
 .nav-tabs>li.active {
 	border-bottom-color: #fff;
-	border-top: 4px solid #d32526;
-	border-left: 1px solid #d32526;
-	border-right: 1px solid #d32526;
+	border-top: 4px solid #3f84f6;
+	border-left: 1px solid #3f84f6;
+	border-right: 1px solid #3f84f6;
 }
 
 .nav-tabs>li.active>a {
@@ -1061,7 +1096,7 @@ a.none:hover {
 }
 
 .nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus {
-	color: #d32526;
+	color: #000;
 }
 
 .nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus,.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus
@@ -1351,4 +1386,96 @@ label {
 	position: relative;
 	top: 20px;
 	left: 32px;
+}
+
+/*公共详情*/
+#pub-com_head {
+	padding: 0;
+	width: 100%;
+	height: 50px;
+	line-height: 50px;
+	background: #3f84f6!important;
+	border-radius: 5px 5px 0 0 ;
+}
+
+#pub-com_head span{
+	margin-left: 10px;
+	color: #fff;
+	font-size: 18px;
+}
+#pub-com_head  .p-right{
+	float: right;
+}
+#pub-com_head  .p-right a{
+	color: #fff !important ;
+	font-size: 14px;
+	margin-right: 20px;
+}
+#pub-com_head  .p-right a img{
+	margin-right: 3px;
+}
+#pub-com_head  .p-right a:hover{
+	text-decoration: underline;
+}
+
+/*分页样式统一调整*/
+.ng-table-pager{
+	height: auto;
+	padding: 25px 0;
+	background: #fff;
+}
+.ng-table-pager .pagination{
+	height: 40px;
+	margin-top: 10px;
+}
+.ng-table-pager .btn-default.active,.ng-table-pager .btn-default:hover,.ng-table-pager .pagination>.disabled>a,.ng-table-pager .pagination>li>a:hover{
+	color: #fff;
+	background-color: #3f84f6;
+	border-color: #3f84f6;
+}
+.ng-table-pager .pagination>.disabled>a{
+	box-shadow: none;
+}
+.ng-table-pager .pagination>li>a, .ng-table-pager .pagination>li>span{
+	font-size: 12px;
+	color: #333;
+	padding: 5px 10px;
+}
+.ng-table-pager .pagination>li:first-child.disabled>a,.ng-table-pager .pagination>li:nth-last-child(2).disabled>a{
+	color: #333;
+	background-color: #fff;
+	border: 1px solid #ddd;
+}
+.ng-table-pager .pagination>li:first-child a{
+	border-bottom-left-radius: 20px;
+	border-top-left-radius: 20px;
+}
+.ng-table-pager .pagination>li:nth-last-child(2) a{
+	border-bottom-right-radius: 20px;
+	border-top-right-radius: 20px;
+}
+.ng-table-pager .pagination>li.disabled>a[ng-switch-when="more"]{
+	color: #333;
+	background-color: #fff;
+	border: 1px solid #ddd;
+}
+.ng-table-pager .pagination>li .page-record span input {
+	width: 25px;
+	height: 25px;
+	border: #b8b8b8 1px solid;
+	margin: 0 5px;
+	text-align: center;
+}
+.pagination>li {
+	display: inline-flex;
+}
+.ng-table-pager .pagination>li .page-record span button {
+	width: 48px;
+	height: 26px;
+	text-align: center;
+	color: #fff;
+	background: #3f84f6;
+	border: 0;
+	border-radius: 5px;
+	margin: 0 5px;
 }

src/main/webapp/resources/css/style.css

@@ -73,25 +73,11 @@ body {
 }
 
 .com_title font {
-	color: #327ebe;
-}
-
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("../img/approvalFlow/comm_bg01.png") no-repeat center;
-	background-color: #f5f5f5;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
+	color: #3f84f6;
 }
 
 .com_head a {
-	color: #327ebe;
+	color: #fff;
 	float: right;
 	margin-right: 40px;
 }
@@ -149,7 +135,7 @@ body {
 }
 
 .com_content ul li .content_list span .clolor01 {
-	color: #327ebe;
+	color: #3f84f6;
 }
 
 .com_content ul li .content_list span .clolor02 {
@@ -235,7 +221,7 @@ body {
 }
 
 .box01_01 span a {
-	color: #327ebe;
+	color: #3f84f6;
 	font-size: 12px;
 	margin-left: 10px;
 }
@@ -297,7 +283,7 @@ body {
 }
 
 .box01_02 span:hover a, .box01_02 span.active:hover a {
-	background: #327ebe;
+	background: #3f84f6;
 }
 
 .box01_02 span.active a {
@@ -305,7 +291,7 @@ body {
 }
 
 .box01_02 span:hover em, .box01_02 span.active em {
-	color: #327ebe;
+	color: #3f84f6;
 }
 
 .box01_02 span.active {
@@ -343,7 +329,7 @@ body {
 }
 
 .box01_03 a.btn01, .box_list .btn01, .next_btn a {
-	background: #327ebe;
+	background: #3f84f6;
 	color: #fff;
 }
 
@@ -352,8 +338,8 @@ body {
 }
 
 .box01_03 a.btn02 {
-	border: #327ebe 1px solid;
-	color: #327ebe;
+	border: #3f84f6 1px solid;
+	color: #3f84f6;
 	margin-left: 45px;
 }
 
@@ -387,7 +373,7 @@ body {
 }
 
 #caozuo a:hover {
-	background: #327ebe;
+	background: #3f84f6;
 	color: #fff;
 }
 
@@ -446,7 +432,7 @@ body {
 }
 
 #caozuo01 a:hover {
-	background: #327ebe;
+	background: #3f84f6;
 	color: #fff;
 }
 
@@ -564,7 +550,7 @@ body {
 
 .box_list dl dd a, .style_list a {
 	font-size: 12px;
-	color: #327ebe;
+	color: #3f84f6;
 	width: 66px;
 	height: 24px;
 	line-height: 24px;
@@ -577,7 +563,7 @@ body {
 }
 
 .box_list dl dd a:hover, .style_list a:hover {
-	background: #327ebe;
+	background: #3f84f6;
 	color: #fff;
 }
 
@@ -678,7 +664,8 @@ body {
 .box_list ul li a {
 	width: 25%;
 	float: right;
-	color: #327ebe;
+	color: #3f84f6;
+;
 }
 
 .box_list ul li a:hover {
@@ -746,8 +733,8 @@ body {
 	height: 24px;
 	line-height: 24px;
 	text-align: center;
-	color: #327ebe;
-	border: #327ebe 1px solid;
+	color: #3f84f6;
+	border: #3f84f6 1px solid;
 }
 
 .day_number div font {

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

@@ -14394,7 +14394,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     /**
      * 新增采购单
      */
-    app.controller('PurcNewOrderCtrl', ['$scope', '$modal', 'toaster', '$filter', 'addtoCart', '$rootScope', 'VendorInfo', 'ngTableParams', 'BaseService', 'Product', 'newPurcOrder', 'cartOperation', 'ShipAddress', 'Vendor', '$http', '$window', 'token', function ($scope, $modal, toaster, $filter, addtoCart, $rootScope, VendorInfo, ngTableParams, BaseService, Product, newPurcOrder, cartOperation, ShipAddress, Vendor, $http, $window, token) {
+    app.controller('PurcNewOrderCtrl', ['$scope', '$modal', 'toaster', '$filter', 'addtoCart', '$rootScope', 'VendorInfo', 'ngTableParams', 'BaseService', 'Product', 'newPurcOrder', 'cartOperation', 'ShipAddress', 'Vendor', '$http', '$window', 'token', 'recentPrice',
+        function ($scope, $modal, toaster, $filter, addtoCart, $rootScope, VendorInfo, ngTableParams, BaseService, Product, newPurcOrder, cartOperation, ShipAddress, Vendor, $http, $window, token, recentPrice) {
         BaseService.scrollBackToTop();
         // 每次进入时先清除掉rootScope下的venduu
         $rootScope.venduu = null;
@@ -14608,19 +14609,29 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 选择
         $scope.check = function (data) {
-            $scope.order.orderItems.push({
-                code: data.code,
-                title: data.title,
-                spec: data.spec,
-                unit: data.unit,
-                qty: null,
-                price: null,
-                remark: null,
-                delivery: null,
-                prid: data.id,
-                taxrate: $scope.order.rate,
-                prodsource: 'seller'
-            });
+            var price = null;
+            var qty = null;
+            var taxRate = null;
+            if (data.id) {
+                recentPrice.agreed({prId: data.id}, {}, function(response) {
+                    price = response.price;
+                    qty = response.qty;
+                    taxRate = response.taxRate;
+                    $scope.order.orderItems.push({
+                        code: data.code,
+                        title: data.title,
+                        spec: data.spec,
+                        unit: data.unit,
+                        qty: qty,
+                        price: price,
+                        remark: null,
+                        delivery: null,
+                        prid: data.id,
+                        taxrate: taxRate,
+                        prodsource: 'seller',
+                    });
+                });
+            }
         };
 
         // 导入商品信息
@@ -16136,7 +16147,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     /**
      * 购物车详情
      */
-    app.controller('CartDetailController', ['$scope', 'cartOperation', '$stateParams', 'toaster', '$timeout', 'BaseService', 'ngTableParams', '$filter', 'Product', 'Vendor', 'ShipAddress', '$modal', 'newPurcOrder', 'addtoCart', '$http', 'token', function ($scope, cartOperation, $stateParams, toaster, $timeout, BaseService, ngTableParams, $filter, Product, Vendor, ShipAddress, $modal, newPurcOrder, addtoCart, $http, token) {
+    app.controller('CartDetailController', ['$scope', 'cartOperation', '$stateParams', 'toaster', '$timeout', 'BaseService', 'ngTableParams', '$filter', 'Product', 'Vendor', 'ShipAddress', '$modal', 'newPurcOrder', 'addtoCart', '$http', 'token', 'recentPrice',
+        function ($scope, cartOperation, $stateParams, toaster, $timeout, BaseService, ngTableParams, $filter, Product, Vendor, ShipAddress, $modal, newPurcOrder, addtoCart, $http, token, recentPrice) {
         BaseService.scrollBackToTop();
         $scope.loading = true;
         var loadData = function () {
@@ -16254,18 +16266,29 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 选择
         $scope.check = function (data) {
-            $scope.order.orderItems.push({
-                code: data.code,
-                title: data.title,
-                spec: data.spec,
-                unit: data.unit,
-                qty: null,
-                price: null,
-                remark: null,
-                delivery: null,
-                prid: data.id,
-                rate: $scope.order.rate
-            });
+            var price = null;
+            var qty = null;
+            var taxRate = null;
+            if (data.id) {
+                recentPrice.agreed({prId: data.id}, {}, function(response) {
+                    price = response.price;
+                    qty = response.qty;
+                    taxRate = response.taxRate;
+                    $scope.order.orderItems.push({
+                        code: data.code,
+                        title: data.title,
+                        spec: data.spec,
+                        unit: data.unit,
+                        qty: qty,
+                        price: price,
+                        remark: null,
+                        delivery: null,
+                        prid: data.id,
+                        taxrate: taxRate,
+                        prodsource: 'seller',
+                    });
+                });
+            }
         };
 
         // 导入商品信息

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

@@ -1719,5 +1719,13 @@ define([ 'ngResource'], function() {
                 }
 			}
 		});
-	}]);
+	}]).factory('recentPrice', ['$resource', function($resource) {
+        return $resource('sale/inquiry', {}, {
+            // 获取最新的已采纳的价信息
+            agreed: {
+                url: 'sale/inquiry/recentPrice/:prId',
+                method: 'GET'
+            }
+        });
+    }]);
 });

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

@@ -5,7 +5,7 @@
 	<div class="pane-header">
 		数据传输日志
 		<div class="pull-right">
-			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body">
@@ -38,7 +38,7 @@
 	<div class="pane-header">
 		平台使用日志
 		<div class="pull-right">
-			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body">

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

@@ -39,7 +39,7 @@
 		color: #5078cb;
 	}
 	.modal-btn .btn:hover{
-		background: #327ebe;
+		background: #3f84f6;
 		color: #fff;
 	}
 	.modal-header{

src/main/webapp/resources/tpl/index/approvalFlow/4.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-fw fa-p"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

src/main/webapp/resources/tpl/index/approvalFlow/5.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

src/main/webapp/resources/tpl/index/approvalFlow/6.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

src/main/webapp/resources/tpl/index/approvalFlow/7.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

src/main/webapp/resources/tpl/index/approvalFlow/8.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

src/main/webapp/resources/tpl/index/approvalFlow/9.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

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

@@ -14,22 +14,7 @@
 	}
 
 	.com_title font {
-		color: #327ebe;
-	}
-
-	.com_head {
-		width: 100%;
-		height: 40px;
-		line-height: 44px;
-		background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-		background-color: #f5f5f5;
-		background-size: 100% 100%;
-	}
-
-	.com_head span {
-		margin-left: 20px;
-		color: #000;
-		font-size: 14px;
+		color: #3f84f6;
 	}
 
 	.com_title01 {
@@ -134,10 +119,10 @@
 		padding-bottom: 20px;
 	}
 	#company .com-list .row-sm:hover{
-		border: #d32526 2px solid;
+		border: #3f84f6 2px solid;
 	}
 	.bule {
-		color: #327ebe;
+		color: #3f84f6;
 		font-size: 14px;
 		padding-left: 20px;
 	}
@@ -156,7 +141,7 @@
 		display: inline-block;
 		text-align: center;
 		float: right;
-		background: #327ebe;
+		background: #3f84f6;
 		color: #fff;
 		margin-right: 20px;
 	}
@@ -729,7 +714,7 @@
 	</div>
 	<div class="com_title01"><span>收货人信息</span>
 		<a ng-click="$open = !$open" ng-show="ships.length>1"><span ng-bind="$open ? '收起' : '展开'"></span><i class="fa fa-angle-down" ng-class="{'fa-angle-up':$open, 'fa-angle-down': !$open}"></i></a>
-		<a ng-show="!connectionEditings"  class="pull-right add-address" href="javascript:void(0);">+新增收货人</a>
+		<a ng-show="!connectionEditings"  class="pull-right add-address" href="javascript:void(0);"><i class="fa fa-plus-square fa-fw"></i>新增收货人</a>
 		<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
 				class="fa fa-reply-all fa-fw"></i>取消</a>
 		<a ng-show="connectionEditings" ng-click="updateDetailInfo()" class="pull-right text-simple color02"><i
@@ -804,7 +789,7 @@
 	<div ng-if="deputyEnter.deputyEnterprise">
 		<div class="com_title01"><span>付款企业信息</span>
 			<a ng-click="$open01 = !$open01" ng-show="pays.length>1"><span ng-bind="$open01 ? '收起' : '展开'"></span><i class="fa fa-angle-down" ng-class="{'fa-angle-up':$open01, 'fa-angle-down': !$open01}"></i></a>
-			<a ng-show="!connectionEditings"  class="pull-right add-paycompany" ng-click="addPayCompany()">+新增付款企业</a>
+			<a ng-show="!connectionEditings"  class="pull-right add-paycompany" ng-click="addPayCompany()"><i class="fa fa-plus-square fa-fw"></i>新增付款企业</a>
 			<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
 					class="fa fa-reply-all fa-fw"></i>取消</a>
 			<a ng-show="connectionEditings" ng-click="updateDetailInfo()" class="pull-right text-simple color02"><i

src/main/webapp/resources/tpl/index/approvalFlow/home.html

@@ -21,7 +21,7 @@
         <!--左侧内容-->
         <div class="shenliu_right">
         	<!--<div class="com_title">设置>企业设置<font>>审批流</font></div>-->
-            <div class="com_head"><span>审批流设置</span><a >+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a ><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_content" >
             	<ul>
                 	<li>

src/main/webapp/resources/tpl/index/approvalFlow/log.html

@@ -1,18 +1,4 @@
 <style>
-	.com_head {
-		width: 100%;
-		height: 40px;
-		line-height: 44px;
-		background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-		background-color: #f5f5f5;
-		background-size: 100% 100%;
-	}
-
-	.com_head span {
-		margin-left: 20px;
-		color: #000;
-		font-size: 14px;
-	}
 	.title-div .pull-right{
 		float: right;
 		margin-right: 15px;
@@ -58,10 +44,10 @@
 </div>
 <div class="pane base-info">
 	<div class="com_head"><span>操作日志</span></div>
-	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+	<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
 		<span class="f14">数据传输日志</span>
 		<div class="pull-right">
-			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body" id="order-detail-list" style="max-height: 500px;overflow: auto;">
@@ -91,10 +77,10 @@
 	</div>
 </div>
 <div class="pane base-info">
-	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+	<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
 		<span class="f14">平台使用日志</span>
 		<div class="pull-right">
-			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body" id="order-detail-list" style="max-height: 500px;overflow: auto;">

src/main/webapp/resources/tpl/index/approvalFlow/prodList.html

@@ -167,14 +167,14 @@
 	width: 80px;
 	height: 24px;
 	line-height: 24px;
-	background: #327ebe;
+	background: #3f84f6;
 	color: #fff !important;
 	border-radius: 5px;
 	padding: 0;
 	margin-left: 15px;
 }
 #public .menu .btn-group .btn#match:hover{
-	background: #327ebe;
+	background: #3f84f6;
     color: #fff !important;
   }
 </style>

src/main/webapp/resources/tpl/index/approvalFlow/productmatches.html

@@ -172,7 +172,7 @@ tbody td div.text-mould {
 	word-break: break-all;
 }
 .productmatches-tab tbody:hover{
-	border: #d32526 2px solid !important;
+	border: #3f84f6 2px solid !important;
 }
 /* 清楚ie下的输入框X */
 ::-ms-clear, ::-ms-reveal{display: none;}
@@ -262,39 +262,42 @@ tbody td div.text-mould {
 			</tr>
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
-			<tr>
-				<td colspan="7">
-					<div class="row text-muted info-container" style="padding: 50px 10px;">
-						<div class="col-md-4 text-center">
-							<br>
-							<br>
-							<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-							<div class="f16">当前没有对应的客户询价单！</div>
+		<tr>
+			<td colspan="6">
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					</div>
+					<div class="right_link">
+						<p>当前没有对应的客户询价单！</p>
+					</div>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="6">
+				<div id="empty_info">
+					<div class="f16 text-center empty_title">
+						<p>为什么我没有接收到客户的询价单？</p>
+					</div>
+					<div class="f14 empty_explain">
+						<div class="info">
+							<p>1、您的客户还没有提交审核询价单<br>
+								解决：与您的客户沟通确认单据是否已经审核（只有客户ERP中已经审核的单据才能接收到）</p>
 						</div>
-						<div class="col-md-8 br-l">
-							<div class="f16">
-								<p>为什么我没有接收到客户的询价单？</p>
-							</div>
-							<div class="f14">
-								<div class="info">
-									<p>1、您的客户还没有提交审核询价单<br>
-									解决：与您的客户沟通确认单据是否已经审核（只有客户ERP中已经审核的单据才能接收到）</p>
-								</div>
-								<div class="info">
-									<p>2、客户ERP中供应商信息有误<br>
-									解决：与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确，尤其是企业UU号</p>
-								</div>
-								<div class="info">
-									<p>3、您的客户正在使用旧版本的UAS商务平台<br>
-									解决：我们仍有部分用户在使用旧版本UAS商务平台系统，你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
-								</div>
-							</div>
-							<br>
-							<br>
+						<div class="info">
+							<p>2、客户ERP中供应商信息有误<br>
+								解决：与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确，尤其是企业UU号</p>
+						</div>
+						<div class="info">
+							<p>3、您的客户正在使用旧版本的UAS商务平台<br>
+								解决：我们仍有部分用户在使用旧版本UAS商务平台系统，你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
 						</div>
 					</div>
-				</td>
-			</tr>
+				</div>
+			</td>
+		</tr>
 		</tbody>
 		<tbody ng-repeat="product in $data track by product.id">
 			<tr>

src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -87,20 +87,6 @@
 	-moz-transition: all 0s ease-in-out;
 	transition: all 0s ease-in-out;
 }
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-	background-color: #f5f5f5;
-	background-size: 100% 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
 .title-div .pull-right{
 	float: right;
 	margin-right: 15px;
@@ -183,7 +169,7 @@
 	width: 70px;
 	height: 36px;
 	display: inline-block;
-	background: #327ebe;
+	background: #3f84f6;
 	font-size: 16px;
 	text-align: center;
 	line-height: 36px;
@@ -205,7 +191,7 @@
 </div>
 <div class="pane base-info">
 	<div class="com_head"><span>人员信息</span></div>
-	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+	<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
 		<span class="f14">我的个人资料</span>
 		<div class="pull-right">
 			<a class="text-simple" ng-click="updateDetail()">
@@ -277,7 +263,7 @@
 	}
 </style>
 <div class="pane base-info" style="border-bottom: none;" ng-if="!isManager">
-	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+	<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
 		<span class="f14">我的客户</span>
 		<div class="pull-right">
 			共&nbsp;{{distributes.length}}&nbsp;客户
@@ -342,7 +328,7 @@
 		</form>
     </script>
 <div class="pane base-info">
-	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+	<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
 		<span class="f14">企业人员信息</span>
 		<div class="pull-right" ng-show="user.sys">
 			<a title="新增用户默认密码为111111" ng-show="adding == true" class="btn btn-success btn-sm" ng-disabled="newUserForm.$invalid || submit" ng-click="addUser(newUser)" class="text-simple" style="color: #fff;">

src/main/webapp/resources/tpl/index/approvalFlow/userProduct.html

@@ -167,14 +167,14 @@
 	width: 80px;
 	height: 24px;
 	line-height: 24px;
-	background: #327ebe;
+	background: #3f84f6;
 	color: #fff !important;
 	border-radius: 5px;
 	padding: 0;
 	margin-left: 15px;
 }
 #public .menu .btn-group .btn#match:hover{
-	background: #327ebe;
+	background: #3f84f6;
     color: #fff !important;
   }
 </style>

src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html

@@ -47,7 +47,7 @@
 #customer-tab .form-horizontal .form-control{
 	height: 36px;
 	line-height: 36px;
-	border: #327ebe 1px solid;
+	border: #3f84f6 1px solid;
 	border-radius: 0px;
 	font-size: 14px;
 }
@@ -59,7 +59,7 @@
 	width: 85px;
 	height: 36px;
 	display: inline-block;
-	background: #327ebe;
+	background: #3f84f6;
 	font-size: 16px;
 	text-align: center;
 	line-height: 36px;
@@ -113,7 +113,7 @@
 	border-bottom: none;
 }
 </style>
-<div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
+<div style="width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
@@ -199,11 +199,19 @@
 					</tr>
 			</tbody>
 			<tbody ng-if="customerParams.total() == 0" class="no-record-tab">
-				<tr>
-					<td>
-						<div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂无客户信息</h3></div>
-					</td>
-				</tr>
+			<tr>
+				<td colspan="5">
+					<div id="empty">
+						<div class="left_img">
+							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						</div>
+						<div class="right_link">
+							<p>暂无客户信息</p>
+						</div>
+					</div>
+				</td>
+			</tr>
 			</tbody>
 		</table>
 		</div>

src/main/webapp/resources/tpl/index/baseInfo/enterpriseList.html

@@ -186,7 +186,7 @@
 	height: 36px;
 	line-height: 36px;
 	color: #fff;
-	background: #327ebe;
+	background: #3f84f6;
 	text-align: center;
 	font-size: 14px;
 	cursor: pointer;
@@ -194,7 +194,7 @@
 #topSearch .input-sm, .form-group-sm .form-control{
 	height: 36px;
 	line-height: 36px;
-	border: #327ebe 1px solid;
+	border: #3f84f6 1px solid;
 	border-radius: 0px;
 	font-size: 14px;
 }
@@ -232,7 +232,7 @@
 	color: #fff;
 }
 .enterprise-table .btn01{
-	color: #327ebe;
+	color: #3f84f6;
 	background: #fff;
 	border: none;
 	font-size: 16px;
@@ -241,7 +241,7 @@
 	width: 85px;
 	height: 36px;
 	display: inline-block;
-	background: #327ebe;
+	background: #3f84f6;
 	font-size: 16px;
 	text-align: center;
 	line-height: 36px;
@@ -257,7 +257,7 @@
 	position: relative;
 }
 </style>
-<div class="block" style="margin-left: -240px; width: 1170px;">
+<div class="block" style="width: 1170px;">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -140,7 +140,7 @@ select::-ms-expand {
 }
 
 .tender-content .date-picker .btn-success {
-	background-color: #327EBE;
+	background-color: #3f84f6;
 }
 
 .tender-content .date-picker ul {
@@ -252,7 +252,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .tender-content>div>div.btn-publish>button {
-	background-color: #327ebe;
+	background-color: #3f84f6;
 	width: 90px;
 	height: 30px;
 	font-size: 14px;
@@ -261,7 +261,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .tender-content>div>div.btn-disabled>button {
-    background-color: #327ebe;
+    background-color: #3f84f6;
 	width: 90px;
 	height: 30px;
 	font-size: 14px;
@@ -297,22 +297,8 @@ input[type="radio"], input[type="checkbox"] {
 	width: 400px;
 }
 
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 42px;
-	background: url(static/img/comm_bg01.png) no-repeat center;
-	background-size: 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
-	color: #327ebe;
+	color: #fff;
 	float: right;
 	margin-right: 40px;
 	font-size: 14px;
@@ -328,7 +314,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .com_title font {
-	color: #327ebe;
+	color: #3f84f6;
 }
 
  /*  这里修改过 margin-top*/
@@ -457,21 +443,9 @@ input[type="radio"], input[type="checkbox"] {
    .purc-tender .col-xs-4 div:last-child{
        color: #969595;
    }
-    .p-right em{
-        font-style: normal;
-    }
-    .p-right .fr{
-        font-size: 14px;
-        color: #959595;
-        margin-right: 20px;
-    }
-    .p-right span.fr em {
-        margin-right: 50px;
-        font-size: 14px;
-    }
     .detail{
         width: 1170px;
-        margin-left: -240px;
+        /*margin-left: -240px;*/
         background: #fff;
         padding:30px 20px;
     }
@@ -566,7 +540,7 @@ input[type="radio"], input[type="checkbox"] {
         text-align: center;
     }
     .detail .footer button{
-        background: #327ebe;
+        background: #3f84f6;
         color:#fff;
     }
 </style>

src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -5,7 +5,7 @@
 /*新增样式 2017-04-19*/
     #tender-list{
          width: 1170px;
-         margin-left: -240px;
+         /*margin-left: -240px;*/
          background: #f5f5f5;
      }
 #tender-list .tender-label{
@@ -70,7 +70,7 @@
         position: absolute;
         right: 0;
         top: 0;
-        background: #5078cb;
+        background: #3f84f6;
         color: #fff;
         height: 35px;
         width: 55px;
@@ -80,7 +80,7 @@
         line-height: 20px;
     }
     .tender-list-content .filter div.form-group .input-group-addon:hover{
-        background: #3a89d1;
+        background: #3f84f6;
     }
     .tender-list-content .filter div.form-group input{
         border-radius: 0;
@@ -148,7 +148,7 @@
     }
     .inquiry-table tbody tr td a.offer{
         font-size: 13px;
-        color: #327ebe;
+        color: #3f84f6;
     }
     .inquiry-table tbody tr td a.offer:hover{
         text-decoration: underline ;
@@ -171,21 +171,6 @@
         position: relative;
         overflow: hidden;
     }
-    .pub-com_head span:before{
-        content: '';
-        position: absolute;
-        top: 17px;
-        left: 13px;
-        width: 4px;
-        height: 13px;
-        background: #000;
-    }
-    .pub-com_head span b{
-        margin-left: 10px;
-        font-weight: normal;
-        font-size: 14px;
-        color: #000;
-    }
     .pub-com_head span em{
         font-style: normal;
         font-size: 14px;
@@ -195,9 +180,10 @@
         float: right;
         padding-right: 30px;
         font-size: 14px;
-        color: #999;
+        color: #fff;
     }
     .tender-list-content .container{
+        width: 1170px !important;
         margin: 0 auto;
         padding: 0;
     }
@@ -299,9 +285,9 @@
         text-align: center;
         font-size: 14px;
         font-weight: normal;
-        color: #327ebe;
+        color: #3f84f6;
         border-radius: 4px;
-        border: 1px solid #327ebe;
+        border: 1px solid #3f84f6;
         cursor: pointer;
     }
     .tender-list-content .filter div.all span img{
@@ -324,7 +310,7 @@
             <div class="tender-label list-unstyled">
                 <div class="pub-com_head">
                     <span>
-                        <b>公共询价</b>
+                        公共询价
                         <!--(<em> 10 </em>)-->
                     </span>
                     <a href="#/index">返回</a>

src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -119,7 +119,7 @@
 	border-bottom: none;
 }
 </style>
-<div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
+<div style="width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/addPartnerAndRecord.html'"></div>
 <link rel="stylesheet" href="static/css/public.css">
 <div id="public" style="background: #f5f5f5;">
@@ -170,13 +170,13 @@
 							<div ng-if="::record.venduseremail != null"  class="col-md-3"><span class="text-muted">邮箱：</span><span ng-bind="::record.venduseremail"></span></div>
 							<div ng-if="record.active == 1 && record.venduu != null"  class="col-md-2"><span class="text-muted">企业UU：</span><span ng-bind="::record.venduu"></span></div>
 							<div class="text-icon" ng-if="record.active == 1">已注册</div>
-							<div class="text-icon" ng-if="record.active == 0" style="border: #327ebe 1px solid; color: #327ebe;">未注册</div>
+							<div class="text-icon" ng-if="record.active == 0" style="border: #3f84f6 1px solid; color: #3f84f6;">未注册</div>
 							<div ng-if="record.active == 1">
 								物料： <span ng-bind="record.productNum"></span>
 							</div>
 						</td>
 						<td width="120" class="text-center all-btn">
-							<a ng-click="reInvite(record.id)" class="btn" ng-if="record.active == 0" style="padding: 0; background: #327ebe; color: #fff;">再次邀请</a>
+							<a ng-click="reInvite(record.id)" class="btn" ng-if="record.active == 0" style="padding: 0; background: #3f84f6; color: #fff;">再次邀请</a>
 						</td>
 					</tr>
 					<tr class="height16">
@@ -184,11 +184,19 @@
 					</tr>
 			</tbody>
 			<tbody ng-if="tableParams.total() == 0" class="no-record-tab">
-				<tr>
-					<td>
-						<div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂无邀请记录！</h3></div>
-					</td>
-				</tr>
+			<tr>
+				<td colspan="5">
+					<div id="empty">
+						<div class="left_img">
+							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						</div>
+						<div class="right_link">
+							<p>暂无邀请记录</p>
+						</div>
+					</div>
+				</td>
+			</tr>
 			</tbody>
 		</table>
 	</div>

src/main/webapp/resources/tpl/index/baseInfo/modal/fuzzysearch_enterprise_modal.html

@@ -193,7 +193,7 @@
 	height: 36px;
 	line-height: 36px;
 	color: #fff;
-	background: #327ebe;
+	background: #3f84f6;
 	text-align: center;
 	font-size: 14px;
 	cursor: pointer;
@@ -201,7 +201,7 @@
 #topSearch .input-sm, .form-group-sm .form-control{
 	height: 36px;
 	line-height: 36px;
-	border: #327ebe 1px solid;
+	border: #3f84f6 1px solid;
 	border-radius: 0px;
 	font-size: 14px;
 }
@@ -241,7 +241,7 @@
 	line-height: 30px;
 }
 .enterprise-table .btn01{
-	color: #327ebe;
+	color: #3f84f6;
 	background: #fff;
 	border: none;
 	font-size: 16px;
@@ -250,7 +250,7 @@
 	width: 85px;
 	height: 36px;
 	display: inline-block;
-	background: #327ebe;
+	background: #3f84f6;
 	font-size: 16px;
 	text-align: center;
 	line-height: 36px;
@@ -270,7 +270,7 @@
 	font-style: normal;
 }
 .invite-btn:hover{
-	border: #d32526 2px solid;
+	border: #3f84f6 2px solid;
 }
 .invite-right{
 	padding-right: 0;
@@ -288,7 +288,7 @@
 	font-style: italic;
 }
 </style>
-<div class="block" style="margin-left: -240px; width: 1170px;">
+<div class="block" style="width: 1170px;">
 <table class="enterprise-table block">
 	<tbody ng-repeat="enterprise in enterprises" class="company-list">
 		<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">