update

src/pages/addAccount/index.vue

@@ -9,6 +9,8 @@ import XUpload from "../../components/XUpload.vue";
 import {reactive} from "vue";
 import {backPage, showToast} from "../../utils/uils.js";
 import {onLoad} from "@dcloudio/uni-app";
+import XDateRange from "../../components/XDateRange.vue";
+import XDateTime from "../../components/XDateTime.vue";
 
 const form = reactive({
     status: null,
@@ -67,6 +69,9 @@ onLoad((options) => {
             <x-form-item label="账号状态">
                 <x-select v-model:model-value="form.status" :api="Api.system.getAccountStatus"></x-select>
             </x-form-item>
+            <x-form-item label="恢复时间" v-if="form.status === 2">
+                <x-date-time :type="1" v-model:model-value="form.abnormaltime"></x-date-time>
+            </x-form-item>
             <x-form-item label="主页截图">
                 <x-upload v-model:files="form.homepage"></x-upload>
             </x-form-item>

src/pages/home/index.vue

@@ -104,7 +104,9 @@ onMounted(() => {
 
     <scroll-view
         @refresherpulling="initFetchData()"
-        @scrolltolower="pagination.page++"
+        @scrolltolower="() => {
+            console.log('触发')
+        }"
         class="h-[calc(100vh-200rpx)]"
         scroll-y>
         <view class="relative overflow-hidden bg-b-r !pb-[34rpx]">
@@ -160,7 +162,7 @@ onMounted(() => {
         <view class="!flex flex-col gap-[20rpx] !mt-[20rpx] !px-[20rpx]">
             <task-item v-for="i in vo.rows" :key="i.id" :data="i"></task-item>
 
-            <tui-loadmore v-if="loading" text="加载中..."></tui-loadmore>
+            <tui-loadmore v-if="loading" text="加载中..." :index="2"></tui-loadmore>
         </view>
     </scroll-view>
 </template>

src/pages/login/AccountLogin.vue

@@ -9,7 +9,7 @@ import {useUserStore} from "../../pinia/UserStore/index.js";
 const UserStore = useUserStore();
 
 const form = reactive({
-    mobile: '15709267061',
+    mobile: '17502997128',
     password: '123456',
 });
 

src/pages/taskDetails/index.vue

@@ -10,6 +10,7 @@ import Api from "../../api/index.js";
 import dayjs from "dayjs";
 import XPrompt from "../../components/XPrompt.vue";
 import {numberToCharacter} from "../../utils/uils.js";
+import AcceptAssignmentModal from "../../components/AcceptAssignmentModal.vue";
 
 // #ifdef APP-PLUS
 // #endif
@@ -348,11 +349,12 @@ onMounted(() => {
                 </view>
             </view>
 
-            <view
-                v-if="details.is_use === 0"
-                class="bg-[var(--primary-color)] rounded-[8rpx] py-[26rpx] text-[#fff] !flex justify-center items-center">
-                接受任务
-            </view>
+            <accept-assignment-modal v-if="details.is_use === 0" :details="details">
+                <view
+                    class="bg-[var(--primary-color)] rounded-[8rpx] py-[26rpx] text-[#fff] !flex justify-center items-center">
+                    接受任务
+                </view>
+            </accept-assignment-modal>
 
             <view
                 v-else