lxf 1 deň pred
rodič
commit
0bed6eb2c5

+ 9 - 0
src/api/copy.js

@@ -118,4 +118,13 @@ export function getExpertTradeList(data) {
     method: 'post',
     data
   })
+}
+
+// 
+export function getExpertTradeListByDayGroup(data) {
+  return request({
+    url: '/Public/getExpertTradeListByDayGroup',
+    method: 'post',
+    data
+  })
 }

+ 3 - 0
src/store/getter.js

@@ -34,4 +34,7 @@ export default {
   followList: state => state.copy.followList,
   followAccount: state => state.copy.followAccount,
   expertInfo: state => state.copy.expertInfo,
+  followLevelNumber: state => state.copy.followLevelNumber,
+  followLevelRate: state => state.copy.followLevelRate,
+  followLevelName: state => state.copy.followLevelName,
 }

+ 24 - 0
src/store/modules/copy.js

@@ -1,9 +1,33 @@
 import { getFollowList, getFollowAccount, getExpertInfo } from "@/api/copy";
+import i18n from '@/lang'
 const copy = {
   state: {
     followList: [],
     followAccount: {},
     expertInfo: {},
+    followLevelNumber: ['1000', '500', '400', '300', '200', '100'],
+    followLevelRate: {
+      '1': '10%',
+      '2': '12%',
+      '3': '14%',
+      '4': '16%',
+      '5': '18%',
+      '6': '20%',
+    },
+    followLevelName: {
+      // '6': '至尊',
+      // '5': '传奇',
+      // '4': '大师',
+      // '3': '高级',
+      // '2': '中级',
+      // '1': '初级',
+      '6': i18n.t('follow.l104'),
+      '5': i18n.t('follow.l105'),
+      '4': i18n.t('follow.l106'),
+      '3': i18n.t('setting.l14'),
+      '2': i18n.t('follow.l107'),
+      '1': i18n.t('follow.l108'),
+    },
   },
   mutations: {
     setFollowList: (state, list) => {

+ 2 - 4
src/view/copyTrade/applyCopy/index.vue

@@ -18,9 +18,7 @@
                 {{ expertInfo.title }}
               </div>
               <div class="level">
-                {{ expertInfo.level }}
-                <!-- 高级 -->
-                <!-- {{ $t('setting.l14') }} -->
+                {{ followLevelName[expertInfo.level] }}
               </div>
             </div>
             <div class="time">
@@ -173,7 +171,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['followAccount']),
+    ...mapGetters(['followAccount', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
     dis() {
       return !this.max_margin.trim() || !this.ratioInput.trim() || !this.checked || !this.checked1
     }

+ 2 - 2
src/view/copyTrade/copyDetail/index.vue

@@ -19,7 +19,7 @@
                   {{ expertInfo.expert_title }}
                 </div>
                 <div class="level">
-                  {{ expertInfo.expert_level }}
+                  {{ followLevelName[expertInfo.expert_level] }}
                 </div>
               </div>
               <div class="time">
@@ -180,7 +180,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['followAccount', 'currencyList']),
+    ...mapGetters(['followAccount', 'currencyList', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
     productDataObj() {
       return this.getproductDataObj()
     },

+ 2 - 2
src/view/copyTrade/following/components/followed.vue

@@ -16,7 +16,7 @@
                 {{ item.expert_title }}
               </div>
               <div class="level">
-                {{ item.expert_level }}
+                {{ followLevelName[item.expert_level] }}
               </div>
             </div>
           </div>
@@ -63,7 +63,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['followList']),
+    ...mapGetters(['followList', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
     followedList() {
       return this.followList.filter(item => item.status != 1)
     }

+ 2 - 2
src/view/copyTrade/following/components/following.vue

@@ -16,7 +16,7 @@
                 {{ item.expert_title }}
               </div>
               <div class="level">
-                {{ item.expert_level }}
+                {{ followLevelName[item.expert_level] }}
               </div>
             </div>
             <div class="tip flex">
@@ -85,7 +85,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['followList']),
+    ...mapGetters(['followList', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
     followingList() {
       return this.followList.filter(item => item.status == 1)
     }

+ 10 - 8
src/view/copyTrade/marketview/find/components/userList.vue

@@ -27,14 +27,12 @@
                 {{ item.title }}
               </div>
               <div class="level">
-                {{ item.level }}
-                <!-- 高级 -->
-                <!-- {{ $t('setting.l14') }} -->
+                {{ followLevelName[item.level] }}
               </div>
             </div>
             <div class="flex users">
               <img class="icon" src="/img/copy/market/icon6.png" alt="">
-              <div>{{item.user_count}}/100</div>
+              <div>{{item.user_count}}/{{ followLevelNumber[followLevelNumber.length - item.level] }}</div>
             </div>
           </div>
         </div>
@@ -78,8 +76,9 @@
   </div>
 </template>
 <script>
-import { getExpertTradeListByDay } from "@/api/copy";
+import { getExpertTradeListByDayGroup } from "@/api/copy";
 import chartView from "../../components/chart.vue";
+import { mapGetters } from "vuex";
 export default {
   props: ['market', 'list'],
   components: {
@@ -90,15 +89,18 @@ export default {
       chartList: ['12', '26', '12', '45'],
     }
   },
+  computed: {
+    ...mapGetters(['followLevelNumber', 'followLevelRate', 'followLevelName']),
+  },
   created () {
-    this.getExpertTradeListByDay()
+    this.getExpertTradeListByDayGroup()
   },
   methods: {
-    getExpertTradeListByDay() {
+    getExpertTradeListByDayGroup() {
       var time_start = new Date().getTime()
       var time_end = new Date()
       time_end = time_end.setDate(time_end.getDate()-30);
-      getExpertTradeListByDay({
+      getExpertTradeListByDayGroup({
         eidList: JSON.stringify(this.list.map(item => item.eid)),
         time_start: time_end,
         time_end: time_start,

+ 3 - 5
src/view/copyTrade/marketview/tradingExperts/index.vue

@@ -77,14 +77,12 @@
                       {{ item.title }}
                     </div>
                     <div class="level">
-                      {{ item.level }}
-                      <!-- 高级 -->
-                      <!-- {{ $t('setting.l14') }} -->
+                      {{ followLevelName[item.level] }}
                     </div>
                   </div>
                   <div class="flex users">
                     <img class="icon" src="/img/copy/market/icon6.png" alt="">
-                    <div>{{item.user_count}}/100</div>
+                    <div>{{item.user_count}}/{{ followLevelNumber[followLevelNumber.length - item.level] }}</div>
                   </div>
                 </div>
               </div>
@@ -159,7 +157,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['followList', 'expertInfo']),
+    ...mapGetters(['followList', 'expertInfo', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
     followingList() {
       return this.followList.filter(item => item.status == 1)
     },

+ 3 - 3
src/view/copyTrade/myCopy/index.vue

@@ -21,7 +21,7 @@
               {{ expertInfo.title }}
             </div>
             <div class="level">
-              {{ expertInfo.level }}
+              {{ followLevelName[expertInfo.level] }}
               <!-- 高级 -->
               <!-- {{ $t('setting.l14') }} -->
             </div>
@@ -33,7 +33,7 @@
           <div class="flex bottom">
             <div class="flex users">
               <img class="icon" src="/img/copy/market/icon6.png" alt="">
-              <div>{{ expertInfo.user_count }}/100</div>
+              <div>{{ expertInfo.user_count }}/{{ followLevelNumber[followLevelNumber.length - expertInfo.level] }}</div>
             </div>
             <div class="uid">
               UID:{{ expertInfo.eid }}
@@ -158,7 +158,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['expertInfo']),
+    ...mapGetters(['expertInfo', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
     product_group() {
       var product_group = this.expertInfo.product_group ? JSON.parse(this.expertInfo.product_group) : []
       return product_group.filter(item => this.tagName[item])

+ 2 - 3
src/view/copyTrade/myTrade/components/list.vue

@@ -16,8 +16,7 @@
                 {{ item.expert_title }}
               </div>
               <div class="level">
-                <!-- 高级 -->
-                {{ $t('setting.l14') }}
+                {{ followLevelName[item.expert_level] }}
               </div>
             </div>
           </div>
@@ -52,7 +51,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['followList']),
+    ...mapGetters(['followList', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
     followingList() {
       return this.followList.filter(item => item.status == 1)
     }

+ 2 - 3
src/view/copyTrade/myTrade/components/list1.vue

@@ -16,8 +16,7 @@
                 {{ item.expert_title }}
               </div>
               <div class="level">
-                <!-- 高级 -->
-                {{ $t('setting.l14') }}
+                {{ followLevelName[item.expert_level] }}
               </div>
             </div>
           </div>
@@ -52,7 +51,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['followList']),
+    ...mapGetters(['followList', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
     followedList() {
       return this.followList.filter(item => item.status != 1)
     }

+ 5 - 47
src/view/copyTrade/register/home.vue

@@ -100,17 +100,17 @@
             {{ $t('follow.l102') }}
           </van-col>
         </van-row>
-        <van-row gutter="10" class="row1" v-for="(item, index) in list" :key="index">
+        <van-row gutter="10" class="row1" v-for="(value, key) in followLevelNumber" :key="key">
           <van-col span="8">
             <div class="rate">
-              {{ item.rate }}
+              {{ followLevelRate[followLevelNumber.length - key] }}
             </div>
           </van-col>
           <van-col span="8" class="center">
-            {{ item.number }}
+            {{ value }}
           </van-col>
           <van-col span="8" class="right">
-            {{ rateText[item.number] }}
+            {{ followLevelName[followLevelNumber.length - key] }}
           </van-col>
         </van-row>
         <div class="tip">
@@ -162,52 +162,10 @@ export default {
     return {
       checked: true,
       loaded: false,
-      list: [
-        {
-          rate: '20%',
-          number: 1000
-        },
-        {
-          rate: '18%',
-          number: 500
-        },
-        {
-          rate: '16%',
-          number: 400
-        },
-        {
-          rate: '14%',
-          number: 300
-        },
-        {
-          rate: '12%',
-          number: 200
-        },
-        {
-          rate: '10%',
-          number: 100
-        }
-      ]
     }
   },
   computed: {
-    ...mapGetters(['expertInfo']),
-    rateText() {
-      return {
-        // '1000': '至尊',
-        // '500': '传奇',
-        // '400': '大师',
-        // '300': '高级',
-        // '200': '中级',
-        // '100': '初级',
-        '1000': this.$t('follow.l104'),
-        '500': this.$t('follow.l105'),
-        '400': this.$t('follow.l106'),
-        '300': this.$t('setting.l14'),
-        '200': this.$t('follow.l107'),
-        '100': this.$t('follow.l108'),
-      }
-    }
+    ...mapGetters(['expertInfo', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
   },
   created () {
     this.$store.dispatch('getExpertInfo').then((res) => {

+ 3 - 5
src/view/copyTrade/tradeDetail/index.vue

@@ -21,15 +21,13 @@
               {{ expertInfo.title }}
             </div>
             <div class="level">
-              {{ expertInfo.level }}
-              <!-- 高级 -->
-              <!-- {{ $t('setting.l14') }} -->
+              {{ followLevelName[expertInfo.level] }}
             </div>
           </div>
           <div class="flex bottom">
             <div class="flex users">
               <img class="icon" src="/img/copy/market/icon6.png" alt="">
-              <div>{{ expertInfo.user_count }}/100</div>
+              <div>{{ expertInfo.user_count }}/{{ followLevelNumber[followLevelNumber.length - expertInfo.level] }}</div>
             </div>
             <div class="uid">
               UID:{{ expertInfo.eid }}
@@ -156,7 +154,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['followList']),
+    ...mapGetters(['followList', 'followLevelNumber', 'followLevelRate', 'followLevelName']),
     followingList() {
       return this.followList.filter(item => item.status == 1)
     },