有考勤规则无工作城市设置也进入打卡页面

pages/attendance/index.vue

@@ -7,6 +7,7 @@
         <span>{{ obj.title }}</span>
         <span v-if="obj.timeOut && !obj.ready" class="over">请补卡</span>
         <span v-if="obj.ready" class="right">已打卡</span>
+        <span v-if="!obj.timeOut && !obj.ready" >{{ obj.beginValue }}</span>
       </div>
     </div>
     <uni-list class="list_wrap">

pages/index.vue

@@ -70,18 +70,23 @@ export default {
   onLoad: function () { },
   methods: {
     async addendanceClick() {
+      // 无考勤规则-无需打卡
       if (!this.$store.getters.user.ruleId) {
         return this.$modal.msgError("您无需打卡");
-      }
-      const result = await this.$store.getters.location
-      console.log('首页-获取地理位置', result)
-      // 判断用户位置和获取位置-城市是否一致
-      if (result.addressComponent.city.startsWith(this.$store.getters.user.workCityName)) {
-        // 跳转到打卡页面
-        this.$tab.navigateTo('/pages/attendance/index')
       } else {
-        // 不一致，提示
-        this.$modal.msgError("工作地点与定位地点不同");
+        // 有工作城市
+        if (this.$store.getters.location.addressComponent) {
+          // 定位城市是否一致
+          if (this.$store.getters.location.addressComponent.city.startsWith(this.$store.getters.user.workCityName)) {
+            // 跳转到打卡页面
+            this.$tab.navigateTo('/pages/attendance/index')
+          } else {
+            this.$modal.msgError("工作地点与定位地点不同");
+          }
+        } else {
+          // 无工作城市-有考勤规则
+          this.$tab.navigateTo('/pages/attendance/index')
+        }
       }
     }
   }

pages/login.vue

@@ -50,7 +50,7 @@ export default {
       register: false,
       globalConfig: getApp().globalData.config,
       loginForm: {
-        username: "wangxiaolu_csjl",
+        username: "wangxiaolu_ceshi2",
         password: "123456",
         // code: "",
         uuid: ''

store/getters.js

@@ -7,17 +7,6 @@ const getters = {
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
   delayTime: state => 3000, // 延迟弹窗关闭时间
-  location: (state) => {
-    // 发现有则返回，没有则获取并赋予
-    return new Promise(async (resolve, reject) => {
-      if (state.map.location) {
-        resolve(state.map.location)
-      } else {
-        const result = await store.dispatch('GetLocation')
-        state.map.location = result
-        resolve(location) 
-      }
-    })
-  }
+  location: (state) => state.map.location
 }
 export default getters