Revert "cars页面增加期间使用率统计"

This reverts commit 4df00855.

.idea/.gitignore

-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/

.idea/modules.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/ygopro-arena-web.iml" filepath="$PROJECT_DIR$/.idea/ygopro-arena-web.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

.idea/ygopro-arena-web.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

src/api.js

@@ -16,11 +16,13 @@ export default class Api {
 
     static clkUrl = `${URL}/clktrack`
 
-  static getMonthlyHistory(opt) {
-    const url = `https://sapi.moecube.com:444/ygopro/arena/historyScore`;
-    return Vue.http.get(url, { params: opt });
+    static getMonthlyWinRate() {
+    
+        let monthlyWinRateUrl = 'https://sapi.moecube.com:444/ygopro/analytics/matchup/type?source=mycard-athletic'
+
+        return Vue.http.get(monthlyWinRateUrl)
     }
-  // https://sapi.moecube.com:444/ygopro/arena/historyScore?username=id&season=yyyy-mm
+
     
     static getDownloadUrl(url) {
         url = url.slice(7)
@@ -39,15 +41,6 @@ export default class Api {
         const url = `${URL}/user?${request}`;
         return Vue.http.get(url);
     }
-  static getUserInfoMonth(opt) {
-    var request = query.stringify(opt);
-    const url = `${URL}/user?${request}`;
-    return Vue.http.get(url);
-  }
-  // https://sapi.moecube.com:444/ygopro/arena/historyScore?username=id&season=yyyy-mm
-
-
-
 
     static getUsers(opt) {
         var request = query.stringify(opt);
@@ -56,12 +49,9 @@ export default class Api {
     }
 
     static getUserDueHistory(opt) {
-    return Vue.http.get(`${URL}/history`, {'params': opt});
+        return Vue.http.get(`${URL}/history`, { 'params': opt });
     }
 
-
-
-
     static getDownloadUrls() {
         return Vue.http.get('https://api.github.com/repos/mycard/mycard/releases/latest')
     }
@@ -77,72 +67,72 @@ export default class Api {
     }
 
     static getDeckInfo(opt) {
-    return Vue.http.get(`${URL}/deckinfo`, {'params': opt});
+        return Vue.http.get(`${URL}/deckinfo`, { 'params': opt });
     }
 
     static saveDeck(opt) {
         const url = `${URL}/deckinfo`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static saveDeckDemo(opt) {
         const url = `${URL}/deckdemo`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static getReport(opt) {
-    return Vue.http.get(`${URL}/report`, {'params': opt});
+        return Vue.http.get(`${URL}/report`, { 'params': opt });
     }
 
     static getVoteList(opt) {
-    return Vue.http.get(`${URL}/votes`, {'params': opt});
+        return Vue.http.get(`${URL}/votes`, { 'params': opt });
     }
 
     static saveVote(opt) {
         const url = `${URL}/votes`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static voteStatus(opt) {
         const url = `${URL}/voteStatus`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static getVote(opt) {
-    return Vue.http.get(`${URL}/vote`, {'params': opt});
+        return Vue.http.get(`${URL}/vote`, { 'params': opt });
     }
 
     static submitVote(opt) {
         const url = `${URL}/submitVote`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static saveAds(opt) {
         const url = `${URL}/ads`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static getAdsList(opt) {
-    return Vue.http.get(`${URL}/ads`, {'params': opt});
+        return Vue.http.get(`${URL}/ads`, { 'params': opt });
     }
 
     static adsStatus(opt) {
         const url = `${URL}/adsStatus`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static getAd(opt) {
-    return Vue.http.get(`${URL}/getAd`, {'params': opt});
+        return Vue.http.get(`${URL}/getAd`, { 'params': opt });
     }
 
     static adClick(opt) {
         const url = `${URL}/adClick`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static adImpl(opt) {
         const url = `${URL}/adImpl`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static getFirstWin(opt) {
@@ -153,21 +143,21 @@ export default class Api {
 
     static adSwitchChange(opt) {
         const url = `${URL}/adSwitchChange`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static saveActivity(opt) {
         const url = `${URL}/activity`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static saveLabel(opt) {
         const url = `${URL}/label`
-    return Vue.http.post(url, opt, {'emulateJSON': true});
+        return Vue.http.post(url, opt, { 'emulateJSON': true });
     }
 
     static getLabel(opt) {
-    return Vue.http.get(`${URL}/label`, {'params': {}});
+        return Vue.http.get(`${URL}/label`, { 'params': {} });
     }
 
 }

src/components/Ads.vue

@@ -491,6 +491,7 @@
 					type: this.type,
 					page: this.page,
 					username: this.username,
+					type: this.type,
 					from_date: this.from_date,
 					to_date: this.to_date
 				}

src/components/lang.js

@@ -41,7 +41,6 @@ module.exports = {
     dueHistory: '最近决斗记录',
     athleticDueHistory: '竞技场决斗记录',
     entertainDueHistory: '娱乐场决斗记录',
-    monthlyHistory: '每月决斗记录',
     tagInfo: '绿色表示获胜方，红色则表示掉线。',
     rates: '卡组胜率',
 

src/components/tb_lang.js

@@ -38,7 +38,6 @@ module.exports = {
 
         deck: "卡组",
         count: "使用数",
-    PickRate : "使用率",
         topTags: "热门标签",
 
         playerA: '玩家A',
@@ -60,7 +59,6 @@ module.exports = {
 
         cardName: "Card Name",
         used: "Used",
-    PickRate:"Pick Rate",
         put1: "Put one ",
         put2: "Put two ",
         put3: "Put three ",