Merge remote-tracking branch 'origin/master'

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

@@ -6,54 +6,44 @@
 	<div class="mui-content vongi-pay vongi-qingjiadt">
 				<div class="vongi-center mui-content-padded margin30">
 					<div class="vongi-zd vongi-zdto flew-items">
-						<img src="~$project/assets/img/payli.png" width="24">
-						<h3>物业服务费</h3>
+                        <img :src="detail.goodsPic" width="24">
+                        <h3>{{detail.billName}}</h3>
 					</div>
-					<h1 class="margin10">-121907.50</h1>
+					<h1 class="margin10">-{{detail.totalFee}}</h1>
 					<h4 class="color55f868">已交费</h4>
 				</div>
 				<form class="mui-input-group">
 					<div class="mui-input-row">
 						<label>付款方式</label>
-						<span>对公转账</span>
+                        <span>{{detail.orderInfo.payNameStr}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>缴费单位</label>
-						<span>荆州万乘企业管理咨询有限公司</span>
+                        <span>{{detail.companyName}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>订单号</label>
-						<span>00000000</span>
+                        <span>{{detail.outOrderNo}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>创建时间</label>
-						<span>2020-11-28 14:13</span>
+                        <span>{{detail.createTime}}</span>
 					</div>			
 				</form>
 				<ul class="mui-table-view openfyy-list">
 					<li class="mui-table-view-cell mui-collapse">
-						<a class="mui-navigate-right" href="#">账单明细</a>
+						<a class="mui-navigate-right"  >账单明细</a>
 						<div class="mui-collapse-content">
 							<ul class="mui-table-view vongi-pay-list openfyy-list">
-								<li class="mui-table-view-cell">
+								<li class="mui-table-view-cell" v-for="mod in list">
 									<div class=" mui-card-content-inner flew-sp">
 										<div class="mui-media-body">
-											<div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">电费</span>(22733-22678=55度)</div>
-											<p>生活缴费</p>
+                                            <div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">{{mod.goodsName}}</span>（{{mod.numStr}}）</div>
+                                            <p>{{mod.standard}}</p>
 										</div>
-										<span class="mui-h2">56.06元</span>
+										<span class="mui-h2">{{mod.details}}元</span>
 									</div>
-									<p class="mui-card-footer">起止日期:2020-11-20至2021-05-19</p>
-								</li>
-								<li class="mui-table-view-cell">
-									<div class=" mui-card-content-inner flew-sp">
-										<div class="mui-media-body">
-											<div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">电费</span>(22733-22678=55度)</div>
-											<p>生活缴费</p>
-										</div>
-										<span class="mui-h2">56.06元</span>
-									</div>
-									<p class="mui-card-footer">起止日期:2020-11-20至2021-05-19</p>
+                                    <p class="mui-card-footer">起止日期:{{mod.beginAndTime}}</p>
 								</li>
 							</ul>
 						</div>
@@ -113,7 +103,9 @@ export default {
 
       qrCodeImg: "",
       isLoading: false,
-      detail: {},
+      detail: {
+          orderInfo:{}
+      },
       list: [],
       goodsTpey: {},
       id: "",
@@ -124,13 +116,14 @@ export default {
   },
   methods: {
     getDetail() {
-      API_Pay.orderDetail({ id: this.id })
+        this.isLoading = true;
+
+        API_Pay.orderDetail({ id: this.id })
         .then((res) => {
-          this.detail = res.orderInfo;
-          this.info = res.goodsTpey;
-          this.goodsTpey = res.goodsTpey;
+            this.isLoading = false;
 
-          this.list = JSON.parse(res.orderInfo.detail);
+            this.detail=res;
+            this.list=res.list;
         })
         .catch((error) => {});
     },

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

@@ -13,7 +13,7 @@
 						</div>
 						<div class="mui-media-body">
 							<div class='flew-sp flew-items'>
-								<div class="mui-ellipsis mui-col-xs-8">{{mod.goodName}}</div><span :style="'color:'+mod.color" >{{mod.goodTypeName}}</span></div>
+								<div class="mui-ellipsis mui-col-xs-8">{{mod.goodName}}</div><span style="color:#FF8800" >未支付</span></div>
 							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>{{mod.totalFee}}<span class="mui-h6">{{mod.createTime}}</span></div>
 						</div>
 					</a>

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

@@ -5,25 +5,25 @@
 
 			<div class="mui-content vongi-qingjiadt margin60"  >
 				<div class="vongi-zd vongi-zdto flew-items">
-					<img src="~$project/assets/img/payli.png" width="24">
-					<h3>物业服务费</h3>
+					<img :src="detail.goodsPic" width="24">
+					<h3>{{detail.billName}}</h3>
 				</div>
 				<form class="mui-input-group">
 					<div class="mui-input-row">
 						<label>缴费单位</label>
-						<span>沙市花园XX物业</span>
+						<span>{{detail.companyName}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>推送用户</label>
-						<span>陈冲</span>
+						<span>{{detail.personName}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>本期账单总金额</label>
-						<span class="mui-h1 colorfe616c">121907.50</span>
+						<span class="mui-h1 colorfe616c">￥{{detail.totalFee}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>账单备注</label>
-						<span>线下付款请联系财务室0716-8121234转8000</span>
+						<span>{{detail.remark}}</span>
 					</div>
 
 				</form>
@@ -31,60 +31,18 @@
 					<h5 class="flew-sp">账单明细<span class="colorfe616c">请在收到账单5日内交纳如下费用</span></h5>
 				</div>
 				<ul class="mui-table-view vongi-pay-list openfyy-list">
-					<li class="mui-table-view-cell">
+					<li class="mui-table-view-cell" v-for="mod in list">
 						<div class=" mui-card-content-inner flew-sp">
 							<div class="mui-media-body">
-								<div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">电费</span>(22733-22678=55度)</div>
-								<p>生活缴费</p>
+								<div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">{{mod.goodsName}}</span>（{{mod.numStr}}）</div>
+								<p>{{mod.standard}}</p>
 							</div>
-							<span class="mui-h2">56.06元</span>
+							<span class="mui-h2">{{mod.details}}元</span>
 						</div>
-						<p class="mui-card-footer">起止日期:2020-11-20至2021-05-19</p>
-					</li>
-					<li class="mui-table-view-cell">
-						<div class=" mui-card-content-inner flew-sp">
-							<div class="mui-media-body">
-								<div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">电费</span>(22733-22678=55度)</div>
-								<p>生活缴费</p>
-							</div>
-							<span class="mui-h2">56.06元</span>
-						</div>
-						<p class="mui-card-footer">起止日期:2020-11-20至2021-05-19</p>
+						<p class="mui-card-footer">起止日期:{{mod.beginAndTime}}</p>
 					</li>
 				</ul>
-				<!-- <div class="vongi-cashier flew-sp">
-					<div class="vongi-zd flew-items">
-						<div class="mui-media-object">
-							<img :src="goodsTpey.iconPic">
-						</div>
-						<h3>
-							{{goodsTpey.goodsName}}
-						</h3>
-					</div>
-					<div class="vongi-cd-pay">
-						<span class="iconfont icon-baobiao color4fc5f7" @click="goRecord()"></span>
-						<h5>历史账单</h5>
-					</div>
-				</div>
-				<form class="mui-input-group vongi-cd-payli">
-					<div class="mui-input-row flew-sp">
-						<h3>{{detail.body}}</h3>
-						<h3>￥{{detail.totalFee}}</h3>
-					</div>
-					<div class="mui-input-row" v-for="(value,key,index)  in list">
-						<label>{{key}}</label>
-						<span>{{value}}</span>
-					</div>
 
-					<div class="mui-input-row">
-						<label>创建时间</label>
-						<span>{{detail.createTime}}</span>
-					</div>
-					<div class="mui-input-row">
-						<label style="width:25%">订单号</label>
-						<span style="width:75%" class="mui-ellipsis">{{detail.outOrderNo}}</span>
-					</div>
-				</form> -->
 				<div class="mui-content-padded">
 					<h5>支付方式</h5></div>
 				<form class="mui-input-group margin10">
@@ -162,12 +120,13 @@
 			},
 		methods:  {
 		getDetail(){
-	        	API_Pay.orderDetail({id:this.id}).then(res=>{
-                    this.detail=res.orderInfo;
-                    this.info=res.goodsTpey;
-                    this.goodsTpey=res.goodsTpey;
+            this.isLoading = true;
+
+            API_Pay.orderDetail({id:this.id}).then(res=>{
+                this.isLoading = false;
 
-                    this.list=JSON.parse(res.orderInfo.detail);
+                this.detail=res;
+                    this.list=res.list;
         		}).catch(error => {
 
         		})
@@ -210,7 +169,7 @@
 			submit() {
 				this.isLoading=true;
 				if(this.paytypeindex=="1"){
-					API_Pay.wxJsapiPay(this.detail.id,'').then(data=>{
+					API_Pay.wxJsapiPay(this.detail.orderInfo.id,'').then(data=>{
 
 						this.isLoading=false;
 						wxPayJs(data)
@@ -220,7 +179,7 @@
 					})
 
 				}else if(this.paytypeindex=="2"){
-					API_Pay.tradePrecreatePay(this.detail.id,'').then(url=>{
+					API_Pay.tradePrecreatePay(this.detail.orderInfo.id,'').then(url=>{
 						this.isLoading = false;
 						let qrcode = new QRCode('qrcode', {
 							width: 200,

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

@@ -4,52 +4,27 @@
     	<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content vongi-zd vongi-zdlist">
-			<div class="mui-content-padded">
-				<h5>本月</h5>
-			</div>
-			<ul class="mui-table-view">
-				<li class="mui-table-view-cell">
-					<a>
-						<div class="mui-media-object mui-pull-left">
-							<img src="~$project/assets/img/payli.png">
-						</div>
-						<div class="mui-media-body">
-							<div class='flew-sp flew-items'>
-								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="color55f868">对公转账</span></div>
-							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
-						</div>
-					</a>
-				</li>
-			</ul>
-			<div class="mui-content-padded">
-				<h5>九月</h5>
+            <template v-for="mod in recordList">
+
+            <div class="mui-content-padded" v-if="ifshow(mod)">
+                <h5>{{mod.month}}</h5>
 			</div>
 			<ul class="mui-table-view">
 				<li class="mui-table-view-cell">
-					<a>
-						<div class="mui-media-object mui-pull-left">
-							<img src="~$project/assets/img/payli.png">
-						</div>
-						<div class="mui-media-body">
-							<div class='flew-sp flew-items'>
-								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="color55f868">对公转账</span></div>
-							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
-						</div>
-					</a>
-				</li>
-				<li class="mui-table-view-cell">
-					<a>
+					<a @click="goto(mod.id)">
 						<div class="mui-media-object mui-pull-left">
-							<img src="~$project/assets/img/payli.png">
+                            <img :src="mod.iconPic">
 						</div>
 						<div class="mui-media-body">
 							<div class='flew-sp flew-items'>
-								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="color55f868">对公转账</span></div>
-							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+								<div class="mui-ellipsis mui-col-xs-8">{{mod.goodName}}</div><span class="color55f868">{{mod.payNameStr}}</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>{{mod.totalFee}}<span class="mui-h6">{{mod.payTime}}</span></div>
 						</div>
 					</a>
 				</li>
 			</ul>
+            </template>
+
 			<NullList :remark="'暂无账单信息'" v-if="!recordList.length"></NullList>
 		</div>
 		<!-- <div class="mui-content vongi-zd">
@@ -148,7 +123,7 @@
 			goto(id) {
 
 				this.$router.push({
-					name: 'MasterMineBillPay',
+					name: 'MasterMineBillInfo',
 					query: {
 						id: id
 					}