Skip to content

Commit 547bf63

Browse files
authored
Merge pull request rChinnnn#50 from rChinnnn/develop
v1.315.2
2 parents 7450fb4 + 784c0c0 commit 547bf63

File tree

7 files changed

+28
-27
lines changed

7 files changed

+28
-27
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Readme.md
22

33
![GitHub Repo stars](https://img.shields.io/github/stars/rChinnnn/rchin-poe-trade?style=social)
4-
![GitHub Downloads](https://img.shields.io/github/downloads/rChinnnn/rchin-poe-trade/latest/rchin-poe-trade-Setup-1.315.1.exe?label=Downloads&style=social)
5-
![GitHub Downloads](https://img.shields.io/github/downloads/rChinnnn/rchin-poe-trade/latest/rchin-poe-trade-1.315.1.exe?label=Downloads&style=social)
4+
![GitHub Downloads](https://img.shields.io/github/downloads/rChinnnn/rchin-poe-trade/latest/rchin-poe-trade-Setup-1.315.2.exe?label=Downloads&style=social)
5+
![GitHub Downloads](https://img.shields.io/github/downloads/rChinnnn/rchin-poe-trade/latest/rchin-poe-trade-1.315.2.exe?label=Downloads&style=social)
66

77
# rChin POE Trade
88
POE 查價工具 (Built with Electron and Vue.)
@@ -15,8 +15,8 @@ POE 查價工具 (Built with Electron and Vue.)
1515

1616
### 安裝版本說明
1717
* 點選 [Releases頁面](https://github.com/rChinnnn/rchin-poe-trade/releases),有兩種版本可以下載
18-
* `rchin-poe-trade-Setup-1.315.1.exe` 安裝版,若程式偵測到有最新版,會在背景下載新版本並在重開程式時更新
19-
* `rchin-poe-trade-1.315.1.exe` 可攜版,無法支援自動更新
18+
* `rchin-poe-trade-Setup-1.315.2.exe` 安裝版,若程式偵測到有最新版,會在背景下載新版本並在重開程式時更新
19+
* `rchin-poe-trade-1.315.2.exe` 可攜版,無法支援自動更新
2020

2121
## 【免責聲明】
2222
* **使用此程式者請自行承擔所有可能後果和風險**

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rchin-poe-trade",
3-
"version": "1.315.1",
3+
"version": "1.315.2",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",

src/server.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
'Sec-Fetch-Site': 'same-origin',
6363
'Sec-Fetch-Mode': 'cors',
6464
'Sec-Fetch-Dest': 'empty',
65-
'User-Agent': 'OAuth rChinPoeTrade/1.315.1 (contact: [email protected])',
65+
'User-Agent': 'OAuth rChinPoeTrade/1.315.2 (contact: [email protected])',
6666
},
6767
rejectUnauthorized: false,
6868
requestCert: false,
@@ -84,7 +84,7 @@
8484
headers: {
8585
'accept': '*/*',
8686
'Cookie': req.body.cookie,
87-
'User-Agent': 'OAuth rChinPoeTrade/1.315.1 (contact: [email protected])',
87+
'User-Agent': 'OAuth rChinPoeTrade/1.315.2 (contact: [email protected])',
8888
},
8989
rejectUnauthorized: false,
9090
requestCert: false,
@@ -110,7 +110,7 @@
110110
headers: {
111111
'accept': '*/*',
112112
'Content-Type': 'application/json',
113-
'User-Agent': 'OAuth rChinPoeTrade/1.315.1 (contact: [email protected])',
113+
'User-Agent': 'OAuth rChinPoeTrade/1.315.2 (contact: [email protected])',
114114
},
115115
rejectUnauthorized: false,
116116
requestCert: false,

src/store/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default new Vuex.Store({
99
accountName: '' || localStorage.getItem('accountName'),
1010
selectedTab: localStorage.getItem('selectedTab') || '0',
1111
priceSettingMin: localStorage.getItem('priceSettingMin') || 0.1,
12-
priceSettingMax: localStorage.getItem('priceSettingMax') || '',
12+
priceSettingMax: localStorage.getItem('priceSettingMax') || null,
1313
},
1414
mutations: {
1515
setPOESESSID(state, POESESSID) {

src/views/About.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="about" style="padding-top: 5px;">
33
<div style="padding:5px 30px;">
44
<b-card-group deck>
5-
<b-card border-variant="primary" header="POE 查價工具 v1.315.1" header-bg-variant="primary" header-text-variant="white" align="center">
5+
<b-card border-variant="primary" header="POE 查價工具 v1.315.2" header-bg-variant="primary" header-text-variant="white" align="center">
66
<b-card-text>作者:rChinnnn</b-card-text>
77
<b-card-text>
88
<b-button @click="openLink(`https://github.com/rChinnnn/rchin-poe-trade/releases`)" size="sm" variant="outline-primary" class="mb-2">

src/views/Home.vue

+17-16
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ export default {
710710
},
711711
"price": {
712712
"min": localStorage.getItem('priceSettingMin') || 0.1,
713-
"max": localStorage.getItem('priceSettingMax') || '',
713+
"max": localStorage.getItem('priceSettingMax') || null,
714714
},
715715
"collapse": {}
716716
}
@@ -1606,7 +1606,8 @@ export default {
16061606
let spellDamageTotal = 0
16071607
tempStat.forEach((element, idx, array) => { // 比對詞綴,抓出隨機數值與詞綴搜尋 ID
16081608
let isStatSearch = false
1609-
let statID = element.ratings[element.bestMatchIndex + 1].target // 詞綴ID
1609+
let bestIndex = (element.bestMatchIndex % 2 === 0) ? element.bestMatchIndex + 1 : element.bestMatchIndex // 處理判斷到英文詞綴的例外狀況,通常是季初有新詞綴尚未翻譯時才發生
1610+
let statID = element.ratings[bestIndex].target // 詞綴ID
16101611
let apiStatText = element.bestMatch.target // API 抓回來的詞綴字串
16111612
let itemStatText = itemDisplayStats[idx] // 物品上的詞綴字串
16121613
switch (true) { // 偽屬性、部分(Local)屬性判斷處理
@@ -2029,8 +2030,8 @@ export default {
20292030
delete this.searchJson.query.filters.misc_filters.filters.ilvl // 刪除物品等級 filter
20302031
} else if (this.itemLevel.isSearch && this.isSearchJson) {
20312032
this.searchJson.query.filters.misc_filters.filters.ilvl = { // 增加物品等級最小值 filter
2032-
"min": this.itemLevel.min,
2033-
"max": this.itemLevel.max ? this.itemLevel.max : ''
2033+
"min": this.itemLevel.min ? this.itemLevel.min : null,
2034+
"max": this.itemLevel.max ? this.itemLevel.max : null
20342035
}
20352036
}
20362037
},
@@ -2041,8 +2042,8 @@ export default {
20412042
this.searchJson.query.filters.socket_filters = { // 增加物品連線 filter
20422043
"filters": {
20432044
"links": {
2044-
"min": this.itemLinked.min ? this.itemLinked.min : '',
2045-
"max": this.itemLinked.max ? this.itemLinked.max : ''
2045+
"min": this.itemLinked.min ? this.itemLinked.min : null,
2046+
"max": this.itemLinked.max ? this.itemLinked.max : null
20462047
}
20472048
}
20482049
}
@@ -2124,8 +2125,8 @@ export default {
21242125
this.itemExBasic.chosenObj = value
21252126
},
21262127
priceSettingChange() {
2127-
this.searchJson_Def.query.filters.trade_filters.filters.price.min = this.storePriceMin
2128-
this.searchJson_Def.query.filters.trade_filters.filters.price.max = this.storePriceMax
2128+
this.searchJson_Def.query.filters.trade_filters.filters.price.min = this.storePriceMin ? this.storePriceMin : null
2129+
this.searchJson_Def.query.filters.trade_filters.filters.price.max = this.storePriceMax ? this.storePriceMax : null
21292130
if (this.priceSetting.chosenObj.prop) {
21302131
this.searchJson_Def.query.filters.trade_filters.filters.price.option = this.priceSetting.chosenObj.prop
21312132
} else {
@@ -2266,8 +2267,8 @@ export default {
22662267
delete this.searchJson.query.filters.map_filters.filters.map_tier // 刪除地圖階級 filter
22672268
} else if (this.mapLevel.isSearch && this.isSearchJson) {
22682269
this.searchJson.query.filters.map_filters.filters.map_tier = { // 指定地圖階級最小 / 最大值 filter
2269-
"min": this.mapLevel.min,
2270-
"max": this.mapLevel.max
2270+
"min": this.mapLevel.min ? this.mapLevel.min : null,
2271+
"max": this.mapLevel.max ? this.mapLevel.max : null
22712272
}
22722273
}
22732274
},
@@ -2295,8 +2296,8 @@ export default {
22952296
delete this.searchJson.query.filters.misc_filters.filters.gem_level // 刪除技能等級 filter
22962297
} else if (this.gemLevel.isSearch && this.isSearchJson) {
22972298
this.searchJson.query.filters.misc_filters.filters.gem_level = { // 指定技能等級最小 / 最大值 filter
2298-
"min": this.gemLevel.min,
2299-
"max": this.gemLevel.max
2299+
"min": this.gemLevel.min ? this.gemLevel.min : null,
2300+
"max": this.gemLevel.max ? this.gemLevel.max : null
23002301
}
23012302
}
23022303
},
@@ -2305,8 +2306,8 @@ export default {
23052306
delete this.searchJson.query.filters.misc_filters.filters.quality // 刪除技能品質 filter
23062307
} else if (this.gemQuality.isSearch && this.isSearchJson) {
23072308
this.searchJson.query.filters.misc_filters.filters.quality = { // 指定技能品質最小 / 最大值 filter
2308-
"min": this.gemQuality.min,
2309-
"max": this.gemQuality.max
2309+
"min": this.gemQuality.min ? this.gemQuality.min : null,
2310+
"max": this.gemQuality.max ? this.gemQuality.max : null
23102311
}
23112312
}
23122313
},
@@ -2493,8 +2494,8 @@ export default {
24932494
let vm = this
24942495
this.baseUrl = this.isGarenaSvr ? 'https://web.poe.garena.tw' : 'https://www.pathofexile.com'
24952496
if (!this.isGarenaSvr) {
2496-
this.leagues.option = this.gggLeagues
2497-
this.leagues.chosenL = this.gggLeagues[0]
2497+
this.leagues.option = Object.assign([], this.gggLeagues);
2498+
this.leagues.chosenL = this.leagues.option[0]
24982499
this.mapBasic.option = Object.assign([], this.gggMapBasic);
24992500
this.gemBasic.option = Object.assign([], this.gggGemBasic);
25002501
} else {

0 commit comments

Comments
 (0)