Merge remote-tracking branch 'origin/release-201817-wangcz' into release-201817-wangcz

src/main/webapp/resources/css/common.css

@@ -1066,7 +1066,7 @@ select {
 }
 .oder_xq_list dl span.total-price p em{
 	color: #333;
-	width: 150px;
+	width: 219px;
 	text-align: left;
 }
 .oder_xq_list dl span.total-price strong{
@@ -1131,4 +1131,10 @@ select {
 }
 .oder_xq_list dl span.total-price em{
 	float: left;
+}
+
+.text-ellipse {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 }

src/main/webapp/resources/css/common/linkSaler.css

@@ -14,6 +14,7 @@
 .link-saler-box .content p {
     line-height: 20px;
     padding-top: 0;
+    color: #333;
 }
 .link-saler-box .content p i {
     color: #4290f7;

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

@@ -973,15 +973,13 @@
           * 分页获取消息
           */
          var _url = $location.absUrl().toString()
-         console.log(_url)
          if (_url.indexOf('/admin#/index') > -1) {
              $rootScope.newShow = true
          }
 
          $scope.newsTableParams = new ngTableParams({
              page : 1,
-             count : 5,
-			 type : '确认收款,付款申请,财务结算'
+             count : 5
          }, {
              total : 0,
              getData : function ($defer, params) {
@@ -990,6 +988,7 @@
                  adminNews.getNewsList(param, function (data) {
                      params.total(data.totalElements);
                      $defer.resolve(data.content);
+                     $scope.totalElements = data.totalElements
                      data.content.forEach(function (item) {
                      	if (item.type == "APPLY_PAID_TYPE" || item.type == "CONFIRM_PAID_TYPE" || item.type == "FINANCIAL_SETTLEMENT_TYPE"){
 							var _arr = item.content.split(' ')[1];
@@ -1005,28 +1004,26 @@
                              item.newsType = '财务结算'
                          }
 					 })
-                     console.log(data.content)
                  }, function (response) {
                      toaster.pop('error', '获取消息列表失败');
                  });
              }
          });
 
-         /**
-          * 获取未读消息数量
-          */
-         adminNews.unreadCount({}, function(data){
-             $scope.unreadCount = data.count;
-         }, function(res){
-             toaster.pop('error', '系统错误', '获取未读消息数量失败' + res.data);
-         });
+         // /**
+         //  * 获取未读消息数量
+         //  */
+         // adminNews.unreadCount({}, function(data){
+         //     $scope.unreadCount = data.count;
+         // }, function(res){
+         //     toaster.pop('error', '系统错误', '获取未读消息数量失败' + res.data);
+         // });
 
          /**
           * 跳转消息详情页
           */
          var enIdFilter = $filter('EncryptionFilter');
          $scope.jumpNewsDetail = function(data) {
-         	console.log(data.OrderNumber)
              if (data.type == "APPLY_PAID_TYPE") {
          		window.location.href = 'admin#/check/request_pay/' + data.remark
 			 }
@@ -1034,15 +1031,14 @@
                  window.location.href = '/admin#/trade/order/' + enIdFilter(data.OrderNumber)
              }
              if (data.type == "FINANCIAL_SETTLEMENT_TYPE") {
-                 window.location.href = 'admin#/check/settlement#batchCheckMoney'
+                 window.location.href = 'admin#/check/settlement'
              }
-             console.log(window.location.href)
-             adminNews.read({messageId: data.id}, null, function () {
-                 adminNews.unreadCount({}, function(data){
-                     $scope.unreadCount = data.count;
-                 }, function(res){
-                     toaster.pop('error', '系统错误', '获取未读消息数量失败' + res.data);
-                 });
+             adminNews.read({messageId: data.id, type: data.type}, null, function () {
+                 // adminNews.unreadCount({}, function(data){
+                 //     $scope.unreadCount = data.count;
+                 // }, function(res){
+                 //     toaster.pop('error', '系统错误', '获取未读消息数量失败' + res.data);
+                 // });
              }, function(res){
                  toaster.pop('error' + res.data);
              });

src/main/webapp/resources/view/admin/news.html

@@ -120,7 +120,7 @@
     }
 </style>
 <div id="msg" ng-controller="adminNewsCtrl">
-	<span class="message" ng-click="lookNews()">待处理 <i class="fa fa-angle-double-down angle-hover-up"></i><span class="red-dot" ng-bind="unreadCount">99</span></span>
+	<span class="message" ng-click="lookNews()">待处理 <i class="fa fa-angle-double-down angle-hover-up"></i><span class="red-dot" ng-bind="totalElements || '0'">99</span></span>
 	<div class="msg-show" ng-show="newShow">
 		<table ng-table="newsTableParams">
 			<thead>

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

@@ -43,7 +43,10 @@
         vertical-align: middle;
         text-align: center;
     }
-    .invoice-com-tab tbody>tr>td:hover a{
+    .invoice-com-tab tbody>tr>td a.invoice-detail{
+        display: block;
+    }
+    .invoice-com-tab tbody>tr>td:hover a.invoice-detail{
         color: #5078cb;
     }
     .invoice-com-tab tbody>tr:hover>td b.invoice-info{
@@ -211,7 +214,7 @@
                             <td ng-bind="item.createTime | date : 'yyyy-MM-dd'"></td>
                             <td><a ng-href="{{'store/' + item.storeid}}" ng-bind="item.sellername" target="_blank"></a></td>
                             <td>
-                                <a ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" target="_blank"></a>
+                                <a ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" target="_blank" class="invoice-detail"></a>
                             </td>
                             <td ng-bind="item.price"></td>
                             <td style="padding: 0;">

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

@@ -233,10 +233,22 @@
                 <em>{{order.sellername}}</em>
             </a>
         </span>
-        <span style="position: relative; width: 10%; margin-left: 50px;">
+        <span style="position: relative; width: 10%; margin-left: 50px;" ng-controller="ChatContactCtrl as chat">
             <img src="static/img/common/songguo.png"/>
-            <a href="javascript:void(0)" class="contact_btn" ng-click="cont = !cont">联系卖家</a>
-            <div class="seller-contact" ng-if="cont" ng-class="{true : 'seller-contact-info', false : 'display-none'}[cont]">
+            <a  href="javascript:void(0)" class="contact_btn" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu)">联系卖家</a>
+            <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 class="seller-contact" ng-if="cont" ng-class="{true : 'seller-contact-info', false : 'display-none'}[cont]">
                                  <div class="contact-title">
                                      <a ng-click="setContFalse()"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>
                                  </div>
@@ -252,7 +264,7 @@
                                      <textarea class="send-message" placeholder="给卖家发送站内消息"></textarea>
                                  </div>
                                  <div style="display: none;" class="send-button"><a class="send">发送</a></div>
-                            </div>
+                            </div>-->
         </span>
         <span style="float: right;margin-right: 46px; font-size: 12px;">其他买家需要你的建议喔</span>
     </div>

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

@@ -484,7 +484,7 @@
 						</span>
 					</dd>
 					<dd class="line60">
-						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[order.deliverytype]"></i>
+						<span class="wd02" style="width: 45%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[order.deliverytype]"></i>
 							<i style="color: #999;" ng-if="rule" ng-bind="'(' + rule.ruleName + ')'">（满1000元包邮，未满足的订单收取运费20元）</i>
 						</span>
 						<span class="total-price" ng-controller="poundageCtrl">

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

@@ -817,7 +817,7 @@
 							</span>
 						</dd>
 						<dd class="line60" ng-class="{'none-border': deliveryList ? deliveryList[details[0].storeid].method==1303 : order.deliverytype=1303}">
-							<span class="style01" style="width: 60%; padding-left: 40px;" ng-class="{'line35': order.status!=501}">配送方式：
+							<span class="style01" style="width: 55%; padding-left: 40px;" ng-class="{'line35': order.status!=501}">配送方式：
 								<select ng-if="order.status == 501 && ruleMap[details[0].storeid].length != 0" class="select" ng-model="deliveryList[details[0].storeid]" style="opacity: 1;"
 										ng-options="rule as deliveryMethod[rule.method] for rule in ruleMap[details[0].storeid]"
 										ng-change="changeFare(details)">
@@ -859,8 +859,8 @@
 										<span class="price-down" ng-mouseenter="showRemindTagActivity = true" ng-mouseleave="showRemindTagActivity = false">减免</span>
 										手续费：
 									</strong>
-									<em ng-if="order.status == 501">{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(getAdd(storePrice[key], fareList[details[0].storeid]), 0.00453) | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)">$1.11</i>）</em>
-									<em ng-if="order.status != 501">
+									<em ng-if="order.status == 501" class="text-ellipse">{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(getAdd(storePrice[key], fareList[details[0].storeid]), 0.00453) | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)">$1.11</i>）</em>
+									<em ng-if="order.status != 501" class="text-ellipse">
 										<em ng-if="storeArray.length == 1">{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(order.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)">$1.11</i>）</em>
 										<em ng-if="storeArray.length != 1">{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(getAdd(storePrice[key], deliveryList[details[0].storeid].fare), 0.00453) | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)">$1.11</i>）</em>
 									</em>

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

@@ -274,10 +274,22 @@
                 <em>{{order.sellername}}</em>
             </a>
         </span>
-        <span style="position: relative; width: 10%; margin-left: 50px;">
+        <span style="position: relative; width: 10%; margin-left: 50px;" ng-controller="ChatContactCtrl as chat">
             <img src="static/img/common/songguo.png"/>
-            <a href="javascript:void(0)" class="contact_btn" ng-click="cont = !cont">联系卖家</a>
-            <div class="seller-contact" ng-if="cont" ng-class="{true : 'seller-contact-info', false : 'display-none'}[cont]">
+            <a href="javascript:void(0)" class="contact_btn" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu)">联系卖家</a>
+            <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 class="seller-contact" ng-if="cont" ng-class="{true : 'seller-contact-info', false : 'display-none'}[cont]">
                                  <div class="contact-title">
                                      <a ng-click="setContFalse()"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>
                                  </div>
@@ -293,7 +305,7 @@
                                      <textarea class="send-message" placeholder="给卖家发送站内消息"></textarea>
                                  </div>
                                  <div style="display: none;" class="send-button"><a class="send">发送</a></div>
-                            </div>
+                            </div>-->
         </span>
         <span style="float: right;margin-right: 46px; font-size: 12px;">其他买家需要你的建议喔</span>
     </div>

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

@@ -541,7 +541,7 @@
 						</span>
 					</dd>
 					<dd class="line60">
-						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[purchase.sendType]"></i>
+						<span class="wd02" style="width: 45%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[purchase.sendType]"></i>
 							<i style="color: #999;" ng-if="rule" ng-bind="'(' + rule.ruleName + ')'">（满1000元包邮，未满足的订单收取运费20元）</i>
 						</span>
 						<span class="total-price" ng-controller="poundageCtrl">

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

@@ -444,9 +444,22 @@
                 <em>{{order.buyername + ' | ' + order.sellername}}</em>
             </a>
         </span>
-        <span style="position: relative; width: 10%; margin-left: 50px;">
+        <span style="position: relative; width: 10%; margin-left: 50px;" ng-controller="ChatContactCtrl as chat">
             <img src="static/img/common/songguo.png"/>
-            <a href="javascript:void(0)" class="contact_btn" ng-click="cont = !cont">联系买家</a>
+            <a href="javascript:void(0)" class="contact_btn" ng-click="chat.contactWithOther(order.buyerTel, order.buyerenuu)">联系买家</a>
+            <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 class="buyer-contact" ng-if="cont" ng-class="{true : 'buyer-contact-info', false : 'display-none'}[cont]">
                                  <div class="contact-title">
                                      <a ng-click="setContFalse()"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>
@@ -463,6 +476,7 @@
                                  </div>
                                  <div style="display: none;" class="send-button"><a class="send">发送</a></div>
                             </div>
+-->
         </span>
         <!--<span style="float: right;margin-right: 46px; font-size: 12px;">其他买家需要你的建议喔</span>-->
     </div>

src/main/webapp/resources/view/vendor/modal/invoice_look_modal.html

@@ -47,7 +47,7 @@
     border-radius: 3px;
     border: solid 1px #fea55d;
     max-height: 138px;
-    overflow-y: scroll
+    overflow-y: auto;
   }
   .modal-body .item-list:first-child a{
     display: inline-block;
@@ -63,7 +63,7 @@
     color: #333;
   }
   .modal-body .item-list:first-child a:nth-child(odd){
-    margin-right: 25px;
+    margin-right: 22px;
   }
   .modal-body .item-list:first-child span{
     color: #6c3000 !important ;