Merge remote-tracking branch 'origin/dev' into dev

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

@@ -533,8 +533,8 @@
 							</a>
 						</span>
 						<span style="width: 22%; text-align: left; position: relative;"><img src="static/img/common/songguo.png">
-							<!--<a name="{{store.arr[0].id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(store.arr[0].sellPhone, store.arr[0].enuu, chat.UserType.STORE)">联系卖家</a>-->
-							<a name="{{store.arr[0].id}}" href="javascript:void(0)" class="contact_btn" >联系卖家</a>
+							<a name="{{store.arr[0].id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(store.arr[0].sellPhone, store.arr[0].enuu, chat.UserType.STORE)">联系卖家</a>
+							<!--<a name="{{store.arr[0].id}}" href="javascript:void(0)" class="contact_btn" >联系卖家</a>-->
 							<div name="{{store.arr[0].id}}" class="buyer-contact" ng-if="store.arr[0].contactSeller">
 									 <div class="contact-title">
 										 <a ng-click="store.arr[0].contactSeller = false"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>

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

@@ -188,7 +188,7 @@
                                 <label for="check-py"></label>
                                 <span>我已阅读并同意</span>
                             </label>
-                            <a href="help/nav/19" class="base-line" target="_blank">《发票须知》</a>
+                            <a href="help/helpList/19" class="base-line" target="_blank">《发票须知》</a>
                         </div>
                     </div>
                     <div class="col-md-offset-3">
@@ -322,7 +322,7 @@
                                 <label for="check-zy"></label>
                                 <span>我已阅读并同意</span>
                             </label>
-                            <a href="help/nav/19">《发票须知》</a>
+                            <a href="help/helpList/19" target="_blank">《发票须知》</a>
                         </div>
                     </div>
                     <div class="col-md-offset-3">

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

@@ -682,8 +682,8 @@
                         </span>
 						<span style="position: relative;">
                             <img src="static/img/common/songguo.png"/>
-                            <!--<a name="{{order.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>-->
-							<a name="{{order.id}}" href="javascript:void(0)" class="contact_btn" ng-click="contactSeller(order)">联系卖家</a>
+                            <a name="{{order.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>
+							<!--<a name="{{order.id}}" href="javascript:void(0)" class="contact_btn" ng-click="contactSeller(order)">联系卖家</a>-->
                              <div name="{{order.id}}" class="seller-contact" ng-if="order.active" ng-class="{true : 'seller-contact-info', false : 'display-none'}[order.active]">
                                  <div class="contact-title">
                                      <a ng-click="order.active=false"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>

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

@@ -310,8 +310,8 @@
 								<a ng-href="store/{{order.orderDetails[0].storeid}}" ng-bind="order.storeName" class="hover-color" target="_blank"></a>
 							</i>
 							<img src="static/img/common/songguo.png" style="margin-right:0; ">
-							<!--<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.buyerTel, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>-->
-							<a href="javascript:void(0)" class="contact_btn" title="联系卖家">联系卖家</a>
+							<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.buyerTel, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>
+							<!--<a href="javascript:void(0)" class="contact_btn" title="联系卖家">联系卖家</a>-->
 						</span>
 					</dd>
 					<div ng-class="{'limit-3': !open}">

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

@@ -450,8 +450,8 @@
                             &nbsp;&nbsp;<img src="static/img/user/images/shop_home01.png"/>
 							店铺：<a ng-href="store/{{details[0].storeid}}" ng-bind="::key" class="hover-color" target="_blank"></a>
 							<img src="static/img/common/songguo.png" style="margin-left: 110px; margin-right:0; ">
-							<!--<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.buyerTel, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>-->
-							<a href="javascript:void(0)" class="contact_btn" title="联系卖家">联系卖家</a>
+							<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.buyerTel, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>
+							<!--<a href="javascript:void(0)" class="contact_btn" title="联系卖家">联系卖家</a>-->
 						</span>
 						</dd>
 						<dd class="oder_l" ng-repeat="detail in details">

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

@@ -118,7 +118,7 @@
                         <span style="margin-right: 0;">订单号：</span>
                         <span style="margin-left: 0; margin-right: 30px;" ng-bind="order.orderid"></span>
                         <span style="margin-right: 0px;"><img src="static/img/user/images/shop_home.png" />&nbsp;<a ng-bind="order.storeName" style="margin-left: 0;margin-right: 20px;" href="store/{{::order.storeid}}" target="_blank"></a></span>
-                        <span><img src="static/img/common/songguo.png"/><!--<a href="#" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>--><a href="#" class="contact_btn" >联系卖家</a></span>
+                        <span><img src="static/img/common/songguo.png"/><a class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu, chat.UserType.STORE)">联系卖家</a><!--<a href="#" class="contact_btn" >联系卖家</a>--></span>
                     </div>
                     <div class="logistics-content">
                         <div class="img"><img src="static/img/icon/member.png"  alt=""/></div>

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

@@ -434,7 +434,7 @@
                     <div class="col-md-11">
                         1. 此账户为卖家收款账户，请仔细核对信息内容，若由信息错误造成的损失，优软商城不承担赔偿责任。<br/>
                         2. 如您的企业名称、开户银行及账号变更，您须在优软商城开展资金结算前进行更正，否则发生转账错误优软商城不承担赔偿责任。<br/>
-                        3. 更多的条款请阅读<a href="help/issue/51" target="_blank">《优软商城代收代付协议》</a> 。
+                        3. 更多的条款请阅读<a href="help/helpDetail/51" target="_blank">《优软商城代收代付协议》</a> 。
                     </div>
                 </div>
             </div>
@@ -619,7 +619,7 @@
                 <div class="col-md-8">
                     1. 此账户为卖家收款账户，请仔细核对信息内容，若由信息错误造成的损失，优软商城不承担赔偿责任。<br/>
                     2. 如您的企业名称、开户银行及账号变更，您须在优软商城开展资金结算前进行更正，否则发生转账错误优软商城不承担赔偿责任。<br/>
-                    3. 更多的条款请阅读<a href="help/issue/51" style="color: #5078cb;" target="_blank">《优软商城代收代付协议》</a> 。
+                    3. 更多的条款请阅读<a href="help/helpDetail/51" style="color: #5078cb;" target="_blank">《优软商城代收代付协议》</a> 。
                 </div>
             </div>
         </div>

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

@@ -357,11 +357,11 @@
 					<dd class="order-company">
 						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px;">
 							<i style="min-width: 315px; display: inline-block">
-								&nbsp;&nbsp;{{purchase.buyername}} <!--<a ng-if="purchase.pu_buyentername" name="{{purchase.id}}" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">|{{purchase.pu_buyentername}}</a>-->
+								&nbsp;&nbsp;{{purchase.buyername}} <a ng-if="purchase.pu_buyentername" name="{{purchase.id}}" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">|{{purchase.pu_buyentername}}</a>
 							</i>
 							<img src="static/img/common/songguo.png" style="margin-right:0; ">
-							<!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>-->
-							<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" >联系买家</a>
+							<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>
+							<!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" >联系买家</a>-->
 						</span>
 					</dd>
 					<div ng-class="{'limit-3': !open}">

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

@@ -122,7 +122,7 @@
                     <div class="logistics-content">
                         <div class="img"><img src="static/img/icon/member.png"  alt=""/></div>
                         <div class="content">
-                            <p><span ng-bind="purchase.buyername"></span> &nbsp;<em ng-show="purchase.buyentername">|</em>&nbsp; <em class="name" ng-bind="purchase.buyentername"></em><img src="static/img/common/songguo.png" /><!--<a href="#" class="contact-btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>--><a href="#" class="contact-btn" >联系买家</a></p>
+                            <p><span ng-bind="purchase.buyername"></span> &nbsp;<em ng-show="purchase.buyentername">|</em>&nbsp; <em class="name" ng-bind="purchase.buyentername"></em><img src="static/img/common/songguo.png" /><a href="#" class="contact-btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a><!--<a href="#" class="contact-btn" >联系买家</a>--></p>
                             <p ng-bind="purchase.buyPhone"></p>
                             <p>收货地址：<em ng-bind="address.area"></em></p>
                         </div>

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

@@ -746,8 +746,8 @@
                         </span>
 						<span style="position: relative;">
                             <img src="static/img/common/songguo.png">
-                            <!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>-->
-							<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" >联系买家</a>
+                            <a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>
+							<!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" >联系买家</a>-->
                              <div name="{{purchase.id}}" class="buyer-contact" ng-if="purchase.active" ng-class="{true : 'buyer-contact-info', false : 'display-none'}[purchase.active]">
                                  <div class="contact-title">
                                      <a ng-click="purchase.active=false"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>