From 758d5f6cf37453c0a3616ee92ba4f51e2034f762 Mon Sep 17 00:00:00 2001
From: Santaner <santaner@qq.com>
Date: Fri, 23 Feb 2024 01:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=E7=B2=BE=E7=A1=AE=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                     |  2 +-
 pages/user/index.vue              |  2 +-
 pages/users/user_payout/index.vue | 40 +++++++++++++++++++++++++------
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 8686bf8..8df7090 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "CRMEB",
-    "appid" : "__UNI__3DEF511",
+    "appid" : "__UNI__6105009",
     "description" : "",
     "versionName" : "1.0.4",
     "versionCode" : 127,
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 4e63f0c..2f6dd22 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -86,7 +86,7 @@
 						</view> -->
 						<view class="num-item" @click="goMenuPage('/pages/users/user_wallet/index')">
 							<text class="num">{{brandInfo.all_value || 0}}</text>
-							<view class="txt">总贡献值</view>
+							<view class="txt">当前贡献值</view>
 						</view>
 						<view class="num-item" @click="goMenuPage('/pages/users/user_wallet/index')">
 							<text class="num">{{userInfo.asset_price || 0}}</text>
diff --git a/pages/users/user_payout/index.vue b/pages/users/user_payout/index.vue
index 6229fe1..00d7264 100644
--- a/pages/users/user_payout/index.vue
+++ b/pages/users/user_payout/index.vue
@@ -47,10 +47,10 @@
 								 type='digit' v-model="extract_price"></input></view>
 						</view>
 						<view class='tip mt25'>
-							提现资产价值：<text class="price">{{extract_price*proportion}}</text>,当前生命值: <text class="price">{{hpValue}}</text>
+							提现资产价值：<text class="price">{{pre_price}}</text>,当前生命值: <text class="price">{{hpValue}}</text>
 						</view>
 						<view class='tip mt25'>
-							实际提现金额：<text class="price">{{extract_price*proportion*0.7*0.94}}</text>,可提现增值积分: <text class="price">{{brokerage_price}}</text>
+							实际提现金额：<text class="price">{{real_price}}</text>,可提现增值积分: <text class="price">{{brokerage_price}}</text>
 						</view>
 						<view class='tip'>
 							<!-- 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 -->
@@ -142,13 +142,19 @@
 				brokerage_price:'',
 				may_value:'',
 				shouxufei:'',
-				real_price:'',
-				pre_price:''
+				// real_price:'',
+				// pre_price:''
 			};
 		},
 		computed: {
 			...mapGetters(['isLogin','viewColor']),
-			... configMap(['sys_extension_type', 'withdraw_type'])
+			... configMap(['sys_extension_type', 'withdraw_type']),
+			pre_price: function(){
+				return this.accMul(this.extract_price,this.proportion);
+			},
+			real_price: function(){
+				return this.accMul(this.pre_price,0.658);
+			}
 		},
 		watch: {
 			withdraw_type: {
@@ -330,8 +336,8 @@
 				// 	title: '提现金额不能低于' + that.minPrice
 				// });
 				value.extract_type = this.currentTab
-				value.pre_price = this.extract_price*this.proportion;
-				value.real_price = this.extract_price*this.proportion*0.7*0.94;
+				// value.pre_price = this.extract_price*this.proportion;
+				// value.real_price = this.extract_price*this.proportion*0.7*0.94;
 				console.log(value, 'value')
 				that.load = true;
 				if(that.sys_extension_type && that.currentTab == 1)
@@ -358,6 +364,26 @@
 					});
 				});
 			},
+
+			/**
+			 * 浮点数据转化
+			 *
+			 */
+			accMul(arg1, arg2) {
+				var m = 0, s1 = arg1.toString(), s2 = arg2.toString();
+				try {
+						m += s1.split(".")[1].length;
+				}
+				catch (e) {
+				}
+				try {
+						m += s2.split(".")[1].length;
+				}
+				catch (e) {
+				}
+				return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m);
+			},
+
 			/**
 			 * 打开支付组件
 			 *