diff --git a/pages/api.js b/pages/api.js
index 69d80bf..10cc47f 100644
--- a/pages/api.js
+++ b/pages/api.js
@@ -58,3 +58,19 @@ export function tempSaveCheckOut(data) {
     data: data,
   });
 }
+export function getResidentInfo(query) {
+  return request({
+    url: "/apartment/manager/resideInfoByIdCard",
+    method: "get",
+    params: query,
+  });
+}
+
+// 强制清退
+export function forceRelease(data) {
+  return request({
+    url: "/mz/forcedeviction/add",
+    method: "post",
+    data: data,
+  });
+}
\ No newline at end of file
diff --git a/pagesA/checkout/detail/detail.vue b/pagesA/checkout/detail/detail.vue
index 518dc01..88bda08 100644
--- a/pagesA/checkout/detail/detail.vue
+++ b/pagesA/checkout/detail/detail.vue
@@ -4,7 +4,7 @@ import { detail } from '@/api/mz/contract';
     <!-- 房间图片 -->
     <image
       class="room-img"
-      src="/static/img/login-top.png"
+      :src="info.houseTypeCoverImg"
       mode="aspectFill"
     ></image>
     <!-- 基本信息卡片 -->
@@ -90,6 +90,7 @@ import { detail } from '@/api/mz/contract';
     <view class="section-card">
       <view class="section-title">图片/视频</view>
       <u-upload
+        accept="all"
         :fileList="fileList"
         @afterRead="afterRead"
         @delete="deletePic"
@@ -269,14 +270,14 @@ export default {
 }
 .room-img {
   width: 100vw;
-  height: 220rpx;
+  height: 400rpx;
   object-fit: cover;
   display: block;
 }
 .info-card {
   background: #fff;
   border-radius: 20rpx;
-  margin: -40rpx 24rpx 16rpx 24rpx;
+  // margin: -40rpx 24rpx 16rpx 24rpx;
   padding: 24rpx 24rpx 12rpx 24rpx;
   box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
   position: relative;
diff --git a/pagesA/checkout/list/list.vue b/pagesA/checkout/list/list.vue
index 318161f..5350da1 100644
--- a/pagesA/checkout/list/list.vue
+++ b/pagesA/checkout/list/list.vue
@@ -11,8 +11,8 @@
       <u-list-item v-for="item in list" :key="item.chooseRoomRecId">
         <view class="checkout-card" @click="goDetail(item)">
           <image
-            v-if="item.houseTypeImages && item.houseTypeImages.length > 0"
-            :src="item.houseTypeImages[0].url || ''"
+            v-if="item.houseTypeCoverImg"
+            :src="item.houseTypeCoverImg || ''"
             class="room-img"
             mode="aspectFill"
           ></image>
@@ -116,6 +116,7 @@ export default {
         telephone: item.telephone, // 联系电话
         checkInDate: item.checkInDate,
         checkOutDate: item.checkOutDate, // 居住日期
+        houseTypeCoverImg: item.houseTypeCoverImg,
       });
       uni.navigateTo({
         url: `/pagesA/checkout/detail/detail?houseId=${item.houseId}`,
diff --git a/pagesA/force/index/index.vue b/pagesA/force/index/index.vue
index aec5db9..9c96275 100644
--- a/pagesA/force/index/index.vue
+++ b/pagesA/force/index/index.vue
@@ -2,62 +2,87 @@
   <view>
     <view class="top-bg"></view>
     <view class="container">
-      <u-form :model="form" ref="uForm" label-width="120">
+      <u-form :model="form" ref="uForm" label-width="90">
         <view class="info-card">
-          <u-form-item label="房间" prop="room" required>
+          <u-form-item label="身份证号" prop="idCard">
             <u-input
-              v-model="form.room"
-              placeholder="请输入房间"
+              v-model="form.idCard"
+              placeholder="请输入身份证号"
               border="none"
-              input-align="right"
+              input-align="left"
+              suffixIcon="search"
+              suffixIconStyle="color: #909399"
+              @confirm="handleQuery"
             />
           </u-form-item>
         </view>
 
         <view class="info-card">
           <u-form-item label="姓名" prop="name" required>
-            <u-input
-              v-model="form.name"
+            <text style="text-align: right">{{ baseInfo.graduateName }}</text>
+            <!-- <u-input
+              v-model="baseInfo.graduateName"
               placeholder="请输入姓名"
               border="none"
               input-align="right"
-            />
+              :disabled="true"
+            /> -->
           </u-form-item>
-          <u-form-item label="身份证号" prop="idCard" required>
-            <u-input
-              v-model="form.idCard"
-              placeholder="请输入身份证号"
+          <u-form-item label="房间" prop="room" required>
+            <text style="text-align: right">{{ roomAllPath }}</text>
+            <!-- <u-input
+              v-model="roomAllPath"
+              placeholder="请输入房间"
               border="none"
               input-align="right"
-            />
+              :disabled="true"
+            /> -->
           </u-form-item>
+
           <u-form-item label="手机号" prop="phone" required>
-            <u-input
-              v-model="form.phone"
+            <text style="text-align: right">{{ baseInfo.telephone }}</text>
+            <!-- <u-input
+              v-model="baseInfo.telephone"
               placeholder="请输入手机号"
               border="none"
               input-align="right"
-            />
+              :disabled="true"
+            /> -->
           </u-form-item>
           <u-form-item
             label="退房日期"
             prop="leaveDate"
             required
-            @click="showDate = true"
+            @click="showDate = false"
           >
-            <u--input
-              v-model="form.leaveDate"
+            <text style="text-align: right">{{ baseInfo.checkOutTime }}</text>
+            <!-- <u--input
+              v-model="baseInfo.checkOutTime"
               placeholder="请选择退房日期"
               border="none"
               readonly
               input-align="right"
-            ></u--input>
+            ></u--input> -->
           </u-form-item>
+          <!-- <u-form-item
+            label="问题类型"
+            prop="problemType"
+            required
+            @click="showProblemTypePicker = true"
+          >
+            <u-input
+              v-model="form.problemType"
+              placeholder="请选择问题类型"
+              border="none"
+              input-align="right"
+              readonly
+            />
+          </u-form-item> -->
         </view>
         <view class="desc-card">
           <view class="label-des">说明</view>
           <u-textarea
-            v-model="descRemark"
+            v-model="forceCheckoutDesc"
             ref="textarea"
             placeholder="请输入内容（不超过500字）"
             maxlength="500"
@@ -67,6 +92,7 @@
           ></u-textarea>
           <view class="label-des">上传图片/视频</view>
           <u-upload
+            accept="all"
             :fileList="fileList"
             @afterRead="afterRead"
             @delete="deletePic"
@@ -74,7 +100,7 @@
             :maxCount="10"
             uploadIconColor="#12c3c3"
             uploadText="点击上传"
-            previewImage="true"
+            :previewImage="true"
           >
           </u-upload>
         </view>
@@ -95,12 +121,19 @@
         @confirm="onDateConfirm"
         @cancel="showDate = false"
       />
+      <u-picker
+        :show="showProblemTypePicker"
+        :columns="[problemTypeOptions]"
+        @confirm="onProblemTypeConfirm"
+        @cancel="showProblemTypePicker = false"
+        keyName="label"
+      />
     </view>
   </view>
 </template>
 
 <script>
-import { uploadImage } from "../../../pages/api";
+import { uploadImage, getResidentInfo, forceRelease } from "../../../pages/api";
 export default {
   data() {
     return {
@@ -115,6 +148,11 @@ export default {
         desc: "",
         imageUrl: "",
         pickerValue: "",
+        problemType: "",
+      },
+      forceCheckoutDesc: "",
+      baseInfo: {
+        roomId: "",
       },
       descRemark: "",
       fileList: [],
@@ -124,9 +162,31 @@ export default {
       maxDate: "2100-12-31",
       descStyle:
         "background:#f7f8fa;border-radius:12rpx;padding:24rpx;font-size:28rpx;color:#222;min-height:250rpx;box-sizing:border-box;",
+      problemTypeOptions: [
+        { label: "违法居住条款，故意破坏房间设施", value: 1 },
+      ],
+      showProblemTypePicker: false, // 控制选择器显示
     };
   },
+  computed: {
+    roomAllPath() {
+      const { apartmentName, buildingName, unitName, roomTypeName } =
+        this.baseInfo;
+      return `${apartmentName || ""}${buildingName || ""}${unitName || ""}${
+        roomTypeName || ""
+      }`;
+    },
+  },
   methods: {
+    handleQuery() {
+      getResidentInfo({ idCard: this.form.idCard }).then((res) => {
+        if (res.code === 200) {
+          console.log("查询结果:", res);
+          this.baseInfo = res.data;
+          this.baseInfo.roomId = res.data.roomId;
+        }
+      });
+    },
     // 上传前校验
     beforeRead(event) {
       // 可以在这里做文件大小、类型校验
@@ -180,14 +240,29 @@ export default {
       });
       this.img1 = arry;
     },
+    onProblemTypeConfirm(e) {
+      const selectedItem = e.value[0];
+      this.form.problemType = selectedItem.label; // 显示标签
+      this.form.problemTypeValue = selectedItem.value; // 保存值
+      this.showProblemTypePicker = false;
+    },
     submit() {
-      this.$refs.uForm.validate((valid) => {
-        if (valid) {
-          uni.showToast({ title: "提交成功", icon: "success" });
-          // 这里可以提交form数据到后端
-        } else {
-          uni.showToast({ title: "请完善表单", icon: "none" });
-        }
+      const params = {
+        // idCard: this.baseInfo.idCard,
+        chooseRoomRecId: this.baseInfo.chooseRecId,
+        checkOutType: 1, //0正常退房1强制退房
+        // questionType: this.form.problemTypeValue,
+        content: this.forceCheckoutDesc,
+        imageList: this.fileList, //退房检查图片
+      };
+      console.log(params, "params");
+
+      this.handleTempSave(params);
+      uni.showToast({ title: "提交成功", icon: "success" });
+    },
+    handleTempSave(params) {
+      forceRelease(params).then((res) => {
+        console.log(res);
       });
     },
   },