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 @@
-->
{{brandInfo.all_value || 0}}
- 总贡献值
+ 当前贡献值
{{userInfo.asset_price || 0}}
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">
- 提现资产价值:{{extract_price*proportion}},当前生命值: {{hpValue}}
+ 提现资产价值:{{pre_price}},当前生命值: {{hpValue}}
- 实际提现金额:{{extract_price*proportion*0.7*0.94}},可提现增值积分: {{brokerage_price}}
+ 实际提现金额:{{real_price}},可提现增值积分: {{brokerage_price}}
@@ -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);
+ },
+
/**
* 打开支付组件
*