Browse Source

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

chenzhen2 1 năm trước cách đây
mục cha
commit
8c9840713d

+ 2 - 3
src/api/home.js

@@ -57,9 +57,8 @@ export function getWeather(projectId) {
 export function confirmLogin({ qrCodeId }) {
   // /duoduo-service/duoduoenv-service/userNew/confirmLogin
   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'
   });
 }
 

+ 10 - 10
src/packagesEnv/pages/officehome/Header/space-basic.wpy

@@ -24,7 +24,7 @@
     <div class="room-bg">
         <div class="space-name">
             <div class="g-fl room-name">
-                <span class="name_text" v-if="isSpaceCanControl">{{officeData.localName}}</span>
+                <span class="name_text" v-if="isSpaceCanControlCopy">{{officeData.localName}}</span>
                 <span class="name_text" v-else>该空间不可调节</span>
                 <has-person
                     v-if="officeData.isPassengerPass !== undefined && IsShowPerson"
@@ -58,18 +58,18 @@ wepy.component({
     userInfo: Object
   },
   data: {
-    h5StaticPath: config.h5StaticPath + '/page-officehome/'
+    h5StaticPath: config.h5StaticPath + '/page-officehome/',
+    isSpaceCanControlCopy: true
   },
   computed: {},
-  methods: {
-
+  watch: {
+    isSpaceCanControl(val) {
+      console.log(val, '-----2222--isSpaceCanControl')
+      this.isSpaceCanControlCopy = val
+    },
+    immediate: true
   },
-    // 生命周期 - 创建完成(可以访问当前this实例)
-  created() {
-
-  },
-    // 生命周期 - 挂载完成(可以访问DOM元素)
-  mounted() {
+  methods: {
 
   }
 })

+ 1 - 4
src/packagesEnv/pages/officehome/index.wpy

@@ -1232,7 +1232,6 @@ wepy.page({
       if (this.userControlSpace.isControlSpace === 1 || this.userControlSpace.isControlSpace === 2 || !this.isUserControlFromMap) {
         flag = false
       }
-      console.log(flag, '----flag')
       return flag
     }
   },
@@ -1314,7 +1313,7 @@ wepy.page({
       } else {
         // 从首页进入
         await this.getCurrentSpace('home')
-        if (this.options.spaceId) {
+        if (this.options.spaceId !== '') {
           await this.getData()
         }
         let setAirtemp = this.$refs.airHandCard.airTemp
@@ -1608,11 +1607,9 @@ wepy.page({
     },
     getSpaceInfo() {
             // 空间信息
-      if (!this.options.spaceId) return
       const params = {
         criteria: {
           spaceId: this.options.spaceId
-                    // userId: 391
         },
         pubname: config.brsgServer.pubname,
         openid: this.userInfo.userId

+ 2 - 2
src/packagesEnv/pages/personalCenter/personalInfo.wpy

@@ -91,8 +91,8 @@ wepy.page({
         {name: '手机号', text: '', url: ''}
     ],
     nextArr: [
-        {name: '岗位', text: 'UX设计师'},
-        {name: '所属', text: '上格云智能技术有限公司'}
+        {name: '岗位', text: ''},
+        {name: '所属', text: ''}
     ]
   },
   computed: {},