Authored by yyq

Merge branch 'feature/homeInvoice' into release/6.1

@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 {{/if}} 101 {{/if}}
102 102
103 {{#if invoiceSupplying}} 103 {{#if invoiceSupplying}}
104 - <span class="op-item on-invoice" data-id="{{../orderNum}}">开票中</span> 104 + <span class="op-item" data-id="{{../orderNum}}">开票中</span>
105 {{/if}} 105 {{/if}}
106 106
107 {{#if supplyInvoice}} 107 {{#if supplyInvoice}}
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 {{/if}} 109 {{/if}}
110 110
111 {{#if unsupportSupply}} 111 {{#if unsupportSupply}}
112 - <span class="op-item on-invoice" data-id="{{../orderNum}}">不支持补开</span> 112 + <span class="op-item" data-id="{{../orderNum}}">不支持补开</span>
113 {{/if}} 113 {{/if}}
114 {{/ invoiceOperation}} 114 {{/ invoiceOperation}}
115 </div> 115 </div>
@@ -207,7 +207,7 @@ $('#me-invoice-orders').on('click', '.supply-invoice', function() { @@ -207,7 +207,7 @@ $('#me-invoice-orders').on('click', '.supply-invoice', function() {
207 if (+data.issueType === 2) { 207 if (+data.issueType === 2) {
208 $this.removeClass('supply-invoice').addClass('view-invoice').text('查看发票'); 208 $this.removeClass('supply-invoice').addClass('view-invoice').text('查看发票');
209 } else { 209 } else {
210 - $this.removeClass('supply-invoice').addClass('on-invoice').text('开票中'); 210 + $this.removeClass('supply-invoice').text('开票中');
211 } 211 }
212 }); 212 });
213 } 213 }
@@ -21,8 +21,14 @@ @@ -21,8 +21,14 @@
21 } 21 }
22 22
23 .operation { 23 .operation {
24 - > .on-invoice { 24 + > .op-item {
25 color: #999; 25 color: #999;
  26 + cursor: default;
  27 + }
  28 +
  29 + > .on-invoice {
  30 + color: #468fa2;
  31 + cursor: pointer;
26 } 32 }
27 33
28 > .supply-invoice { 34 > .supply-invoice {
@@ -34,6 +40,7 @@ @@ -34,6 +40,7 @@
34 text-align: center; 40 text-align: center;
35 color: #000; 41 color: #000;
36 border: 1px solid #000; 42 border: 1px solid #000;
  43 + cursor: pointer;
37 } 44 }
38 } 45 }
39 46