From 3b7af3a28da39037c9c2ba31fbd345d0e3aa293e Mon Sep 17 00:00:00 2001
From: chenbiao <chenbiao0828@foxmail.com>
Date: Fri, 13 May 2022 15:26:11 +0800
Subject: [PATCH] add 我的钱包 接口联调

---
 common/common.js                      |   6 +++---
 common/filters.js                     |  16 ++--------------
 main.js                               |   2 +-
 pages/index/index.vue                 |  28 ++++++++++++++--------------
 pages/moneyRecharge/moneyRecharge.vue | 424 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 5 files changed, 234 insertions(+), 242 deletions(-)

diff --git a/common/common.js b/common/common.js
index 3d3d18b..011473a 100644
--- a/common/common.js
+++ b/common/common.js
@@ -36,15 +36,15 @@ const requestSign = function(inputData) {
 
 	var jsonList = inputData || {};
 
-  jsonList.orgId = public_orgId;
+  // jsonList.orgId = public_orgId;
 	jsonList.sign_type = "md5";
 	jsonList.app_id = "0eca8f5373ca4866aec2f8e9d9367104";
 	jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E";
 	jsonList.salt = getSalt();
 	jsonList.terminalSource = "11";
-	// jsonList.token = getGlobalUser("globalUser").token;
+	jsonList.token = getGlobalUser("globalUser").token;
   // jsonList.token = getGlobalUser("globalUser").token;
-  jsonList.token = 'eb1538c4c2ee45d7b2610cf071c4a27f';
+  // jsonList.token = 'eb1538c4c2ee45d7b2610cf071c4a27f';
 
 	var arrData = [];
 	for (var key in jsonList) {
diff --git a/common/filters.js b/common/filters.js
index 1ac5c61..13c812e 100644
--- a/common/filters.js
+++ b/common/filters.js
@@ -31,21 +31,9 @@ const RMB = (value) => {
 	return `￥${value}`
 }
 
-// 保留两位小数
+// 钱保留两位小数
 const toFixed2 = num => {
-	let f = Number(parseFloat(num));
-	if (isNaN(f)) return false;
-	let z = Math.round(num * 100) / 100;
-	let s = z.toString();
-	let rs = s.indexOf('.');
-	if (rs < 0) {
-		rs = s.length;
-		s += '.';
-	}
-	while (s.length <= rs + 2) {
-		s += '0';
-	}
-	return s
+	return isNaN(num) ? 0.00 : parseFloat((num/100).toFixed(2));
 }
 
 // 数字每三位加个逗号
diff --git a/main.js b/main.js
index fff4540..f06ca47 100644
--- a/main.js
+++ b/main.js
@@ -4,7 +4,7 @@ import store from './store'
 import common from "./common/common.js";
 import { myRequest } from './common/requestServer.js'
 //引入封装的过滤器 filters
-import * as filters from './common/filters.js'
+import filters from './common/filters.js'
 // 挂在Vue属性 全局通过this.$myRequest()可以访问到
 Vue.prototype.$common = common
 Vue.prototype.$myRequest = myRequest
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2b99320..4f79b5f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -103,15 +103,15 @@
 			}
 		},
 		onLoad() {
-				let userToken= uni.getStorageSync("globalUser").token;
-				if(userToken){
-					this.userIsLogin = false;
-					let indexInfo= uni.getStorageSync("indexInfo");
-					this.userName=indexInfo.userName;
-					
-				}else{
-					this.userIsLogin = true;
-				}
+			let userToken = uni.getStorageSync("globalUser").token;
+			if (userToken) {
+				this.userIsLogin = false;
+				let indexInfo = uni.getStorageSync("indexInfo");
+				this.userName = indexInfo.userName;
+
+			} else {
+				this.userIsLogin = true;
+			}
 		},
 		methods: {
 			login() {
@@ -193,12 +193,12 @@
 
 				});
 			},
-            toRecordPage() {
-            	uni.navigateTo({
-              		url: '../parkRecordList/parkRecordList'
+			toRecordPage() {
+				uni.navigateTo({
+					url: '../parkRecordList/parkRecordList'
 
-            	});
-          	},
+				});
+			},
 
 
 
diff --git a/pages/moneyRecharge/moneyRecharge.vue b/pages/moneyRecharge/moneyRecharge.vue
index 5884c42..07289f7 100644
--- a/pages/moneyRecharge/moneyRecharge.vue
+++ b/pages/moneyRecharge/moneyRecharge.vue
@@ -1,219 +1,223 @@
 <template>
-    <view>
-       
-        <view class="rechargeTop">
-            <view class="toDetail uni-list-cell-pd uni-right" @click="detailCell">明细 ></view>
-            <view class="rechargeNum uni-center">¥{{acctBalance}}</view>
-        </view>
-				
-        <uni-section title="充值金额" type="line" padding>
-            <uni-grid :column="3" :highlight="true" :showBorder="false" :square="false" @change="change">
-                <uni-grid-item v-for="(item, index) in ListData" :index="index" :key="index">
-                    <view class="grid-item-box" style="background-color: #fff;">
-                        <view class="text" :class="currentIndex==index?'itemActive':''">{{item.text}}</view>
-                    </view>
-                </uni-grid-item>
-            </uni-grid>
-        </uni-section>
-
-        <view class="uni-list-cell-pd">
-            温馨提示：暂不支持退款，请谨慎选择充值金额！
-        </view>
-        <view class="border-bg"></view>
-
-        <view class="order-title">
-            支付方法
-        </view>
-        <view class="order-line"></view>
-
-        <view class="orderwaysview">
-            <image src="../../static/orderInfo/orderinfo-wechat.png" class="orderways"></image>
-            <view class="order-info" style="margin-left: 8px;">
-                微信支付
-            </view>
-            <image src="../../static/orderInfo/orderinfo-sel.png" class="orderwaysSel"></image>
-        </view>
-
-        <button @click="payClick" class="button-sp-area" type="primary" plain="true">确认充值</button>
-      
-    </view>
+	<view>
+
+		<view class="rechargeTop">
+			<view class="toDetail uni-list-cell-pd uni-right" @click="detailCell">明细 ></view>
+			<view class="rechargeNum uni-center">¥{{acctBalance | toFixed2 }}</view>
+		</view>
+
+		<uni-section title="充值金额" type="line" padding>
+			<uni-grid :column="3" :highlight="true" :showBorder="false" :square="false" @change="change">
+				<uni-grid-item v-for="(item, index) in ListData" :index="index" :key="index">
+					<view class="grid-item-box" style="background-color: #fff;">
+						<view class="text" :class="currentIndex==index?'itemActive':''">{{item.text}}</view>
+					</view>
+				</uni-grid-item>
+			</uni-grid>
+		</uni-section>
+
+		<view class="uni-list-cell-pd">
+			温馨提示：暂不支持退款，请谨慎选择充值金额！
+		</view>
+		<view class="border-bg"></view>
+
+		<view class="order-title">
+			支付方法
+		</view>
+		<view class="order-line"></view>
+
+		<view class="orderwaysview">
+			<image src="../../static/orderInfo/orderinfo-wechat.png" class="orderways"></image>
+			<view class="order-info" style="margin-left: 8px;">
+				微信支付
+			</view>
+			<image src="../../static/orderInfo/orderinfo-sel.png" class="orderwaysSel"></image>
+		</view>
+
+		<button @click="payClick" class="button-sp-area" type="primary" plain="true">确认充值</button>
+
+	</view>
 </template>
 
 <script>
-import common from "../../common/common.js";
-export default {
-  data() {
-    return {
-			acctBalance:'0.00',
-      ListData: [
-        {
-          text: '100元'
-        },
-        {
-          text: '200元'
-        },
-        {
-          text: '300元'
-        },
-        {
-          text: '600元'
-        },
-        {
-          text: '1000元'
-        },
-        {
-          text: '其他'
-        },
-      ],
-      currentIndex: 0,
-
-    }
-  },
-  onLoad() {
-  
-  },
-  mounted() {
-    this.recharge()
-  },
-  methods: {
-		recharge() {
-			let that = this;
-			that.$myRequest({
-				url: that.$common.walletAccount,
-				method: 'POST',
-				data: that.$common.requestSign()
-			}).then(res => {
-		
-				console.log(res)
-				let data = res.data;
-				that.acctBalance = data.acctBalance;
-				
-			})
+	
+	export default {
+		data() {
+			return {
+				acctBalance: '0.00',
+				ListData: [{
+						text: '100元'
+					},
+					{
+						text: '200元'
+					},
+					{
+						text: '300元'
+					},
+					{
+						text: '600元'
+					},
+					{
+						text: '1000元'
+					},
+					{
+						text: '其他'
+					},
+				],
+				currentIndex: 0,
+
+			}
+		},
+		onLoad() {
+
+		},
+		mounted() {
+			this.recharge()
 		},
-		
-    change(e) {
-
-      let {
-        index
-      } = e.detail
-      
-      this.currentIndex = index
-			console.log(index+1)
-     
-    },
-   
-	 }
-}
+		methods: {
+			recharge() {
+				let that = this;
+				that.$myRequest({
+					url: that.$common.walletAccount,
+					method: 'POST',
+					data: that.$common.requestSign()
+				}).then(res => {
+
+					console.log(res)
+					let data = res.data;
+					that.acctBalance = data.acctBalance;
+
+				})
+			},
+
+			change(e) {
+
+				let {
+					index
+				} = e.detail
+
+				this.currentIndex = index
+				console.log(index + 1)
+
+			},
+			detailCell() {
+				
+			}
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-    .rechargeTop{
-        height: 100px;
-        background: #007AFF;
-        color: #fff;
-        position: relative;
-    }
-    .toDetail{
-        /*text-align: right;*/
-
-    }
-    .rechargeNum{
-        font-size: 30px;
-    }
-    .text {
-        width: 80%;
-        height: 60px;
-        line-height: 60px;
-        margin: 10px auto;
-        border: 1px solid #ccc;
-        text-align: center;
-    }
-
-    .itemActive {
-        background: #f0ad4e;
-    }
-
-    .order-title {
-        font-size: 18px;
-        margin-left: 16px;
-        margin-top: 15px;
-        font-weight: bold;
-        color: #404040;
-    }
-
-    .order-info {
-        font-size: 14px;
-        margin-left: 15px;
-        margin-top: 12px;
-        color: #404040;
-    }
-
-    .order-line {
-        background: #D9D9D9;
-        height: 1px;
-        margin-top: 12px;
-        margin-left: 15px;
-        padding: 0px;
-        overflow: hidden;
-        /* 透明度 */
-        opacity: 0.5;
-    }
-
-    .order-line-bold {
-        background: #FAFAFA;
-        height: 12px;
-        margin-top: 12px;
-        padding: 0px;
-        overflow: hidden;
-    }
-
-    .flex-row-justify-between {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-    }
-
-    .flex-row-justify-end {
-        display: flex;
-        flex-direction: row;
-        /* 水平对齐*/
-        align-items: baseline;
-
-    }
-
-    .order-discount {
-        color: #C8C7CC;
-        margin-right: 20 upx;
-        /* margin-right: 12px ; */
-        /* margin-top:12px ; */
-
-    }
-
-    .orderwaysview {
-        display: flex;
-        flex-direction: row;
-    }
-
-    .orderways {
-        width: 18px;
-        height: 18px;
-        margin-left: 15px;
-        margin-top: 14px;
-    }
-
-    .orderwaysSel {
-        width: 16px;
-        height: 16px;
-        margin-left: auto;
-        margin-right: 14px;
-        margin-top: 14px;
-        /* justify-content:flex-end; */
-    }
-
-    .button-sp-area {
-        margin: 0 auto;
-        width: 60%;
-        margin-top: 40px;
-
-    }
+	.rechargeTop {
+		height: 100px;
+		background: #007AFF;
+		color: #fff;
+		position: relative;
+	}
+
+	.toDetail {
+		/*text-align: right;*/
+
+	}
+
+	.rechargeNum {
+		font-size: 30px;
+	}
+
+	.text {
+		width: 80%;
+		height: 60px;
+		line-height: 60px;
+		margin: 10px auto;
+		border: 1px solid #ccc;
+		text-align: center;
+	}
+
+	.itemActive {
+		background: #f0ad4e;
+	}
+
+	.order-title {
+		font-size: 18px;
+		margin-left: 16px;
+		margin-top: 15px;
+		font-weight: bold;
+		color: #404040;
+	}
+
+	.order-info {
+		font-size: 14px;
+		margin-left: 15px;
+		margin-top: 12px;
+		color: #404040;
+	}
+
+	.order-line {
+		background: #D9D9D9;
+		height: 1px;
+		margin-top: 12px;
+		margin-left: 15px;
+		padding: 0px;
+		overflow: hidden;
+		/* 透明度 */
+		opacity: 0.5;
+	}
+
+	.order-line-bold {
+		background: #FAFAFA;
+		height: 12px;
+		margin-top: 12px;
+		padding: 0px;
+		overflow: hidden;
+	}
+
+	.flex-row-justify-between {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.flex-row-justify-end {
+		display: flex;
+		flex-direction: row;
+		/* 水平对齐*/
+		align-items: baseline;
+
+	}
+
+	.order-discount {
+		color: #C8C7CC;
+		margin-right: 20 upx;
+		/* margin-right: 12px ; */
+		/* margin-top:12px ; */
+
+	}
+
+	.orderwaysview {
+		display: flex;
+		flex-direction: row;
+	}
+
+	.orderways {
+		width: 18px;
+		height: 18px;
+		margin-left: 15px;
+		margin-top: 14px;
+	}
+
+	.orderwaysSel {
+		width: 16px;
+		height: 16px;
+		margin-left: auto;
+		margin-right: 14px;
+		margin-top: 14px;
+		/* justify-content:flex-end; */
+	}
+
+	.button-sp-area {
+		margin: 0 auto;
+		width: 60%;
+		margin-top: 40px;
+
+	}
 </style>
--
libgit2 0.21.4