From fc25cdfa0270da157287dbaf50da611b0208893d Mon Sep 17 00:00:00 2001
From: hejinfu1026 <18537720348@163.com>
Date: Fri, 14 Jan 2022 09:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8F=90=E5=89=8D?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=9F=8E=E5=B8=82=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=BC=96=E8=BE=91=E5=9C=B0=E5=9D=80=E6=97=B6?=
 =?UTF-8?q?=E7=AD=89=E5=BE=85=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/app.js        |  4 ++--
 pages/user/index.vue | 35 +++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/config/app.js b/config/app.js
index dfef6ad2..752d35e4 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,12 +1,12 @@
 
-let domain = 'https://xxx.xxx'
+let domain = 'xxx.xxx'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名
 	// #ifdef MP
 		HTTP_REQUEST_URL: domain,
 	// #endif
-	HTTP_ADMIN_URL:'https://xxx.xxx.xxx', //PC后台的API请求地址，上传图片用
+	HTTP_ADMIN_URL:'xxx.xxx.xxx', //PC后台的API请求地址，上传图片用
 	// #ifdef H5
 		//H5接口是浏览器地址
 		// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 8628b73c..59793d2e 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -125,22 +125,12 @@
 <script>
 	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	import Cache from '@/utils/cache';
-	import {
-		BACK_URL
-	} from '@/config/cache';
-	import {
-		getMenuList
-		// setVisit
-	} from '@/api/user.js';
-	import {
-		orderData
-	} from '@/api/order.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
+	import {BACK_URL} from '@/config/cache';
+	import {getMenuList} from '@/api/user.js';
+	import {orderData} from '@/api/order.js';
+	import {toLogin} from '@/libs/login.js';
+	import {getCity} from '@/api/api.js';
+	import {mapGetters} from "vuex";
 	// #ifdef H5
 	import Auth from '@/libs/wechat';
 	// #endif
@@ -218,6 +208,7 @@
 			that.$set(that, 'pageHeight', app.globalData.windowHeight);
 			// #endif
 			that.$set(that, 'MyMenus', app.globalData.MyMenus);
+			if (!this.$Cache.has('cityList')) this.getCityList();
 			if (that.isLogin == false) {
 				// #ifdef H5
 				toLogin()
@@ -355,6 +346,18 @@
 					this.openAuto()
 					// #endif
 				}
+			},
+			// 获取地址数据
+			getCityList: function() {
+				let that = this;
+				getCity().then(res => {
+					let oneDay = 24 * 3600 * 1000;
+					this.$Cache.setItem({
+						name: 'cityList',
+						value: res.data,
+						expires: oneDay * 7
+					}); //设置七天过期时间
+				})
 			}
 		}
 	}