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

src/main/webapp/resources/css/user/user.css

@@ -1034,6 +1034,7 @@ body {
 
 .oder_list dl .line01 img {
     margin-right: 5px;
+    margin-bottom: 5px;
     vertical-align: middle;
 }
 

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/helpList/205">《发票须知》</a>
+					                     <a href="/help/helpList/19">《发票须知》</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/helpList/205">《发票须知》</a>
+				                       	<a href="/help/helpList/19">《发票须知》</a>
 				                   </div>
 				               </div>
 				               <div class="text-center span8">

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

@@ -725,7 +725,7 @@
                         <label for="check-mzy" style="position: relative;bottom: 2px;"></label>
                         <span style="color: #333;">我已阅读并同意</span>
                     </label>
-                    <a href="/help/helpList/205" target="_blank" style="color: #5078cb; font-size: 14px; position: relative;top: 2px;">《发票须知》</a>
+                    <a href="/help/helpList/19" target="_blank" style="color: #5078cb; font-size: 14px; position: relative;top: 2px;">《发票须知》</a>
                 </div>
                 <div class="form-btn">
                     <input type="button" value="取消" class="btn" ng-click="exitEdit()">

src/main/webapp/resources/view/usercenter/billInput.html

@@ -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/helpList/205" 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">
@@ -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/helpList/205">《发票须知》</a>
+                    <a href="/help/helpList/19">《发票须知》</a>
                </div>
            </div>
            <div class="col-md-offset-3">

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

@@ -646,7 +646,7 @@
                                     <label for="check-mzy" style="position: relative;bottom: 2px;"></label>
                                     <span style="color: #333;">我已阅读并同意</span>
                                 </label>
-                                <a href="/help/helpList/205" target="_blank" style="color: #5078cb; font-size: 14px; position: relative;top: 2px;">《发票须知》</a>
+                                <a href="/help/helpList/19" target="_blank" style="color: #5078cb; font-size: 14px; position: relative;top: 2px;">《发票须知》</a>
                         </div>
                         <div class="form-btn">
                             <input type="button" value="取消" class="btn" ng-click="setChangeBillStatusFlag(false)">