@uxda/appkit 1.2.38 → 1.2.42

package/dist/appkit.css

@@ -966,7 +966,7 @@ page {
 }
 .rights-card {
   margin: 10px 15px 0px;
-  background: #FFF8F3;
+  background: #fff8f3;
   border-radius: 5px;
   box-shadow: 0px 5px 18.9px 2px rgba(0, 0, 0, 0.0509803922);
   padding: 15px 20px;
@@ -1010,7 +1010,7 @@ page {
   background: -webkit-linear-gradient(262.82deg, #353535 10.04%, #433f46 90.21%);
   background: linear-gradient(187.18deg, #353535 10.04%, #433f46 90.21%);
   border-radius: 27rpx;
-  color: #E7CAAD;
+  color: #e7caad;
   font-size: 24rpx;
   font-weight: 400;
   margin-left: 40rpx;
@@ -1274,7 +1274,7 @@ page {
 }
 .login-setting {
   position: fixed;
-  z-index: 10000;
+  z-index: 4;
   left: 12px;
   top: 10px;
   bottom: 10px;

package/dist/index.js

@@ -2,7 +2,7 @@ import { defineComponent, reactive, resolveComponent, openBlock, createBlock, wi
 import Taro, { useDidShow } from '@tarojs/taro';
 import '@nutui/nutui-taro';
 import dayjs from 'dayjs';
-import _ from 'lodash';
+import groupBy from 'lodash/groupBy';
 
 const _hoisted_1$n = { class: "token-line number" };
 const _hoisted_2$j = { class: "number" };
@@ -2158,9 +2158,7 @@ var script$9 = /* @__PURE__ */ defineComponent({
       const groups = consumptionGroups.value || [];
       data.forEach((d) => {
         const date = dayjs(d.time).format("YYYY-MM-DD");
-        let group = groups.find(
-          (g) => g.date === date
-        );
+        let group = groups.find((g) => g.date === date);
         if (!group) {
           group = {
             date,
@@ -2204,7 +2202,7 @@ var script$9 = /* @__PURE__ */ defineComponent({
         const { privileges, total } = data;
         const filterData = {
           total,
-          privileges: _.groupBy(privileges, "appCode")
+          privileges: groupBy(privileges, "appCode")
         };
         balance.value = filterData;
       });
@@ -3489,7 +3487,7 @@ function useHttp() {
         return false;
       },
       (raw) => {
-        if (raw.status > 500) {
+        if (raw.status > 500 && raw.status != 51014) {
           return true;
         }
         return false;
@@ -3820,7 +3818,7 @@ var script = /* @__PURE__ */ defineComponent({
         appCode: props.app || appkitOptions.app(),
         tenantId: appkitOptions.tenant()
       }).then((result) => {
-        if (result)
+        if (result === true)
           return;
         getLoginRule();
         showLoginRule.value = true;

package/package.json

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

package/src/balance/components/AccountView.vue

@@ -32,13 +32,23 @@
       <div class="rights-card" v-if="balance.privileges.corporateStar">
         <div class="title">企明星权益</div>
         <div class="list">
-          <div class="item star-item" v-for="(item, index) in balance.privileges.corporateStar" :key="index">
-            <div class="item-count"><span>{{ item.count }}</span><span>{{ item.unit }}</span></div>
+          <div
+            class="item star-item"
+            v-for="(item, index) in balance.privileges.corporateStar"
+            :key="index"
+          >
+            <div class="item-count">
+              <span>{{ item.count }}</span
+              ><span>{{ item.unit }}</span>
+            </div>
             <div class="item-title">
               <div>{{ item.title }}</div>
-              <div class="item-title-button" v-if="item.id"> 
+              <div class="item-title-button" v-if="item.id">
                 <div @click="gotoTrade(item)">超值换购</div>
-                <img class="button-icon" src="https://cdn.ddjf.com/static/images/bpms-workBench/button-hg.svg" />
+                <img
+                  class="button-icon"
+                  src="https://cdn.ddjf.com/static/images/bpms-workBench/button-hg.svg"
+                />
               </div>
             </div>
           </div>
@@ -54,7 +64,7 @@
         </div>
       </div>
     </div>
-  </div>  
+  </div>
   <nut-popup
     pop-class="consumption-rules-popup"
     v-model:visible="rulesPopupOpen"
@@ -96,10 +106,7 @@
   </nut-popup>
   <app-drawer v-model="secondBalanceOpen" title="收支明细">
     <div class="operation-box">
-      <div
-        class="operation-title spa-between"
-        :class="{ 'with-shadow': scrolled > 0 }"
-      >
+      <div class="operation-title spa-between" :class="{ 'with-shadow': scrolled > 0 }">
         <div class="search-time">
           <div class="title">收支明细</div>
           <div class="time" @click="openDateFilter" v-show="filtering.dateFrom">
@@ -128,11 +135,7 @@
           @scrolltolower="onReachBottom"
         >
           <div class="box" v-if="consumptionGroups.length > 0">
-            <div
-              class="box-detail"
-              v-for="(item, index) in consumptionGroups"
-              :key="index"
-            >
+            <div class="box-detail" v-for="(item, index) in consumptionGroups" :key="index">
               <div class="title number">{{ item.date }}</div>
               <div class="item" v-for="(it, i) in item.consumptions" :key="i">
                 <div class="item-type">
@@ -147,7 +150,7 @@
                       <div class="item-info-title">{{ it.title }}</div>
                     </div>
                     <div class="item-info-amount number">
-                      {{ it.收入还是支出 == "支出" ? "-" : "+" }}{{ it.amount }}
+                      {{ it.收入还是支出 == '支出' ? '-' : '+' }}{{ it.amount }}
                     </div>
                   </div>
                   <div class="item-detail-remark">{{ it.description }}</div>
@@ -164,47 +167,47 @@
 </template>
 
 <script lang="ts" setup>
-import Taro, { useDidShow } from "@tarojs/taro";
-import { computed, onMounted, reactive, ref, watch } from "vue";
-import { endpoints, useHttp } from "../api";
-import { 账户流水筛选项, Balance, ConsumptionGroup, 账户流水 } from "../types";
-import ConsumptionFilter from "./ConsumptionFilter.vue";
-import DateFilter from "./DateFilter.vue";
-import ConsumptionRules from "./ConsumptionRules.vue";
-import { AppDrawer, PageHeader, WithPaging } from "../../shared";
-import dayjs from "dayjs";
-import EmptyView from "../../shared/components/EmptyView.vue";
+import Taro, { useDidShow } from '@tarojs/taro'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import { endpoints, useHttp } from '../api'
+import { 账户流水筛选项, Balance, ConsumptionGroup, 账户流水 } from '../types'
+import ConsumptionFilter from './ConsumptionFilter.vue'
+import DateFilter from './DateFilter.vue'
+import ConsumptionRules from './ConsumptionRules.vue'
+import { AppDrawer, PageHeader, WithPaging } from '../../shared'
+import dayjs from 'dayjs'
+import EmptyView from '../../shared/components/EmptyView.vue'
 import Tip from './Tip.vue'
-import _ from "lodash";
+import groupBy from 'lodash/groupBy'
 
-const refreshing = ref(false);
+const refreshing = ref(false)
 
 type AccountViewProps = {
-  app: string;
-};
+  app: string
+}
 const props = withDefaults(defineProps<AccountViewProps>(), {
-  app: "",
-});
+  app: '',
+})
 
-const emit = defineEmits(["recharge", "trade"]);
+const emit = defineEmits(['recharge', 'trade'])
 
-const filterOpen = ref<boolean>(false);
+const filterOpen = ref<boolean>(false)
 
 // 规则说明弹窗
-const rulesPopupOpen = ref<boolean>(false);
+const rulesPopupOpen = ref<boolean>(false)
 
 const filtering = reactive<账户流水筛选项>({
-  账户类型: "全部",
-  收入还是支出: "全部",
-  交易类型: "全部",
-  权益类目: "",
-  dateFrom: "",
-  dateTo: "",
+  账户类型: '全部',
+  收入还是支出: '全部',
+  交易类型: '全部',
+  权益类目: '',
+  dateFrom: '',
+  dateTo: '',
   page: 1,
   pageSize: 20,
-});
+})
 
-const reachedLastPage = ref<boolean>(false);
+const reachedLastPage = ref<boolean>(false)
 
 /**
  * 全新搜索
@@ -212,25 +215,25 @@ const reachedLastPage = ref<boolean>(false);
  */
 function restartSearch() {
   // 从第一页开始
-  filtering.page = 1;
-  consumptionGroups.value = [];
-  loadConsumptions();
+  filtering.page = 1
+  consumptionGroups.value = []
+  loadConsumptions()
 }
 
 // 时间筛选
-const datePickerOpen = ref<boolean>(false);
+const datePickerOpen = ref<boolean>(false)
 
 function openDateFilter() {
-  datePickerOpen.value = true;
+  datePickerOpen.value = true
 }
 
 const dateRangeDisplay = computed(() => {
-  let startTime = filtering.dateFrom?.replace(/-/g, ".").substring(2);
-  let endTime = filtering.dateTo?.replace(/-/g, ".").substring(2);
-  return startTime + " - " + endTime;
-});
+  let startTime = filtering.dateFrom?.replace(/-/g, '.').substring(2)
+  let endTime = filtering.dateTo?.replace(/-/g, '.').substring(2)
+  return startTime + ' - ' + endTime
+})
 
-const consumptionGroups = ref<ConsumptionGroup[]>([]);
+const consumptionGroups = ref<ConsumptionGroup[]>([])
 
 /**
  * 余额数据
@@ -238,39 +241,37 @@ const consumptionGroups = ref<ConsumptionGroup[]>([]);
 const balance = ref<Balance>({
   total: 0,
   privileges: {},
-});
+})
 
 useDidShow(() => {
   Taro.setNavigationBarTitle({
-    title: "我的账户",
-  });
-  loadBalance();
-});
+    title: '我的账户',
+  })
+  loadBalance()
+})
 
 function groupDataByDate(data: 账户流水[]): ConsumptionGroup[] {
   // 按照日期分组
-  const groups: ConsumptionGroup[] = consumptionGroups.value || [];
+  const groups: ConsumptionGroup[] = consumptionGroups.value || []
   // [
   //  date: '2023-10-1',
   //  consumptions: []
   // ]
   // 组装成按日期分组
   data.forEach((d) => {
-    const date = dayjs(d.time).format("YYYY-MM-DD");
-    let group: ConsumptionGroup | undefined = groups.find(
-      (g) => g.date === date
-    );
+    const date = dayjs(d.time).format('YYYY-MM-DD')
+    let group: ConsumptionGroup | undefined = groups.find((g) => g.date === date)
     if (!group) {
       group = {
         date,
         consumptions: [],
-      };
-      groups.push(group);
+      }
+      groups.push(group)
     }
-    group.consumptions.push(d);
-  });
-  groups.sort((a, b) => (a.date > b.date ? -1 : 1));
-  return groups;
+    group.consumptions.push(d)
+  })
+  groups.sort((a, b) => (a.date > b.date ? -1 : 1))
+  return groups
 }
 
 /**
@@ -279,35 +280,35 @@ function groupDataByDate(data: 账户流水[]): ConsumptionGroup[] {
  */
 async function loadConsumptions(append: boolean = false) {
   if (!append) {
-    consumptionGroups.value = [];
+    consumptionGroups.value = []
   }
-  const $http = useHttp();
+  const $http = useHttp()
   Taro.showLoading({
     title: `加载中...`,
     mask: true,
-  });
+  })
   $http
     .get<WithPaging<账户流水[]>>(endpoints.获取账户流水, {
       app: props.app,
       ...filtering,
     })
     .then((response) => {
-      consumptionGroups.value = groupDataByDate(response.data);
+      consumptionGroups.value = groupDataByDate(response.data)
       if (filtering.page >= response.totalPages) {
-        filtering.page = response.totalPages;
-        reachedLastPage.value = true;
+        filtering.page = response.totalPages
+        reachedLastPage.value = true
       } else {
-        reachedLastPage.value = false;
+        reachedLastPage.value = false
       }
-      Taro.hideLoading();
-    });
+      Taro.hideLoading()
+    })
 }
 
 /**
  * 获取账户余额明细
  */
 async function loadBalance() {
-  const $http = useHttp();
+  const $http = useHttp()
   $http
     .get<Balance>(endpoints.获取余额明细, {
       app: props.app,
@@ -316,63 +317,63 @@ async function loadBalance() {
       const { privileges, total } = data
       const filterData = {
         total,
-        privileges: _.groupBy(privileges, 'appCode')
+        privileges: groupBy(privileges, 'appCode'),
       }
-      balance.value = filterData;
-    });
+      balance.value = filterData
+    })
 }
 
 const onFilterComplete = (value) => {
-  filtering.账户类型 = value[0];
-  filtering.收入还是支出 = value[1];
-  filtering.交易类型 = value[2];
-  filtering.权益类目 = value[3];
-  filterOpen.value = false;
-  restartSearch();
-};
+  filtering.账户类型 = value[0]
+  filtering.收入还是支出 = value[1]
+  filtering.交易类型 = value[2]
+  filtering.权益类目 = value[3]
+  filterOpen.value = false
+  restartSearch()
+}
 
 const onDateFilterComplete = (value) => {
-  filtering.dateFrom = value.from;
-  filtering.dateTo = value.to;
-  datePickerOpen.value = false;
-  restartSearch();
-};
+  filtering.dateFrom = value.from
+  filtering.dateTo = value.to
+  datePickerOpen.value = false
+  restartSearch()
+}
 
 function gotoRecharge() {
-  emit("recharge");
+  emit('recharge')
 }
 
-function gotoTrade(item: any){
-  emit("trade", item);
+function gotoTrade(item: any) {
+  emit('trade', item)
 }
 
 function loadNextPage() {
-  filtering.page++;
-  loadConsumptions(true);
+  filtering.page++
+  loadConsumptions(true)
 }
 
 // 以下这一大段处理下拉刷新、上滑分页以及弹窗与页面滑动的逻辑
-const scrolled = ref<number>(0);
+const scrolled = ref<number>(0)
 
 /**
  * 记录 scroll-view 滚动的位置
  */
 const onScroll = (e) => {
-  const { scrollTop } = e;
-  scrolled.value = scrollTop;
-};
+  const { scrollTop } = e
+  scrolled.value = scrollTop
+}
 
 /**
  * 下拉刷新 pull down refresh
  */
 const onPullDownRefresh = () => {
-  refreshing.value = true;
+  refreshing.value = true
   // 重新请求余额数据
-  loadBalance();
+  loadBalance()
   setTimeout(() => {
-    refreshing.value = false;
-  }, 500);
-};
+    refreshing.value = false
+  }, 500)
+}
 
 /**
  * 滑动到底部请求下一页并合并查询结果
@@ -380,10 +381,10 @@ const onPullDownRefresh = () => {
 const onReachBottom = () => {
   console.log('到底了')
   if (reachedLastPage.value) {
-    return false;
+    return false
   }
-  loadNextPage();
-};
+  loadNextPage()
+}
 
 /**
  * 浮窗弹出时不允许
@@ -391,34 +392,29 @@ const onReachBottom = () => {
  * 2. 上滑分页
  */
 const isAnyPopupOpen = computed(() => {
-  return (
-    rulesPopupOpen.value ||
-    datePickerOpen.value ||
-    filterOpen.value ||
-    secondBalanceOpen.value
-  );
-});
+  return rulesPopupOpen.value || datePickerOpen.value || filterOpen.value || secondBalanceOpen.value
+})
 
-const secondBalanceOpen = ref<boolean>(false);
+const secondBalanceOpen = ref<boolean>(false)
 
 function onSecondBalanceButtonClick() {
-  secondBalanceOpen.value = true;
-  loadConsumptions();
+  secondBalanceOpen.value = true
+  loadConsumptions()
 }
 
 watch(secondBalanceOpen, () => {
   Taro.setNavigationBarColor({
-    frontColor: secondBalanceOpen.value ? "#000000" : "#ffffff",
-    backgroundColor: "#ffffff",
+    frontColor: secondBalanceOpen.value ? '#000000' : '#ffffff',
+    backgroundColor: '#ffffff',
     animation: {
       duration: 400,
-      timingFunc: "easeIn",
+      timingFunc: 'easeIn',
     },
-  });
-});
+  })
+})
 
 function onDateReset() {
-  resetDateRange();
+  resetDateRange()
 }
 
 /**
@@ -426,26 +422,26 @@ function onDateReset() {
  */
 function resetDateRange() {
   // 筛选的起止时间
-  filtering.dateTo = dayjs().format("YYYY-MM-DD");
-  filtering.dateFrom = dayjs().add(-3, "M").format("YYYY-MM-DD");
+  filtering.dateTo = dayjs().format('YYYY-MM-DD')
+  filtering.dateFrom = dayjs().add(-3, 'M').format('YYYY-MM-DD')
 }
 
 function onPageHeaderClose() {
   Taro.navigateBack({
     delta: 1,
-  });
+  })
 }
 
 onMounted(() => {
-  resetDateRange();
-});
+  resetDateRange()
+})
 </script>
 
 <style lang="scss">
 .account-view {
   height: 100vh;
   .scroll-content {
-    background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNzUwIiBoZWlnaHQ9IjQwNiIgdmlld0JveD0iMCAwIDc1MCA0MDYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGQ9Ik0zODIuNSA0MDcuNUM1NzcuMzU3IDQwNy41IDc1My43ODggMzgxLjI0OCA4ODEuNTIxIDMzOC43OTFDOTQ1LjM4NiAzMTcuNTYzIDk5Ny4xMDQgMjkyLjI3NiAxMDMyLjg3IDI2NC4xNzFDMTA2OC42MiAyMzYuMDcxIDEwODguNSAyMDUuMDk3IDEwODguNSAxNzIuNUMxMDg4LjUgMTM5LjkwMyAxMDY4LjYyIDEwOC45MjkgMTAzMi44NyA4MC44Mjg5Qzk5Ny4xMDQgNTIuNzI0NSA5NDUuMzg2IDI3LjQzNjcgODgxLjUyMSA2LjIwODk4Qzc1My43ODggLTM2LjI0ODIgNTc3LjM1NyAtNjIuNSAzODIuNSAtNjIuNUMxODcuNjQzIC02Mi41IDExLjIxMjIgLTM2LjI0ODIgLTExNi41MjIgNi4yMDg5OEMtMTgwLjM4NiAyNy40MzY3IC0yMzIuMTA0IDUyLjcyNDUgLTI2Ny44NjcgODAuODI4OUMtMzAzLjYyNCAxMDguOTI5IC0zMjMuNSAxMzkuOTAzIC0zMjMuNSAxNzIuNUMtMzIzLjUgMjA1LjA5NyAtMzAzLjYyNCAyMzYuMDcxIC0yNjcuODY3IDI2NC4xNzFDLTIzMi4xMDQgMjkyLjI3NiAtMTgwLjM4NiAzMTcuNTYzIC0xMTYuNTIyIDMzOC43OTFDMTEuMjEyMiAzODEuMjQ4IDE4Ny42NDMgNDA3LjUgMzgyLjUgNDA3LjVaIiBmaWxsPSIjM0IzOTNDIiBzdHJva2U9ImJsYWNrIi8+Cjwvc3ZnPgo=");
+    background-image: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNzUwIiBoZWlnaHQ9IjQwNiIgdmlld0JveD0iMCAwIDc1MCA0MDYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIGQ9Ik0zODIuNSA0MDcuNUM1NzcuMzU3IDQwNy41IDc1My43ODggMzgxLjI0OCA4ODEuNTIxIDMzOC43OTFDOTQ1LjM4NiAzMTcuNTYzIDk5Ny4xMDQgMjkyLjI3NiAxMDMyLjg3IDI2NC4xNzFDMTA2OC42MiAyMzYuMDcxIDEwODguNSAyMDUuMDk3IDEwODguNSAxNzIuNUMxMDg4LjUgMTM5LjkwMyAxMDY4LjYyIDEwOC45MjkgMTAzMi44NyA4MC44Mjg5Qzk5Ny4xMDQgNTIuNzI0NSA5NDUuMzg2IDI3LjQzNjcgODgxLjUyMSA2LjIwODk4Qzc1My43ODggLTM2LjI0ODIgNTc3LjM1NyAtNjIuNSAzODIuNSAtNjIuNUMxODcuNjQzIC02Mi41IDExLjIxMjIgLTM2LjI0ODIgLTExNi41MjIgNi4yMDg5OEMtMTgwLjM4NiAyNy40MzY3IC0yMzIuMTA0IDUyLjcyNDUgLTI2Ny44NjcgODAuODI4OUMtMzAzLjYyNCAxMDguOTI5IC0zMjMuNSAxMzkuOTAzIC0zMjMuNSAxNzIuNUMtMzIzLjUgMjA1LjA5NyAtMzAzLjYyNCAyMzYuMDcxIC0yNjcuODY3IDI2NC4xNzFDLTIzMi4xMDQgMjkyLjI3NiAtMTgwLjM4NiAzMTcuNTYzIC0xMTYuNTIyIDMzOC43OTFDMTEuMjEyMiAzODEuMjQ4IDE4Ny42NDMgNDA3LjUgMzgyLjUgNDA3LjVaIiBmaWxsPSIjM0IzOTNDIiBzdHJva2U9ImJsYWNrIi8+Cjwvc3ZnPgo=');
     background-position: center -200px;
     background-repeat: no-repeat;
   }
@@ -483,7 +479,7 @@ onMounted(() => {
     color: #e7caad;
     font-size: 12px;
     label {
-      background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTEwIDZMMTYgMTJMMTAgMThWNloiIGZpbGw9IiNFN0NBQUQiIHN0cm9rZT0iI0U3Q0FBRCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+Cjwvc3ZnPgo=");
+      background-image: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTEwIDZMMTYgMTJMMTAgMThWNloiIGZpbGw9IiNFN0NBQUQiIHN0cm9rZT0iI0U3Q0FBRCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+Cjwvc3ZnPgo=');
       padding-right: 18px;
       background-repeat: no-repeat;
       background-position: right center;
@@ -555,7 +551,7 @@ onMounted(() => {
   padding: 24px;
 }
 
-.operation-box{
+.operation-box {
   width: 100vw;
   overflow: hidden;
   display: flex;
@@ -613,7 +609,7 @@ onMounted(() => {
   .operation-list {
     flex: 1;
     width: 100%;
-    .operation-scroll{
+    .operation-scroll {
       height: calc(100vh - 130px);
       padding: 0 15px;
       box-sizing: border-box;
@@ -637,11 +633,7 @@ onMounted(() => {
           display: flex;
           margin-bottom: 10px;
           &-type {
-            background: linear-gradient(
-              113.95deg,
-              #f4e2ce 1.2%,
-              #debb9b 77.63%
-            );
+            background: linear-gradient(113.95deg, #f4e2ce 1.2%, #debb9b 77.63%);
             width: 30px;
             height: 30px;
             border-radius: 15px;
@@ -690,16 +682,16 @@ onMounted(() => {
     }
   }
 }
-.rights-card{
+.rights-card {
   margin: 10px 15px 0px;
-  background: #FFF8F3;
+  background: #fff8f3;
   border-radius: 5px;
-  box-shadow: 0px 5px 18.9px 2px #0000000D;
+  box-shadow: 0px 5px 18.9px 2px #0000000d;
   padding: 15px 20px;
-  .title{
+  .title {
     height: 25px;
     line-height: 25px;
-    background: rgba($color: #FF8320, $alpha: 0.3);
+    background: rgba($color: #ff8320, $alpha: 0.3);
     border-radius: 20px 50px 50px 0px;
     color: #353535;
     font-size: 12px;
@@ -707,38 +699,38 @@ onMounted(() => {
     padding-left: 5px;
     padding-right: 12px;
   }
-  .list{
+  .list {
     display: flex;
     flex-wrap: wrap;
-    .item{
+    .item {
       width: 50%;
       margin-top: 15px;
-      .item-count{
+      .item-count {
         font-size: 20px;
-        color:#353535;
+        color: #353535;
         font-weight: 700;
         line-height: 23px;
       }
-      .item-title{
+      .item-title {
         line-height: 23px;
         color: #987356;
         font-size: 11px;
         display: flex;
         align-items: center;
-        .item-title-button{
+        .item-title-button {
           padding: 0 27rpx;
           height: 54rpx;
           line-height: 54rpx;
           background: -webkit-linear-gradient(262.82deg, #353535 10.04%, #433f46 90.21%);
           background: linear-gradient(187.18deg, #353535 10.04%, #433f46 90.21%);
           border-radius: 27rpx;
-          color: #E7CAAD;
+          color: #e7caad;
           font-size: 24rpx;
           font-weight: 400;
           margin-left: 40rpx;
           display: flex;
           align-items: center;
-          .button-icon{
+          .button-icon {
             display: block;
             width: 24rpx;
             height: 24rpx;
@@ -748,7 +740,7 @@ onMounted(() => {
         }
       }
     }
-    .star-item{
+    .star-item {
       width: 100%;
     }
   }

package/src/notice/api/index.ts

@@ -54,7 +54,7 @@ function useHttp() {
         return false
       },
       (raw) => {
-        if (raw.status > 500) {
+        if (raw.status > 500 && raw.status != 51014) {
           return true
         }
         return false

package/src/notice/components/LoginSetting.vue

@@ -60,8 +60,8 @@ async function checkLoginTimeRule() {
       appCode: props.app || appkitOptions.app(),
       tenantId: appkitOptions.tenant(),
     })
-    .then((result) => {
-      if (result) return
+    .then((result: any) => {
+      if (result === true) return
 
       getLoginRule()
       showLoginRule.value = true
@@ -91,7 +91,7 @@ const emits = defineEmits(['show'])
 <style lang="scss">
 .login-setting {
   position: fixed;
-  z-index: 10000;
+  z-index: 4;
   left: 12px;
   top: 10px;
   bottom: 10px;

package/src/notice/components/NoticeView.vue

@@ -1,134 +0,0 @@
-<template>
-  <div class="notice-view">
-    <dd-search
-      :bordered="false"
-      :focus="false"
-      :value="query.title"
-      placeholder="请输入客户姓名搜索"
-      @search="onSearch"
-    />
-
-    <div class="h-full box-border">
-      <div class="wrapper box-border" v-if="list.length">
-        <scroll-view
-          class="content box-border"
-          :scroll-y="true"
-          :refresher-enabled="true"
-          :refresherTriggered="isRefresh"
-          @refresherrefresh="onRefresh"
-          :lower-threshold="100"
-          @scrolltolower="runNext"
-          bindscroll=""
-        >
-          <div
-            class="card box-border"
-            :class="{ active: item.isRead != '1' }"
-            v-for="(item, index) in list"
-            :key="index"
-            @click="notifyRead(item, index)"
-          >
-            <div class="point"></div>
-            <template v-if="appCode === 'loankit'">
-              <div class="time">
-                {{ formatMinutes(item.receiveTime) }}
-              </div>
-              <div class="text" :class="{ gray: item.isRead == '1' }">
-                {{ item.context }}
-              </div>
-            </template>
-            <template v-else>
-              <div class="time">
-                {{ formatMinutes(item.receiveTime) }}
-              </div>
-              <div class="text tit" :class="{ gray: item.isRead == '1' }">
-                {{ item.title }}
-              </div>
-              <div class="text" :class="{ gray: item.isRead == '1' }">
-                <rich-text style="white-space: pre-wrap" :nodes="item.context"></rich-text>
-              </div>
-            </template>
-          </div>
-          <div v-if="isLast" class="cue-text" style="padding-bottom: 40px">没有更多了</div>
-        </scroll-view>
-      </div>
-      <div v-else class="no-data h-full">
-        <div class="w-238px h-157px mt-105px mb-19px">
-          <img
-            class="w-full h-full"
-            src="https://cdn.ddjf.com/static/images/loan-manage/no-data.png"
-            alt=""
-          />
-        </div>
-        <div class="text">暂无记录</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, ref } from 'vue'
-import { useHttp } from '../api'
-import { useAppKitOptions } from '../../Appkit'
-import DdSearch from '../../components/dd-search/index.vue'
-
-const props = withDefaults(
-  defineProps<{
-    app: string
-  }>(),
-  {
-    app: '',
-  }
-)
-
-// 父组件事件
-const emits = defineEmits(['detail', 'close'])
-</script>
-
-<style lang="scss">
-.notice-banner {
-  height: 30px;
-  margin-bottom: 8px;
-  .dd-notice-bar {
-    position: relative;
-    background: #f2f3ff;
-    font-size: 10px;
-    color: #000000e5;
-    padding: 0 8px;
-    height: 0;
-    min-height: auto;
-    transition: all 0.2s;
-    opacity: 0;
-    &.show {
-      height: 30px;
-      opacity: 1;
-    }
-  }
-  &-icon {
-    width: 22px;
-    height: 22px;
-    margin-right: 8px;
-  }
-  .dd-notice-bar__close-img {
-    display: none;
-  }
-  .dd-notice-bar__close {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20' fill='none'%3E  %3Cpath d='M3.3335 3.33331L16.6668 16.6666' stroke='%23353535' stroke-width='1.66667' stroke-linecap='round' stroke-linejoin='round'/%3E  %3Cpath d='M3.3335 16.6666L16.6668 3.33331' stroke='%23353535' stroke-width='1.66667' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
-    background-position: center;
-    background-repeat: no-repeat;
-    background-size: 12px 12px;
-    opacity: 0.6;
-  }
-  &-text {
-    flex: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
-  }
-  &-btn {
-    color: #017fff;
-    padding-left: 6px;
-  }
-}
-</style>