Sfoglia il codice sorgente

评论:测试问题bug修复

wangdy 8 anni fa
parent
commit
e80338e152

+ 1 - 0
src/main/webapp/resources/js/vendor/controllers/forstore/show_rate_ctrl.js

@@ -3,6 +3,7 @@ define(['app/app'], function(app) {
 
         /***********卖家回复评论模块 *** start *****************************/
 
+        $scope.cont = false;
             //初始化
         var init = function () {
                 //卖家评价买家

+ 92 - 2
src/main/webapp/resources/view/vendor/forstore/showRate.html

@@ -360,19 +360,109 @@
     .add-rate .bg-f5f8fe {
         background: #f5f8fe!important;
     }
+    .buyer-contact-info {
+        position: absolute;
+        z-index: 2;
+        height: 155px;<!--506-->
+        border: 1px solid #E7E5E2;
+        opacity: 1;
+        background-color: white;
+        width: 600px;
+        top: 40px;
+        left: -560px;
+        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);
+    }
+
+    .display-none {
+        display: none;
+    }
+    .buyer-contact .contact-title {
+        height: 26px;
+        background-color: #5078cb;
+        text-align: right;
+        padding-right: 15px;
+        line-height: 26px;
+        color: white;
+    }
+
+    .buyer-contact .contact-title a, .buyer-contact .contact-title a:hover {
+        color: white;
+    }
+
+    .buyer-contact .contact-buyer-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: 100px;
+    }
+
+    .buyer-contact .contact-buyer-info div {
+        text-align: left;
+        font-size: 14px;
+        padding-left: 15px;
+        padding-right: 15px;
+    }
+
+    .buyer-contact .contact-buyer-info .company-name {
+        text-align: center;
+        font-size: 18px;
+    }
+
+    .buyer-contact .send-message {
+        width: 553px;
+        height: 258px;
+        background-color: #F7F7F6;
+        padding-left: 13px;
+        padding-top: 15px;
+        border-radius: 4px;
+        border: none;
+    }
+
+    .buyer-contact .send-button .send{
+        width: 100px;
+        background-color: #3A76E3;
+        color: white;
+        display: inline-block;
+        border-radius: 3px;
+        height: 32px;
+        line-height: 32px;
+    }
 </style>
 
 <div class="add-rate">
     <div class="add-rate-head">
         <span style="width: 27%;">
-            <a href="store/{{::order.storeid}}" target="_blank" class="add-rate-company">
+            <a target="_blank" class="add-rate-company"> <!--href="store/{{::order.storeid}}" -->
                <!-- <img src="static/img/user/images/shop_home.png"/>-->
                 <em>{{order.buyername + ' | ' + order.sellername}}</em>
             </a>
         </span>
         <span style="position: relative; width: 10%; margin-left: 50px;">
             <img src="static/img/common/songguo.png"/>
-            <a href="javascript:void(0)" class="contact_btn">联系买家</a>
+            <a href="javascript:void(0)" class="contact_btn" ng-click="cont = !cont">联系买家</a>
+            <div class="buyer-contact" ng-if="cont" ng-class="{true : 'buyer-contact-info', false : 'display-none'}[cont]">
+                                 <div class="contact-title">
+                                     <a ng-click="cont=false"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>
+                                 </div>
+                                 <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>
+                                     </div>
+                                 </div>
+                                 <div style="display: none;">
+                                     <textarea class="send-message" placeholder="给买家发送站内消息"></textarea>
+                                 </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>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -975,7 +975,7 @@
 						<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-click="contactBuyer(purchase)">联系买家</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>