From 4c4d84858495fd4d34c4e8c830e5953dcdc9f0bb Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Wed, 15 May 2024 08:21:18 +0800
Subject: [PATCH] 11

---
 pages/huitong/huitongbao/index.vue           | 10 +++---
 pages/order_details/index.vue                | 30 ++++++++--------
 pages/order_details/stay.vue                 | 30 ++++++++--------
 pages/points_mall/exchange_record.vue        | 30 ++++++++--------
 pages/points_mall/integral_order.vue         | 38 ++++++++++----------
 pages/points_mall/integral_order_details.vue | 30 ++++++++--------
 pages/user/index.vue                         |  8 ++---
 pages/users/order_confirm/index.vue          | 38 ++++++++++----------
 pages/users/order_list/search.vue            | 30 ++++++++--------
 pages/users/presell_order_list/index.vue     | 30 ++++++++--------
 pages/users/user_address/index.vue           |  4 +--
 pages/users/user_integral1/benpiao.vue       |  4 +--
 pages/users/user_integral1/index.vue         |  8 ++---
 pages/users/user_payment/index.vue           |  4 +--
 pages/users/user_spread_money/index.vue      |  4 +--
 15 files changed, 150 insertions(+), 148 deletions(-)

diff --git a/pages/huitong/huitongbao/index.vue b/pages/huitong/huitongbao/index.vue
index 4ee404c..d68c5e4 100644
--- a/pages/huitong/huitongbao/index.vue
+++ b/pages/huitong/huitongbao/index.vue
@@ -8,12 +8,12 @@
 				<view class='nav acea-row'>
 					<view class='item'>
 						<view>账户复购积分数</view>
-						<view class='num'>{{huitong || 0}}</view>
+						<view class='num'>{{huitong || 0.00}}</view>
 						
 					</view>
 					<view class='item'>
 						<view>账户提现积分数</view>
-						<view class='num'>{{huitong_frozen || 0}}</view>
+						<view class='num'>{{huitong_frozen || 0.00}}</view>
 						
 					</view>
 					<!-- <view class='item'>
@@ -447,8 +447,10 @@
 			getUserInfo() {
 				let that = this;
 				getUserInfo().then((res)=>{
-					this.huitong = Math.floor(Number(res.data.assets.integral_buy))
-					this.huitong_frozen = Math.floor(Number(res.data.assets.integral_withdraw));//提现积分
+					// this.huitong = Math.floor(Number(res.data.assets.integral_buy))
+					// this.huitong_frozen = Math.floor(Number(res.data.assets.integral_withdraw));//提现积分
+					this.huitong = Number(res.data.assets.integral_buy).toFixed(2)
+					this.huitong_frozen = Number(res.data.assets.integral_withdraw).toFixed(2);//提现积分
 					this.mobilePhoneNum = res.data.phone
 					this.getIntegralList()
 					// getIntegralInfo().then(function(res) {
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index fefc09d..888e94b 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -362,21 +362,21 @@
 						title: '微信快捷支付',
 						payStatus: 1
 					},
-					{
-						name: "支付宝支付",
-						icon: "icon-zhifubao",
-						value: 'alipay',
-						title: '支付宝支付',
-						payStatus: this.$store.getters.globalData.alipay_open
-					},
-					{
-						name: "余额支付",
-						icon: "icon-yuezhifu",
-						value: 'balance',
-						title: '可用余额:',
-						number: 0,
-						payStatus: this.$store.getters.globalData.yue_pay_status
-					}
+					// {
+					// 	name: "支付宝支付",
+					// 	icon: "icon-zhifubao",
+					// 	value: 'alipay',
+					// 	title: '支付宝支付',
+					// 	payStatus: this.$store.getters.globalData.alipay_open
+					// },
+					// {
+					// 	name: "余额支付",
+					// 	icon: "icon-yuezhifu",
+					// 	value: 'balance',
+					// 	title: '可用余额:',
+					// 	number: 0,
+					// 	payStatus: this.$store.getters.globalData.yue_pay_status
+					// }
 				],
 				pay_close: false,
 				pay_order_id: '',
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index d8a89d6..b51bfa9 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -221,21 +221,21 @@
 						title: '微信快捷支付',
 						payStatus: 1
 					},
-					{
-						name: "支付宝支付",
-						icon: "icon-zhifubao",
-						value: 'alipay',
-						title: '支付宝支付',
-						payStatus: this.$store.getters.globalData.alipay_open
-					},
-					{
-						name: "余额支付",
-						icon: "icon-yuezhifu",
-						value: 'balance',
-						title: '可用余额:',
-						number: 0,
-						payStatus: this.$store.getters.globalData.yue_pay_status
-					},
+					// {
+					// 	name: "支付宝支付",
+					// 	icon: "icon-zhifubao",
+					// 	value: 'alipay',
+					// 	title: '支付宝支付',
+					// 	payStatus: this.$store.getters.globalData.alipay_open
+					// },
+					// {
+					// 	name: "余额支付",
+					// 	icon: "icon-yuezhifu",
+					// 	value: 'balance',
+					// 	title: '可用余额:',
+					// 	number: 0,
+					// 	payStatus: this.$store.getters.globalData.yue_pay_status
+					// },
 				],
 				pay_close: false,
 				pay_order_id: '',
diff --git a/pages/points_mall/exchange_record.vue b/pages/points_mall/exchange_record.vue
index da5a306..54f6a23 100644
--- a/pages/points_mall/exchange_record.vue
+++ b/pages/points_mall/exchange_record.vue
@@ -87,21 +87,21 @@
 					title: '微信快捷支付',
 					payStatus: 1
 				},
-				{
-					name: "支付宝支付",
-					icon: "icon-zhifubao",
-					value: 'alipay',
-					title: '支付宝支付',
-					payStatus: this.$store.getters.globalData.alipay_open
-				},
-				{
-					name: "余额支付",
-					icon: "icon-yuezhifu",
-					value: 'balance',
-					title: '可用余额:',
-					number: 0,
-					payStatus: this.$store.getters.globalData.yue_pay_status
-				}
+				// {
+				// 	name: "支付宝支付",
+				// 	icon: "icon-zhifubao",
+				// 	value: 'alipay',
+				// 	title: '支付宝支付',
+				// 	payStatus: this.$store.getters.globalData.alipay_open
+				// },
+				// {
+				// 	name: "余额支付",
+				// 	icon: "icon-yuezhifu",
+				// 	value: 'balance',
+				// 	title: '可用余额:',
+				// 	number: 0,
+				// 	payStatus: this.$store.getters.globalData.yue_pay_status
+				// }
 				],
 				loadend: false,
 				loading: false,
diff --git a/pages/points_mall/integral_order.vue b/pages/points_mall/integral_order.vue
index 2274adf..463f704 100644
--- a/pages/points_mall/integral_order.vue
+++ b/pages/points_mall/integral_order.vue
@@ -183,25 +183,25 @@
 						title: '微信快捷支付',
 						payStatus: 1,
 					},
-					{
-						name: "支付宝支付",
-						icon: "icon-icon34",
-						// #ifdef H5 || APP-PLUS
-						value: 'alipay',
-						// #endif
-						// #ifdef MP
-						value: 'alipayQr',
-						// #endif
-						title: '支付宝支付',
-						payStatus: this.$store.getters.globalData.alipay_open
-					},
-					{
-						"name": "余额支付",
-						"icon": "icon-icon-test",
-						value: 'balance',
-						title: '可用余额:',
-						payStatus: this.$store.getters.globalData.yue_pay_status,
-					}
+					// {
+					// 	name: "支付宝支付",
+					// 	icon: "icon-icon34",
+					// 	// #ifdef H5 || APP-PLUS
+					// 	value: 'alipay',
+					// 	// #endif
+					// 	// #ifdef MP
+					// 	value: 'alipayQr',
+					// 	// #endif
+					// 	title: '支付宝支付',
+					// 	payStatus: this.$store.getters.globalData.alipay_open
+					// },
+					// {
+					// 	"name": "余额支付",
+					// 	"icon": "icon-icon-test",
+					// 	value: 'balance',
+					// 	title: '可用余额:',
+					// 	payStatus: this.$store.getters.globalData.yue_pay_status,
+					// }
 				],
 				formContent: '',
 				payType: 'weixin', //支付方式
diff --git a/pages/points_mall/integral_order_details.vue b/pages/points_mall/integral_order_details.vue
index 913950a..dfcdd31 100644
--- a/pages/points_mall/integral_order_details.vue
+++ b/pages/points_mall/integral_order_details.vue
@@ -172,21 +172,21 @@
 						title: '微信快捷支付',
 						payStatus: 1
 					},
-					{
-						name: "支付宝支付",
-						icon: "icon-zhifubao",
-						value: 'alipay',
-						title: '支付宝支付',
-						payStatus: this.$store.getters.globalData.alipay_open
-					},
-					{
-						name: "余额支付",
-						icon: "icon-yuezhifu",
-						value: 'balance',
-						title: '可用余额:',
-						number: 0,
-						payStatus: this.$store.getters.globalData.yue_pay_status
-					},
+					// {
+					// 	name: "支付宝支付",
+					// 	icon: "icon-zhifubao",
+					// 	value: 'alipay',
+					// 	title: '支付宝支付',
+					// 	payStatus: this.$store.getters.globalData.alipay_open
+					// },
+					// {
+					// 	name: "余额支付",
+					// 	icon: "icon-yuezhifu",
+					// 	value: 'balance',
+					// 	title: '可用余额:',
+					// 	number: 0,
+					// 	payStatus: this.$store.getters.globalData.yue_pay_status
+					// },
 				],
 				pay_close: false,
 				pay_order_id: '',
diff --git a/pages/user/index.vue b/pages/user/index.vue
index eada83b..55dda55 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -367,10 +367,10 @@
 				activeRouter: '',
 				sysHeight: sysHeight,
 				assets:{
-					diamond: "0.00",
-					integral_buy: "0.00",
-					integral_withdraw: "0.00",
-					stock: "0.00",
+					diamond: "0",
+					integral_buy: "0",
+					integral_withdraw: "0",
+					stock: "0",
 				},
 				show:false
 			}
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 558473e..6d086a1 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -543,25 +543,25 @@
 						title: '微信快捷支付',
 						payStatus: 1,
 					},
-					{
-						name: "支付宝支付",
-						icon: "icon-icon34",
-						// #ifdef H5 || APP-PLUS
-						value: 'alipay',
-						// #endif
-						// #ifdef MP
-						value: 'alipayQr',
-						// #endif
-						title: '支付宝支付',
-						payStatus: this.$store.getters.globalData.alipay_open
-					},
-					{
-						"name": "余额支付",
-						"icon": "icon-icon-test",
-						value: 'balance',
-						title: '可用余额:',
-						payStatus: this.$store.getters.globalData.yue_pay_status,
-					},
+					// {
+					// 	name: "支付宝支付",
+					// 	icon: "icon-icon34",
+					// 	// #ifdef H5 || APP-PLUS
+					// 	value: 'alipay',
+					// 	// #endif
+					// 	// #ifdef MP
+					// 	value: 'alipayQr',
+					// 	// #endif
+					// 	title: '支付宝支付',
+					// 	payStatus: this.$store.getters.globalData.alipay_open
+					// },
+					// {
+					// 	"name": "余额支付",
+					// 	"icon": "icon-icon-test",
+					// 	value: 'balance',
+					// 	title: '可用余额:',
+					// 	payStatus: this.$store.getters.globalData.yue_pay_status,
+					// },
 					{
 						"name": "线下支付",
 						"icon": "icon-yinhangqia",
diff --git a/pages/users/order_list/search.vue b/pages/users/order_list/search.vue
index 343715e..c9d09e7 100644
--- a/pages/users/order_list/search.vue
+++ b/pages/users/order_list/search.vue
@@ -255,21 +255,21 @@
 						title: '微信快捷支付',
 						payStatus: 1
 					},
-					{
-						name: "支付宝支付",
-						icon: "icon-zhifubao",
-						value: 'alipay',
-						title: '支付宝支付',
-						payStatus: this.$store.getters.globalData.alipay_open
-					},
-					{
-						name: "余额支付",
-						icon: "icon-yuezhifu",
-						value: 'balance',
-						title: '可用余额:',
-						number: 0,
-						payStatus: this.$store.getters.globalData.yue_pay_status
-					}
+					// {
+					// 	name: "支付宝支付",
+					// 	icon: "icon-zhifubao",
+					// 	value: 'alipay',
+					// 	title: '支付宝支付',
+					// 	payStatus: this.$store.getters.globalData.alipay_open
+					// },
+					// {
+					// 	name: "余额支付",
+					// 	icon: "icon-yuezhifu",
+					// 	value: 'balance',
+					// 	title: '可用余额:',
+					// 	number: 0,
+					// 	payStatus: this.$store.getters.globalData.yue_pay_status
+					// }
 				],
 				pay_close: false,
 				pay_order_id: '',
diff --git a/pages/users/presell_order_list/index.vue b/pages/users/presell_order_list/index.vue
index 61d40f7..c3b2589 100644
--- a/pages/users/presell_order_list/index.vue
+++ b/pages/users/presell_order_list/index.vue
@@ -107,21 +107,21 @@
 						title: '微信快捷支付',
 						payStatus: 1
 					},
-					{
-						name: "支付宝支付",
-						icon: "icon-zhifubao",
-						value: 'alipay',
-						title: '支付宝支付',
-						payStatus: this.$store.getters.globalData.alipay_open
-					},
-					{
-						name: "余额支付",
-						icon: "icon-yuezhifu",
-						value: 'balance',
-						title: '可用余额:',
-						number: 0,
-						payStatus: this.$store.getters.globalData.yue_pay_status
-					}
+					// {
+					// 	name: "支付宝支付",
+					// 	icon: "icon-zhifubao",
+					// 	value: 'alipay',
+					// 	title: '支付宝支付',
+					// 	payStatus: this.$store.getters.globalData.alipay_open
+					// },
+					// {
+					// 	name: "余额支付",
+					// 	icon: "icon-yuezhifu",
+					// 	value: 'balance',
+					// 	title: '可用余额:',
+					// 	number: 0,
+					// 	payStatus: this.$store.getters.globalData.yue_pay_status
+					// }
 				],
 				pay_close: false,
 				pay_order_id: '',
diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index cbff91b..a014310 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -37,10 +37,10 @@
 				</view>
 				<button class='keepBnt' form-type="submit" :disabled="loading">立即保存</button>
 				<!-- #ifdef MP -->
-				<view class="wechatAddress" v-if="!address_id" @click="getWxAddress">导入微信地址</view>
+				<!-- <view class="wechatAddress" v-if="!address_id" @click="getWxAddress">导入微信地址</view> -->
 				<!-- #endif -->
 				<!-- #ifdef H5 -->
-				<view class="wechatAddress" v-if="this.$wechat.isWeixin() && !address_id" @click="getAddress">导入微信地址</view>
+				<!-- <view class="wechatAddress" v-if="this.$wechat.isWeixin() && !address_id" @click="getAddress">导入微信地址</view> -->
 				<!-- #endif -->
 			</view>
 		</form>
diff --git a/pages/users/user_integral1/benpiao.vue b/pages/users/user_integral1/benpiao.vue
index 88f846f..d3c9f2a 100644
--- a/pages/users/user_integral1/benpiao.vue
+++ b/pages/users/user_integral1/benpiao.vue
@@ -8,7 +8,7 @@
 				<view class='nav acea-row'>
 					<view class='item'>
 						<view>账户本票数</view>
-						<view class='num'>{{contribution || 0}}</view>
+						<view class='num'>{{contribution || 0.00}}</view>
 						
 					</view>
 					<!-- <view class='item'>
@@ -202,7 +202,7 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then((res)=>{
-					this.contribution = Math.floor(Number(res.data.assets.stock))
+					this.contribution = Number(res.data.assets.stock).toFixed(2)
 					// this.contribution_frozen = res.data.assets.contribution_frozen
 					getIntegralInfo().then(function(res) {
 						that.$set(that,'userInfo',res.data);
diff --git a/pages/users/user_integral1/index.vue b/pages/users/user_integral1/index.vue
index 970ab74..f2bcafc 100644
--- a/pages/users/user_integral1/index.vue
+++ b/pages/users/user_integral1/index.vue
@@ -8,7 +8,7 @@
 				<view class='nav acea-row'>
 					<view class='item'>
 						<view>账户钻石数</view>
-						<view class='num'>{{huitong || 0}}</view>
+						<view class='num'>{{huitong || 0.00}}</view>
 						
 					</view>
 					
@@ -313,7 +313,7 @@
 					});
 					return;
 				}
-				DiamondTostock({count:Math.floor(Number(this.huitongToConsumeNum))}).then(res=>{
+				DiamondTostock({count:Number(this.huitongToConsumeNum).toFixed(2)}).then(res=>{
 					
 					if(res.status==200){
 						this.getUserInfo()
@@ -364,7 +364,7 @@
 					});
 					return;
 				}
-				this.zhuanrang.count = Math.floor(Number(this.zhuanrang.count))
+				this.zhuanrang.count = Number(this.zhuanrang.count).toFixed(2)
 				
 				sendDiamond(this.zhuanrang).then(res=>{
 					
@@ -444,7 +444,7 @@
 			getUserInfo() {
 				let that = this;
 				getUserInfo().then((res)=>{
-					this.huitong = Math.floor(Number(res.data.assets.diamond));
+					this.huitong = Number(res.data.assets.diamond).toFixed(2);
 				
 					this.mobilePhoneNum = res.data.phone
 					this.getIntegralList()
diff --git a/pages/users/user_payment/index.vue b/pages/users/user_payment/index.vue
index 98bb9ae..558b869 100644
--- a/pages/users/user_payment/index.vue
+++ b/pages/users/user_payment/index.vue
@@ -8,7 +8,7 @@
 					<view class='item'>
 						<view>预存金额</view>
 						<!-- <view class='num'>{{ userinfo.now_money || 0 }}</view> -->
-						<view class='num'>{{ deposit_total || 0 }}</view>
+						<view class='num'>{{ deposit_total || 0.00 }}</view>
 						
 					</view>
 					
@@ -220,7 +220,7 @@
 				// 	that.$set(that, 'userinfo', res.data);
 				// })
 				getUserInfo().then((res)=>{
-					this.deposit_total = Math.floor(Number(res.data.assets.deposit_total));
+					this.deposit_total = Number(res.data.assets.deposit_total).toFixed(2);
 				
 				})
 				
diff --git a/pages/users/user_spread_money/index.vue b/pages/users/user_spread_money/index.vue
index add065b..4f47ce9 100644
--- a/pages/users/user_spread_money/index.vue
+++ b/pages/users/user_spread_money/index.vue
@@ -17,9 +17,9 @@
 											<view class='name line1' v-if="item.extract_type == 2">支付宝提现</view>
 											<view class='name line1' v-if="item.extract_type == 3">提现到零钱</view>
 										</block>
-									<!-- 	<block v-else>
+										<block v-else>
 											<view class='name line1'>提现失败<text class="message">({{item.fail_msg}})</text></view>
-										</block> -->
+										</block>
 										<view>{{item.create_time}}</view>
 									</view>
 									<view style="margin:0 10px;">