Merge remote-tracking branch 'origin/master'

src/projects/business/views/Master/Mine/Bill/Info.vue

@@ -17,6 +17,10 @@
 						<label>付款方式</label>
                         <span>{{detail.orderInfo.payNameStr}}</span>
 					</div>
+                    <div class="mui-input-row" v-if="detail.invoiceName">
+                        <label>开票方式</label>
+                        <span  >{{detail.invoiceName}}</span>
+                    </div>
 					<div class="mui-input-row">
 						<label>缴费单位</label>
                         <span>{{detail.companyName}}</span>
@@ -31,7 +35,7 @@
 					</div>			
 				</form>
 				<ul class="mui-table-view openfyy-list">
-					<li class="mui-table-view-cell mui-collapse">
+					<li class="mui-table-view-cell mui-collapse mui-active">
 						<a class="mui-navigate-right"  >账单明细</a>
 						<div class="mui-collapse-content">
 							<ul class="mui-table-view vongi-pay-list openfyy-list">

src/projects/business/views/Master/Mine/Bill/Pay.vue

@@ -37,10 +37,14 @@
                     <label>账号</label>
                     <span>{{detail.account}}</span>
                 </div>
+                <div class="mui-input-row" v-if="detail.invoiceName">
+                    <label>开票方式</label>
+                    <span  >{{detail.invoiceName}}</span>
+                </div>
 
             </form>
             <div class="mui-content-padded">
-                <h5 class="flew-sp">账单明细<span class="colorfe616c">请在收到账单{{detail.cycle}}交纳如下费用</span></h5>
+                <h5 class="flew-sp">账单明细<span class="colorfe616c">请在收到账单{{detail.cycle}}日内交纳如下费用</span></h5>
             </div>
             <ul class="mui-table-view vongi-pay-list openfyy-list">
                 <li class="mui-table-view-cell" v-for="mod in list">

src/projects/business/views/Master/Property/Cost/Pay.vue

@@ -26,6 +26,10 @@
 						<label>付款方式</label>
 						<span class="color55f868">{{detail.orderInfo.payNameStr}}</span>
 					</div>
+                    <div class="mui-input-row" v-if="detail.invoiceName">
+                        <label>开票方式</label>
+                        <span  >{{detail.invoiceName}}</span>
+                    </div>
                     <div class="mui-input-row">
                         <label>订单号</label>
                         <span>{{detail.outOrderNo}}</span>
@@ -40,7 +44,7 @@
 					</div>			
 				</form>
 				<ul class="mui-table-view openfyy-list margin60">
-					<li class="mui-table-view-cell mui-collapse">
+					<li class="mui-table-view-cell mui-collapse mui-active">
 						<a class="mui-navigate-right"  >账单明细</a>
 						<div class="mui-collapse-content">
 							<ul class="mui-table-view vongi-pay-list openfyy-list">

src/projects/pension/views/Master/Mine/Bill/Info.vue

@@ -31,7 +31,7 @@
 					</div>			
 				</form>
 				<ul class="mui-table-view openfyy-list">
-					<li class="mui-table-view-cell mui-collapse">
+					<li class="mui-table-view-cell mui-collapse mui-active">
 						<a class="mui-navigate-right"  >账单明细</a>
 						<div class="mui-collapse-content">
 							<ul class="mui-table-view vongi-pay-list openfyy-list">

src/projects/pension/views/Master/Mine/Bill/Pay.vue

@@ -37,10 +37,13 @@
                     <label>账号</label>
                     <span>{{detail.account}}</span>
                 </div>
-
+                <div class="mui-input-row" v-if="detail.invoiceName">
+                    <label>开票方式</label>
+                    <span  >{{detail.invoiceName}}</span>
+                </div>
             </form>
             <div class="mui-content-padded">
-                <h5 class="flew-sp">账单明细<span class="colorfe616c">请在收到账单{{detail.cycle}}交纳如下费用</span></h5>
+                <h5 class="flew-sp">账单明细<span class="colorfe616c">请在收到账单{{detail.cycle}}日内交纳如下费用</span></h5>
             </div>
             <ul class="mui-table-view vongi-pay-list openfyy-list">
                 <li class="mui-table-view-cell" v-for="mod in list">