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

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

@@ -1418,7 +1418,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     /**
      * QQ分享
      */
-    app.controller('QQShareCtrl', ['$scope', 'InvitationRecord', function($scope, InvitationRecord) {
+    app.controller('QQShareCtrl', ['$scope', 'InvitationRecord', '$modalInstance',  function($scope, InvitationRecord, $modalInstance) {
         InvitationRecord.getInviteUrl({}, function(data) {
             $scope.inviteUrl = data.url;
             var p = {
@@ -1442,11 +1442,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 window.open("http://connect.qq.com/widget/shareqq/index.html?" + s)
             }
         });
+
+        $scope.close = function() {
+            $modalInstance.dismiss();
+        }
     }]);
 
+    /**
+     * 再次邀请
+     */
     app.controller('ReInviteCtrl', ['$scope', 'toaster', '$modalInstance', 'id', 'InvitationRecord', function ($scope, toaster, $modalInstance, id, InvitationRecord) {
-
-
         var loadData = function (id) {
             InvitationRecord.getRecordById({id: id}, {}, function (data) {
                 if (data.user !== null) {

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -586,18 +586,15 @@ input[type="radio"], input[type="checkbox"] {
             <li>
                 <span>联系人&nbsp;</span><em ng-bind="::inquiryItem.userName"></em>
             </li>
-            <li>
-                <span>联系电话</span><em ng-bind="::inquiryItem.userTel"></em>
-            </li>
-            <li>
-                <span>企业地址</span><em ng-bind="::inquiryItem.inquiry.ship"></em>
-            </li>
             <li ng-if="inquiryItem.endDate != null">
                 <span>报价截止</span><em ng-bind="::inquiryItem.endDate | date:'yyyy-MM-dd'"></em>
             </li>
             <li  ng-if="inquiryItem.endDate == null">
                 <span>报价截止</span><em ng-bind="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></em>
             </li>
+            <li>
+                <span>企业地址</span><em ng-bind="::inquiryItem.inquiry.ship"></em>
+            </li>
         </ul>
     </div>
     <table class="table">

src/main/webapp/resources/tpl/index/baseInfo/modal/QQshare_modal.html

@@ -77,7 +77,7 @@
 <div class="share">
     <div class="modal-header">
         <span>分享邀请链接</span>
-        <a class="close">&times;</a>
+        <a class="close" ng-click="close()">&times;</a>
     </div>
     <div class="modal-body">
         <div class="content">