浏览代码

feat: 首页定位

chenjj 1 周之前
父节点
当前提交
bee8461689
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 2 2
      pages/index.vue
  2. 7 2
      utils/adress.js

+ 2 - 2
pages/index.vue

@@ -128,7 +128,7 @@ const pages = ref({
 const cityClick = async () => {
 	const {latitude,longitude} = data.address;
 	const address = await chooseLocationInit({latitude,longitude});
-	data.address = address;
+	data.address = {...data.address,...address};
 	settingAddress();
 	console.log('address', address);
 }
@@ -245,7 +245,7 @@ const settingAddress = async() => {
 		}
 		const res = await settingHomeAddress(parmas);
 		console.log('res',res);
-		getList();
+		userType === '1' && getList();
 	} catch (error) {
 		console.log('设置地址失败',error);
 	}

+ 7 - 2
utils/adress.js

@@ -22,9 +22,14 @@ const chooseLocationInit = (data) => {
       ...data,
       success: function(res){
         console.log('111',res);
-        const result = splitAddress(res.address);
-        const handlecityData = getCityCode([result.province,result.city,result.district].join(' '))
+        if(res.address.name){
+          const result = splitAddress(res.address);
+          const handlecityData = getCityCode([result.province,result.city,result.district].join(' '))
           resolve({...res,cityCode:handlecityData})
+        }else{
+          resolve(data)
+        }
+        
         },
         fail: function(res){
           console.log('fail',res);