diff --git a/api/wallet.js b/api/wallet.js
index f980836..4996c59 100644
--- a/api/wallet.js
+++ b/api/wallet.js
@@ -191,6 +191,12 @@ class Wallet {
static financial_redemption(data){
return Serve.get('/financial/financial_redemption',data)
}
+ static financial_wlog(data){
+ return Serve.post('/financial/financial_wlog',data,{loading:true})
+ }
+ static financial_vip(data){
+ return Serve.get('/financial/financial_vip ',data)
+ }
}
export default Wallet;
\ No newline at end of file
diff --git a/assets/img/vipIco.png b/assets/img/vipIco.png
new file mode 100644
index 0000000..fb01dc4
Binary files /dev/null and b/assets/img/vipIco.png differ
diff --git a/element/index.js b/element/index.js
index 68f6e7b..e52e639 100644
--- a/element/index.js
+++ b/element/index.js
@@ -1,6 +1,6 @@
// 导入自己需要的组件
-import { Slider,Collapse,CollapseItem } from 'element-ui'
-const components = [Slider,Collapse,CollapseItem]
+import { Slider,Collapse,CollapseItem,Progress } from 'element-ui'
+const components = [Slider,Collapse,CollapseItem,Progress]
const element = {
install: function (Vue) {
// Vue.use(Slider)
diff --git a/i18n/lang/en.json b/i18n/lang/en.json
index 98a9d80..32135bc 100644
--- a/i18n/lang/en.json
+++ b/i18n/lang/en.json
@@ -3,6 +3,10 @@
"D": "Day",
"M": "Month",
"Y": "Year",
+ "grade": "It is already the highest level",
+ "distance": "You are far",
+ "week": "week",
+ "today": "today",
"add": "Add",
"address": "Address",
"all": "All",
diff --git a/i18n/lang/zh-TW.json b/i18n/lang/zh-TW.json
index 2bf6a6e..ac5e771 100644
--- a/i18n/lang/zh-TW.json
+++ b/i18n/lang/zh-TW.json
@@ -3,6 +3,10 @@
"D": "日",
"M": "月",
"Y": "年",
+ "grade": "已是最高等級",
+ "distance": "你距離",
+ "week": "周",
+ "today": "今天",
"add": "添加",
"address": "地址",
"all": "所有",
diff --git a/pages/assets/userfeedback.vue b/pages/assets/userfeedback.vue
index a22af49..269fc0f 100644
--- a/pages/assets/userfeedback.vue
+++ b/pages/assets/userfeedback.vue
@@ -1,9 +1,9 @@
-
+
-
+
@@ -20,7 +20,7 @@
-
+
{{$t('common.c36')}}
@@ -45,13 +45,14 @@
methods: {
advices(){
Wallet.advices({}).then(res => {
- this.list = res.data;
+ this.list = res.data.data;
});
},
onsend(){
Wallet.addAdvice({contents:this.text}).then(data => {
this.text = "";
this.advices();
+ this.$toast(this.$t('common.sendSuccess'))
})
}
}
@@ -75,7 +76,7 @@
margin: 20px 10px;
padding: 20px 20px;
border-radius: 10px;
- border: 1px solid #eee;
+ border: 1px solid #d6d6d6;
}
.viewtext{
max-width: 100%;
diff --git a/pages/base/home.vue b/pages/base/home.vue
index f4485ce..65ba28d 100644
--- a/pages/base/home.vue
+++ b/pages/base/home.vue
@@ -1083,13 +1083,13 @@
},
watch: {
isShow(n) {
- if(n&&this.isLogin){
- this.chatcount = setInterval(()=>{
- this.chat()
- },2000)
- } else if(!n){
- clearInterval(this.chatcount);
- }
+ // if(n&&this.isLogin){
+ // this.chatcount = setInterval(()=>{
+ // this.chat()
+ // },2000)
+ // } else if(!n){
+ // clearInterval(this.chatcount);
+ // }
if (n) {
this.indexData()
this.ws.send({
@@ -1352,7 +1352,7 @@
})
.then(() => {
this.outLogin();
- clearInterval(this.chatcount);
+ // clearInterval(this.chatcount);
})
.catch(() => {});
})
@@ -1469,9 +1469,9 @@
this.getCollegeLinks();
if (this.isLogin) {
- this.chatcount = setInterval(()=>{
- this.chat()
- },5000)
+ // this.chatcount = setInterval(()=>{
+ // this.chat()
+ // },5000)
this.createWalletAddress();
this.getAuthInfo()
}
diff --git a/pages/financialManagement/finances-history.vue b/pages/financialManagement/finances-history.vue
index cbd3847..054ae2c 100644
--- a/pages/financialManagement/finances-history.vue
+++ b/pages/financialManagement/finances-history.vue
@@ -28,37 +28,28 @@
-->
-
+
-
+
+
+ {{$t('common.today')}}
+ 1{{$t('common.week')}}
+ 1{{$t('common.M')}}
+
+
+
+
-
- {{ $t("common.d8") }}
- {{item.currency}}
-
-
- {{ $t("common.amout") }}
- {{item.amount}}
-
-
- {{ $t("common.d9") }}
- {{item.rate}}%
-
-
- {{ $t("common.d10") }}
- {{$t('common.d17')}}
- {{item.day}}{{$t('exchange.f0')}}
+
+ {{item.log_type_text}}
+ {{item.created_at}}
-
- {{ $t("common.d13") }}
- {{item.financial_time}}
-
-
- {{ $t("common.d15") }}
- {{item.redemption_time}}
+
+ {{item.amount}}{{item.coin_name}}
+
@@ -77,21 +68,68 @@ export default {
watch: {
},
- created() {
+ mounted() {
this.init()
},
data() {
return {
- recordsList:[]
+ recordsList:[],
+ Numbertype:2,
+ page:1,
+ start_time:'',
+ end_time:'',
+ range:[],
+ last_page:1
};
},
methods: {
init(){
- Wallet.financial_records({status:1}).then(res => {
- this.recordsList = res.data.data;
- console.log(this.recordsList);
+ let data = {
+ page:this.page,
+ type:this.start_time?'':this.Numbertype,
+ start_time:this.start_time,
+ end_time:this.end_time,
+ }
+ Wallet.financial_wlog(data).then(res => {
+ if(res.code==200){
+ if(this.page==1){
+ this.last_page = res.data.last_page
+ this.recordsList = res.data.data;
+ }else{
+ this.last_page = res.data.last_page
+ this.recordsList = [...this.recordsList, ...res.data.data];
+ }
+ }
+ // console.log(this.recordsList);
+ }).catch(error => {
+ console.error('Promise:', error);
})
},
+ onskytype(type){
+ this.Numbertype = type;
+ this.page = 1;
+ this.recordsList = [];
+ this.init();
+ },
+ scrollpage(e){
+ if(this.page>this.last_page) return
+ this.page++
+ this.init();
+ },
+ pickerChange(e){
+ if(e.length!==0){
+ this.start_time = e[0]
+ this.end_time = e[1]
+ this.page = 1;
+ this.init();
+ }else{
+ this.start_time = ''
+ this.end_time = ''
+ this.page = 1;
+ this.init();
+ }
+ // console.log(e);
+ }
}
};
@@ -185,10 +223,9 @@ export default {
.recordsList_box{
display: flex;
flex-wrap: wrap;
- margin:40rpx 0px;
- padding: 30rpx;
- border-radius: 20rpx;
- background-color: #fff;
+ // margin:40rpx 0px;
+ padding: 40rpx 30rpx;
+ border-bottom: 1px solid #ccc;
justify-content: space-between;
}
\ No newline at end of file
diff --git a/pages/financialManagement/finances-product.vue b/pages/financialManagement/finances-product.vue
index 994dd41..a5fb7f0 100644
--- a/pages/financialManagement/finances-product.vue
+++ b/pages/financialManagement/finances-product.vue
@@ -101,7 +101,7 @@
-
+
{{$t('common.d17')}}
{{item.rate}}%{{$t('exchange.e3')}}
@@ -139,7 +139,7 @@
{{$t('common.d39')}}
- 100.00USDT
+ {{amount*(subscriptionobj.fixed_rate/100)}}USDT
{{$t('common.d40')}}
@@ -187,7 +187,8 @@ export default {
userAdressList:[],
subscriptionobj:{
coin_id:1,
- index:1
+ index:1,
+ fixed_rate:0.50
},
coin_name:"USDT",
activeCoin:{},
diff --git a/pages/financialManagement/index.vue b/pages/financialManagement/index.vue
index 95d94cf..3bb8af5 100644
--- a/pages/financialManagement/index.vue
+++ b/pages/financialManagement/index.vue
@@ -10,10 +10,16 @@
{{$t('common.d23')}}
- 
+
+
+
+
+
+
+
- {{ activeCoin.usable_balance }}
+ {{ filterMoney(activeCoin.usable_balance) }}
USDT
@@ -30,6 +36,20 @@
$ {{activeCoin.totalAmount}}
+
+
+
+ VIP {{financial.vip.level}}
+
+
+ {{financial.vip.level==5?$t('common.grade'):$t('common.distance')}} VIP{{financial.nextVip.level}}
+
+
+ {{financial.performance}}
+ {{financial.nextVip.performance}}
+
+
+
{{$t('common.d12')}}
{{$t('common.d14')}}
@@ -57,31 +77,58 @@