1

src/components/global/newHead.vue

@@ -29,15 +29,15 @@
 .CityChange .el-select .el-input__inner:focus {
   border: none;
 }
-.juanmei{
+.juanmei {
   width: 140px !important;
   cursor: pointer;
   padding-right: 40px;
 }
-.juanmei div{
+.juanmei div {
   text-align: right !important;
 }
-.juanmei img{
+.juanmei img {
   z-index: 1;
   position: absolute;
   top: -20px;
@@ -142,7 +142,7 @@
         <el-row class="_flex_center">
           <!-- 左 logo -->
           <el-col :span="5">
-            <img class="logo" src="../../assets/img/logo_t.png" alt>
+            <img class="logo" src="../../assets/img/logo_t.png" alt />
           </el-col>
           <!-- 中 搜索框 -->
           <el-col :span="2">
@@ -338,13 +338,17 @@
           <!-- 活动中心 -->
           <li :class="{_active: navActive === 9}" style="width: auto;">
             <div @click="handleSelect('/IceCreamTask', 9), navActive = 9">
-              <img style="z-index: -1;position: absolute;top: -27px;" src="../../assets/img/task/nav_bg.png" alt="">
-              <img src="../../assets/img/task/nav_text.png" alt="">
+              <img
+                style="z-index: -1;position: absolute;top: -27px;"
+                src="../../assets/img/task/nav_bg.png"
+                alt
+              />
+              <img src="../../assets/img/task/nav_text.png" alt />
             </div>
           </li>
           <li :class="{_active: navActive === 9}" class="juanmei">
             <div @click="handleSelect('', ), navActive = 9">
-              <img src="../../assets/img/task/juanmei.png" alt="">
+              <img src="../../assets/img/task/juanmei.png" alt />
             </div>
           </li>
         </ul>
@@ -414,12 +418,11 @@ export default {
             let cityname = this.cityText.slice(0, this.cityText.length - 1);
             if (this.sites.length > 0) {
               this.sites.forEach(item => {
-                if (item.siteName.indexOf(cityname) != -1) {
+                if (cityname.indexOf(item.siteName.replace("站", "")) != -1) {
                   //出现改字段
                   this.city = item.companyId;
                   window.localStorage.site = this.city;
                   window.localStorage.cityId = item.cityId;
-                  console.log(window.localStorage.cityId);
                 } else {
                 }
               });
@@ -493,31 +496,17 @@ export default {
     }
   },
   created() {
-    let _this = this;
-    //获取用户所在城市信息
-    //实例化城市查询类
-    var citysearch = new AMap.CitySearch();
-    //自动获取用户IP，返回当前城市
-    citysearch.getLocalCity(function(status, result) {
-      if (status === "complete" && result.info === "OK") {
-        if (result && result.city && result.bounds) {
-          var citybounds = result.bounds;
-          _this.cityText = result.city;
-          // document.getElementById('info').innerHTML = '您当前所在城市：'+cityinfo;
-          // //地图显示当前城市
-          // map.setBounds(citybounds);
+    let that = this;
+    require(["http://pv.sohu.com/cityjson?ie=utf-8"], () => {
+      setTimeout(() => {
+        if (returnCitySN) {
+          that.loadSites();
+          that.cityText = returnCitySN.cname;
+        } else {
+          that.loadSites();
         }
-      } else {
-      }
+      }, 1500);
     });
-    // let geolocation = location.initMap("map-container"); //定位
-    //   AMap.event.addListener(geolocation, "complete", result => {
-    //     console.log(result)
-    //     if(result.addressComponent.city){
-    //       this.cityText=result.addressComponent.city;
-    //     }
-    this.loadSites();
-    // });
     if (localStorage.g && localStorage.g != "undefined") {
       this.groupInfo = JSON.parse(localStorage.g);
     }

vue.config.js

@@ -10,8 +10,9 @@ module.exports = {
     devServer: {
       // host: 'www.B2B.com',
     },
-      externals: {
-        BMap: 'BMap'
-      }
+      externals:  [
+        'BMap',
+        require('webpack-require-http')
+      ]
     },
   }
\ No newline at end of file