Browse Source

Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-sagacare-weChat

anxiaoxia 1 year ago
parent
commit
050a25da78

+ 2 - 3
src/api/home.js

@@ -57,9 +57,8 @@ export function getWeather(projectId) {
 export function confirmLogin({ qrCodeId }) {
 export function confirmLogin({ qrCodeId }) {
   // /duoduo-service/duoduoenv-service/userNew/confirmLogin
   // /duoduo-service/duoduoenv-service/userNew/confirmLogin
   return $http({
   return $http({
-    url: `/userNew/confirmLogin/${qrCodeId}`,
-    method: 'GET',
-    serverSp: 'http://192.168.16.181:52009',
+    url: `/duoduo-service/duoduoenv-service/userNew/confirmLogin/${qrCodeId}`,
+    method: 'GET'
   });
   });
 }
 }
 
 

+ 1 - 1
src/packagesEnv/pages/administration/chooseIdentity.wpy

@@ -135,7 +135,7 @@ wepy.page({
   },
   },
   methods: {
   methods: {
     loginAdmin() {
     loginAdmin() {
-      confirmLogin({ qrCodeId: '1792589efd114af5a1493f1b05a22378' })
+      confirmLogin({ qrCodeId: this.qrCodeId })
         .then((res) => {
         .then((res) => {
           if (res.result == 'success') {
           if (res.result == 'success') {
             wx.navigateTo({
             wx.navigateTo({

+ 10 - 4
src/packagesEnv/pages/home/index.wpy

@@ -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>