From f93c3c38cc6cb9c070b23ac7e537bc72847d46de Mon Sep 17 00:00:00 2001
From: Vion <leung@waynetechs.com>
Date: Thu, 20 Jan 2022 21:46:46 +0800
Subject: [PATCH] Pre-combine with JiaMin

---
 rc-busness/components/addressInput.vue      |  4 ++--
 rc-busness/config/async/fetch.js            | 12 +++++++++---
 rc-busness/pages/useraddress/addaddress.vue |  1 -
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue
index 4677f531..a7671802 100644
--- a/rc-busness/components/addressInput.vue
+++ b/rc-busness/components/addressInput.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="ts-area-picker-container">
-		<input class="ts-area-picker-value-displayer" placeholder="请选择收货地址" @focus="initAddress" v-model="displayValue"></input>
+		<input class="ts-area-picker-value-displayer" placeholder="请选择收货地址" @focus="popAddress" v-model="displayValue"></input>
 		<input type="hidden" :value="returnValue">
 		
 		<div class="ts-area-picker-desktop" v-if="show">
@@ -303,7 +303,7 @@ export default {
 		}
 	},
 	mounted(){
-
+		this.initAddress();
 	},
 	components:{
 
diff --git a/rc-busness/config/async/fetch.js b/rc-busness/config/async/fetch.js
index 2eafb5a5..6f8d8392 100644
--- a/rc-busness/config/async/fetch.js
+++ b/rc-busness/config/async/fetch.js
@@ -20,14 +20,20 @@ export default async(url = '', data = {}, type = 'GET', method = 'fetch') => {
   }
 
   if (window.fetch && method === 'fetch') {
+	let token='';
+	let tokenStr = localStorage.getItem("userInfo");
+	if(tokenStr){
+		tokenStr = JSON.parse(tokenStr);
+	if(tokenStr && tokenStr.xaccessToken)
+		token=tokenStr.xaccessToken;
+	}
     let requestConfig = {
-    
       method: type,
       headers: {
         // 'Accept': 'text/plain',
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
+		'x-access-token': token
       },
-
       mode: 'cors',
       // channelId:'H5@2021',
       cache: 'force-cache'
diff --git a/rc-busness/pages/useraddress/addaddress.vue b/rc-busness/pages/useraddress/addaddress.vue
index c6f6b3df..ccb10b74 100644
--- a/rc-busness/pages/useraddress/addaddress.vue
+++ b/rc-busness/pages/useraddress/addaddress.vue
@@ -52,7 +52,6 @@
 import Myheader from '~/components/header.vue'
 import addressInput from '~/components/addressInput.vue'
 import MyFooter from '~/components/rc-footer.vue'
-import addressInput from '~/components/addressInput.vue'
 export default {
   data() {
     return {