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

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

@@ -860,14 +860,14 @@
              } else {
                  $rootScope.newShow = false
 			 }
-			 window.onmouseup = function() {
-                 var _url = $location.absUrl().toString()
-                 if (_url.indexOf('/admin#/index') > -1) {
-                     $rootScope.newShow = true
-                 } else {
-                     $rootScope.newShow = false
-                 }
-			 }
+			 // window.onmouseup = function() {
+              //    var _url = $location.absUrl().toString()
+              //    if (_url.indexOf('/admin#/index') > -1) {
+              //        $rootScope.newShow = true
+              //    } else {
+              //        $rootScope.newShow = false
+              //    }
+			 // }
          });
      }]);
 	

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

@@ -260,7 +260,7 @@ body div.ng-table-pager a.page-a {
                             </td>
                             <td><a ng-href="{{'store/' + item.storeid}}" ng-bind="item.storeName" target="_blank"></a></td>
                             <td>
-                                <a ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderid.split(',')" ng-bind="orderid" target="_blank"></a>
+                                <a ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderid.split(',')" ng-bind="orderid" target="_blank" style="display: block;"></a>
                             </td>
                             <td ng-bind="item.price"></td>
                         </tr>

src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -60,8 +60,12 @@
         vertical-align: middle;
         text-align: center;
     }
-    .invoice-com-tab tbody>tr>td:hover a{
-        color: #5078cb;
+    .invoice-com-tab tbody>tr>td a.link-order{
+        cursor: default;
+        display: block;
+    }
+    .invoice-com-tab tbody>tr>td:hover a.link-order{
+        color: #666;
     }
     .invoice-com-tab tbody>tr:hover>td b.invoice-info{
         display: block;
@@ -355,9 +359,8 @@
                         </td>
                         <td ng-bind="item.createTime | date : 'yyyy-MM-dd'"></td>
                         <td>
-                            <div>{{orderid}}</div>
                             <!--<a ng-href="vendor#/purchase/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid"></a>-->
-                            <a ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" style="cursor: default"></a>
+                            <a ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" class="link-order"></a>
                         </td>
                         <td ng-bind="item.price"></td>
                         <td style="padding: 0;">
@@ -422,7 +425,7 @@
                     <td ng-bind="item.createTime | date : 'yyyy-MM-dd'"></td>
                     <td>
                         <!--<a ng-href="vendor#/purchase/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" target="_blank"></a>-->
-                        <a ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" style="cursor: default"></a>
+                        <a ng-repeat="orderid in item.orderids.split(',')" ng-bind="orderid" class="link-order"></a>
                     </td>
                     <td ng-bind="item.price"></td>
                     <td style="padding: 0;">

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

@@ -853,7 +853,7 @@
 					</div>
 				</div>
 				<div class="image_tip">
-					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用970*280px的图片
+					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用955*280px的图片
 					<a href="javascript:void(0)" class="model-btn" ng-click="showTemplate(true)" ng-if="canChooseTempalte">使用提供的模板</a>
 				</div>
 			</div>

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

@@ -1061,7 +1061,7 @@
 						 style="width: 660px;height: 155px;  left: 0; position: absolute;"></div>
 				</div>
 				<div class="image_tip">
-					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用970*280px的图片
+					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用955*280px的图片
 					<a href="javascript:void(0)" class="model-btn" ng-click="showTemplate(true)" >使用提供的模板</a>
 				</div>
 
@@ -1105,7 +1105,7 @@
 					</div>
 				</div>
 				<div class="image_tip">
-					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用970*280px的图片
+					仅支持JPG、PNG、GIF格式，大小不超过3M，建议使用955*280px的图片
 					<a href="#" class="model-btn" style="display: none;">使用提供的模板</a>
 				</div>
 			</div>

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

@@ -53,9 +53,15 @@
     display: inline-block;
     float: left;
     font-size: 14px;
-    color: #5078cb;
+    color: #333;
     text-align: left;
   }
+  .modal-body .item-list:first-child a:hover {
+    color: #5078cb;
+  }
+  .modal-body .item-list:first-child a.noOrder:hover{
+    color: #333;
+  }
   .modal-body .item-list:first-child a:nth-child(odd){
     margin-right: 25px;
   }
@@ -88,7 +94,7 @@
   .modal-footer .btn{
     width: 64px;
     height: 25px;
-    line-height: 14px;
+    line-height: 12px;
     font-size: 14px;
     color: #fff;
     background-color: #5078cb;
@@ -104,7 +110,7 @@
     <span>订单号：</span>
     <span>
       <a ng-if="isUserCenter" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in chooseInvoice.orderids.split(',')" ng-bind="orderid || '-'" target="_blank">965666768973953454654</a>
-      <a ng-if="!isUserCenter" ng-repeat="orderid in chooseInvoice.orderids.split(',')" ng-bind="orderid || '-'" style="cursor: default">965666768973953454654</a>
+      <a ng-if="!isUserCenter" ng-repeat="orderid in chooseInvoice.orderids.split(',')" ng-bind="orderid || '-'" style="cursor: default;" class="noOrder">965666768973953454654</a>
     </span>
   </div>
   <div class="item-list">