评论：测试问题bug修复3

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -205,6 +205,15 @@ public class SecurityController {
 		model.addAttribute("askUrl", config.getCrossAskOutUrl());
 		Object referer = request.getSession().getAttribute(SSOConfig.SSOReferer);
 		model.addAttribute("returnUrl", null == referer ? "/" : referer.toString());
+		// 未登录情况下，登录地址
+		Object logoutUrl = null;
+		boolean cross = SSOHelper.isCrossDomain(request);
+		if (cross) {
+			logoutUrl = SSOHelper.getRedirectRefererLogoutUrl(request);
+		} else {
+			logoutUrl = SSOHelper.getRedirectLogoutUrl(request, String.valueOf(request.getSession().getAttribute("SSOReferer")));
+		}
+		model.addAttribute("logoutUrl", logoutUrl);
 		return model;
 	}
 

src/main/resources/dev/account.properties

@@ -8,6 +8,7 @@ sso.app=mall
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.login.url=http://113.105.74.135:8001/sso/login
+sso.logout.url=http://113.105.74.135:8001/sso/logout
 sso.register.url=http://113.105.74.135:8001/sso/register
 
 #cross domain

src/main/resources/prod/account.properties

@@ -8,6 +8,7 @@ sso.app=mall
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.login.url=https://account.ubtob.com/sso/login
+sso.logout.url=http://account.ubtob.com/sso/logout
 sso.register.url=http://account.ubtob.com/sso/register
 
 #cross domain

src/main/webapp/resources/view/usercenter/forstore/show_rate.html

@@ -202,6 +202,67 @@
         background: #fff;
         display: block;
     }
+    .seller-contact .contact-title {
+        height: 26px;
+        background-color: #5078cb;
+        text-align: right;
+        padding-right: 15px;
+        line-height: 26px;
+        color: white;
+    }
+
+    .seller-contact .contact-title a, .seller-contact .contact-title a:hover {
+        color: white;
+    }
+
+    .seller-contact .contact-seller-info {
+        margin-left: 24px;
+        margin-right: 24px;
+        background-color: #5078cb;
+        color: #ffffff;
+        margin-top: 15px;
+        margin-bottom: 12px;
+        border-radius: 4px;
+        font-family: "Microsoft Yahei", "微软雅黑";
+        height: 150px;
+    }
+
+    .seller-contact .contact-seller-info div {
+        text-align: left;
+        font-size: 14px;
+        padding-left: 15px;
+        padding-right: 15px;
+    }
+
+    .seller-contact .contact-seller-info .company-name {
+        text-align: center;
+        font-size: 18px;
+        padding-top: 15px;
+    }
+
+    .seller-contact .send-message {
+        width: 553px;
+        height: 258px;
+        background-color: #F7F7F6;
+        padding-left: 13px;
+        padding-top: 15px;
+        border-radius: 4px;
+    }
+
+    .seller-contact-info {
+        position: absolute;
+        z-index: 2;
+        height: 210px;<!--506-->
+        border: 1px solid #E7E5E2;
+        opacity: 1;
+        background-color: white;
+        width: 600px;
+        top: 40px;
+        left: -130px;
+        border: 1px solid #E7E5E2;
+        -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+        box-shadow: 0 5px 15px rgba(0,0,0,.5);
+    }
 
 </style>
 

src/main/webapp/resources/view/vendor/forstore/showRate.html

@@ -369,7 +369,7 @@
         background-color: white;
         width: 600px;
         top: 40px;
-        left: -560px;
+        left: -130px;
         border: 1px solid #E7E5E2;
         -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
         box-shadow: 0 5px 15px rgba(0,0,0,.5);
@@ -454,8 +454,8 @@
                                  <div class="contact-buyer-info">
                                      <div class="company-name" ng-bind="::order.buyername || '买家姓名没获取到'"></div>
                                      <div>
-                                         <em>手机：<em ng-bind="::order.buyPhone || '暂无联系电话'"></em></em>
-                                         <em style="margin-left: 60px;">邮箱：<em ng-bind="::order.buyEmail || '暂无电子邮箱'"></em></em>
+                                         <em>手机：<em ng-bind="::order.buyerTel || '暂无联系电话'"></em></em>
+                                         <em style="margin-left: 60px;">邮箱：<em ng-bind="::order.buyerEmail || '暂无电子邮箱'"></em></em>
                                      </div>
                                  </div>
                                  <div style="display: none;">