diff --git a/public/tool.html b/public/tool.html
index 1bac150722908f26c3a2138a13bee6fd62abe731..c1e26057bd5df659fb12099408f20b7298a6a0ef 100644
--- a/public/tool.html
+++ b/public/tool.html
@@ -7,7 +7,7 @@
+
diff --git a/src/adapter/chrome/manifest.json b/src/adapter/chrome/manifest.json
index c40196864361eb46f83618bb3f7acfab38f55420..d003b30a42d27fe89b12ca2085280cdeb04c704a 100644
--- a/src/adapter/chrome/manifest.json
+++ b/src/adapter/chrome/manifest.json
@@ -21,7 +21,9 @@
"permissions": [
"clipboardWrite",
"clipboardRead",
- "storage"
+ "webRequest",
+ "storage",
+ "http://ip.taobao.com/*"
],
"update_url": "http://clients2.google.com/service/update2/crx"
}
\ No newline at end of file
diff --git a/src/views/tool/ip.vue b/src/views/tool/ip.vue
index 025b49f94efa0dabffbd38497ca9bcfcde063615..fa7d25e1996ba11efba8f36fb0d9dfe557f486a5 100644
--- a/src/views/tool/ip.vue
+++ b/src/views/tool/ip.vue
@@ -26,6 +26,7 @@ import codeEditor from "./components/codeEditor";
import jsonFormatter from "./library/formatter/json";
import heightResize from "./components/heightResize";
+<<<<<<< HEAD
export default {
components: {
codeEditor,
@@ -54,6 +55,31 @@ export default {
this.$t('ip_error', [error.message]).toString()
)
});
+=======
+ export default {
+ created() {
+ this.current = Object.assign(this.current,this.$getToolData("input"))
+ },
+ methods: {
+ handle() {
+ if (this.current.input) {
+ request({
+ url:"http://ip.taobao.com/outGetIpInfo",
+ data:{
+ "ip":this.current.input === "localhost" ? 'myip' : this.current.input,
+ "accessKey": "alibaba-inc"
+ },
+ },(err, res, result)=>{
+ if (err) return this.$Message.error("ip地址信息查询错误:"+err);
+ this.current.output = JSON.stringify(JSON.parse(result),null, 4);
+ this.$saveToolData(this.current);
+ });
+ }
+ },
+ local(){
+ this.current.input = 'localhost';
+ this.handle()
+>>>>>>> 3e57baf... 修复ip查询
}
},
local() {