店铺关注页联系卖家

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

@@ -32,6 +32,7 @@
 		width : 1026px;
 		height: 230px;
 		border-bottom: 1px dashed #dadada;
+		clear: both;
 	}
 	.store-item > div{
 		float:left;
@@ -374,7 +375,7 @@
 		<!-- 店铺关注具体信息 -->
 		<div class="store-container" ng-if="store.length != 0">
 			<ul>
-				<li ng-repeat="item in store" class="store-item">
+				<li ng-repeat="item in store" class="store-item clearfix">
 					<div class="img-div" ng-click="setActive(item)" ng-class="{'isSelected-background': isBatch &&item.active}">
 						<a name="imgDetail" href="store/{{item.storeInfo.uuid}}" target="_blank">
 							<img src="{{item.storeInfo.logoUrl}}" class="store-img"/>
@@ -386,11 +387,11 @@
 							<div ng-bind=item.storeName class="item-storeName"></div>
 						</a>
 						<i class="fa fa-trash fa-2x item-delete" ng-click="deleteById(item.id)" ng-hide="isBatch" title="取消关注" style="cursor: pointer"></i>
-						<div class="item-seller" style="position: relative;">
+						<div class="item-seller" style="position: relative;" ng-controller="ChatContactCtrl as chat">
 							<img src="static/img/common/songguo.png">
-							<a href="javascript:void(0)" class="item-contact" title="联系卖家" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(item.storeInfo.enterprise.enTel, item.storeInfo.enterprise.uu, chat.UserType.STORE)">联系卖家</a>
+							<a href="javascript:void(0)" class="item-contact" title="联系卖家" ng-click="chat.contactWithOther(item.storeInfo.enterprise.enTel, item.storeInfo.enterprise.uu, chat.UserType.STORE)">联系卖家</a>
 							<!--<a class="item-contact" ng-click="contactSeller(item)">联系卖家</a>-->
-							<div class="contact-box" ng-if="item.contactBNox">
+							<!--<div class="contact-box" ng-if="item.contactBNox">
 								<div class="title"><i class="fa fa-close fa-lg" ng-click="item.contactBNox = false"></i></div>
 								<div class="content">
 									<div class="company-title" ng-bind="item.storeInfo.enterprise.enName">深圳市优软科技</div>
@@ -406,8 +407,21 @@
 										<em ng-bind="item.storeInfo.enterprise.address || '暂无地址信息'">1212314531455</em>
 									</div>
 								</div>
+							</div>-->
+							<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
+								<div class="title">
+									<i ng-click="setShowLinkBox(false)"></i>
+								</div>
+								<div class="content">
+									<p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
+									<p>卖家联系电话：<span ng-bind="phone"></span></p>
+									<div>
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
+									</div>
+								</div>
 							</div>
 						</div>
+						</div>
 						<div class="item-mark">
 							<div>公司介绍：
 								<span ng-bind="item.storeInfo.description"></span>

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

@@ -707,8 +707,8 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.inbrand}}" style="width: 100%" class="fl item size-middle"><span>品牌：</span><div class="content" style="width:135px">{{seek.inbrand || '-'}}</div></div>
-                            <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%" class="fl item bottom size-middle"><span>物料名称：</span><div class="content" style="width:135px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
+                            <div title="{{seek.inbrand}}" style="width: 100%" class="fl item size-middle"><span>品牌：</span><div class="content" style="width:134px">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%" class="fl item bottom size-middle"><span>物料名称：</span><div class="content" style="width:134px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                         </div>
                     </div>
                 </td>