@uxda/appkit 1.2.42 → 1.2.46

package/dist/index.js

@@ -3796,8 +3796,8 @@ var script = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const safeArea = useSafeArea();
-    const loginRule = ref({});
     const showLoginRule = ref(false);
+    const loginRuleTip = ref("");
     const style = computed(() => {
       let str = "";
       if (props.withTabbar) {
@@ -3808,7 +3808,7 @@ var script = /* @__PURE__ */ defineComponent({
       }
       return str;
     });
-    onMounted(() => {
+    useDidShow(() => {
       checkLoginTimeRule();
     });
     async function checkLoginTimeRule() {
@@ -3816,22 +3816,14 @@ var script = /* @__PURE__ */ defineComponent({
       const $http = useHttp();
       $http.post("/cas/sysUser/checkLoginTimeRule", {
         appCode: props.app || appkitOptions.app(),
-        tenantId: appkitOptions.tenant()
+        tenantId: appkitOptions.tenant(),
+        device: "mini"
       }).then((result) => {
         if (result === true)
           return;
-        getLoginRule();
+        loginRuleTip.value = result.message;
         showLoginRule.value = true;
-      });
-    }
-    async function getLoginRule() {
-      const appkitOptions = useAppKitOptions();
-      const $http = useHttp();
-      $http.get("/cas/sysUser/getLoginRule", {
-        appCode: props.app || appkitOptions.app()
-      }).then((result) => {
-        loginRule.value = result;
-        emits("show", { startTime: loginRule.value.startTime, endTime: loginRule.value.endTime });
+        emits("show", loginRuleTip.value);
       });
     }
     const emits = __emit;
@@ -3848,7 +3840,7 @@ var script = /* @__PURE__ */ defineComponent({
           createElementVNode(
             "div",
             _hoisted_2,
-            " \u4EC5\u53EF\u5728\u5DE5\u4F5C\u65E5" + toDisplayString(loginRule.value.startTime) + "-" + toDisplayString(loginRule.value.endTime) + "\u8FDB\u884C\u4E1A\u52A1\u64CD\u4F5C ",
+            toDisplayString(loginRuleTip.value),
             1
             /* TEXT */
           )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "1.2.42",
+  "version": "1.2.46",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/notice/components/LoginSetting.vue

@@ -5,16 +5,17 @@
       src="https://cdn.ddjf.com/static/images/nutshell/empty-permission.png"
     />
     <div class="login-setting-text">
-      仅可在工作日{{ loginRule.startTime }}-{{ loginRule.endTime }}进行业务操作
+      {{ loginRuleTip }}
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue'
+import { computed, ref } from 'vue'
 import { useHttp } from '../api'
 import { useAppKitOptions } from '../../Appkit'
 import { useSafeArea } from '../../shared/composables'
+import { useDidShow } from '@tarojs/taro'
 
 const props = withDefaults(
   defineProps<{
@@ -32,8 +33,8 @@ const props = withDefaults(
 )
 
 const safeArea = useSafeArea()
-const loginRule = ref<any>({})
 const showLoginRule = ref<boolean>(false)
+const loginRuleTip = ref('')
 
 const style = computed(() => {
   let str = ''
@@ -46,7 +47,7 @@ const style = computed(() => {
   return str
 })
 
-onMounted(() => {
+useDidShow(() => {
   checkLoginTimeRule()
 })
 
@@ -59,28 +60,16 @@ async function checkLoginTimeRule() {
     .post('/cas/sysUser/checkLoginTimeRule', {
       appCode: props.app || appkitOptions.app(),
       tenantId: appkitOptions.tenant(),
+      device: 'mini',
     })
     .then((result: any) => {
       if (result === true) return
 
-      getLoginRule()
-      showLoginRule.value = true
-    })
-}
-
-// 查询当前租户登录规则
-async function getLoginRule() {
-  const appkitOptions = useAppKitOptions()
+      loginRuleTip.value = result.message
 
-  const $http = useHttp()
-  $http
-    .get('/cas/sysUser/getLoginRule', {
-      appCode: props.app || appkitOptions.app(),
-    })
-    .then((result) => {
-      loginRule.value = result
+      showLoginRule.value = true
 
-      emits('show', { startTime: loginRule.value.startTime, endTime: loginRule.value.endTime })
+      emits('show', loginRuleTip.value)
     })
 }