From 847a80f251ee9045d83857375a51b3d9b147b7b2 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 25 Dec 2023 16:35:55 +0800
Subject: [PATCH] =?UTF-8?q?Style(=E9=A6=96=E9=A1=B5):=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E6=8E=88=E6=9D=83=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/wenwan.js        |  2 +-
 pages/home/index.vue | 71 --------------------------------------------
 utils/request.js     |  7 -----
 3 files changed, 1 insertion(+), 79 deletions(-)

diff --git a/api/wenwan.js b/api/wenwan.js
index a7d5a91..907a642 100644
--- a/api/wenwan.js
+++ b/api/wenwan.js
@@ -16,6 +16,6 @@ export function fetchStore(page, cityName, name) {
  * */
 export function fetchCity(type) {
     return request.get(`/wenwan/cityList/${type}`, {}, {
-        login: true
+        login: false
     })
 }
diff --git a/pages/home/index.vue b/pages/home/index.vue
index d425915..16a35fa 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -306,7 +306,6 @@
 <script>
 import {mapActions, mapGetters} from 'vuex';
 import {formatDateTime} from "@/utils";
-import config from '@/utils/mapConfig';
 
 import PromotionGood from '@/components/PromotionGood';
 import CouponWindow from '@/components/CouponWindow';
@@ -523,8 +522,6 @@ export default {
       this.getUnreadMsgList();
     }
 
-    //定位
-    this.getCurAddress();
     this.init();
     //获取团购商品
     this.getGroupGoods();
@@ -671,74 +668,6 @@ export default {
     msgConfirm: function () {
       that.$refs.popup.close();
     },
-    //获取当前定位地址
-    getCurAddress() {
-      let that = this;
-      uni.getLocation({
-        type: 'wgs84',
-        success: function (res) {
-          let latitude = res.latitude;
-          let longitude = res.longitude;
-
-          that.setLocation({
-            'latitude': latitude + '',
-            'longitude': longitude + ''
-          });
-
-          // #ifdef H5
-          Vue.jsonp(
-              'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' +
-              longitude + '&key=' +
-              config.key, {
-                //callbackName: 'QQmap',
-                output: 'jsonp',
-              }).then(json => {
-            // Success.
-            // uni.hideLoading();
-            that.cityName = json.result.ad_info.city;
-            //定位成功刷新数据
-            //if (that.activeIndex==0) {
-            that.getHotelList();
-            that.getShopList();
-            that.getRestaurantList();
-            //}
-
-          }).catch(err => {
-            // Failed.
-          })
-          // #endif
-
-          // #ifndef H5
-          uni.request({
-            url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' +
-                longitude +
-                '&key=' + config.key,
-            success: function (res) {
-              const address = res.data.result.ad_info
-              that.cityName = address.city;
-              let location = address.province + address.city + address.district;
-              uni.setStorageSync("location", location)
-
-              //定位成功刷新数据
-              //if (that.activeIndex==0) {
-              that.getHotelList();
-              that.getShopList();
-              that.getRestaurantList();
-              //}
-
-            },
-            fail: function (res) {
-            },
-            complete: function () {
-            }
-          });
-          // #endif
-        },
-        fail: function (err) {
-          console.log("home getCurAddress", err)
-        }
-      });
-    },
     getHotelList: function () {
       let that = this;
 
diff --git a/utils/request.js b/utils/request.js
index 5dd88d3..157e009 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -44,13 +44,6 @@ function baseRequest(options) {
     Authorization: "Bearer " + token
   }
 
-  // 如果需要登录才可访问的接口没有拿到 token 视为登录失效
-  if (options.login === true && !token) {
-    // 跳转到登录或授权页面
-    handleLoginFailure();
-    // 提示错误信息
-    return Promise.reject({ msg: "未登录", toLogin: true });
-  }
   // 结构请求需要的参数
   const { url, params, data, login, ...option } = options