Use new wiki URL.

yeckham · Jun 28, 2017 · 491deea · 491deea
1 parent 447c616
commit 491deea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/HM_AchieveWiki/HM_AchieveWiki.lua b/HM_AchieveWiki/HM_AchieveWiki.lua
@@ -105,7 +105,7 @@ function HM_AchieveWiki.OnItemLButtonClick()
 	local szName = this:GetName()
 	if szName == "Text_Link" then
 		local frame = this:GetRoot()
-		OpenInternetExplorer(ACHI_ROOT_URL .. "/wiki/view/" .. frame.dwAchievement)
+		OpenInternetExplorer(ACHI_ROOT_URL .. "/wiki/details/" .. frame.dwAchievement)
 		Achievement.ClosePanel()
 	end
 end
@@ -261,7 +261,7 @@ function Achievement.OpenEncyclopedia(dwID, dwIcon, szTitle, szDesc)
 	frame.desc:SetText(szDesc)
 	frame:Lookup("Btn_Edit"):Enable(false)
 	frame.pedia:Clear()
-	frame.link:SetText(_L("Link(Open URL):%s", ACHI_ROOT_URL .. "/wiki/view/" .. dwID))
+	frame.link:SetText(_L("Link(Open URL):%s", ACHI_ROOT_URL .. "/wiki/details/" .. dwID))
 	frame.link:AutoSize()
 	PlaySound(SOUND.UI_SOUND, g_sound.OpenFrame)
 	frame.warn:Show()

diff --git a/HM_ToolBox/HM_Price.lua b/HM_ToolBox/HM_Price.lua
@@ -316,12 +316,14 @@ _HM_Price.PS.OnPanelActive = function(frame)
 			ui:Fetch("Text_Unit"):Toggle(false)
 			return ui:Fetch("Text_Price"):Text("请先满级")
 		end
+		ui:Fetch("Btn_Submit"):Enable(false)
 		-- update role
 		local data = HM_About.GetSyncData()
 		data.__qrcode = "0"
 		HM.PostJson(ROOT_URL .. "/api/jx3/roles", data):done(function(res)
 			if not res or  res.errcode ~= 0 then
 				ui:Fetch("Text_Price"):Text(res and res.errmsg or "Unknown")
+				ui:Fetch("Btn_Submit"):Enable(true)
 			else
 				local data = _HM_Price.GetAllInfo()
 				HM.PostJson(ROOT_URL .. "/api/jx3/price-records", HM.JsonEncode(data)):done(function(res)
@@ -348,12 +350,11 @@ _HM_Price.PS.OnPanelActive = function(frame)
 	end)
 	ui:Append("Text", { x = 3, y = bY + 130, font = 218, txt = "注1：估价不包括未绑定物品、通宝、积分等" })
 	ui:Append("Text", { x = 3, y = bY + 152, font = 218, txt = "注2：市场价格波动较快，结果数值仅供此时参考" })
-	ui:Append("Text", { x = 3, y = bY + 174, font = 218, txt = "注3：有兴趣提供报价或改进建议的，请加Q群：231377316" })
 	-- url
-	ui:Append("Text", { x = 0, y = bY + 226 , txt = "估价器官网", font = 27 })
-	ui:Append("WndEdit", { x = 100, y = bY + 226 , w = 300, h = 28, txt = ROOT_URL .. "/jx3/gujia", color = { 255, 255, 200 } })
-	ui:Append("Text", { x = 0, y = bY + 254 , txt = _L["Global ID"], font = 27 })
-	ui:Append("WndEdit", { x = 100, y = bY + 254 , w = 300, h = 28, txt = gid, color = { 255, 255, 200 } })
+	ui:Append("Text", { x = 0, y = bY + 206 , txt = "估价器官网", font = 27 })
+	ui:Append("WndEdit", { x = 100, y = bY + 206 , w = 300, h = 28, txt = ROOT_URL .. "/jx3/gujia", color = { 255, 255, 200 } })
+	ui:Append("Text", { x = 0, y = bY + 234 , txt = _L["Global ID"], font = 27 })
+	ui:Append("WndEdit", { x = 100, y = bY + 234 , w = 300, h = 28, txt = gid, color = { 255, 255, 200 } })
 	-- load equip scores
 	_HM_Price.ui = ui
 	_HM_Price.LoadAllScores()