feat: merge

vitechliu · May 12, 2019 · e8c6d60 · e8c6d60
2 parents d908427 + 875cc3c
commit e8c6d60
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 70 deletions.
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -33,6 +33,13 @@ let babelrc = {
   ],
   plugins: [
     '@babel/plugin-transform-runtime',
+    [
+      'component',
+      {
+        libraryName: 'element-ui',
+        styleLibraryName: 'theme-chalk'
+      }
+    ],
     '@babel/plugin-transform-modules-commonjs',
     '@babel/plugin-syntax-dynamic-import'
   ]
@@ -104,7 +111,8 @@ module.exports = {
   plugins: [new VueLoaderPlugin()].concat(
     new HtmlWebpackPlugin({
       env: process.env.NODE_ENV,
-      filename: process.env.NODE_ENV === 'development' ? 'index.html' : '../index.html',
+      filename:
+        process.env.NODE_ENV === 'development' ? 'index.html' : '../index.html',
       template: './src/index.html'
     })
   )

diff --git a/dist/index.3b2e6baf.js b/dist/index.3b2e6baf.js
diff --git a/dist/index.c113a869.js b/dist/index.c113a869.js
diff --git a/index.html b/index.html
@@ -13,5 +13,5 @@
   <link href="./dist/index.6df05eea.css" rel="stylesheet"></head>
   <body>
     <div id="root"></div>
-  <script type="text/javascript" src="./dist/index.3b2e6baf.js"></script></body>
+  <script type="text/javascript" src="./dist/index.c113a869.js"></script></body>
 </html>
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "@babel/register": "^7.0.0",
     "@babel/runtime": "^7.1.2",
     "babel-loader": "^8.0.4",
+    "babel-plugin-component": "^1.1.1",
     "chalk": "^2.0.1",
     "core-js": "^2.6.5",
     "cross-env": "^5.2.0",

diff --git a/src/components/bot.js b/src/components/bot.js
@@ -26,6 +26,7 @@ module.exports = {
       }
     },
     botAnalyze: function(yaolings) {
+
       for (var i = 0; i < yaolings.length; i++) {
         var ti = yaolings[i];
 
@@ -35,13 +36,13 @@ module.exports = {
           2000313, // 银角小妖
           2000327, // 小蝙蝠
           2000265, // 香玉
-          2000238 // 颜如玉
+          2000238, // 颜如玉
         ];
 
         if (FILTER_BOT.indexOf(ti.sprite_id) === -1) {
           continue;
         }
-
+        
         var time = new Date() - new Date(ti.gentime * 1000);
         var second = time / 1000;
         var minute = Math.floor(second / 60);
@@ -51,14 +52,14 @@ module.exports = {
 
         var yaoling_hash = ti.gentime.toString() + ti.latitude.toString();
 
-        if (this.botChecked.indexOf(yaoling_hash) === -1) {
+        if (this.botChecked.indexOf(yaoling_hash) >= 0) {
           continue;
-        }
-
+        } 
+        
         this.botChecked.push(yaoling_hash);
-        var yl = this.getYaoling(ti.sprite_id);
+        var yl = this.getYaolingById(ti.sprite_id);
 
-        geocoder = new qq.maps.Geocoder({
+        var geocoder = new qq.maps.Geocoder({
           complete: result => {
             var pois = result.detail.nearPois,
               pos;

diff --git a/src/index.js b/src/index.js
@@ -6,11 +6,18 @@
 import Vue from 'vue';
 window.$ = window.jQuery = require('jquery');
 import App from './App';
-import Element from 'element-ui';
+import { Button, Switch, Notification } from 'element-ui';
 import './index.less';
-import '../node_modules/element-ui/lib/theme-chalk/index.css';
+import 'element-ui/lib/theme-chalk/button.css';
+import 'element-ui/lib/theme-chalk/switch.css';
+import 'element-ui/lib/theme-chalk/notification.css';
+import 'element-ui/lib/theme-chalk/icon.css';
 
-Vue.use(Element, { size: 'medium' });
+Vue.prototype.$ELEMENT = { size: 'medium' };
+Vue.prototype.$notify = Notification;
+
+Vue.use(Button);
+Vue.use(Switch);
 
 let vueapp = new Vue({
   el: '#root',