From fd014141627f5cce4d52f74b3c0f4ecbcba3ce63 Mon Sep 17 00:00:00 2001
From: chenbiao <chenbiao0828@foxmail.com>
Date: Thu, 9 Jun 2022 13:54:37 +0800
Subject: [PATCH] add 修复bug余额明细 详情支付方式更新

---
 pages/rechargeDetail/outDetail.vue      | 379 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/rechargeDetail/rechargeDetail.vue |  16 +++++-----------
 2 files changed, 191 insertions(+), 204 deletions(-)

diff --git a/pages/rechargeDetail/outDetail.vue b/pages/rechargeDetail/outDetail.vue
index f90c2c5..f8a79e9 100644
--- a/pages/rechargeDetail/outDetail.vue
+++ b/pages/rechargeDetail/outDetail.vue
@@ -1,206 +1,199 @@
 <template>
-    <view>
-        <view style="height: 100px;line-height: 100px;" class="uni-center">
-            <text style="font-size: 32px;font-weight: 500;">{{changeFeeDetail}}</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}}</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">
-                    {{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 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>
+		</view>
+		<view class="border-bg"></view>
 
-    </view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    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.kind == 1) {
-      this.payType = '支付宝'
-    }
-    if (option.kind == 2) {
-      this.payType = '微信'
-    }
-    if (option.kind == 3) {
-      this.payType = '平台现金'
-    }
-    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}`;
-    },
-    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
-      })
-    },
-  }
-}
+	export default {
+		data() {
+			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
+			this.payType = option.typeName
+
+			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}`;
+			},
+			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;
+	.rechargeWrap {
+		position: relative;
 
-        .rechargeArrow {
-            position: absolute;
-            right: 10px;
-            top: 30px;
-            font-size: 20px;
-            color: #999;
-        }
-    }
+		.rechargeArrow {
+			position: absolute;
+			right: 10px;
+			top: 30px;
+			font-size: 20px;
+			color: #999;
+		}
+	}
 
-    .recordCon {
-        padding-right: 35px;
-        color: #999;
-        display: flex;
-        justify-content: space-between;
-    }
+	.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 a126718..411bdf9 100644
--- a/pages/rechargeDetail/rechargeDetail.vue
+++ b/pages/rechargeDetail/rechargeDetail.vue
@@ -67,17 +67,11 @@
 						<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 v-if="item.kind == '1'" class="color-green">支付宝</text>
-						<text v-if="item.typeName == '2'" class="color-green">微信</text>
-						<text v-if="item.typeName == '3'" class="color-red">平台现金</text>
-
-
+						<text class="color-green">{{item.typeName}}</text>
+						<!-- <text v-if="item.type == '2'" class="color-green">{{item.typeName}}</text> -->
+						<!-- <text v-if="item.type == '3'" class="color-red">{{item.typeName}}</text> -->
+						<!-- <text v-if="item.type == '1'" class="color-blue">{{item.typeName}}</text> -->
+				
 						<text>{{item.opTime}}</text>
 					</view>
 					<view class="uni-icon pos-abs icon-arrowright uni-icon-arrowright">
--
libgit2 0.21.4