From 2e99af66822a427566109b092682d9f8dcd70760 Mon Sep 17 00:00:00 2001
From: chenbiao <chenbiao0828@foxmail.com>
Date: Wed, 18 May 2022 10:39:22 +0800
Subject: [PATCH] add 账单详情 接口联调

---
 common/common.js                        |   5 +++++
 pages/rechargeDetail/outDetail.vue      | 379 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/rechargeDetail/rechargeDetail.vue |  63 +++++++++++++++++++++++++++++++++++++++++----------------------
 3 files changed, 237 insertions(+), 210 deletions(-)

diff --git a/common/common.js b/common/common.js
index dd43f6e..8dc7f8b 100644
--- a/common/common.js
+++ b/common/common.js
@@ -52,6 +52,10 @@ const walletDetailsPage = serverUrl + "/business/h5/wallet/detailsPage";
 // 钱包充值-微信
 const publicUnifiedOrder = serverUrl + "/business/h5/pay/weixinpay/publicUnifiedOrder";
 
+// 钱包-根据订单ID获取购买优惠券信息
+const couponInfo = serverUrl + "/business/h5/wallet/detail/couponInfo";
+// const couponInfo = "http://127.0.0.1:8075/business/h5/wallet/detail/couponInfo";
+
 
 
 
@@ -223,5 +227,6 @@ export default {
 	detailSummary,
 	walletDetailsPage,
 	publicUnifiedOrder,
+	couponInfo,
 
 }
diff --git a/pages/rechargeDetail/outDetail.vue b/pages/rechargeDetail/outDetail.vue
index 9110b6b..a350f34 100644
--- a/pages/rechargeDetail/outDetail.vue
+++ b/pages/rechargeDetail/outDetail.vue
@@ -1,201 +1,204 @@
 <template>
-    <view>
-        <view style="height: 100px;line-height: 100px;" class="uni-center">
-            <text>-5.2</text>
-        </view>
-        <view class="border-bg"></view>
+	<view>
+		<view style="height: 100px;line-height: 100px;" class="uni-center">
+			<text style="font-size: 32px;font-weight: 500;">{{changeFeeDetail | toFixed2}}</text>
+		</view>
+		<view class="border-bg"></view>
 
-        <view class="uni-list">
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    订单编号
-                </view>
-                <view class="uni-list-cell-db">
-                    12313123128787312673
-                </view>
-            </view>
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    支付时间
-                </view>
-                <view class="uni-list-cell-db">
-                    2020-10-01  19:19:19
-                </view>
-            </view>
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    支付方式
-                </view>
-                <view class="uni-list-cell-db color-green">
-                    商户余额
-                </view>
-            </view>
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    交易类型
-                </view>
-                <view class="uni-list-cell-db">
-                    停车支付
-                </view>
-            </view>
-        </view>
+		<view class="uni-list">
+			<view class="uni-list-cell paddingTopBottom">
+				<view class="uni-list-cell-left">
+					订单编号
+				</view>
+				<view class="uni-list-cell-db">
+					{{orderId | tranNull}}
+				</view>
+			</view>
+			<view class="uni-list-cell paddingTopBottom">
+				<view class="uni-list-cell-left">
+					支付时间
+				</view>
+				<view class="uni-list-cell-db">
+					{{payTime | tranNull}}
+				</view>
+			</view>
+			<view class="uni-list-cell paddingTopBottom">
+				<view class="uni-list-cell-left">
+					支付方式
+				</view>
+				<view class="uni-list-cell-db color-green">
+					{{payType | tranNull}}
+				</view>
+			</view>
+			<view class="uni-list-cell paddingTopBottom">
+				<view class="uni-list-cell-left">
+					交易类型
+				</view>
+				<view class="uni-list-cell-db">
+					{{typeName | tranNull}}
+				</view>
+			</view>
+			<view class="" v-if="cardIsShow">
+				<view class="uni-list-cell paddingTopBottom">
+					<view class="uni-list-cell-left">
+						卡券类型
+					</view>
+					<view class="uni-list-cell-db">
+						{{cardType | tranNull}}
+					</view>
+				</view>
+				<view class="uni-list-cell paddingTopBottom">
+					<view class="uni-list-cell-left">
+						卡规则名称
+					</view>
+					<view class="uni-list-cell-db">
+						{{cardRuleName | tranNull}}
+					</view>
+				</view>
+				<view class="uni-list-cell paddingTopBottom">
+					<view class="uni-list-cell-left">
+						购买数量
+					</view>
+					<view class="uni-list-cell-db">
+						{{cardNum | tranNull}}张
+					</view>
+				</view>
 
+			</view>
+		</view>
+		<view class="border-bg"></view>
 
-
-        <view class="border-bg"></view>
-        <view class="uni-list">
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    订单编号
-                </view>
-                <view class="uni-list-cell-db">
-                    12313123128787312673
-                </view>
-            </view>
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    支付时间
-                </view>
-                <view class="uni-list-cell-db">
-                    2020-10-01  19:19:19
-                </view>
-            </view>
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    支付方式
-                </view>
-                <view class="uni-list-cell-db color-green">
-                    商户余额
-                </view>
-            </view>
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    交易类型
-                </view>
-                <view class="uni-list-cell-db color-green">
-                    购买卡券
-                </view>
-            </view>
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    卡券类型
-                </view>
-                <view class="uni-list-cell-db">
-                    金额券
-                </view>
-            </view>
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    卡规则名称
-                </view>
-                <view class="uni-list-cell-db">
-                    5元金额券
-                </view>
-            </view>
-            <view class="uni-list-cell paddingTopBottom">
-                <view class="uni-list-cell-left">
-                    购买数量
-                </view>
-                <view class="uni-list-cell-db">
-                    20张
-                </view>
-            </view>
-        </view>
-
-
-
-
-
-
-    </view>
+	</view>
 </template>
 
 <script>
-import common from "../../common/common.js";
-export default {
-  data() {
-
-    return {
+	export default {
+		data() {
 
-    }
-  },
-  onLoad(params) {
-    wx.showShareMenu({
-      withShareTicket: true
-    })
+			return {
+				changeFeeDetail: '',
+				orderId: '',
+				payTime: '',
+				typeName: '',
+				payType: '商户余额',
+				cardRuleName: '',
+				cardType: '',
+				cardNum: '',
+				cardIsShow: false,
+			}
+		},
+		onLoad(params) {
+			wx.showShareMenu({
+				withShareTicket: true
+			})
+			let option = JSON.parse(params.optionData)
+			console.log(option)
+			this.changeFeeDetail = option.changeFeeDetail
+			this.orderId = option.orderId
+			this.typeName = option.typeName			
+			this.payTime = option.opTime
+			if (option.typeName == "购买卡券") {
+				this.cardIsShow = true;
+				this.getCouponInfo();
+			}else{
+				this.cardIsShow = false;
+			}
+			
+			
 
-  },
-  onShow() {
-    var me = this;
-    var userInfo = me.getGlobalUser("globalUser");
-    if (userInfo != null) {
-      me.phoneNumb = userInfo.userPhone;
-    }
-    var pages = getCurrentPages();
-    var currPage = pages[pages.length - 1]; //当前页面
-    console.log('currPage.data.selCoupon = ' + currPage.data.selCoupon);
-    me.selCoupon = currPage.data.selCoupon;
-    console.log(JSON.stringify(me.selCoupon));
-    // me.GetbillQueryInfo(me.mycarNumber, me.myorderId, me.myparkCode, me.selCoupon.cardNo, me.selCoupon.couponType, me.selCoupon
-    //   .discValue);
-    // GetbillQueryInfo(carnum, orderId, parkCode, cardNo, couponType, disValue) {
-  },
-  computed: {
-    startDate() {
-      return this.getDate('start');
-    },
-    endDate() {
-      return this.getDate('end');
-    }
-  },
-  methods: {
-    bindPickerChange: function (e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.index = e.detail.value
-    },
-    bindPickerChangeWay: function (e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.indexWay = e.detail.value
-    },
-    bindStartDateChange: function (e) {
-      this.benginDate = e.detail.value
-    },
-    bindEndDateChange: function (e) {
-      this.overDate = e.detail.value
-    },
-    getDate(type) {
-      const date = new Date();
-      let year = date.getFullYear();
-      let month = date.getMonth() + 1;
-      let day = date.getDate();
-      if (type === 'start') {
-        year = year - 60;
-      } else if (type === 'end') {
-        year = year + 2;
-      }
-      month = month > 9 ? month : '0' + month;
-      day = day > 9 ? day : '0' + day;
-      return `${year}-${month}-${day}`;
-    },
-  }
-}
+		},
+		onShow() {
+			var me = this;
+			var userInfo = me.getGlobalUser("globalUser");
+			if (userInfo != null) {
+				me.phoneNumb = userInfo.userPhone;
+			}
+			var pages = getCurrentPages();
+			var currPage = pages[pages.length - 1]; //当前页面
+			console.log('currPage.data.selCoupon = ' + currPage.data.selCoupon);
+			me.selCoupon = currPage.data.selCoupon;
+			console.log(JSON.stringify(me.selCoupon));
+			// me.GetbillQueryInfo(me.mycarNumber, me.myorderId, me.myparkCode, me.selCoupon.cardNo, me.selCoupon.couponType, me.selCoupon
+			//   .discValue);
+			// GetbillQueryInfo(carnum, orderId, parkCode, cardNo, couponType, disValue) {
+		},
+		computed: {
+			startDate() {
+				return this.getDate('start');
+			},
+			endDate() {
+				return this.getDate('end');
+			}
+		},
+		methods: {
+			bindPickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
+				this.index = e.detail.value
+			},
+			bindPickerChangeWay: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
+				this.indexWay = e.detail.value
+			},
+			bindStartDateChange: function(e) {
+				this.benginDate = e.detail.value
+			},
+			bindEndDateChange: function(e) {
+				this.overDate = e.detail.value
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			},
+			getCouponInfo(){
+				let that = this
+				let paramsData = {
+				  orderId: that.orderId
+				}
+				
+				that.$myRequest({
+				  url: that.$common.couponInfo,
+				  method: 'POST',
+				  data: that.$common.requestSign(paramsData)
+				}).then(res => {
+				  console.log(res)
+					that.cardType =  res.data.cardTypeName
+					that.cardRuleName =  res.data.cardRuleName
+					that.cardNum =  res.data.buyNum
+				})
+				
+				
+			},
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-    .rechargeWrap{
-        position: relative;
-        .rechargeArrow{
-            position: absolute;
-            right: 10px;
-            top: 30px;
-            font-size: 20px;
-            color: #999;
-        }
-    }
-    .recordCon {
-        padding-right: 35px;
-        color: #999;
-        display: flex;
-        justify-content: space-between;
-    }
+	.rechargeWrap {
+		position: relative;
+
+		.rechargeArrow {
+			position: absolute;
+			right: 10px;
+			top: 30px;
+			font-size: 20px;
+			color: #999;
+		}
+	}
+
+	.recordCon {
+		padding-right: 35px;
+		color: #999;
+		display: flex;
+		justify-content: space-between;
+	}
 </style>
diff --git a/pages/rechargeDetail/rechargeDetail.vue b/pages/rechargeDetail/rechargeDetail.vue
index c9ea541..aa4847d 100644
--- a/pages/rechargeDetail/rechargeDetail.vue
+++ b/pages/rechargeDetail/rechargeDetail.vue
@@ -60,21 +60,24 @@
 
 		<view class="" v-if="orderList.length > 0">
 
-			<uni-list class="rechargeWrap pos-rel" v-for="(item, index) in orderList" :key="index">
-				<view class="recordCon uni-list-cell-pd">
-					<text class="color-black">{{item.changeFeeDetail}}</text>
-					<text>{{item.payStateDesc}}</text>
-				</view>
-				<view class="recordCon uni-list-cell-pd">
-					<text v-if="item.typeName == '购买卡券'" class="color-green">{{item.typeName}}</text>
-					<text v-if="item.typeName == '微信充值'" class="color-green">{{item.typeName}}</text>
-					<text v-if="item.typeName == '支付停车费'" class="color-red">{{item.typeName}}</text>
-					<text v-if="item.typeName == '支付宝充值'" class="color-blue">{{item.typeName}}</text>
-					<text v-if="item.typeName == '平台现金充值'" class="color-red">{{item.typeName}}</text>
-					<text>{{item.opTime}}</text>
-				</view>
-				<view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
-				</view>
+			<uni-list class="rechargeWrap pos-rel" clickable v-for="(item, index) in orderList" :key="index" >
+				<view class="" @click="toOutDetail(item)">
+					<view class="recordCon uni-list-cell-pd">
+						<text class="color-black">{{item.changeFeeDetail}}</text>
+						<text>{{item.payStateDesc}}</text>
+					</view>
+					<view class="recordCon uni-list-cell-pd">
+						<text v-if="item.typeName == '购买卡券'" class="color-green">{{item.typeName}}</text>
+						<text v-if="item.typeName == '微信充值'" class="color-green">{{item.typeName}}</text>
+						<text v-if="item.typeName == '支付停车费'" class="color-red">{{item.typeName}}</text>
+						<text v-if="item.typeName == '支付宝充值'" class="color-blue">{{item.typeName}}</text>
+						<text v-if="item.typeName == '平台现金充值'" class="color-red">{{item.typeName}}</text>
+						<text>{{item.opTime}}</text>
+					</view>
+					<view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
+					</view>
+				</view>	
+				
 			</uni-list>
 			<uni-load-more :status="status" />
 
@@ -192,6 +195,11 @@
 				that.type = that.kindArray[that.index].typeList[0].type;
 				console.log(that.kind, that.type)
 				that.getDetailSummary();
+			
+				that.page = 1
+				that.pageSize = this.pageSize
+				that.totalPages = 1
+				that.orderList = []
 				that.fetchData()
 			},
 			bindPickerChangeWay: function(e) {
@@ -200,16 +208,28 @@
 				this.type = this.arrayWay[this.indexWay].type;
 				console.log(this.kind, this.type)
 				this.getDetailSummary();
+				this.page = 1
+				this.pageSize = this.pageSize
+				this.totalPages = 1
+				this.orderList = []
 				this.fetchData()
 			},
 			bindStartDateChange: function(e) {
 				this.beginDate = e.detail.value
 				this.getDetailSummary();
+				this.page = 1
+				this.pageSize = this.pageSize
+				this.totalPages = 1
+				this.orderList = []
 				this.fetchData()
 			},
 			bindEndDateChange: function(e) {
 				this.overDate = e.detail.value
 				this.getDetailSummary();
+				this.page = 1
+				this.pageSize = this.pageSize
+				this.totalPages = 1
+				this.orderList = []
 				this.fetchData()
 			},
 			getDate(type) {
@@ -274,17 +294,16 @@
 					} else {
 						this.status = 'more'
 					}
-
 					that.totalPages = res.data.pageTotals;
 					that.orderList = that.orderList.concat(res.data.dataList)
-
-
 				})
-
-
-
-
 			},
+			toOutDetail(i){
+				console.log('详情')
+				uni.navigateTo({
+				  url: '../rechargeDetail/outDetail?optionData='+JSON.stringify(i)
+				});
+			}
 
 		}
 	}
--
libgit2 0.21.4