|
@@ -301,8 +301,12 @@ import {
|
|
switchCompany,
|
|
switchCompany,
|
|
getWeather,
|
|
getWeather,
|
|
} from '@/api/home.js';
|
|
} from '@/api/home.js';
|
|
-import { getCompanyDataByPhone, wxLogin , checkHasUserInfo, checkLoginNew } from '@/service/user.js';
|
|
|
|
-
|
|
|
|
|
|
+import {
|
|
|
|
+ getCompanyDataByPhone,
|
|
|
|
+ wxLogin,
|
|
|
|
+ checkHasUserInfo,
|
|
|
|
+ checkLoginNew,
|
|
|
|
+} from '@/service/user.js';
|
|
|
|
|
|
wepy.page({
|
|
wepy.page({
|
|
store,
|
|
store,
|
|
@@ -318,6 +322,7 @@ wepy.page({
|
|
showCard: {},
|
|
showCard: {},
|
|
spaceParam: {},
|
|
spaceParam: {},
|
|
weather: {},
|
|
weather: {},
|
|
|
|
+ iii: 1,
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
...mapState({
|
|
...mapState({
|
|
@@ -462,7 +467,7 @@ wepy.page({
|
|
console.log("home----onLoad");
|
|
console.log("home----onLoad");
|
|
checkLoginNew()
|
|
checkLoginNew()
|
|
.then(() => {
|
|
.then(() => {
|
|
- console.log("触发了")
|
|
|
|
|
|
+
|
|
checkHasUserInfo();
|
|
checkHasUserInfo();
|
|
//获取项目list
|
|
//获取项目list
|
|
getCompanyDataByPhone()
|
|
getCompanyDataByPhone()
|
|
@@ -503,7 +508,8 @@ wepy.page({
|
|
},
|
|
},
|
|
onShow() {
|
|
onShow() {
|
|
console.log("home----onShow");
|
|
console.log("home----onShow");
|
|
- // checkHasUserInfo();
|
|
|
|
|
|
+ this.loadData();
|
|
|
|
+
|
|
},
|
|
},
|
|
});
|
|
});
|
|
</script>
|
|
</script>
|