Browse Source

发票管理及结算页、买家首页发票模态框bug处理。

yangc 8 years ago
parent
commit
b91a8b56cf

+ 1 - 0
src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -971,6 +971,7 @@ define(['app/app'], function(app) {
 					$scope.bill.address.province = arr[0];
 					$scope.bill.address.city = arr[1];
 					$scope.bill.address.district = arr[2];
+					// console.log($scope.bill.address)
 				}
 			}
 			$scope.bill.is_agree = true;

+ 2 - 2
src/main/webapp/resources/view/admin/checkMoney/billInput.html

@@ -212,7 +212,7 @@ a:HOVER {
 					                     <label class="checkbox-inline text-inverse">
 					                     		<input type="checkbox" checked="true" name="is_agree" ng-model="bill.is_agree" required="required" /> 我已阅读并同意 
 					                     </label>
-					                     <a href="help/nav/19">《发票须知》</a>
+					                     <a href="/help/helpList/205">《发票须知》</a>
 				                     </div>
 				               </div>
 				               <div class="text-center span8 text-center">
@@ -330,7 +330,7 @@ a:HOVER {
 				                       <label class="check-inline text-inverse">
 				                       		<input checked="true" type="checkbox" ng-model="bill.is_agree" name="is_agree" required=""> 我已阅读并同意
 				                       </label>
-				                       	<a href="help/nav/19">《发票须知》</a>
+				                       	<a href="/help/helpList/205">《发票须知》</a>
 				                   </div>
 				               </div>
 				               <div class="text-center span8">

+ 4 - 4
src/main/webapp/resources/view/prod/modal/edit-invoice-modal.html

@@ -105,7 +105,7 @@
 </style>
 <div id="bill-info">
       <div class="row">
-          <h2 class="content-header">新增开票资料</h2>
+          <h2 class="content-header" ng-bind="bill.head?'修改开票资料':'新增开票资料'">修改开票资料</h2>
       </div>
       <div class="row">
           <label class="col-md-3 normal-control-label"><b class="text-inverse">*</b>发票类型:</label>
@@ -201,7 +201,7 @@
                             <label for="check-mpy"></label>
                              <span>我已阅读并同意</span>
                      </label>
-                     <a href="help/helpList/19" class="base-line" target="_blank" style=" position: relative;top: -3px;">《发票须知》</a>
+                     <a href="/help/helpList/205" class="base-line" target="_blank" style=" position: relative;top: -3px;">《发票须知》</a>
                     </div>
               </div>
               <div class="col-md-offset-3">
@@ -245,7 +245,7 @@
                   </div>
               </div>
               <div class="form-group address">
-             	 <label class="col-md-3 control-label"><b class="text-inverse">*</b>收票地址:</label>
+             	 <label class="col-md-3 control-label"><b class="text-inverse">*</b>收票地址:{{bill.address}}</label>
                 <div class="row checkbox">
 					<div class="col-md-3">
 						<select required="required" class="select-adder form-control"
@@ -341,7 +341,7 @@
                           <label for="check-mzy"></label>
                           <span>我已阅读并同意</span>
                       </label>
-                      <a href="help/helpList/19">《发票须知》</a>
+                      <a href="/help/helpList/205">《发票须知》</a>
                   </div>
               </div>
               <div class="col-md-offset-3">

+ 3 - 3
src/main/webapp/resources/view/usercenter/billInput.html

@@ -82,7 +82,7 @@ h2 {
 </style>
 <div id="bill-info">
   <div class="row">
-      <h2 class="content-header">新增开票资料</h2>
+      <h2 class="content-header" ng-bind="bill.head?'修改开票资料':'新增开票资料'">新增开票资料</h2>
   </div>
    <div class="row">
        <label class="col-md-3 normal-control-label"><b class="text-inverse">*</b>发票类型:</label>
@@ -157,7 +157,7 @@ h2 {
                      <label class="checkbox-inline text-inverse">
                             <input type="checkbox" checked="true" name="is_agree" ng-model="bill.is_agree" required="required" /> 我已阅读并同意
                      </label>
-                     <a href="help#/nav/19" class="base-line" target="_blank">《发票须知》</a>
+                     <a href="/help/helpList/205" class="base-line" target="_blank">《发票须知》</a>
                  </div>
            </div>
            <div class="col-md-offset-3">
@@ -274,7 +274,7 @@ h2 {
                    <label class="check-inline text-inverse">
                         <input checked="true" type="checkbox" ng-model="bill.is_agree" name="is_agree" required=""> 我已阅读并同意
                    </label>
-                    <a href="help#/nav/19">《发票须知》</a>
+                    <a href="/help/helpList/205">《发票须知》</a>
                </div>
            </div>
            <div class="col-md-offset-3">

+ 7 - 0
src/main/webapp/resources/view/usercenter/forstore/buyer_invoice.html

@@ -435,6 +435,13 @@
     .bg-fff8ee {
         background: #fff8ee;
     }
+    input:-webkit-autofill,
+    input:-webkit-autofill:hover,
+    input:-webkit-autofill:focus,
+    input:-webkit-autofill:active {
+        -webkit-transition-delay: 99999s;
+        -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr u_c_invoice">