💊 修复我的投稿再未认领情况下加载错误问题

src/pages/dig/forms/submits.vue

@@ -113,7 +113,7 @@ import Tag from '@/components/display/Tag.vue';
 import Icon from '@/components/basic/Icon.vue';
 import DropdownMenu from '@/components/feedback/DropdownMenu.vue';
 import DropdownMenuItem from '@/components/feedback/DropdownMenuItem.vue';
-import VillageApi from '@/api/inhert/VillageApi';
+import VillageApi, { type VillageListItem } from '@/api/inhert/VillageApi';
 import { waitTimeOut } from '@imengyu/imengyu-utils';
 
 const searchText = ref('');
@@ -121,14 +121,26 @@ const filterStatus = ref(-100);
 const filterVillage = ref(0);
 
 const villageListLoader = useSimpleDataLoader(async () => {
-  const res = await VillageApi.getClaimedVallageList()
-  if (filterVillage.value == 0) 
-    filterVillage.value = res[0].villageId;
-  return res.map(item => ({
+  let res = [] as VillageListItem[];
+  try {
+    res = await VillageApi.getClaimedVallageList()
+  } catch (e) {
+    console.log(e);
+  }
+  const list = res.map(item => ({
     text: item.villageName,
     value: item.villageId!,
   }));
-}, true);
+  if (list.length == 0) {
+    list.push({
+      text: '未选择村社',
+      value: -100,
+    });
+  }
+  if (filterVillage.value == 0) 
+    filterVillage.value = list[0].value;
+  return list;
+}, false);
 const listLoader = useSimplePageListLoader<CommonInfoModel>(8, async (page, pageSize) => {
   await waitTimeOut(300);
   const res = await VillageInfoApi.getList({
@@ -143,7 +155,7 @@ const listLoader = useSimplePageListLoader<CommonInfoModel>(8, async (page, page
     list: res.list,
     total: res.total,
   };
-});
+}, false);
 function goDetail(item: CommonInfoModel) {
   navTo('common', { 
     id: item.id,
@@ -165,7 +177,8 @@ const { querys } = useLoadQuerys({
   villageVolunteerId: 0,
 }, async (querys) => {
   filterVillage.value = querys.villageId || 0;
-  listLoader.load(false, querys)
+  await villageListLoader.load()
+  await listLoader.load(false, querys)
 });
 
 watch(filterStatus, () => listLoader.reload())

src/pages/user/login.vue

@@ -67,10 +67,6 @@
         <Height :size="20" />
         <!-- #endif -->
         <Button type="default" block size="large" text="用户名密码登录" @click="type='mobile'" />
-
-        <FlexRow v-if="isTestEnv" position="absolute" :left="10" :bottom="10">
-          <CheckBox v-model="isTestCode" />
-        </FlexRow>
       </FlexCol>
     </FlexCol>
   </CommonRoot>
@@ -83,10 +79,9 @@ import { useAppInit } from '@/common/composeabe/AppInit';
 import { waitTimeOut } from '@imengyu/imengyu-utils';
 import { onMounted, ref } from 'vue';
 import { showError } from '@/common/composeabe/ErrorDisplay';
-import { alert, closeToast, confirm, toast } from '@/components/dialog/CommonRoot';
-import { checkAndGoBindVolunteer } from '../dig/forms/bind';
+import { closeToast, toast } from '@/components/dialog/CommonRoot';
 import { back } from '@/components/utils/PageAction';
-import AppCofig, { isTestEnv } from '@/common/config/AppCofig';
+import AppCofig from '@/common/config/AppCofig';
 import type { Rules } from 'async-validator';
 import FlexCol from '@/components/layout/FlexCol.vue';
 import Form from '@/components/form/Form.vue';
@@ -100,7 +95,6 @@ import CommonRoot from '@/components/dialog/CommonRoot.vue';
 import StatusBarSpace from '@/components/layout/space/StatusBarSpace.vue';
 import Image from '@/components/basic/Image.vue';
 import Text from '@/components/basic/Text.vue';
-import CheckBox from '@/components/form/CheckBox.vue';
 import MemoryTimeOut from '@/components/composeabe/MemoryTimeOut';
 import NavBar from '@/components/nav/NavBar.vue';
 
@@ -144,7 +138,6 @@ const fieldStyle = themeContext.useThemeStyle({
   marginBottom: '20rpx',
 });
 
-const isTestCode = ref(false);
 const tipBindWechat = new MemoryTimeOut('TipBindWechat', 1000 * 3600 * 72);
 
 async function loginWechat() {
@@ -160,18 +153,6 @@ async function loginWechat() {
       uni.getUserProfile({ desc: '用于完善会员资料' }),
     ])
 
-    //测试code功能
-    if (isTestCode.value) {
-      uni.setClipboardData({
-        data: res[0].code,
-      });
-      alert({
-        title: '测试登录',
-        content: '已复制登录信息到剪贴板\n' + JSON.stringify(res),
-      });
-      return;
-    }
-
     //登录微信
     await authStore.loginWechart(res[0].code, res[1]);
     toast({  type: 'success',content: '登录成功' });