diff --git a/pages.json b/pages.json
index 1cbca2c..8915ba0 100644
--- a/pages.json
+++ b/pages.json
@@ -152,13 +152,15 @@
             "pages": [{
                     "path": "index",
                     "style": {
-                        "navigationBarTitleText": "上传走动式管理"
+                        "navigationBarTitleText": "上传走动式管理",
+                        "navigationBarBackgroundColor": "#E5EEFE"
                     }
                 },
                 {
                     "path": "statusPage",
                     "style": {
-                        "navigationBarTitleText": ""
+                        "navigationBarTitleText": "",
+                        "navigationBarBackgroundColor": "#E5EEFE"
                     }
                 },
                 {
@@ -211,7 +213,7 @@
                     "path": "mbwa",
                     "style": {
                         "navigationBarTitleText": "走动式管理",
-                        "navigationStyle": "custom"
+                        "navigationBarBackgroundColor": "#ffffff"
                     }
                 },
                 {
diff --git a/pages/mbwa/mbwa.vue b/pages/mbwa/mbwa.vue
index 0d75d82..11a2ee0 100644
--- a/pages/mbwa/mbwa.vue
+++ b/pages/mbwa/mbwa.vue
@@ -1,205 +1,221 @@
 <template>
   <view class="main">
-    <view class="top" :style="{ height: menu.bottom + 92 + 'px' }">
+    <!-- <view class="tabBox">
       <view
-        class="arrowBox"
-        :style="{ paddingTop: menu.top + 'px', height: menu.height + 'px' }"
-      >
-        <image
-          @click="handleBack"
-          class="img"
-          src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"
-        />
-
-        <picker
-          :value="selectIndex"
-          :range="selectServiceList"
-          @change="handleChangeService"
-          range-key="label"
-        >
-          <view class="selectServiceBox">
-            <image
-              class="serviceIcon"
-              src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/serviceIcon.png"
-            />
-            <view class="nameBox">
-              <span class="service">{{
-                selectServiceList[selectIndex].label
-              }}</span>
-              <image
-                class="moreIcon"
-                src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"
-              />
-            </view>
-          </view>
-        </picker>
-      </view>
-
-      <view class="timeBox">
-        <picker
-          class="timeSelect"
-          mode="date"
-          :value="$moment(searchTime).format('YYYY-MM-DD')"
-          :start="'2025-01-01'"
-          @change="handleGetTime"
-        >
-          <text>{{ searchTime || "" }}</text>
-        </picker>
-        <image
-          class="bottomArrow"
-          src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/bottomArrow.png"
-        />
-      </view>
-
-      <view class="TabsBox">
-        <view class="tabItemList">
-          <view
-            :class="selectFilter === 4 ? 'tabItem selectTabItem' : 'tabItem'"
-            @click="handleChangeSelect({ id: 4 })"
-          >
-            全部
-          </view>
-          <view
-            :class="selectFilter === 0 ? 'tabItem selectTabItem' : 'tabItem'"
-            @click="handleChangeSelect({ id: 0 })"
-          >
-            现场
-          </view>
-          <view
-            :class="selectFilter === 2 ? 'tabItem selectTabItem' : 'tabItem'"
-            @click="handleChangeSelect({ id: 2 })"
-          >
-            异常
-          </view>
-          <view
-            :class="selectFilter === 1 ? 'tabItem selectTabItem' : 'tabItem'"
-            @click="handleChangeSelect({ id: 1 })"
-          >
-            待我处理
-          </view>
-        </view>
+        :class="item.value === selectFilter ? 'tabItem selectTab' : 'tabItem'"
+        v-for="(item, index) in tabList"
+        :key="index"
+        @click="handleChangeSelect(item.value)"
+        >{{ item.label }}
       </view>
+    </view> -->
+    <view class="tabBox">
+      <MenuItem v-for="(item, index) in tabList" :key="index" :item="item" round="true" size="28"
+        :src="selectFilter == item.id ? item.active : item.src"
+        :nameStyle="selectFilter == item.id ? 'color:#5B96E9' : 'color:#808D97'" :imageBoxStyle="(selectFilter == item.id
+        ? 'background:#f0f7fe;'
+        : 'background:#f6f7f8;') +
+        'height:75rpx;width:75rpx;padding: 18rpx;'
+        " @handleClick="handleChangeSelect(item.id)">
+      </MenuItem>
     </view>
 
-    <scroll-view
-      class="contentBox"
-      :scroll-y="true"
-      :style="{ height: `calc(100vh - ${menu.bottom + 92}px)` }"
-      @scrolltolower="handleScrollBottom"
-      refresher-enabled="true"
-      :refresher-triggered="isRefreshing"
-      @refresherrefresh="handleRefresherRefresh"
-    >
+    <scroll-view class="scrollbox" :scroll-y="true" @scrolltolower="handleScrollBottom">
       <view class="dataList">
-        <view
-          class="dataItem"
-          v-for="(item, index) in dataList"
-          :key="index"
-          @click="handleGoDetail(item)"
-          :style="{
-            boxShadow:
-              item.SETTLEMENT_STATE === 0 || item.SETTLEMENT_STATE === 2
-                ? '0 0px 6rpx #f9b297'
-                : '',
-            marginTop: index === 0 ? '0px' : '',
-          }"
-        >
+        <view class="dataItem" v-for="(item, index) in dataList" :key="index" @click="handleGoDetail(item)">
           <div class="content-index">{{ index + 1 }}</div>
           <view class="itemRow">
             <view class="projectName">{{ item.template.title || "-" }}</view>
-            <view
-              class="stateName"
-              :style="{
-                color:
-                  item.extendObj.errorStatus === 0
-                    ? 'red'
-                    : item.extendObj.errorStatus === 1
-                    ? '#FF814FFF'
-                    : '',
-              }"
-              >{{
-                item.extendObj.errorStatus === 0
-                  ? "待处理"
-                  : item.extendObj.errorStatus === 1
-                  ? "处理中"
-                  : item.extendObj.errorStatus === 2
-                  ? "已处理"
-                  : "-"
-              }}</view
-            >
+            <view class="stateName" :style="{
+        color:
+          item.extendObj.errorStatus === 0
+            ? 'red'
+            : item.extendObj.errorStatus === 1
+              ? '#3B72FF'
+              : item.extendObj.errorStatus === 2
+                ? '#139942'
+                : '',
+      }">
+              {{
+        item.extendObj.errorStatus === 0
+          ? "待处理"
+          : item.extendObj.errorStatus === 1
+            ? "处理中"
+            : item.extendObj.errorStatus === 2
+              ? "已处理"
+              : ""
+      }}</view>
           </view>
-
           <view class="itemCenterRow" style="margin: 60rpx 0 20rpx">
-            <view class="value">{{ item.extendObj.uploadResult || "-" }}</view>
-            <view class="label">巡查内容</view>
-          </view>
+            <view class="value">{{
+          item.extendObj.uploadResult || "-"
+        }}</view>
 
+          </view>
           <view class="itemRow">
-            <view
-              class="leftName"
-              :style="{
-                color: item.extendObj.situation === 1 ? '#FF814FFF' : '',
-              }"
-              >{{
-                item.extendObj.situation === 0
-                  ? "正常"
-                  : item.extendObj.situation === 1
-                  ? "异常"
-                  : "-"
-              }}</view
-            >
+            <view class="leftName"></view>
             <!--          <view class="rightName">{{ $util.getMoney(item.REVENUE_AMOUNT) }}</view>-->
 
-            <view class="rightName"
-              >巡查时间：<span class="month">{{
-                item.submittedAt
-                  ? $moment(item.submittedAt).format("YYYY-MM-DD HH:mm:ss")
-                  : "-"
-              }}</span>
-            </view>
+            <view class="rightName"><span :style="{
+          color:
+            item.extendObj.situation === 0
+              ? '#139942'
+              : item.extendObj.situation === 1
+                ? '#F75031'
+                : ''
+        }">{{
+        item.extendObj.situation === 0
+          ? "正常情况"
+          : item.extendObj.situation === 1
+            ? "急需处理"
+            : "-"
+      }}</span> </view>
           </view>
 
           <view class="line"></view>
           <view class="itemRow">
-            <view class="leftName"
-              ><span class="radio" style="background: #44bea3"></span
-              >{{ item.serverPartName || "" }}</view
-            >
+            <view class="leftName"><span class="radio" style="background: #44bea3"></span>{{ item.userName || "-" }}
+            </view>
             <view class="rightName"></view>
           </view>
           <view class="itemRow">
-            <view class="leftName"
-              ><span class="radio" style="background: #398efe"></span
-              >{{ item.userName || "" }}</view
-            >
+            <view class="leftName"><span class="radio" style="background: #398EFE"></span>{{
+        item.createdAt
+          ? $moment(item.createdAt).format("YYYY-MM-DD HH:mm:ss")
+          : "-"
+      }}</view>
           </view>
         </view>
       </view>
+
+      <view class="dataList" v-if=false>
+        <view class="dataItem" v-for="(item, index) in dataList" :key="index" @click="handleGoDetail(item)">
+          <view class="dataTop">
+            <view class="topLeft">
+              <image class="itemIcon" src="/static/images/mbwa/fixed.svg" />
+              <span class="itemTitle">{{ item.template.title || "-" }}</span>
+            </view>
+            <view class="topRight" :style="{
+        color:
+          item.extendObj.errorStatus === 0
+            ? 'red'
+            : item.extendObj.errorStatus === 1
+              ? '#3B72FF'
+              : item.extendObj.errorStatus === 2
+                ? '#139942'
+                : '',
+      }">
+              {{
+        item.extendObj.errorStatus === 0
+          ? "待处理"
+          : item.extendObj.errorStatus === 1
+            ? "处理中"
+            : item.extendObj.errorStatus === 2
+              ? "已处理"
+              : ""
+      }}
+            </view>
+          </view>
+
+          <view class="dataBottom">
+            <view class="statusBox" :style="{
+          color:
+            item.extendObj.situation === 0
+              ? '#139942'
+              : item.extendObj.situation === 1
+                ? '#F75031'
+                : '',
+          background:
+            item.extendObj.situation === 0
+              ? '#EBF7EF'
+              : item.extendObj.situation === 1
+                ? '#FEF0ED'
+                : '',
+        }">{{
+        item.extendObj.situation === 0
+          ? "正常情况"
+          : item.extendObj.situation === 1
+            ? "急需处理"
+            : "-"
+      }}</view>
+
+            <view class="itemContent">{{
+          item.extendObj.uploadResult || "-"
+        }}</view>
+
+            <view class="userBox">
+              <text class="userName">{{ item.userName || "-" }}</text>
+              <text class="time">{{
+        item.createdAt
+          ? $moment(item.createdAt).format("YYYY-MM-DD HH:mm:ss")
+          : "-"
+      }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
       <view class="load-more" v-if="dataList && dataList.length > 0">
         <text>{{
           !isEnd ? "正在加载,请稍后..." : "——— 我是有底线的 ———"
-        }}</text>
+          }}</text>
       </view>
     </scroll-view>
   </view>
 </template>
 <script>
+import MenuItem from "@/components/menu/menuItem.vue";
 export default {
   data() {
     let stime = this.$util.cutDate(new Date(), "YYYY-MM-DD");
     return {
+      tabList: [
+        {
+          name: "全部",
+          src: "/static/images/expense/type/shenp.png",
+          active: "/static/images/expense/type/shenpz.png",
+          id: 1,
+        },
+        {
+          name: "正常",
+          src: "/static/images/expense/type/yichl.png",
+          active: "/static/images/expense/type/yichlz.png",
+          id: 2,
+        },
+        {
+          name: "异常",
+          src: "/static/images/expense/type/yifq.png",
+          active: "/static/images/expense/type/yifqz.png",
+          id: 3,
+        },
+        {
+          name: "待我处理",
+          src: "/static/images/expense/type/yichl.png",
+          active: "/static/images/expense/type/yichlz.png",
+          id: 4,
+        },
+        // { label: "全部", value: 1 },
+        // { label: "正常", value: 2 },
+        // { label: "异常", value: 3 },
+        // { label: "待我处理", value: 4 },
+      ],
+      selectFilter: 1, // 选择的tab
+
       menu: {}, //当前的手机样式
       searchTime: stime, // 查询的时间
       selectIndex: 0, // 选择的服务区
       selectServiceList: [], // 服务区列表
       selectServerpartObj: {}, // 选择的服务区对象 label value
-      selectFilter: 0, // 选择的tab
+
       dataList: [], // 下面的数据
       useInfo: {}, // 用户详情
       isEnd: false, // 判断是否到底了
       PageIndex: 1, // 默认的页数
     };
   },
+  components: {
+    MenuItem,
+  },
   onLoad() {
     this.menu = uni.getMenuButtonBoundingClientRect();
     let userInfo = uni.getStorageSync("vuex");
@@ -255,50 +271,75 @@ export default {
       uni.switchTab({ url: "/pages/index/index" });
     },
     // 改变tab
-    handleChangeSelect(obj) {
-      this.selectFilter = obj.id;
+    handleChangeSelect(value) {
+      this.selectFilter = value;
       this.dataList = [];
+      this.isEnd = false;
+      this.PageIndex = 1;
       this.handleGetDataList();
     },
     // 拿到滚动框里面的数据
     async handleGetDataList() {
+      console.log("this.selectFilter", this.selectFilter);
+      uni.showLoading({
+        title: "加载中...",
+      });
       const req = {
-        serverPartId: this.selectServiceList[this.selectIndex].value,
-        startTime: `${this.searchTime} 00:00:00`,
-        endTime: `${this.searchTime} 23:59:59`,
+        serverPartId: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        page: this.PageIndex,
+        pageSize: 10,
+        // serverPartId: this.selectServiceList[this.selectIndex].value,
+        // startTime: `${this.searchTime} 00:00:00`,
+        // endTime: `${this.searchTime} 23:59:59`,
         extend:
-          this.selectFilter === 4
+          this.selectFilter === 1
             ? undefined
-            : this.selectFilter === 0
-            ? [
+            : this.selectFilter === 2
+              ? [
                 {
                   key: "situation",
                   value: 0,
                 },
               ]
-            : this.selectFilter === 2
-            ? [
-                {
-                  key: "situation",
-                  value: 1,
-                },
-              ]
-            : undefined,
+              : this.selectFilter === 3
+                ? [
+                  {
+                    key: "situation",
+                    value: 1,
+                  },
+                ]
+                : this.selectFilter === 4
+                  ? [
+                    {
+                      key: "person.STAFF_NAME",
+                      value: this.useInfo.userData.UserName,
+                      //   this.useInfo.userData.UserId
+                    },
+                  ]
+                  : undefined,
 
-        any:
-          this.selectFilter === 1
-            ? [
-                {
-                  key: "userId",
-                  value:
-                    this.selectFilter === 1
-                      ? this.useInfo.userData.UserId
-                      : undefined,
-                },
-              ]
-            : undefined,
+        // any:
+        //   this.selectFilter === 4
+        //     ? [
+        //         {
+        //           key: "STAFF_NAME",
+        //           value: this.selectFilter === 4 ? "李玉" : undefined,
+        //         },
+        //         // {
+        //         //   key: "userId",
+        //         //   value:
+        //         //     this.selectFilter === 4
+        //         //       ? this.useInfo.userData.UserId
+        //         //       : undefined,
+        //         // },
+        //       ]
+        //     : undefined,
         // 1 待我处理,
       };
+      console.log("req", req);
+
       const data = await this.$request.$webNodePOST(
         `questionnaire-responses/search/many`,
         req
@@ -316,10 +357,13 @@ export default {
           }
           item.extendObj = extendObj;
         });
+      } else {
+        this.isEnd = true;
       }
 
       this.dataList = this.dataList.concat(list);
       console.log("this.dataList", this.dataList);
+      uni.hideLoading();
     },
     // 拿到服务区的数据
     async handleGetServerpartList() {
@@ -332,7 +376,7 @@ export default {
       );
       console.log("Info", data);
       const secondReq = {
-        ServerpartCodes: data.Result_Data.CityAuthority,
+        ServerpartCodes: data.Result_Data.CityAuthority || "",
         ServerpartType: 1000,
         StatisticsType: "1000,2000",
       };
@@ -355,186 +399,69 @@ export default {
 </script>
 <style lang="less" scoped>
 .main {
-  width: 100%;
+  width: 100vw;
   min-height: 100vh;
   background: #f5f7f9;
   box-sizing: border-box;
-  .top {
+
+  .tabBox {
     width: 100%;
-    background-image: url("https://eshangtech.com/ShopICO/yxcl/settlementApproval/pageBg.png");
-    background-repeat: no-repeat;
-    background-size: cover;
-    box-sizing: border-box;
-    padding: 0 32rpx;
-    z-index: 4;
-    position: relative;
-    .arrowBox {
-      width: 100%;
+    display: flex;
+    align-items: center;
+    background: #fff;
+
+    // width: 100%;
+    // height: 74rpx;
+    // box-sizing: border-box;
+    // padding: 16rpx 0 18rpx;
+    // display: flex;
+    // align-items: center;
+    // background: #ffffff;
+    .tabItem {
+      width: 25%;
       display: flex;
+      justify-content: center;
       align-items: center;
-      .img {
-        width: 48rpx;
-        height: 48rpx;
-      }
-      .selectServiceBox {
-        margin-left: 16rpx;
-        display: flex;
-        align-items: center;
-        .serviceIcon {
-          width: 80rpx;
-          height: 80rpx;
-          position: relative;
-          z-index: 2;
-        }
-        .nameBox {
-          font-family: "PingFangSC";
-          font-weight: 600;
-          font-size: 28rpx;
-          color: #160002;
-          line-height: 40rpx;
-          text-align: left;
-          font-style: normal;
-          padding: 12rpx 34rpx 12rpx 48rpx;
-          display: inline-block;
-          border-top-right-radius: 200rpx;
-          border-bottom-right-radius: 200rpx;
-          background: #fff;
-          transform: translateX(-20px);
-          .moreIcon {
-            width: 24rpx;
-            height: 24rpx;
-            margin-left: 14rpx;
-          }
-        }
-      }
+      font-family: "PingFangSC";
+      font-weight: 400;
+      font-size: 30rpx;
+      color: #010b18;
+      line-height: 40rpx;
+      font-style: normal;
     }
 
-    .timeBox {
-      height: 28px;
-      margin-top: 12px;
-      display: flex;
-      align-items: center;
-      .timeSelect {
-        display: flex;
-        align-items: center;
-        .monthNumber {
-          font-family: "DINAlternate";
-          font-size: 42rpx;
-          font-weight: bold;
-        }
-        .monthUnit {
-          margin-left: 4rpx;
-          font-family: "PingFangSC";
-          font-weight: 400;
-          font-size: 28rpx;
-          color: #242729;
-        }
-        .year {
-          font-family: "DINAlternate";
-          font-weight: 400;
-          font-size: 28rpx;
-          color: #786b6c;
-          line-height: 32rpx;
-          text-align: left;
-          font-style: normal;
-          margin-left: 8rpx;
-        }
-      }
-
-      .bottomArrow {
-        width: 32rpx;
-        height: 32rpx;
-        margin-left: 8rpx;
-      }
+    .selectTab {
+      position: relative;
     }
 
-    .TabsBox {
-      width: 100%;
-      height: 32px;
-      margin-top: 16px;
-      box-sizing: border-box;
-      display: flex;
-      align-items: center;
-      .tabItemList {
-        width: calc(100% - 140rpx);
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        height: 62rpx;
-        margin-right: 30rpx;
-        .tabItem {
-          display: inline-block;
-          font-family: PingFangSC, PingFang SC;
-          font-weight: 400;
-          font-size: 28rpx;
-          height: 62rpx;
-          color: #242729;
-          line-height: 40rpx;
-          text-align: left;
-          font-style: normal;
-        }
-        .selectTabItem {
-          font-family: PingFangSC, PingFang SC;
-          font-weight: 500;
-          font-size: 28rpx;
-          color: #fd7f21;
-          line-height: 40rpx;
-          text-align: left;
-          font-style: normal;
-          position: relative;
-        }
-        .selectTabItem:after {
-          content: "";
-          height: 6rpx;
-          position: absolute;
-          width: 100%;
-          left: 0;
-          bottom: 0;
-          background: #fd7f21;
-        }
-      }
-      .otherItem {
-        width: 110rpx;
-        height: 62rpx;
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #786b6c;
-        line-height: 40rpx;
-        text-align: left;
-        font-style: normal;
-        position: relative;
-        box-sizing: border-box;
-        display: flex;
-        justify-content: flex-end;
-        padding-left: 10rpx;
-        .filterIcon {
-          width: 32rpx;
-          height: 32rpx;
-          margin-right: 4rpx;
-          margin-top: 4rpx;
-        }
-      }
-      .otherItem:before {
-        content: "";
-        width: 1px;
-        height: 36rpx;
-        background: #e4e4e4;
-        position: absolute;
-        top: 0;
-        left: 0;
-      }
+    .selectTab::after {
+      content: "";
+      width: 2rem;
+      height: 6rpx;
+      background: #3b72ff;
+      position: absolute;
+      bottom: -18rpx;
+      left: 50%;
+      transform: translateX(-50%);
     }
   }
 
-  .contentBox {
-    width: 100%;
-    height: 100%;
-    background-color: #f3f3f3;
+  .scrollbox {
+    width: 100vw;
+    height: calc(100vh - 180rpx - 48rpx);
+    background: #f6f7f9;
+    box-sizing: border-box;
+    margin-top: 24rpx;
+    // padding: 0 32rpx;
+    padding-bottom: env(safe-area-inset-bottom);
+    /* 兼容 iOS 11.2+ */
+    padding-bottom: constant(safe-area-inset-bottom);
+
     .dataList {
       width: 100%;
       box-sizing: border-box;
       padding: 24rpx 24rpx 0;
+
       .dataItem {
         width: 100%;
         box-sizing: border-box;
@@ -542,8 +469,9 @@ export default {
         padding: 16rpx;
         margin: 24rpx 0;
         border-radius: 8rpx;
-        box-shadow: 0 0px 6rpx #e2e2e2;
+        box-shadow: 0 0px 6rpx #E2E2E2;
         position: relative;
+
         .content-index {
           width: 42rpx;
           height: 32rpx;
@@ -555,16 +483,18 @@ export default {
           position: absolute;
           top: 26rpx;
           left: -4rpx;
-          box-shadow: 4rpx 4rpx 2rpx 0 rgba(238, 112, 27, 0.5);
+          box-shadow: 4rpx 4rpx 2rpx 0 rgba(238, 112, 27, 0.5)
         }
+
         .itemRow {
           width: 100%;
           display: flex;
           align-items: center;
           justify-content: space-between;
+
           .projectName {
             width: 60%;
-            font-size: 28rpx;
+            font-size: 30rpx;
             height: 54rpx;
             overflow: hidden;
             text-overflow: ellipsis;
@@ -573,9 +503,11 @@ export default {
             box-sizing: border-box;
             padding-left: 40rpx;
           }
+
           .leftName {
             color: #686868;
             font-size: 24rpx;
+
             .radio {
               display: inline-block;
               width: 14rpx;
@@ -584,13 +516,16 @@ export default {
               margin: 0 8px 0 5px;
             }
           }
+
           .stateName {
             font-size: 28rpx;
             color: #999999;
           }
+
           .rightName {
             color: #686868;
             font-size: 24rpx;
+
             .radio {
               display: inline-block;
               width: 14rpx;
@@ -598,34 +533,37 @@ export default {
               border-radius: 14rpx;
               margin: 0 8px 0 5px;
             }
+
             .month {
               font-family: DINAlternate-Bold, DINAlternate;
             }
           }
         }
+
         .itemCenterRow {
           width: 100%;
           display: flex;
           flex-direction: column;
           align-items: center;
+
           .value {
             font-family: DINAlternate-Bold, DINAlternate;
-            font-size: 16px;
+            font-size: 28rpx;
             font-weight: 600;
             color: #ff814fff;
             width: 70%;
             display: -webkit-box;
-            -webkit-line-clamp: 2; /* 设置显示的行数 */
+            -webkit-line-clamp: 2;
+            /* 设置显示的行数 */
             -webkit-box-orient: vertical;
             overflow: hidden;
             text-overflow: ellipsis;
             text-align: center;
           }
-          .label {
-            font-size: 12px;
-            color: #999999;
-          }
+
+
         }
+
         .line {
           height: 2rpx;
           width: 100%;
@@ -635,13 +573,296 @@ export default {
         }
       }
     }
-    .load-more {
-      text-align: center;
-      width: 100%;
-      height: 80rpx;
-      color: #9999;
-      font-size: 24rpx;
-    }
   }
+
+  .scrollbox ::-webkit-scrollbar {
+    display: none;
+    width: 0;
+  }
+
+  //   .top {
+  //     width: 100%;
+  //     background-image: url("https://eshangtech.com/ShopICO/yxcl/settlementApproval/pageBg.png");
+  //     background-repeat: no-repeat;
+  //     background-size: cover;
+  //     box-sizing: border-box;
+  //     padding: 0 32rpx;
+  //     z-index: 4;
+  //     position: relative;
+  //     .arrowBox {
+  //       width: 100%;
+  //       display: flex;
+  //       align-items: center;
+  //       .img {
+  //         width: 48rpx;
+  //         height: 48rpx;
+  //       }
+  //       .selectServiceBox {
+  //         margin-left: 16rpx;
+  //         display: flex;
+  //         align-items: center;
+  //         .serviceIcon {
+  //           width: 80rpx;
+  //           height: 80rpx;
+  //           position: relative;
+  //           z-index: 2;
+  //         }
+  //         .nameBox {
+  //           font-family: "PingFangSC";
+  //           font-weight: 600;
+  //           font-size: 28rpx;
+  //           color: #160002;
+  //           line-height: 40rpx;
+  //           text-align: left;
+  //           font-style: normal;
+  //           padding: 12rpx 34rpx 12rpx 48rpx;
+  //           display: inline-block;
+  //           border-top-right-radius: 200rpx;
+  //           border-bottom-right-radius: 200rpx;
+  //           background: #fff;
+  //           transform: translateX(-20px);
+  //           .moreIcon {
+  //             width: 24rpx;
+  //             height: 24rpx;
+  //             margin-left: 14rpx;
+  //           }
+  //         }
+  //       }
+  //     }
+
+  //     .timeBox {
+  //       height: 28px;
+  //       margin-top: 12px;
+  //       display: flex;
+  //       align-items: center;
+  //       .timeSelect {
+  //         display: flex;
+  //         align-items: center;
+  //         .monthNumber {
+  //           font-family: "DINAlternate";
+  //           font-size: 42rpx;
+  //           font-weight: bold;
+  //         }
+  //         .monthUnit {
+  //           margin-left: 4rpx;
+  //           font-family: "PingFangSC";
+  //           font-weight: 400;
+  //           font-size: 28rpx;
+  //           color: #242729;
+  //         }
+  //         .year {
+  //           font-family: "DINAlternate";
+  //           font-weight: 400;
+  //           font-size: 28rpx;
+  //           color: #786b6c;
+  //           line-height: 32rpx;
+  //           text-align: left;
+  //           font-style: normal;
+  //           margin-left: 8rpx;
+  //         }
+  //       }
+
+  //       .bottomArrow {
+  //         width: 32rpx;
+  //         height: 32rpx;
+  //         margin-left: 8rpx;
+  //       }
+  //     }
+
+  //     .TabsBox {
+  //       width: 100%;
+  //       height: 32px;
+  //       margin-top: 16px;
+  //       box-sizing: border-box;
+  //       display: flex;
+  //       align-items: center;
+  //       .tabItemList {
+  //         width: calc(100% - 140rpx);
+  //         display: flex;
+  //         align-items: center;
+  //         justify-content: space-between;
+  //         height: 62rpx;
+  //         margin-right: 30rpx;
+  //         .tabItem {
+  //           display: inline-block;
+  //           font-family: PingFangSC, PingFang SC;
+  //           font-weight: 400;
+  //           font-size: 28rpx;
+  //           height: 62rpx;
+  //           color: #242729;
+  //           line-height: 40rpx;
+  //           text-align: left;
+  //           font-style: normal;
+  //         }
+  //         .selectTabItem {
+  //           font-family: PingFangSC, PingFang SC;
+  //           font-weight: 500;
+  //           font-size: 28rpx;
+  //           color: #fd7f21;
+  //           line-height: 40rpx;
+  //           text-align: left;
+  //           font-style: normal;
+  //           position: relative;
+  //         }
+  //         .selectTabItem:after {
+  //           content: "";
+  //           height: 6rpx;
+  //           position: absolute;
+  //           width: 100%;
+  //           left: 0;
+  //           bottom: 0;
+  //           background: #fd7f21;
+  //         }
+  //       }
+  //       .otherItem {
+  //         width: 110rpx;
+  //         height: 62rpx;
+  //         font-family: PingFangSC, PingFang SC;
+  //         font-weight: 400;
+  //         font-size: 28rpx;
+  //         color: #786b6c;
+  //         line-height: 40rpx;
+  //         text-align: left;
+  //         font-style: normal;
+  //         position: relative;
+  //         box-sizing: border-box;
+  //         display: flex;
+  //         justify-content: flex-end;
+  //         padding-left: 10rpx;
+  //         .filterIcon {
+  //           width: 32rpx;
+  //           height: 32rpx;
+  //           margin-right: 4rpx;
+  //           margin-top: 4rpx;
+  //         }
+  //       }
+  //       .otherItem:before {
+  //         content: "";
+  //         width: 1px;
+  //         height: 36rpx;
+  //         background: #e4e4e4;
+  //         position: absolute;
+  //         top: 0;
+  //         left: 0;
+  //       }
+  //     }
+  //   }
+
+  //   .contentBox {
+  //     width: 100%;
+  //     height: 100%;
+  //     background-color: #f3f3f3;
+  //     .dataList {
+  //       width: 100%;
+  //       box-sizing: border-box;
+  //       padding: 24rpx 24rpx 0;
+  //       .dataItem {
+  //         width: 100%;
+  //         box-sizing: border-box;
+  //         background: #fff;
+  //         padding: 16rpx;
+  //         margin: 24rpx 0;
+  //         border-radius: 8rpx;
+  //         box-shadow: 0 0px 6rpx #e2e2e2;
+  //         position: relative;
+  //         .content-index {
+  //           width: 42rpx;
+  //           height: 32rpx;
+  //           line-height: 32rpx;
+  //           font-size: 24rpx;
+  //           color: #fff;
+  //           text-align: center;
+  //           background-color: #fb8b56;
+  //           position: absolute;
+  //           top: 26rpx;
+  //           left: -4rpx;
+  //           box-shadow: 4rpx 4rpx 2rpx 0 rgba(238, 112, 27, 0.5);
+  //         }
+  //         .itemRow {
+  //           width: 100%;
+  //           display: flex;
+  //           align-items: center;
+  //           justify-content: space-between;
+  //           .projectName {
+  //             width: 60%;
+  //             font-size: 28rpx;
+  //             height: 54rpx;
+  //             overflow: hidden;
+  //             text-overflow: ellipsis;
+  //             white-space: nowrap;
+  //             color: #333333;
+  //             box-sizing: border-box;
+  //             padding-left: 40rpx;
+  //           }
+  //           .leftName {
+  //             color: #686868;
+  //             font-size: 24rpx;
+  //             .radio {
+  //               display: inline-block;
+  //               width: 14rpx;
+  //               height: 14rpx;
+  //               border-radius: 14rpx;
+  //               margin: 0 8px 0 5px;
+  //             }
+  //           }
+  //           .stateName {
+  //             font-size: 28rpx;
+  //             color: #999999;
+  //           }
+  //           .rightName {
+  //             color: #686868;
+  //             font-size: 24rpx;
+  //             .radio {
+  //               display: inline-block;
+  //               width: 14rpx;
+  //               height: 14rpx;
+  //               border-radius: 14rpx;
+  //               margin: 0 8px 0 5px;
+  //             }
+  //             .month {
+  //               font-family: DINAlternate-Bold, DINAlternate;
+  //             }
+  //           }
+  //         }
+  //         .itemCenterRow {
+  //           width: 100%;
+  //           display: flex;
+  //           flex-direction: column;
+  //           align-items: center;
+  //           .value {
+  //             font-family: DINAlternate-Bold, DINAlternate;
+  //             font-size: 16px;
+  //             font-weight: 600;
+  //             color: #ff814fff;
+  //             width: 70%;
+  //             display: -webkit-box;
+  //             -webkit-line-clamp: 2; /* 设置显示的行数 */
+  //             -webkit-box-orient: vertical;
+  //             overflow: hidden;
+  //             text-overflow: ellipsis;
+  //             text-align: center;
+  //           }
+  //           .label {
+  //             font-size: 12px;
+  //             color: #999999;
+  //           }
+  //         }
+  //         .line {
+  //           height: 2rpx;
+  //           width: 100%;
+  //           background-color: #eee;
+  //           margin-bottom: 18rpx;
+  //           margin-top: 16rpx;
+  //         }
+  //       }
+  //     }
+  //     .load-more {
+  //       text-align: center;
+  //       width: 100%;
+  //       height: 80rpx;
+  //       color: #9999;
+  //       font-size: 24rpx;
+  //     }
+  //   }
 }
 </style>
diff --git a/pages/walkAroundManager/detail.vue b/pages/walkAroundManager/detail.vue
index ec60a0a..6ff7cd7 100644
--- a/pages/walkAroundManager/detail.vue
+++ b/pages/walkAroundManager/detail.vue
@@ -1,80 +1,595 @@
 <template>
   <view class="main">
-    <div class="pageHeader">
-      <div class="hederContent">
-        <img :src="user.Membership_Headimage" alt="" />
-        <div>
-          <p>{{ detailObj.userName || "" }}</p>
-          <p class="fs12">巡查人员</p>
-        </div>
-      </div>
-    </div>
-
-    <div class="addressBox">
-      <div class="contentBox">
-        <image
-          src="/static/images/publicity/dingwei.png"
-          mode="aspectFit"
-          class="addressIcon"
-        ></image>
-        <div>
-          <p class="xuncha address">{{ detailObj.template.title || "-" }}</p>
-          <div>
-            <span>巡查时间：</span
-            ><span>{{
-              detailObj.createdAt
-                ? $moment(detailObj.createdAt).format("YYYY-MM-DD HH:mm:ss")
+    <scroll-view
+      class="pageScroll"
+      :style="{
+        height:
+          extendObj.errorStatus === 0 || extendObj.errorStatus === 1
+            ? 'calc(100% - 120rpx)'
+            : '100%',
+      }"
+      :scroll-y="true"
+    >
+      <view class="topContent">
+        <view class="placeBox">
+          <image class="itemIcon" src="/static/images/mbwa/fixed.svg" />
+          <view class="placeName">{{ detailObj.template.title || "-" }}</view>
+          <view
+            class="statusBox"
+            :style="{
+              color:
+                extendObj.situation === 0
+                  ? '#139942'
+                  : extendObj.situation === 1
+                  ? '#F75031'
+                  : '',
+              background:
+                extendObj.situation === 0
+                  ? '#EBF7EF'
+                  : extendObj.situation === 1
+                  ? '#FEF0ED'
+                  : '',
+            }"
+            >{{
+              extendObj.situation === 0
+                ? "正常情况"
+                : extendObj.situation === 1
+                ? "急需处理"
                 : "-"
-            }}</span>
+            }}</view
+          >
+
+          <!-- <view class="userBox">
+            <view class="userTop">
+              <text class="userName">{{ detailObj.userName || "" }}</text>
+              <text class="labelBox">巡查人员</text>
+            </view>
+            <view class="timeBox">
+              <image class="timeIcon" src="/static/images/mbwa/timeIcon.svg" />
+              <text class="nowTime">{{
+                detailObj.createdAt
+                  ? $moment(detailObj.createdAt).format("YYYY-MM-DD HH:mm:ss")
+                  : "-"
+              }}</text>
+            </view>
+          </view> -->
+        </view>
+
+        <view class="inspectionContent">
+          <view class="contentTop">
+            巡检内容<span class="required">*</span>
+          </view>
+          <view>
+            <textarea
+              v-model="uploadResult"
+              class="contentBoxResult"
+              placeholder="请输入巡查内容，并上传现场照片"
+              placeholderStyle="font-size: 24rpx;color: #CDCED1"
+              :auto-height="true"
+              disabled
+            ></textarea>
+          </view>
+
+          <view class="uploadImgBox">
+            <!-- <div class="submitImgBox" @click="submitImg">
+              <image
+                class="addIcon"
+                src="/static/images/mbwa/addImageIcon.svg"
+              />
+            </div> -->
+
+            <div class="imgItem" v-for="(item, index) in imgsList" :key="index">
+              <image
+                :src="item"
+                @tap="showImg2(index, imgsList)"
+                mode="aspectFill"
+              />
+              <!-- <view class="closeBox" @click.stop="deleteImgFunc(item, index)">
+                <image
+                  class="closeIcon"
+                  src="/static/images/mbwa/closeIcon.svg"
+                />
+              </view> -->
+            </div>
+          </view>
+        </view>
+      </view>
+
+      <view class="otherBox">
+        <view class="questionItem">
+          <view class="quetionTitle"
+            >情况类型<text class="required">*</text></view
+          >
+
+          <radio-group class="radioGroup" @change="handleChangeSituationType">
+            <label class="radioItem">
+              <view>
+                <radio
+                  color="#3B72FF"
+                  :value="'0'"
+                  :checked="0 === current"
+                  disabled
+                />
+              </view>
+              <view style="font-size: 24rpx">情况正常</view>
+            </label>
+            <label class="radioItem">
+              <view>
+                <radio
+                  color="#3B72FF"
+                  :value="'1'"
+                  :checked="1 === current"
+                  disabled
+                />
+              </view>
+              <view style="font-size: 24rpx">急需处理</view>
+            </label>
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="qusetionBox">
+        <!-- requestionRadioList -->
+        <!-- requestionCheckedList -->
+
+        <!-- 单选题 -->
+        <view v-if="requestionRadioList && requestionRadioList.length > 0">
+          <view
+            class="questionItem"
+            v-for="(item, index) in requestionRadioList"
+            :key="index"
+          >
+            <view class="quetionTitle"
+              >{{ item.question.title
+              }}<text class="required" v-if="item.isRequired">*</text></view
+            >
+
+            <view
+              class="checkedBottom"
+              v-if="item.isChecked && item.isChecked.length > 0"
+            >
+              <view
+                class="bottomItem"
+                style="margin-bottom: 0"
+                v-for="(subItem, subIndex) in item.isChecked"
+                :key="subIndex"
+              >
+                {{ subItem || "" }}
+                <!-- <image
+                  @click="handDeleteChecked(item, subItem)"
+                  class="closeIcon"
+                  src="/static/images/mbwa/closeIcon.svg"
+                /> -->
+              </view>
+            </view>
+
+            <!-- <radio-group
+              class="radioGroup"
+              v-if="
+                item.question &&
+                item.question.options &&
+                item.question.options.length > 0
+              "
+              @change="radioChange($event, item)"
+            >
+              <label
+                class="radioItem"
+                v-for="(subItem, subIndex) in item.question.options"
+                :key="subIndex"
+              >
+                <view>
+                  <radio
+                    color="#3B72FF"
+                    :value="subItem.text"
+                    :checked="subItem.isChecked"
+                    disabled
+                  />
+                </view>
+                <view style="font-size: 24rpx">{{ subItem.text }}</view>
+              </label>
+            </radio-group> -->
+          </view>
+        </view>
+
+        <view v-if="requestionCheckedList && requestionCheckedList.length > 0">
+          <view
+            class="requestionCheckedItem"
+            v-for="(item, index) in requestionCheckedList"
+            :key="index"
+          >
+            <!-- @click="handleShowCheckPopup(item)" -->
+            <view class="checkedTop">
+              <view class="topLeft">
+                {{ item.question.title || ""
+                }}<text class="required" v-if="item.isRequired">*</text>
+              </view>
+              <view class="topRight">
+                <!-- <text
+                  class="placeSelect"
+                  v-if="!(item.isChecked && item.isChecked.length > 0)"
+                  >请选择</text
+                >
+                <image
+                  class="rightArrow"
+                  src="/static/images/mbwa/rightArrow.svg"
+                /> -->
+              </view>
+            </view>
+            <view
+              class="checkedBottom"
+              v-if="item.isChecked && item.isChecked.length > 0"
+            >
+              <view
+                class="bottomItem"
+                v-for="(subItem, subIndex) in item.isChecked"
+                :key="subIndex"
+              >
+                {{ subItem.text || "" }}
+                <!-- <image
+                  @click="handDeleteChecked(item, subItem)"
+                  class="closeIcon"
+                  src="/static/images/mbwa/closeIcon.svg"
+                /> -->
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 只有异常的时候才会出现的巡检进度 -->
+      <view class="progressBox">
+        <view class="progress">
+          <view class="topBox">巡检进度</view>
+
+          <view class="progressContent">
+            <view class="progressItem">
+              <view class="itemLeft">
+                <image class="img" :src="user.Membership_Headimage" />
+                <image
+                  class="successIcon"
+                  src="/static/images/mbwa/successSmallIcon.svg"
+                />
+              </view>
+              <view class="itemRight">
+                <view class="itemTop">
+                  <text class="name">{{ detailObj.userName || "-" }}</text>
+                  <text class="time">{{
+                    detailObj.createdAt
+                      ? $moment(detailObj.createdAt).format(
+                          "YYYY-MM-DD HH:mm:ss"
+                        )
+                      : "-"
+                  }}</text>
+                </view>
+                <view class="itemBottom">{{ extendObj.uploadResult }}</view>
+              </view>
+            </view>
+
+            <view
+              class="progressItem"
+              style="margin-top: 40rpx"
+              v-if="extendObj.errorStatus >= 1"
+              @click="handleShowPopup(1)"
+            >
+              <view class="itemLeft">
+                <image class="img" :src="user.Membership_Headimage" />
+                <image
+                  class="successIcon"
+                  src="/static/images/mbwa/successSmallIcon.svg"
+                />
+              </view>
+              <view class="itemRight">
+                <view class="itemTop">
+                  <text class="name">{{
+                    extendObj.person.MEMBERSHIP_NAME || "-"
+                  }}</text>
+                  <text class="time">{{
+                    extendObj.suggestTime
+                      ? $moment(extendObj.suggestTime).format(
+                          "YYYY-MM-DD HH:mm:ss"
+                        )
+                      : "-"
+                  }}</text>
+                </view>
+                <view class="itemBottom">{{ extendObj.suggestion }}</view>
+              </view>
+            </view>
+
+            <view
+              class="progressItem"
+              style="margin-top: 40rpx"
+              v-if="extendObj.errorStatus === 2"
+              @click="handleShowPopup(2)"
+            >
+              <view class="itemLeft">
+                <image class="img" :src="user.Membership_Headimage" />
+                <image
+                  class="successIcon"
+                  src="/static/images/mbwa/successSmallIcon.svg"
+                />
+              </view>
+              <view class="itemRight">
+                <view class="itemTop">
+                  <text class="name">{{
+                    extendObj.person.MEMBERSHIP_NAME || "-"
+                  }}</text>
+                  <text class="time">{{
+                    extendObj.feedbackTime
+                      ? $moment(extendObj.feedbackTime).format(
+                          "YYYY-MM-DD HH:mm:ss"
+                        )
+                      : "-"
+                  }}</text>
+                </view>
+                <view class="itemBottom">{{ extendObj.feedbackContent }}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <view
+      class="bottomBtnBox"
+      v-if="
+        (extendObj.errorStatus === 0 ||
+          extendObj.errorStatus === 1 ||
+          feedbackStatus === 1 ||
+          feedbackStatus === 2) &&
+        isManager
+      "
+    >
+      <view class="bottomBtn" @click="handleAssign">{{
+        extendObj.errorStatus === 0 || feedbackStatus === 1
+          ? "指派"
+          : extendObj.errorStatus === 1 || feedbackStatus === 2
+          ? "反馈"
+          : ""
+      }}</view>
+    </view>
+
+    <uniPopup
+      ref="checkPopup"
+      type="bottom"
+      :show="isShowPopup"
+      @hidePopup="handleClosePopup"
+    >
+      <view class="popupBox">
+        <view class="contentTop">
+          <view class="left"></view>
+          <view class="center">{{
+            extendObj.errorStatus === 0 || feedbackStatus === 1
+              ? "指派"
+              : extendObj.errorStatus === 1 || feedbackStatus === 2
+              ? "反馈"
+              : ""
+          }}</view>
+          <view class="right" @click="handleClosePopup">
+            <image class="closeIcon" src="/static/images/mbwa/closeIcon.svg" />
+          </view>
+        </view>
+        <scroll-view class="checkPopupContent" :scroll-y="true">
+          <view
+            class="itemContent"
+            v-if="extendObj.errorStatus === 0 || feedbackStatus === 1"
+          >
+            <view class="title"
+              >异常处理人<text style="color: red">*</text></view
+            >
+
+            <view
+              class="anwersList"
+              v-if="
+                selectPersonList &&
+                selectPersonList.length > 0 &&
+                extendObj.errorStatus === 0
+              "
+            >
+              <view
+                class="anwersItem"
+                v-for="(item, index) in selectPersonList"
+                :key="index"
+                @click="handleSelectPerson(item)"
+              >
+                <view
+                  :class="item.isChecked ? 'anwers selectAnwersItem' : 'anwers'"
+                >
+                  {{ item.STAFF_NAME || "" }}</view
+                >
+              </view>
+            </view>
+
+            <view v-if="feedbackStatus === 1" class="anwersList">
+              <view class="anwersItem">
+                <view class="anwers selectAnwersItem">
+                  {{ extendObj.person.MEMBERSHIP_NAME || "" }}</view
+                >
+              </view>
+            </view>
+          </view>
+
+          <view
+            class="itemContent"
+            v-if="extendObj.errorStatus === 0 || feedbackStatus === 1"
+          >
+            <view class="title">整改意见<text style="color: red">*</text></view>
+            <div class="descBox">
+              <textarea
+                v-if="extendObj.errorStatus === 0"
+                auto-height
+                v-model="suggestion"
+                placeholder="请输入整改意见"
+                :disabled="extendObj.errorStatus !== 0"
+                style="text-align: left"
+                placeholderStyle="font-size: 28rpx;color: #CDCED1;text-align: left;"
+              ></textarea>
+              <view style="text-align: left" v-else>{{
+                extendObj.suggestion || ""
+              }}</view>
+            </div>
+          </view>
+
+          <view
+            class="itemContent"
+            v-if="extendObj.errorStatus === 1 || feedbackStatus === 2"
+          >
+            <view class="title">反馈图片<text style="color: red">*</text></view>
+
+            <view class="uploadImgBox">
+              <div
+                class="submitImgBox"
+                @click="submitImg"
+                v-if="feedbackStatus !== 2"
+              >
+                <image
+                  class="addIcon"
+                  src="/static/images/mbwa/addImageIcon.svg"
+                />
+              </div>
+
+              <div
+                class="imgItem"
+                v-for="(item, index) in feedbackImgList"
+                :key="index"
+              >
+                <image
+                  :src="item"
+                  @click="showImg2(index, feedbackImgList)"
+                  mode="aspectFill"
+                />
+                <view
+                  class="closeBox"
+                  @click.stop="deleteImgFunc(item, index)"
+                  v-if="feedbackStatus !== 2"
+                >
+                  <image
+                    class="closeIcon"
+                    src="/static/images/mbwa/closeIcon.svg"
+                  />
+                </view>
+              </div>
+            </view>
+          </view>
+
+          <view
+            class="itemContent"
+            style="margin-top: 40rpx"
+            v-if="extendObj.errorStatus === 1 || feedbackStatus === 2"
+          >
+            <view class="title">反馈结果<text style="color: red">*</text></view>
+            <div class="descBox">
+              <textarea
+                v-if="extendObj.errorStatus === 1"
+                auto-height
+                v-model="feedbackContent"
+                placeholder="请输入反馈内容"
+                :disabled="extendObj.errorStatus === 2"
+                style="text-align: left"
+                placeholderStyle="font-size: 28rpx;color: #CDCED1;text-align: left;"
+              ></textarea>
+
+              <view style="text-align: left" v-if="feedbackStatus === 2">{{
+                extendObj.feedbackContent || "-"
+              }}</view>
+            </div>
+          </view>
+        </scroll-view>
+
+        <view class="bottomBtnBox">
+          <view
+            class="bottomBtn"
+            v-if="extendObj.errorStatus === 0"
+            @click="handleGetUpdate"
+            >确定</view
+          >
+
+          <button
+            v-if="extendObj.errorStatus === 1"
+            class="bottomBtn"
+            @click="handleGetUpdate"
+          >
+            确定
+          </button>
+        </view>
+      </view>
+    </uniPopup>
+
+    <view v-if="false">
+      <div class="pageHeader">
+        <div class="hederContent">
+          <img :src="user.Membership_Headimage" alt="" />
+          <div>
+            <p>{{ detailObj.userName || "" }}</p>
+            <p class="fs12">巡查人员</p>
           </div>
         </div>
       </div>
-    </div>
 
-    <div class="formBox">
-      <ul>
-        <li>
-          <span :class="inputfocus ? 'circle' : 'circle'"></span>
-          <div class="examineContent">
-            <div class="titleBox">
-              <i :class="inputfocus ? 'img-zds activezds' : 'img-zds'"></i>
-              <div
-                :class="inputfocus ? 'titleTextActive' : 'titleText'"
-                style="display: flex"
-              >
-                <i style="color: red; margin-right: 5px">*</i>巡查内容
-              </div>
+      <div class="addressBox">
+        <div class="contentBox">
+          <image
+            src="/static/images/publicity/dingwei.png"
+            mode="aspectFit"
+            class="addressIcon"
+          ></image>
+          <div>
+            <p class="xuncha address">{{ detailObj.template.title || "-" }}</p>
+            <div>
+              <span>巡查时间：</span
+              ><span>{{
+                detailObj.createdAt
+                  ? $moment(detailObj.createdAt).format("YYYY-MM-DD HH:mm:ss")
+                  : "-"
+              }}</span>
             </div>
+          </div>
+        </div>
+      </div>
 
-            <div class="inputBox">
-              <textarea
-                auto-height
-                v-model="uploadResult"
-                placeholder="请输入巡查内容"
-                disabled
-              ></textarea>
-            </div>
-
-            <div class="tagList" v-for="(tags, i) in tagList" :key="i">
-              <div class="tagName">
-                <span
-                  style="display: inline-block; max-width: calc(100% - 10rpx)"
-                >
-                  {{ tags.question.title || "" }}
-                </span>
-                <span v-if="tags.isRequired" style="color: red">*</span>
-              </div>
-
-              <div class="tagsBox">
+      <div class="formBox">
+        <ul>
+          <li>
+            <span :class="inputfocus ? 'circle' : 'circle'"></span>
+            <div class="examineContent">
+              <div class="titleBox">
+                <i :class="inputfocus ? 'img-zds activezds' : 'img-zds'"></i>
                 <div
-                  v-for="(tag, s) in tags.choiceResponse"
-                  :key="s"
-                  class="tagUnit active"
+                  :class="inputfocus ? 'titleTextActive' : 'titleText'"
+                  style="display: flex"
                 >
-                  {{ tag }}
+                  <i style="color: red; margin-right: 5px">*</i>巡查内容
                 </div>
               </div>
-              <!-- <div class="tagsBox">
+
+              <div class="inputBox">
+                <textarea
+                  auto-height
+                  v-model="uploadResult"
+                  placeholder="请输入巡查内容"
+                  disabled
+                ></textarea>
+              </div>
+
+              <div class="tagList" v-for="(tags, i) in tagList" :key="i">
+                <div class="tagName">
+                  <span
+                    style="display: inline-block; max-width: calc(100% - 10rpx)"
+                  >
+                    {{ tags.question.title || "" }}
+                  </span>
+                  <span v-if="tags.isRequired" style="color: red">*</span>
+                </div>
+
+                <div class="tagsBox">
+                  <div
+                    v-for="(tag, s) in tags.choiceResponse"
+                    :key="s"
+                    class="tagUnit active"
+                  >
+                    {{ tag }}
+                  </div>
+                </div>
+                <!-- <div class="tagsBox">
                 <div
                   v-for="(tag, s) in tags.question.options"
                   :key="s"
@@ -84,141 +599,10 @@
                   {{ tag.text }}
                 </div>
               </div> -->
-            </div>
-          </div>
-        </li>
-
-        <li>
-          <span :class="imgfocus ? 'circle' : 'circle'"></span>
-          <div class="examineContent">
-            <div class="titleBox">
-              <i
-                :class="
-                  imgfocus
-                    ? 'img-upload activeupload'
-                    : 'img-upload activeupload'
-                "
-              ></i>
-              <div
-                style="display: flex"
-                :class="imgfocus ? 'titleTextActive' : 'titleTextActive'"
-              >
-                <i style="color: red; margin-right: 5px">*</i>现场图片
-              </div>
-            </div>
-            <div class="uploadBox">
-              <div
-                class="uploadList"
-                v-for="(item, index) in imgsList"
-                :key="index"
-              >
-                <image
-                  :src="item"
-                  @click="showImg2(index, imgsList)"
-                  mode="aspectFill"
-                />
-              </div>
-            </div>
-          </div>
-        </li>
-
-        <li>
-          <span
-            :class="
-              radiofocus
-                ? 'circle circleActive circle-last'
-                : 'circle circle-last'
-            "
-          >
-          </span>
-          <div class="examineContent">
-            <radio-group style="display: flex">
-              <label
-                class="uni-list-cell"
-                v-for="(item, index) in options"
-                :key="item.value"
-              >
-                <view>
-                  <radio
-                    :value="item.value"
-                    color="#409eff"
-                    :checked="index === current"
-                    style="transform: scale(0.8)"
-                    :disabled="true"
-                  />
-                </view>
-                <view>{{ item.name }}</view>
-              </label>
-            </radio-group>
-          </div>
-        </li>
-      </ul>
-
-      <view v-if="pageType === 'error' && extendObj.errorStatus >= 0">
-        <ul>
-          <li>
-            <span class="circle"> </span>
-            <div class="examineContent">
-              <div class="titleBox">
-                <div class="titleTextActive" style="display: flex">
-                  <i style="color: red; margin-right: 5px">*</i>异常处理人
-                </div>
-              </div>
-
-              <div class="inputBox" style="margin-top: 12rpx">
-                <picker
-                  v-if="extendObj.errorStatus === 0"
-                  :value="selectPersonIndex"
-                  :range="selectPersonList"
-                  @change="handleChangePerson"
-                  range-key="STAFF_NAME"
-                >
-                  {{
-                    selectPersonIndex === -1
-                      ? "--请选择处理人--"
-                      : selectPersonList[selectPersonIndex].STAFF_NAME
-                  }}
-                </picker>
-                <view v-else>{{ showPersonName || "" }}</view>
               </div>
             </div>
           </li>
-          <li>
-            <span :class="inputfocus ? 'circle' : 'circle'"></span>
-            <div class="examineContent">
-              <div class="titleBox">
-                <i class="img-zds"></i>
-                <div
-                  :class="inputfocus ? 'titleTextActive' : 'titleText'"
-                  style="display: flex"
-                >
-                  <i style="color: red; margin-right: 5px">*</i>整改意见
-                </div>
-              </div>
 
-              <div class="inputBox">
-                <textarea
-                  auto-height
-                  v-model="suggestion"
-                  placeholder="请输入整改意见"
-                  :disabled="extendObj.errorStatus !== 0"
-                ></textarea>
-              </div>
-            </div>
-          </li>
-        </ul>
-
-        <button
-          v-if="extendObj.errorStatus === 0"
-          class="btn"
-          @click="handleGetUpdate"
-        >
-          提交
-        </button>
-      </view>
-
-      <view v-if="pageType === 'error' && extendObj.errorStatus >= 1">
-        <ul>
           <li>
             <span :class="imgfocus ? 'circle' : 'circle'"></span>
             <div class="examineContent">
@@ -234,80 +618,213 @@
                   style="display: flex"
                   :class="imgfocus ? 'titleTextActive' : 'titleTextActive'"
                 >
-                  <i style="color: red; margin-right: 5px">*</i>反馈图片
+                  <i style="color: red; margin-right: 5px">*</i>现场图片
                 </div>
               </div>
               <div class="uploadBox">
                 <div
                   class="uploadList"
-                  v-for="(item, index) in feedbackImgList"
+                  v-for="(item, index) in imgsList"
                   :key="index"
                 >
-                  <span
-                    v-if="extendObj.errorStatus === 1"
-                    class="upload-file-remove"
-                    @click.stop="deleteImgFunc(item, index)"
-                    >×</span
-                  >
                   <image
                     :src="item"
-                    @click="showImg2(index, feedbackImgList)"
+                    @click="showImg2(index, imgsList)"
                     mode="aspectFill"
                   />
                 </div>
-
-                <div
-                  class="uploadAdd"
-                  @click="submitImg"
-                  v-if="extendObj.errorStatus === 1"
-                >
-                  <div class="upload-file-add-container">
-                    <span class="walk-manage-plus">+</span>
-                  </div>
-                </div>
               </div>
             </div>
           </li>
 
           <li>
-            <span :class="inputfocus ? 'circle' : 'circle'"></span>
+            <span
+              :class="
+                radiofocus
+                  ? 'circle circleActive circle-last'
+                  : 'circle circle-last'
+              "
+            >
+            </span>
             <div class="examineContent">
-              <div class="titleBox">
-                <i :class="inputfocus ? 'img-zds activezds' : 'img-zds'"></i>
-                <div
-                  :class="inputfocus ? 'titleTextActive' : 'titleText'"
-                  style="display: flex"
+              <radio-group style="display: flex">
+                <label
+                  class="uni-list-cell"
+                  v-for="(item, index) in options"
+                  :key="item.value"
                 >
-                  <i style="color: red; margin-right: 5px">*</i>反馈内容
-                </div>
-              </div>
-
-              <div class="inputBox">
-                <textarea
-                  auto-height
-                  v-model="feedbackContent"
-                  placeholder="请输入整改意见"
-                  :disabled="extendObj.errorStatus === 2"
-                ></textarea>
-              </div>
+                  <view>
+                    <radio
+                      :value="item.value"
+                      color="#409eff"
+                      :checked="index === current"
+                      style="transform: scale(0.8)"
+                      :disabled="true"
+                    />
+                  </view>
+                  <view>{{ item.name }}</view>
+                </label>
+              </radio-group>
             </div>
           </li>
+        </ul>
+
+        <view v-if="pageType === 'error' && extendObj.errorStatus >= 0">
+          <ul>
+            <li>
+              <span class="circle"> </span>
+              <div class="examineContent">
+                <div class="titleBox">
+                  <div class="titleTextActive" style="display: flex">
+                    <i style="color: red; margin-right: 5px">*</i>异常处理人
+                  </div>
+                </div>
+
+                <div class="inputBox" style="margin-top: 12rpx">
+                  <picker
+                    v-if="extendObj.errorStatus === 0"
+                    :value="selectPersonIndex"
+                    :range="selectPersonList"
+                    @change="handleChangePerson"
+                    range-key="STAFF_NAME"
+                  >
+                    {{
+                      selectPersonIndex === -1
+                        ? "--请选择处理人--"
+                        : selectPersonList[selectPersonIndex].STAFF_NAME
+                    }}
+                  </picker>
+                  <view v-else>{{ showPersonName || "" }}</view>
+                </div>
+              </div>
+            </li>
+            <li>
+              <span :class="inputfocus ? 'circle' : 'circle'"></span>
+              <div class="examineContent">
+                <div class="titleBox">
+                  <i class="img-zds"></i>
+                  <div
+                    :class="inputfocus ? 'titleTextActive' : 'titleText'"
+                    style="display: flex"
+                  >
+                    <i style="color: red; margin-right: 5px">*</i>整改意见
+                  </div>
+                </div>
+
+                <div class="inputBox">
+                  <textarea
+                    auto-height
+                    v-model="suggestion"
+                    placeholder="请输入整改意见"
+                    :disabled="extendObj.errorStatus !== 0"
+                  ></textarea>
+                </div>
+              </div>
+            </li>
+          </ul>
 
           <button
-            v-if="extendObj.errorStatus === 1"
+            v-if="extendObj.errorStatus === 0"
             class="btn"
             @click="handleGetUpdate"
           >
             提交
           </button>
-        </ul>
-      </view>
-    </div>
+        </view>
+
+        <view v-if="pageType === 'error' && extendObj.errorStatus >= 1">
+          <ul>
+            <li>
+              <span :class="imgfocus ? 'circle' : 'circle'"></span>
+              <div class="examineContent">
+                <div class="titleBox">
+                  <i
+                    :class="
+                      imgfocus
+                        ? 'img-upload activeupload'
+                        : 'img-upload activeupload'
+                    "
+                  ></i>
+                  <div
+                    style="display: flex"
+                    :class="imgfocus ? 'titleTextActive' : 'titleTextActive'"
+                  >
+                    <i style="color: red; margin-right: 5px">*</i>反馈图片
+                  </div>
+                </div>
+                <div class="uploadBox">
+                  <div
+                    class="uploadList"
+                    v-for="(item, index) in feedbackImgList"
+                    :key="index"
+                  >
+                    <span
+                      v-if="extendObj.errorStatus === 1"
+                      class="upload-file-remove"
+                      @click.stop="deleteImgFunc(item, index)"
+                      >×</span
+                    >
+                    <image
+                      :src="item"
+                      @click="showImg2(index, feedbackImgList)"
+                      mode="aspectFill"
+                    />
+                  </div>
+
+                  <div
+                    class="uploadAdd"
+                    @click="submitImg"
+                    v-if="extendObj.errorStatus === 1"
+                  >
+                    <div class="upload-file-add-container">
+                      <span class="walk-manage-plus">+</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </li>
+
+            <li>
+              <span :class="inputfocus ? 'circle' : 'circle'"></span>
+              <div class="examineContent">
+                <div class="titleBox">
+                  <i :class="inputfocus ? 'img-zds activezds' : 'img-zds'"></i>
+                  <div
+                    :class="inputfocus ? 'titleTextActive' : 'titleText'"
+                    style="display: flex"
+                  >
+                    <i style="color: red; margin-right: 5px">*</i>反馈内容
+                  </div>
+                </div>
+
+                <div class="inputBox">
+                  <textarea
+                    auto-height
+                    v-model="feedbackContent"
+                    placeholder="请输入整改意见"
+                    :disabled="extendObj.errorStatus === 2"
+                  ></textarea>
+                </div>
+              </div>
+            </li>
+
+            <button
+              v-if="extendObj.errorStatus === 1"
+              class="btn"
+              @click="handleGetUpdate"
+            >
+              提交
+            </button>
+          </ul>
+        </view>
+      </div>
+    </view>
   </view>
 </template>
-  
-  <script>
+
+<script>
 import { mapGetters } from "vuex";
+import uniPopup from "@/components/uni-popup";
 export default {
   data() {
     let nowTime = this.$util.cutDate(new Date(), "hh:mm:ss");
@@ -345,8 +862,18 @@ export default {
       feedbackContent: "", // 反馈内容
       feedbackImgList: [], // 反馈图片
       showPersonName: "", // 当状态过了 直接显示 名称
+
+      requestionRadioList: [], // 单选题
+      requestionCheckedList: [], // 多选题
+      isShowPopup: false,
+      selectPersonObj: {}, // 当前选择的派遣人
+      feedbackStatus: 0, // 回显的状态 1 为 管理员选整改的人 2 为反馈
+      isManager: false, // 判断是否出现指派按钮
     };
   },
+  components: {
+    uniPopup,
+  },
   computed: {
     ...mapGetters({
       user: "getUser",
@@ -365,6 +892,40 @@ export default {
     }
   },
   methods: {
+    // 回显内容
+    handleShowPopup(value) {
+      this.isShowPopup = true;
+      this.feedbackStatus = value;
+      console.log("this.feedbackStatus", this.feedbackStatus);
+
+      this.$forceUpdate();
+    },
+    // 新的选指派人
+    handleSelectPerson(obj) {
+      console.log("obj", obj);
+      let list = JSON.parse(JSON.stringify(this.selectPersonList));
+      let personObj = {};
+      list.forEach((item) => {
+        if (item.STAFF_ID === obj.STAFF_ID) {
+          item.isChecked = true;
+          personObj = item;
+        } else {
+          item.isChecked = false;
+        }
+      });
+      this.selectPersonList = list;
+      this.selectPersonObj = personObj;
+      console.log("this.selectPersonList", this.selectPersonList);
+    },
+    // 指派
+    handleAssign() {
+      this.isShowPopup = true;
+    },
+    // 关闭
+    handleClosePopup() {
+      this.isShowPopup = false;
+      this.feedbackStatus = 0;
+    },
     // 删除图片
     deleteImgFunc(item, index) {
       this.feedbackImgList.splice(index, 1);
@@ -387,10 +948,65 @@ export default {
         `questionnaire-responses/${id}`
       );
       let obj = data.data;
-      console.log("obj", obj);
       this.detailObj = obj;
-      this.tagList = obj.questionResponses;
+      console.log("this.detailObj", this.detailObj);
+
+      // requestionRadioList
+      // requestionCheckedList
+
+      // 这里是问题列表 我们稍微筛选一下
+      // 单选 必填
+      let radioRequiredList = [];
+      let radioList = [];
+      // 多选必填
+      let checkRequiredList = [];
+      let checkList = [];
+
+      let requestionList = obj.questionResponses;
+      if (requestionList && requestionList.length > 0) {
+        requestionList.forEach((item) => {
+          // type 是单选还是多选 questionType 是题目类型 暂时只有选择题
+          let [type, questionType] = item.question.type.split("_");
+          item.isChecked = item.choiceResponse;
+          if (item.question.options && item.question.options.length > 0) {
+            item.question.options.forEach((subItem) => {
+              if (item.choiceResponse.indexOf(subItem.text) !== -1) {
+                subItem.isChecked = true;
+              }
+            });
+          }
+
+          if (type === "radio") {
+            if (item.isRequired) {
+              radioRequiredList.push(item);
+            } else {
+              radioList.push(item);
+            }
+          } else if (type === "checked") {
+            if (item.isRequired) {
+              checkRequiredList.push(item);
+            } else {
+              checkList.push(item);
+            }
+          }
+        });
+      }
+      // 全部的单选题
+      let requestionRadioList = radioRequiredList.concat(radioList);
+      // 全部的多选题
+      let requestionCheckedList = checkRequiredList.concat(checkList);
+
+      this.requestionRadioList = requestionRadioList;
+      this.requestionCheckedList = requestionCheckedList;
+
+      console.log("this.requestionRadioList", this.requestionRadioList);
+      console.log("this.requestionCheckedList", this.requestionCheckedList);
+
+      // this.tagList = obj.questionnaireTemplateQuestions;
+
+      // this.tagList = obj.questionResponses;
       console.log("this.tagList", this.tagList);
+
       if (obj.extend) {
         let extend = JSON.parse(obj.extend);
         this.uploadResult = extend.uploadResult;
@@ -406,6 +1022,7 @@ export default {
           this.feedbackImgList = extend.feedbackImgList;
         }
       }
+
       console.log("this.extendObj", this.extendObj);
       // 获取处理人列表
       if (this.extendObj.errorStatus === 0) {
@@ -413,6 +1030,7 @@ export default {
       }
     },
     async handleGetPersonList() {
+      // 被指派的人
       const req = {
         SERVERPART_ID: this.detailObj.serverPartId,
         PROVINCE_CODE: this.user.ProvinceCode,
@@ -421,13 +1039,44 @@ export default {
 
       const data = await this.$request.$getMp("GetDealerList", req);
       console.log("handleGetPersonList", data);
+
+      // 指派他们的人
+      const managerReq = {
+        SERVERPART_ID: this.detailObj.serverPartId,
+        PROVINCE_CODE: this.user.ProvinceCode,
+        module_Guid: "ce6f442c-fbaa-4512-9754-44b563457dda",
+      };
+      console.log("req", req);
+
+      const managerData = await this.$request.$getMp(
+        "GetDealerList",
+        managerReq
+      );
+      console.log("req", req);
+      let managerList = managerData.Data.List;
+      let managerIdList = [];
+      if (managerList && managerList.length > 0) {
+        managerList.forEach((item) => {
+          managerIdList.push(item.MEMBERSHIP_ID);
+        });
+      }
+
       let list = data.Data.List;
+      console.log("managerList", managerList);
+      if (managerIdList.indexOf(this.user.Membership_Id) !== -1) {
+        this.isManager = true;
+      } else {
+        this.isManager = false;
+      }
+
+      // isManager
+
       this.selectPersonList = list;
     },
     async handleGetUpdate() {
       let req = {};
       if (this.extendObj.errorStatus === 0) {
-        if (this.selectPersonIndex === -1) {
+        if (!this.selectPersonObj) {
           uni.showToast({
             title: "请选择处理人！",
             icon: "none",
@@ -441,7 +1090,8 @@ export default {
           });
           return;
         }
-        let personObj = this.selectPersonList[this.selectPersonIndex];
+        // let personObj = this.selectPersonList[this.selectPersonIndex];
+        let personObj = this.selectPersonObj;
         console.log("personObj", personObj);
         req = {
           ...this.extendObj,
@@ -607,276 +1257,1009 @@ export default {
   },
 };
 </script>
-  
-  <style lang="less" scoped>
+
+<style lang="less" scoped>
 .main {
   width: 100%;
-  // height: 100vh;
+  height: 100vh;
   background-color: #fff;
   box-sizing: border-box;
-  padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS 11.2+ */
+  padding-bottom: env(safe-area-inset-bottom);
   padding-bottom: constant(safe-area-inset-bottom);
-  .pageHeader {
-    height: 120rpx;
+
+  .pageScroll {
     width: 100%;
-    background-color: rgb(246, 246, 246);
-    box-shadow: rgb(214, 207, 207) 4rpx 0px 20rpx;
-    background: url("../../static/images/mbwa/bj_logo.png") no-repeat bottom
-      right;
-    background-size: 34%;
-    padding-left: 30rpx;
+    height: calc(100% - 120rpx);
+    background-color: #f6f7f9;
     box-sizing: border-box;
-    .hederContent {
-      display: flex;
-      align-items: center;
-      img {
-        width: 100rpx;
-        height: 100rpx;
-        border-radius: 50%;
-        margin-top: 10rpx;
-        margin-right: 20rpx;
-      }
-    }
-  }
+    padding-bottom: 32rpx;
 
-  .addressBox {
-    color: #727272;
-    padding: 30rpx;
-    .contentBox {
-      display: flex;
-      .addressIcon {
-        display: inline-block;
-        width: 49rpx;
-        height: 48rpx;
-        border-radius: 10rpx;
-        margin-right: 6rpx;
-      }
-      .xuncha {
-        font-size: 26rpx;
-        color: #1b1c20;
-      }
-    }
-  }
+    .topContent {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 16rpx 32rpx 0;
+      background: linear-gradient(#e6eefd 0%, #f6f7f9 100%);
 
-  .formBox {
-    position: relative;
-    margin-left: 24rpx;
-    box-sizing: border-box;
-    ul {
-      li {
+      .placeBox {
         width: 100%;
-        position: relative;
-        margin-top: 16rpx;
+        box-sizing: border-box;
+        padding: 24rpx;
+        border-radius: 16rpx;
+        background: #fff;
+        background-image: url("https://eshangtech.com/minTestImg/placeBg.png");
+        background-size: 100% 100%;
+        background-position: 2rpx 2rpx;
+        background-repeat: no-repeat;
+        display: flex;
+        align-items: center;
 
-        .circle {
-          background-color: #b2b2b2;
-          height: 16rpx;
-          width: 16rpx;
-          border-radius: 50%;
-          position: absolute;
-          top: 16rpx;
-          left: 1rpx;
-        }
-        .circle-first {
-          top: 14rpx;
-        }
-        .circle-last {
-          top: 46rpx;
-        }
-        .circleActive {
-          height: 16rpx;
-          width: 16rpx;
-          border-radius: 50%;
-          position: absolute;
-          left: 1rpx;
-          top: 18rpx;
-          background-color: #409eff;
+        .itemIcon {
+          width: 36rpx;
+          height: 36rpx;
+          margin-right: 4rpx;
         }
 
-        .examineContent {
+        .placeName {
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 30rpx;
+          color: #010b18;
+          line-height: 40rpx;
+          text-align: left;
+          font-style: normal;
+        }
+
+        .statusBox {
+          margin-left: 12rpx;
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 24rpx;
+          color: #139942;
+          line-height: 36rpx;
+          text-align: left;
+          font-style: normal;
+          padding: 2rpx 8rpx;
+          border-radius: 4rpx;
+        }
+
+        .userBox {
           width: 100%;
-          box-sizing: border-box;
-          padding-left: 40rpx;
-          .titleBox {
+          margin-top: 20rpx;
+
+          .userTop {
+            .userName {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 30rpx;
+              color: #010b18;
+              line-height: 40rpx;
+              text-align: left;
+              font-style: normal;
+              margin-right: 12rpx;
+            }
+
+            .labelBox {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 22rpx;
+              color: #676d74;
+              line-height: 32rpx;
+              text-align: left;
+              font-style: normal;
+              padding: 2rpx 8rpx;
+              background: #f0f2f7;
+              border-radius: 4rpx;
+            }
+          }
+
+          .timeBox {
             display: flex;
             align-items: center;
+            margin-top: 8rpx;
 
-            .img-zds {
-              display: inline-block;
+            .timeIcon {
               width: 32rpx;
               height: 32rpx;
-              background: url("../../static/images/mbwa/content_img_gray.png")
-                no-repeat center;
-              background-size: contain;
-              margin-right: 6rpx;
+              margin-right: 4rpx;
             }
 
-            .img-upload {
-              display: inline-block;
-              width: 32rpx;
-              height: 32rpx;
-              background: url("../../static/images/mbwa/pic_img_gray.png")
-                no-repeat center;
-              background-size: contain;
-              margin-right: 6rpx;
-            }
-
-            .activezds {
-              background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
-            }
-
-            .activeupload {
-              background-image: url("../../static/images/mbwa/zdsgl_sm_pic.png");
-            }
-
-            .titleText {
-              font-size: 26rpx;
-              color: #7a7a7a;
-            }
-            .titleTextActive {
-              font-size: 26rpx;
-              color: #409eff;
-            }
-          }
-
-          .inputBox {
-            color: #939393;
-            font-size: 24rpx;
-            padding-bottom: 40rpx;
-            width: 100%;
-            box-sizing: border-box;
-            textarea {
-              min-height: 50rpx;
+            .nowTime {
+              font-family: "PingFangSC";
+              font-weight: 400;
               font-size: 24rpx;
-              line-height: 1.8;
-              border-bottom: 1rpx solid #eee;
-              margin-top: 20rpx;
-              color: #727272;
+              color: #676d74;
+              line-height: 32rpx;
+              text-align: left;
+              font-style: normal;
             }
           }
+        }
+      }
 
-          .tagList {
-            display: flex;
+      .inspectionContent {
+        width: 100%;
+        margin-top: 24rpx;
+        background: #fff;
+        border-radius: 16rpx;
+        box-sizing: border-box;
+        padding: 24rpx;
+
+        .contentTop {
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #676d74;
+          line-height: 40rpx;
+          text-align: left;
+          font-style: normal;
+
+          .required {
+            font-family: "PingFangSC";
+            font-weight: 400;
             font-size: 24rpx;
-            color: #606266;
-            width: 100%;
-            box-sizing: border-box;
-            .tagName {
-              width: 200rpx;
-              margin-right: 16rpx;
-              font-size: 22rpx;
-              line-height: 2.9;
-            }
-            .tagsBox {
-              width: calc(100% - 200rpx);
-              // width: 546rpx;
-              padding: 0 24rpx 0 12rpx;
-            }
-            .tagUnit {
-              padding: 4rpx 16rpx;
-              background-color: #f4f4f4;
-              color: #606266;
-              border-radius: 24rpx;
-              margin: 8rpx;
-              font-size: 22rpx;
-              display: inline-block;
-              vertical-align: middle;
-            }
-            .active {
-              color: #ed7043;
-              background-color: #fdf1ec;
+            color: #ff0000;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+            margin-left: 4rpx;
+          }
+        }
+
+        .contentBoxResult {
+          width: 100%;
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 24rpx;
+          line-height: 40rpx;
+          text-align: left;
+          font-style: normal;
+        }
+
+        .uploadImgBox {
+          width: 100%;
+          margin-top: 16rpx;
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+
+          .submitImgBox {
+            width: 148rpx;
+            height: 148rpx;
+            background: #f7f7f8;
+            border-radius: 8rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 16rpx;
+
+            .addIcon {
+              width: 48rpx;
+              height: 48rpx;
+              color: #b4b5ba;
             }
           }
 
-          .uploadBox {
-            display: flex;
-            flex-flow: row wrap;
-            justify-content: flex-start;
-            align-items: flex-start;
-            width: 100%;
-            box-sizing: border-box;
-            padding: 20rpx 0;
-            /* padding-left: 54rpx; */
-            min-height: 160rpx;
-            .uploadList {
-              position: relative;
-              display: flex;
-              flex-flow: row nowrap;
-              justify-content: center;
-              align-items: center;
-              background-color: #f1f1f1;
-              box-sizing: border-box;
-              width: 160rpx;
-              height: 160rpx;
-              border-radius: 6rpx;
-              margin-top: 16rpx;
-            }
-            .uploadList:nth-child(3n-1) {
-              margin-left: 16rpx;
-              margin-right: 16rpx;
-            }
-            .uploadList image {
-              width: 160rpx;
-              height: 160rpx;
-              border-radius: 6rpx;
+          .imgItem {
+            width: 148rpx;
+            height: 148rpx;
+            margin-right: 16rpx;
+            position: relative;
+            border-radius: 8rpx;
+            overflow: hidden;
+
+            image {
+              width: 100%;
+              height: 100%;
             }
 
-            .uploadAdd {
-              width: 26%;
-              box-sizing: border-box;
-              .upload-file-add-container {
-                display: flex;
-                flex-flow: column nowrap;
-                justify-content: center;
-                align-items: center;
-                border: 1rpx dashed #c6c6c6;
-                height: 160rpx;
-                width: 160rpx;
-                margin-top: 15rpx;
-                border-radius: 6rpx;
-                margin-left: 12rpx;
-                .walk-manage-plus {
-                  line-height: 60rpx;
-                  width: 62rpx;
-                  height: 62rpx;
-                  text-align: center;
-                  border-radius: 50%;
-                  background-color: #409eff;
-                  color: #ffffff;
-                  font-size: 48rpx;
-                  box-shadow: 0 2rpx 6rpx 0 #eee;
-                }
+            .closeBox {
+              width: 32rpx;
+              height: 32rpx;
+              border-radius: 0rpx 8rpx 0rpx 8rpx;
+              background: rgba(6, 10, 25, 0.5);
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              position: absolute;
+              top: 0;
+              right: 0;
+
+              .closeIcon {
+                width: 24rpx;
+                height: 24rpx;
               }
             }
           }
+        }
+      }
+    }
 
-          .uni-list-cell {
-            justify-content: unset;
-            margin-top: 28rpx;
+    .qusetionBox {
+      width: 100%;
+      margin-top: 24rpx;
+      box-sizing: border-box;
+      padding: 0 32rpx;
+
+      .questionItem {
+        width: 100%;
+        background: #fff;
+        box-sizing: border-box;
+        padding: 24rpx;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+
+        .quetionTitle {
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #676d74;
+          line-height: 40rpx;
+          text-align: left;
+          font-style: normal;
+
+          .required {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #ff0000;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+            margin-left: 4rpx;
           }
+        }
 
-          .uni-list-cell:after {
-            background-color: #f9f9f9;
+        .radioGroup {
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+
+          .radioItem {
+            display: flex;
+            align-items: center;
+            padding: 8rpx;
+          }
+        }
+
+        .checkedBottom {
+          width: 100%;
+          display: flex;
+          flex-wrap: wrap;
+          align-items: center;
+          margin-top: 16rpx;
+
+          .bottomItem {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #676d74;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+            padding: 8rpx 16rpx;
+            border-radius: 6rpx;
+            // background: #f6f6f7;
+            margin-right: 16rpx;
+            margin-bottom: 16rpx;
+
+            .closeIcon {
+              width: 24rpx;
+              height: 24rpx;
+              margin-left: 16rpx;
+            }
           }
         }
       }
 
-      .active .img-zds {
-        background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
+      .requestionCheckedItem {
+        width: 100%;
+        box-sizing: border-box;
+        padding: 24rpx;
+        background: #ffffff;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+
+        .checkedTop {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+
+          .topLeft {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #676d74;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+
+            .required {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #ff0000;
+              line-height: 40rpx;
+              text-align: left;
+              font-style: normal;
+              margin-left: 4rpx;
+            }
+          }
+
+          .topRight {
+            display: flex;
+            align-items: center;
+
+            .placeSelect {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 30rpx;
+              color: #d6d7da;
+              line-height: 40rpx;
+              text-align: left;
+              font-style: normal;
+            }
+
+            .rightArrow {
+              width: 32rpx;
+              height: 32rpx;
+              margin-left: 8rpx;
+            }
+          }
+        }
+
+        .checkedBottom {
+          width: 100%;
+          display: flex;
+          flex-wrap: wrap;
+          align-items: center;
+          margin-top: 16rpx;
+
+          .bottomItem {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #676d74;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+            padding: 8rpx 16rpx;
+            border-radius: 6rpx;
+            background: #f6f6f7;
+            margin-right: 16rpx;
+            margin-bottom: 16rpx;
+
+            .closeIcon {
+              width: 24rpx;
+              height: 24rpx;
+              margin-left: 16rpx;
+            }
+          }
+        }
       }
     }
 
-    .btn {
-      width: 80%;
-      margin: 0 auto;
-      margin-top: 50rpx;
-      background-color: #409eff;
-      border-radius: 10rpx;
-      color: #fff;
-      font-size: 28rpx;
-      line-height: 2.8;
-      margin-top: 96rpx;
+    .otherBox {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 16rpx 32rpx 0;
+
+      .questionItem {
+        width: 100%;
+        background: #fff;
+        box-sizing: border-box;
+        padding: 24rpx;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+
+        .quetionTitle {
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #676d74;
+          line-height: 40rpx;
+          text-align: left;
+          font-style: normal;
+
+          .required {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #ff0000;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+            margin-left: 4rpx;
+          }
+        }
+
+        .radioGroup {
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+
+          .radioItem {
+            display: flex;
+            align-items: center;
+            padding: 8rpx;
+          }
+        }
+      }
+    }
+
+    .progressBox {
+      width: 100%;
+      margin-top: 24rpx;
+      box-sizing: border-box;
+      padding: 0 24rpx;
+
+      .progress {
+        width: 100%;
+        background: #fff;
+        border-radius: 16rpx;
+        box-sizing: border-box;
+        padding: 24rpx;
+
+        .topBox {
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 28rpx;
+          color: #676d74;
+          line-height: 40rpx;
+          text-align: left;
+          font-style: normal;
+        }
+
+        .progressContent {
+          width: 100%;
+          margin-top: 24rpx;
+
+          .progressItem {
+            width: 100%;
+            display: flex;
+            align-items: center;
+
+            .itemLeft {
+              width: 80rpx;
+              height: 80rpx;
+              margin-right: 16rpx;
+              position: relative;
+
+              .img {
+                width: 80rpx;
+                height: 80rpx;
+                border-radius: 50%;
+              }
+
+              .successIcon {
+                width: 32rpx;
+                height: 32rpx;
+                position: absolute;
+                right: 0;
+                bottom: 4rpx;
+              }
+            }
+
+            .itemRight {
+              width: 100%;
+
+              .itemTop {
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+
+                .name {
+                  font-family: "PingFangSC";
+                  font-weight: 400;
+                  font-size: 26rpx;
+                  color: #010b18;
+                  line-height: 40rpx;
+                  text-align: left;
+                  font-style: normal;
+                }
+
+                .time {
+                  font-family: "PingFangSC";
+                  font-weight: 400;
+                  font-size: 24rpx;
+                  color: #676d74;
+                  line-height: 32rpx;
+                  text-align: left;
+                  font-style: normal;
+                }
+              }
+
+              .itemBottom {
+                font-family: "PingFangSC";
+                font-weight: 400;
+                font-size: 24rpx;
+                color: #676d74;
+                line-height: 32rpx;
+                text-align: left;
+                font-style: normal;
+                margin-top: 4rpx;
+              }
+            }
+          }
+        }
+      }
     }
   }
+
+  .bottomBtnBox {
+    width: 100%;
+    height: 120rpx;
+    box-sizing: border-box;
+    padding: 16rpx 40rpx;
+    background: #fff;
+
+    .bottomBtn {
+      width: 100%;
+      height: 100%;
+      font-family: "PingFangSC";
+      font-weight: 400;
+      font-size: 32rpx;
+      color: #ffffff;
+      font-style: normal;
+      background: #3b72ff;
+      border-radius: 6rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  .popupBox {
+    width: 100%;
+    height: 60vh;
+    box-sizing: border-box;
+    padding-bottom: env(safe-area-inset-bottom);
+    padding-bottom: constant(safe-area-inset-bottom);
+    border-radius: 24rpx 24rpx 0rpx 0rpx;
+
+    .contentTop {
+      width: 100%;
+      height: 108rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 32rpx;
+      box-sizing: border-box;
+
+      .left,
+      .right {
+        width: 32rpx;
+        height: 32rpx;
+
+        .closeIcon {
+          width: 32rpx;
+          height: 32rpx;
+        }
+      }
+
+      .center {
+        font-family: "PingFangSC";
+        font-weight: 400;
+        font-size: 26rpx;
+        color: #010b18;
+        line-height: 40rpx;
+        text-align: left;
+        font-style: normal;
+      }
+    }
+
+    .checkPopupContent {
+      width: 100%;
+      height: calc(100% - 100rpx - 108rpx);
+      background: #fff;
+      border-radius: 24rpx 24rpx 0rpx 0rpx;
+      box-sizing: border-box;
+      padding: 0 32rpx;
+
+      .itemContent {
+        width: 100%;
+
+        .title {
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 30rpx;
+          color: #010b18;
+          line-height: 40rpx;
+          text-align: justify;
+          font-style: normal;
+        }
+
+        .anwersList {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+          margin-top: 16rpx;
+
+          .anwersItem {
+            .anwers {
+              min-width: calc((100% - 48rpx) / 3);
+              background: #f6f6f7;
+              border-radius: 6rpx;
+              text-align: center;
+              padding: 14rpx;
+              margin-right: 16rpx;
+              margin-bottom: 16rpx;
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 28rpx;
+              color: #010b18;
+              line-height: 40rpx;
+              font-style: normal;
+            }
+
+            .selectAnwersItem {
+              background: #e7eeff;
+              color: #3b72ff;
+            }
+          }
+        }
+
+        .descBox {
+          width: 100%;
+          background: #f6f6f7;
+          border-radius: 6rpx;
+          box-sizing: border-box;
+          padding: 16rpx 24rpx;
+          margin-top: 12rpx;
+        }
+
+        .uploadImgBox {
+          width: 100%;
+          margin-top: 16rpx;
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+
+          .submitImgBox {
+            width: 148rpx;
+            height: 148rpx;
+            background: #f7f7f8;
+            border-radius: 8rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 16rpx;
+
+            .addIcon {
+              width: 48rpx;
+              height: 48rpx;
+              color: #b4b5ba;
+            }
+          }
+
+          .imgItem {
+            width: 148rpx;
+            height: 148rpx;
+            margin-right: 16rpx;
+            position: relative;
+            border-radius: 8rpx;
+            overflow: hidden;
+
+            image {
+              width: 100%;
+              height: 100%;
+            }
+
+            .closeBox {
+              width: 32rpx;
+              height: 32rpx;
+              border-radius: 0rpx 8rpx 0rpx 8rpx;
+              background: rgba(6, 10, 25, 0.5);
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              position: absolute;
+              top: 0;
+              right: 0;
+
+              .closeIcon {
+                width: 24rpx;
+                height: 24rpx;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .bottomBtnBox {
+      width: 100%;
+      height: 100rpx;
+      box-sizing: border-box;
+      padding: 12rpx 40rpx 0;
+      background: #fff;
+
+      .bottomBtn {
+        width: 100%;
+        height: 88rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-family: "PingFangSC";
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #ffffff;
+        line-height: 44rpx;
+        font-style: normal;
+        background: #3b72ff;
+        border-radius: 6rpx;
+      }
+    }
+  }
+
+  // width: 100%;
+  // // height: 100vh;
+  // background-color: #fff;
+  // box-sizing: border-box;
+  // padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS 11.2+ */
+  // padding-bottom: constant(safe-area-inset-bottom);
+  // .pageHeader {
+  //   height: 120rpx;
+  //   width: 100%;
+  //   background-color: rgb(246, 246, 246);
+  //   box-shadow: rgb(214, 207, 207) 4rpx 0px 20rpx;
+  //   background: url("../../static/images/mbwa/bj_logo.png") no-repeat bottom
+  //     right;
+  //   background-size: 34%;
+  //   padding-left: 30rpx;
+  //   box-sizing: border-box;
+  //   .hederContent {
+  //     display: flex;
+  //     align-items: center;
+  //     img {
+  //       width: 100rpx;
+  //       height: 100rpx;
+  //       border-radius: 50%;
+  //       margin-top: 10rpx;
+  //       margin-right: 20rpx;
+  //     }
+  //   }
+  // }
+
+  // .addressBox {
+  //   color: #727272;
+  //   padding: 30rpx;
+  //   .contentBox {
+  //     display: flex;
+  //     .addressIcon {
+  //       display: inline-block;
+  //       width: 49rpx;
+  //       height: 48rpx;
+  //       border-radius: 10rpx;
+  //       margin-right: 6rpx;
+  //     }
+  //     .xuncha {
+  //       font-size: 26rpx;
+  //       color: #1b1c20;
+  //     }
+  //   }
+  // }
+
+  // .formBox {
+  //   position: relative;
+  //   margin-left: 24rpx;
+  //   box-sizing: border-box;
+  //   ul {
+  //     li {
+  //       width: 100%;
+  //       position: relative;
+  //       margin-top: 16rpx;
+
+  //       .circle {
+  //         background-color: #b2b2b2;
+  //         height: 16rpx;
+  //         width: 16rpx;
+  //         border-radius: 50%;
+  //         position: absolute;
+  //         top: 16rpx;
+  //         left: 1rpx;
+  //       }
+  //       .circle-first {
+  //         top: 14rpx;
+  //       }
+  //       .circle-last {
+  //         top: 46rpx;
+  //       }
+  //       .circleActive {
+  //         height: 16rpx;
+  //         width: 16rpx;
+  //         border-radius: 50%;
+  //         position: absolute;
+  //         left: 1rpx;
+  //         top: 18rpx;
+  //         background-color: #409eff;
+  //       }
+
+  //       .examineContent {
+  //         width: 100%;
+  //         box-sizing: border-box;
+  //         padding-left: 40rpx;
+  //         .titleBox {
+  //           display: flex;
+  //           align-items: center;
+
+  //           .img-zds {
+  //             display: inline-block;
+  //             width: 32rpx;
+  //             height: 32rpx;
+  //             background: url("../../static/images/mbwa/content_img_gray.png")
+  //               no-repeat center;
+  //             background-size: contain;
+  //             margin-right: 6rpx;
+  //           }
+
+  //           .img-upload {
+  //             display: inline-block;
+  //             width: 32rpx;
+  //             height: 32rpx;
+  //             background: url("../../static/images/mbwa/pic_img_gray.png")
+  //               no-repeat center;
+  //             background-size: contain;
+  //             margin-right: 6rpx;
+  //           }
+
+  //           .activezds {
+  //             background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
+  //           }
+
+  //           .activeupload {
+  //             background-image: url("../../static/images/mbwa/zdsgl_sm_pic.png");
+  //           }
+
+  //           .titleText {
+  //             font-size: 26rpx;
+  //             color: #7a7a7a;
+  //           }
+  //           .titleTextActive {
+  //             font-size: 26rpx;
+  //             color: #409eff;
+  //           }
+  //         }
+
+  //         .inputBox {
+  //           color: #939393;
+  //           font-size: 24rpx;
+  //           padding-bottom: 40rpx;
+  //           width: 100%;
+  //           box-sizing: border-box;
+  //           textarea {
+  //             min-height: 50rpx;
+  //             font-size: 24rpx;
+  //             line-height: 1.8;
+  //             border-bottom: 1rpx solid #eee;
+  //             margin-top: 20rpx;
+  //             color: #727272;
+  //           }
+  //         }
+
+  //         .tagList {
+  //           display: flex;
+  //           font-size: 24rpx;
+  //           color: #606266;
+  //           width: 100%;
+  //           box-sizing: border-box;
+  //           .tagName {
+  //             width: 200rpx;
+  //             margin-right: 16rpx;
+  //             font-size: 22rpx;
+  //             line-height: 2.9;
+  //           }
+  //           .tagsBox {
+  //             width: calc(100% - 200rpx);
+  //             // width: 546rpx;
+  //             padding: 0 24rpx 0 12rpx;
+  //           }
+  //           .tagUnit {
+  //             padding: 4rpx 16rpx;
+  //             background-color: #f4f4f4;
+  //             color: #606266;
+  //             border-radius: 24rpx;
+  //             margin: 8rpx;
+  //             font-size: 22rpx;
+  //             display: inline-block;
+  //             vertical-align: middle;
+  //           }
+  //           .active {
+  //             color: #ed7043;
+  //             background-color: #fdf1ec;
+  //           }
+  //         }
+
+  //         .uploadBox {
+  //           display: flex;
+  //           flex-flow: row wrap;
+  //           justify-content: flex-start;
+  //           align-items: flex-start;
+  //           width: 100%;
+  //           box-sizing: border-box;
+  //           padding: 20rpx 0;
+  //           /* padding-left: 54rpx; */
+  //           min-height: 160rpx;
+  //           .uploadList {
+  //             position: relative;
+  //             display: flex;
+  //             flex-flow: row nowrap;
+  //             justify-content: center;
+  //             align-items: center;
+  //             background-color: #f1f1f1;
+  //             box-sizing: border-box;
+  //             width: 160rpx;
+  //             height: 160rpx;
+  //             border-radius: 6rpx;
+  //             margin-top: 16rpx;
+  //           }
+  //           .uploadList:nth-child(3n-1) {
+  //             margin-left: 16rpx;
+  //             margin-right: 16rpx;
+  //           }
+  //           .uploadList image {
+  //             width: 160rpx;
+  //             height: 160rpx;
+  //             border-radius: 6rpx;
+  //           }
+
+  //           .uploadAdd {
+  //             width: 26%;
+  //             box-sizing: border-box;
+  //             .upload-file-add-container {
+  //               display: flex;
+  //               flex-flow: column nowrap;
+  //               justify-content: center;
+  //               align-items: center;
+  //               border: 1rpx dashed #c6c6c6;
+  //               height: 160rpx;
+  //               width: 160rpx;
+  //               margin-top: 15rpx;
+  //               border-radius: 6rpx;
+  //               margin-left: 12rpx;
+  //               .walk-manage-plus {
+  //                 line-height: 60rpx;
+  //                 width: 62rpx;
+  //                 height: 62rpx;
+  //                 text-align: center;
+  //                 border-radius: 50%;
+  //                 background-color: #409eff;
+  //                 color: #ffffff;
+  //                 font-size: 48rpx;
+  //                 box-shadow: 0 2rpx 6rpx 0 #eee;
+  //               }
+  //             }
+  //           }
+  //         }
+
+  //         .uni-list-cell {
+  //           justify-content: unset;
+  //           margin-top: 28rpx;
+  //         }
+
+  //         .uni-list-cell:after {
+  //           background-color: #f9f9f9;
+  //         }
+  //       }
+  //     }
+
+  //     .active .img-zds {
+  //       background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
+  //     }
+  //   }
+
+  //   .btn {
+  //     width: 80%;
+  //     margin: 0 auto;
+  //     margin-top: 50rpx;
+  //     background-color: #409eff;
+  //     border-radius: 10rpx;
+  //     color: #fff;
+  //     font-size: 28rpx;
+  //     line-height: 2.8;
+  //     margin-top: 96rpx;
+  //   }
+  // }
 }
 </style>
\ No newline at end of file
diff --git a/pages/walkAroundManager/index.vue b/pages/walkAroundManager/index.vue
index a86e4dc..8530838 100644
--- a/pages/walkAroundManager/index.vue
+++ b/pages/walkAroundManager/index.vue
@@ -1,168 +1,422 @@
 <template>
   <view class="main">
-    <div class="pageHeader">
-      <div class="hederContent">
-        <img :src="user.Membership_Headimage" alt="" />
-        <div>
-          <p>{{ user.Membership_Name || "" }}</p>
-          <p class="fs12">巡查人员</p>
-        </div>
-      </div>
-    </div>
+    <scroll-view class="pageScroll" :scroll-y="true">
+      <view class="topContent">
+        <view class="placeBox">
+          <view class="placeName">{{ detailObj.title || "-" }}</view>
 
-    <div class="addressBox">
-      <div class="contentBox">
-        <image
-          src="/static/images/publicity/dingwei.png"
-          mode="aspectFit"
-          class="addressIcon"
-        ></image>
-        <div>
-          <p class="xuncha address">{{ detailObj.title || "-" }}</p>
-          <div>
-            <span>巡查时间：</span><span>{{ now_time }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+          <view class="userBox">
+            <view class="userTop">
+              <text class="userName">{{ user.Membership_Name || "" }}</text>
+              <text class="labelBox">巡查人员</text>
+            </view>
+            <view class="timeBox">
+              <image class="timeIcon" src="/static/images/mbwa/timeIcon.svg" />
+              <text class="nowTime">{{ now_time || "-" }}</text>
+            </view>
+          </view>
+        </view>
 
-    <div class="formBox">
-      <ul>
-        <li>
-          <span
-            :class="
-              inputfocus
-                ? 'circle circleActive circle-first '
-                : 'circle circle-first'
-            "
-          ></span>
-          <div class="examineContent">
-            <div class="titleBox">
-              <i :class="inputfocus ? 'img-zds activezds' : 'img-zds'"></i>
-              <div
-                :class="inputfocus ? 'titleTextActive' : 'titleText'"
-                style="display: flex"
-              >
-                <i style="color: red; margin-right: 5px">*</i>巡查内容
-              </div>
+        <view class="inspectionContent">
+          <view class="contentTop">
+            巡检内容<span class="required">*</span>
+          </view>
+          <textarea
+            v-model="uploadResult"
+            class="contentBox"
+            placeholder="请输入巡查内容，并上传现场照片"
+            placeholderStyle="font-size: 24rpx;color: #CDCED1"
+            :auto-height="true"
+          ></textarea>
+          <view class="uploadImgBox">
+            <div class="submitImgBox" @click="submitImg">
+              <image
+                class="addIcon"
+                src="/static/images/mbwa/addImageIcon.svg"
+              />
             </div>
 
-            <div class="inputBox">
-              <textarea
-                auto-height
-                v-model="uploadResult"
-                placeholder="请输入巡查内容"
-                focus="true"
-                @focus="inputfocus = true"
-                @blur="inputfocus = false"
-              ></textarea>
+            <div class="imgItem" v-for="(item, index) in imgsList" :key="index">
+              <image :src="item" @tap="showImg2(index)" mode="aspectFill" />
+              <view class="closeBox" @click.stop="deleteImgFunc(item, index)">
+                <image
+                  class="closeIcon"
+                  src="/static/images/mbwa/closeIcon.svg"
+                />
+              </view>
             </div>
+          </view>
+        </view>
+      </view>
 
-            <div class="tagList" v-for="(tags, i) in tagList" :key="i">
-              <div class="tagName">
-                <span
-                  style="display: inline-block; max-width: calc(100% - 10rpx)"
-                >
-                  {{ tags.question.title || "" }}
-                </span>
-                <span v-if="tags.isRequired" style="color: red">*</span>
-              </div>
-              <div class="tagsBox">
-                <div
-                  v-for="(tag, s) in tags.question.options"
-                  :key="s"
-                  @tap="selectTag(tag, tags.question)"
-                  :class="tag.ischecked ? 'tagUnit active ' : 'tagUnit'"
-                >
-                  {{ tag.text }}
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-
-        <li>
-          <span :class="imgfocus ? 'circleActive' : 'circle'"></span>
-          <div class="examineContent">
-            <div class="titleBox">
-              <i
-                :class="imgfocus ? 'img-upload activeupload' : 'img-upload'"
-              ></i>
-              <div
-                style="display: flex"
-                :class="imgfocus ? 'titleTextActive' : 'titleText'"
-              >
-                <i style="color: red; margin-right: 5px">*</i>请上传现场图片
-              </div>
-            </div>
-            <div class="uploadBox">
-              <div
-                class="uploadList"
-                v-for="(item, index) in imgsList"
-                :key="index"
-              >
-                <span
-                  class="upload-file-remove"
-                  @click.stop="deleteImgFunc(item, index)"
-                  >×</span
-                >
-                <image :src="item" @tap="showImg2(index)" mode="aspectFill" />
-              </div>
-              <div class="uploadAdd" @click="submitImg">
-                <div class="upload-file-add-container">
-                  <span class="walk-manage-plus">+</span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </li>
-
-        <li>
-          <span
-            :class="
-              radiofocus
-                ? 'circle circleActive circle-last'
-                : 'circle circle-last'
-            "
+      <view class="otherBox">
+        <view class="questionItem">
+          <view class="quetionTitle"
+            >情况类型<text class="required">*</text></view
           >
-          </span>
-          <div class="examineContent">
+
+          <radio-group class="radioGroup" @change="handleChangeSituationType">
+            <label class="radioItem">
+              <view>
+                <radio color="#3B72FF" :value="'0'" :checked="0 === current" />
+              </view>
+              <view style="font-size: 24rpx">情况正常</view>
+            </label>
+            <label class="radioItem">
+              <view>
+                <radio color="#3B72FF" :value="'1'" :checked="1 === current" />
+              </view>
+              <view style="font-size: 24rpx">急需处理</view>
+            </label>
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="qusetionBox">
+        <!-- requestionRadioList -->
+        <!-- requestionCheckedList -->
+
+        <!-- 单选题 -->
+        <view v-if="requestionRadioList && requestionRadioList.length > 0">
+          <view
+            class="questionItem"
+            v-for="(item, index) in requestionRadioList"
+            :key="index"
+          >
+            <view
+              class="quetionTitle"
+              @click="handleShowCheckPopup(item, 'radio')"
+            >
+              <view class="quetionLeft">
+                {{ item.question.title
+                }}<text class="required" v-if="item.isRequired">*</text>
+              </view>
+
+              <view class="quetionRight">
+                <text
+                  class="placeSelect"
+                  v-if="
+                    !(item.choiceResponse && item.choiceResponse.length > 0)
+                  "
+                  >请选择</text
+                >
+                <image
+                  class="rightArrow"
+                  src="/static/images/mbwa/rightArrow.svg"
+                />
+              </view>
+            </view>
+
+            <view
+              class="checkedBottom"
+              v-if="item.choiceResponse && item.choiceResponse.length > 0"
+            >
+              <view
+                class="bottomItem"
+                v-for="(subItem, subIndex) in item.choiceResponse"
+                :key="subIndex"
+              >
+                {{ subItem || "" }}
+                <image
+                  @click="handDeleteChecked(item, subItem, 'radio')"
+                  class="closeIcon"
+                  src="/static/images/mbwa/closeIcon.svg"
+                />
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view v-if="requestionCheckedList && requestionCheckedList.length > 0">
+          <view
+            class="requestionCheckedItem"
+            v-for="(item, index) in requestionCheckedList"
+            :key="index"
+          >
+            <view
+              class="checkedTop"
+              @click="handleShowCheckPopup(item, 'checked')"
+            >
+              <view class="topLeft">
+                {{ item.question.title || ""
+                }}<text class="required" v-if="item.isRequired">*</text>
+              </view>
+              <view class="topRight">
+                <text
+                  class="placeSelect"
+                  v-if="!(item.isChecked && item.isChecked.length > 0)"
+                  >请选择</text
+                >
+                <image
+                  class="rightArrow"
+                  src="/static/images/mbwa/rightArrow.svg"
+                />
+              </view>
+            </view>
+            <view
+              class="checkedBottom"
+              v-if="item.isChecked && item.isChecked.length > 0"
+            >
+              <view
+                class="bottomItem"
+                v-for="(subItem, subIndex) in item.isChecked"
+                :key="subIndex"
+              >
+                {{ subItem.text || "" }}
+                <image
+                  @click="handDeleteChecked(item, subItem, 'checked')"
+                  class="closeIcon"
+                  src="/static/images/mbwa/closeIcon.svg"
+                />
+              </view>
+            </view>
+
+            <!-- <checkbox-group @change="handleChangeCheck">
+            <label
+              class="checkItem"
+              v-for="(subItem, subIndex) in item.question.options"
+              :key="subIndex"
+            >
+              <view>
+                <checkbox :value="subItem.text" />
+              </view>
+              <view>{{ subItem.text }}</view>
+            </label>
+          </checkbox-group> -->
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <view class="bottomBtnBox">
+      <view class="bottomBtn" @click="submitUpload">提交</view>
+    </view>
+
+    <view v-if="false">
+      <div class="pageHeader">
+        <div class="hederContent">
+          <img :src="user.Membership_Headimage" alt="" />
+          <div>
+            <p>{{ user.Membership_Name || "" }}</p>
+            <p class="fs12">巡查人员</p>
+          </div>
+        </div>
+      </div>
+
+      <div class="addressBox">
+        <div class="contentBox">
+          <image
+            src="/static/images/publicity/dingwei.png"
+            mode="aspectFit"
+            class="addressIcon"
+          ></image>
+          <div>
+            <p class="xuncha address">{{ detailObj.title || "-" }}</p>
+            <div>
+              <span>巡查时间：</span><span>{{ now_time }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="formBox">
+        <ul>
+          <li>
+            <span
+              :class="
+                inputfocus
+                  ? 'circle circleActive circle-first '
+                  : 'circle circle-first'
+              "
+            ></span>
+            <div class="examineContent">
+              <div class="titleBox">
+                <i :class="inputfocus ? 'img-zds activezds' : 'img-zds'"></i>
+                <div
+                  :class="inputfocus ? 'titleTextActive' : 'titleText'"
+                  style="display: flex"
+                >
+                  <i style="color: red; margin-right: 5px">*</i>巡查内容
+                </div>
+              </div>
+
+              <div class="inputBox">
+                <textarea
+                  auto-height
+                  v-model="uploadResult"
+                  placeholder="请输入巡查内容"
+                  focus="true"
+                  @focus="inputfocus = true"
+                  @blur="inputfocus = false"
+                ></textarea>
+              </div>
+
+              <div class="tagList" v-for="(tags, i) in tagList" :key="i">
+                <div class="tagName">
+                  <span
+                    style="display: inline-block; max-width: calc(100% - 10rpx)"
+                  >
+                    {{ tags.question.title || "" }}
+                  </span>
+                  <span v-if="tags.isRequired" style="color: red">*</span>
+                </div>
+                <div class="tagsBox">
+                  <div
+                    v-for="(tag, s) in tags.question.options"
+                    :key="s"
+                    @tap="selectTag(tag, tags.question)"
+                    :class="tag.ischecked ? 'tagUnit active ' : 'tagUnit'"
+                  >
+                    {{ tag.text }}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </li>
+
+          <li>
+            <span :class="imgfocus ? 'circleActive' : 'circle'"></span>
+            <div class="examineContent">
+              <div class="titleBox">
+                <i
+                  :class="imgfocus ? 'img-upload activeupload' : 'img-upload'"
+                ></i>
+                <div
+                  style="display: flex"
+                  :class="imgfocus ? 'titleTextActive' : 'titleText'"
+                >
+                  <i style="color: red; margin-right: 5px">*</i>请上传现场图片
+                </div>
+              </div>
+              <div class="uploadBox">
+                <div
+                  class="uploadList"
+                  v-for="(item, index) in imgsList"
+                  :key="index"
+                >
+                  <span
+                    class="upload-file-remove"
+                    @click.stop="deleteImgFunc(item, index)"
+                    >×</span
+                  >
+                  <image :src="item" @tap="showImg2(index)" mode="aspectFill" />
+                </div>
+                <div class="uploadAdd" @click="submitImg">
+                  <div class="upload-file-add-container">
+                    <span class="walk-manage-plus">+</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </li>
+
+          <li>
+            <span
+              :class="
+                radiofocus
+                  ? 'circle circleActive circle-last'
+                  : 'circle circle-last'
+              "
+            >
+            </span>
+            <div class="examineContent">
+              <radio-group
+                @change="radioChange"
+                style="display: flex"
+                @click="radioFocus"
+                @blur="radiofocus = false"
+              >
+                <label
+                  class="uni-list-cell"
+                  v-for="(item, index) in options"
+                  :key="item.value"
+                >
+                  <view>
+                    <radio
+                      :value="item.value"
+                      color="#409eff"
+                      :checked="index === current"
+                      style="transform: scale(0.8)"
+                    />
+                  </view>
+                  <view>{{ item.name }}</view>
+                </label>
+              </radio-group>
+            </div>
+          </li>
+        </ul>
+
+        <button v-if="!submit" class="btn" @click="submitUpload">提交</button>
+      </div>
+    </view>
+
+    <uniPopup
+      ref="checkPopup"
+      type="bottom"
+      :show="isShowPopup"
+      @hidePopup="handleClosePopup"
+    >
+      <view class="popupBox">
+        <scroll-view class="checkPopupContent" :scroll-y="true">
+          <view v-if="questionType === 'checked'">
+            <view class="anwersList" v-if="popupShowObj">
+              <view
+                class="anwersItem"
+                v-for="(item, index) in popupShowObj.question.options"
+                :key="index"
+                @click="handleCheckAnwers(popupShowObj, item)"
+              >
+                <view
+                  :class="item.checked ? 'anwers selectAnwersItem' : 'anwers'"
+                >
+                  {{ item.text || "" }}</view
+                >
+              </view>
+            </view>
+          </view>
+
+          <view v-if="questionType === 'radio'">
             <radio-group
-              @change="radioChange"
-              style="display: flex"
-              @click="radioFocus"
-              @blur="radiofocus = false"
+              class="radioGroup"
+              v-if="
+                popupShowObj.question &&
+                popupShowObj.question.options &&
+                popupShowObj.question.options.length > 0
+              "
+              @change="radioChange($event, popupShowObj)"
             >
               <label
-                class="uni-list-cell"
-                v-for="(item, index) in options"
-                :key="item.value"
+                class="radioItem"
+                v-for="(subItem, subIndex) in popupShowObj.question.options"
+                :key="subIndex"
               >
                 <view>
                   <radio
-                    :value="item.value"
-                    color="#409eff"
-                    :checked="index === current"
-                    style="transform: scale(0.8)"
+                    color="#3B72FF"
+                    :value="subItem.text"
+                    :checked="popupShowObj.choiceResponse[0] === subItem.text"
                   />
                 </view>
-                <view>{{ item.name }}</view>
+                <view style="font-size: 24rpx">{{ subItem.text }}</view>
               </label>
             </radio-group>
-          </div>
-        </li>
-      </ul>
+          </view>
+        </scroll-view>
 
-      <button v-if="!submit" class="btn" @click="submitUpload">提交</button>
-    </div>
+        <view class="bottomBtnBox">
+          <view class="bottomBtn" @click="handleClosePopup">确认</view>
+        </view>
+      </view>
+    </uniPopup>
   </view>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
+import uniPopup from "@/components/uni-popup";
 export default {
   data() {
-    let nowTime = this.$util.cutDate(new Date(), "hh:mm:ss");
+    let nowTime = this.$util.cutDate(new Date(), "YYYY-MM-DD hh:mm:ss");
     return {
       now_time: nowTime,
       inputfocus: true, // 是否聚焦
@@ -188,14 +442,25 @@ export default {
       imgsList: [],
       submit: false, // 是否提交成功了
       requiredList: [], // 必填项的数组
+
+      requestionRadioList: [], // 单选题
+      requestionCheckedList: [], // 多选题
+      isShowPopup: false, // 显示弹出框
+      popupShowObj: {},
+      questionType: "", // 判断是 单选还是多选
     };
   },
+  components: {
+    uniPopup,
+  },
   computed: {
     ...mapGetters({
       user: "getUser",
     }),
   },
   onLoad(query) {
+    console.log("query", query);
+
     this.handleGetModalData(query.id);
   },
   methods: {
@@ -215,47 +480,6 @@ export default {
         });
         return;
       }
-      console.log("selectAnwersList", this.selectAnwersList);
-      console.log("selectAnwersObj", this.selectAnwersObj);
-      console.log("requiredList", this.requiredList);
-
-      if (this.selectAnwersList && this.selectAnwersList.length > 0) {
-        let isAllRequired = true;
-        if (this.requiredList && this.requiredList.length > 0) {
-          this.requiredList.forEach((item) => {
-            if (
-              this.selectAnwersObj[item] &&
-              this.selectAnwersObj[item][0].ischecked
-            ) {
-            } else {
-              isAllRequired = false;
-            }
-          });
-        }
-        console.log("isAllRequired", isAllRequired);
-
-        if (!isAllRequired) {
-          uni.showToast({
-            title: "考核结果未填写完全！",
-            icon: "none",
-          });
-          return;
-        }
-
-        // if (this.selectAnwersList.length !== this.tagList.length) {
-        //   uni.showToast({
-        //     title: "考核结果未填写完全！",
-        //     icon: "none",
-        //   });
-        //   return;
-        // }
-      } else {
-        uni.showToast({
-          title: "请选择考核结果！",
-          icon: "none",
-        });
-        return;
-      }
 
       if (!(this.imgsList && this.imgsList.length > 0)) {
         uni.showToast({
@@ -265,6 +489,66 @@ export default {
         return;
       }
 
+      let AllOK = true;
+
+      let questionResponsesList = [];
+
+      console.log("this.requestionRadioList", this.requestionRadioList);
+      console.log("this.requestionCheckedList", this.requestionCheckedList);
+      // 看单选题中是否有必填的没填
+      if (this.requestionRadioList && this.requestionRadioList.length > 0) {
+        this.requestionRadioList.forEach((item) => {
+          if (item.isRequired) {
+            if (item.choiceResponse && item.choiceResponse.length > 0) {
+            } else {
+              AllOK = false;
+            }
+          }
+
+          if (item.choiceResponse && item.choiceResponse.length > 0) {
+            questionResponsesList.push({
+              questionId: item.questionId,
+              textResponse: "",
+              choiceResponse: item.choiceResponse,
+              imageResponse: "",
+              score: item.mark ? item.mark : 0,
+            });
+          }
+        });
+      }
+
+      // 看多选题中是否有必填的没填
+      if (this.requestionCheckedList && this.requestionCheckedList.length > 0) {
+        this.requestionCheckedList.forEach((item) => {
+          if (item.isRequired) {
+            if (item.isChecked && item.isChecked.length > 0) {
+            } else {
+              AllOK = false;
+            }
+          }
+          if (item.isChecked && item.isChecked.length > 0) {
+            questionResponsesList.push({
+              questionId: item.questionId,
+              textResponse: "",
+              choiceResponse: item.isChecked,
+              imageResponse: "",
+              score: item.mark ? item.mark : 0,
+            });
+          }
+        });
+      }
+
+      if (!AllOK) {
+        uni.showToast({
+          title: "有必填项未填写，请检查！",
+          icon: "none",
+        });
+        return;
+      }
+
+      console.log("requestionRadioList", this.requestionRadioList);
+      console.log("requestionCheckedList", this.requestionCheckedList);
+
       let extendObj = {
         uploadResult: this.uploadResult,
         imgsList: this.imgsList,
@@ -284,8 +568,11 @@ export default {
         provinceName: "",
         serverPartId: this.detailObj.serverPartId,
         serverPartName: this.detailObj.serverPartName,
-        questionResponses: this.selectAnwersList,
+        questionResponses: questionResponsesList,
       };
+
+      console.log("req", req);
+
       const data = await this.$request.$webNodePOST(
         `questionnaire-responses`,
         req
@@ -297,10 +584,13 @@ export default {
           title: data.message,
           icon: "none",
         });
-        this.$util.toNextRoute(
-          "redirectTo",
-          `/pages/walkAroundManager/statusPage?id=${data.data.id}`
-        );
+        let _this = this;
+        setTimeout(() => {
+          _this.$util.toNextRoute(
+            "redirectTo",
+            `/pages/walkAroundManager/statusPage?id=${data.data.id}`
+          );
+        }, 1000);
       } else {
         uni.showToast({
           title: data.message,
@@ -454,20 +744,67 @@ export default {
         });
       }
       this.requiredList = list;
+
+      // 这里是问题列表 我们稍微筛选一下
+      // 单选 必填
+      let radioRequiredList = [];
+      let radioList = [];
+      // 多选必填
+      let checkRequiredList = [];
+      let checkList = [];
+
+      let requestionList = obj.questionnaireTemplateQuestions;
+      if (requestionList && requestionList.length > 0) {
+        requestionList.forEach((item) => {
+          // type 是单选还是多选 questionType 是题目类型 暂时只有选择题
+          let [type, questionType] = item.question.type.split("_");
+          if (type === "radio") {
+            if (item.isRequired) {
+              radioRequiredList.push(item);
+            } else {
+              radioList.push(item);
+            }
+          } else if (type === "checked") {
+            if (item.isRequired) {
+              checkRequiredList.push(item);
+            } else {
+              checkList.push(item);
+            }
+          }
+        });
+      }
+      // 全部的单选题
+      let requestionRadioList = radioRequiredList.concat(radioList);
+      // 全部的多选题
+      let requestionCheckedList = checkRequiredList.concat(checkList);
+
+      this.requestionRadioList = requestionRadioList;
+      this.requestionCheckedList = requestionCheckedList;
+
       this.tagList = obj.questionnaireTemplateQuestions;
+      console.log("this.requestionRadioList", this.requestionRadioList);
+      console.log("this.requestionCheckedList", this.requestionCheckedList);
     },
     radioFocus() {
       this.radiofocus = true;
       this.imgfocus = false;
     },
-    radioChange(evt) {
-      this.value = evt.target.value;
-      for (let i = 0; i < this.options.length; i++) {
-        if (this.options[i].value === evt.target.value) {
-          this.current = i;
-          break;
-        }
-      }
+    radioChange(evt, obj) {
+      console.log("evt", evt);
+      console.log("obj", obj);
+      obj.choiceResponse = [evt.detail.value];
+      console.log("requestionRadioList", this.requestionRadioList);
+
+      // this.value = evt.target.value;
+      // for (let i = 0; i < this.options.length; i++) {
+      //   if (this.options[i].value === evt.target.value) {
+      //     this.current = i;
+      //     break;
+      //   }
+      // }
+    },
+    handleChangeCheck(e) {
+      console.log("e", e);
     },
     submitImg(e) {
       this.imgfocus = true;
@@ -584,6 +921,79 @@ export default {
         fail: function (err) {},
       });
     },
+    // 显示多选的弹出框
+    handleShowCheckPopup(obj, type) {
+      console.log("obj", obj);
+      this.questionType = type;
+      this.isShowPopup = true;
+      this.popupShowObj = obj;
+    },
+    handleClosePopup() {
+      this.isShowPopup = false;
+      this.popupShowObj = undefined;
+      this.questionType = "";
+    },
+    handleCheckAnwers(detailObj, selectObj) {
+      console.log("detailObj", detailObj);
+      console.log("selectObj", selectObj);
+
+      if (selectObj.checked) {
+        selectObj.checked = false;
+        let old = JSON.parse(JSON.stringify(detailObj.isChecked));
+        let res = [];
+        if (old && old.length > 0) {
+          old.forEach((item) => {
+            if (item.checked && item.text !== selectObj.text) {
+              res.push(item);
+            }
+          });
+        }
+        detailObj.isChecked = res;
+      } else {
+        if (detailObj.isChecked && detailObj.isChecked.length > 0) {
+          detailObj.isChecked.push(selectObj);
+        } else {
+          detailObj.isChecked = [selectObj];
+        }
+        selectObj.checked = true;
+      }
+
+      this.$forceUpdate();
+    },
+    // 点击了多选里面的删除 去掉里面的当前项
+    handDeleteChecked(obj, smallObj, type) {
+      console.log("obj", obj);
+      console.log("smallObj", smallObj);
+      if (type === "checked") {
+        let list = JSON.parse(JSON.stringify(obj.isChecked));
+        let res = [];
+        list.forEach((item) => {
+          if (item.text === smallObj.text) {
+          } else {
+            res.push(item);
+          }
+        });
+        if (obj.question.options && obj.question.options.length > 0) {
+          obj.question.options.forEach((item) => {
+            if (item.text === smallObj.text) {
+              item.checked = false;
+            }
+          });
+        }
+
+        obj.isChecked = res;
+        this.$forceUpdate();
+      } else {
+        obj.choiceResponse = [];
+        this.$forceUpdate();
+      }
+    },
+
+    // 修改情况类型
+    handleChangeSituationType(e) {
+      console.log("e", e);
+      this.current = Number(e.detail.value);
+    },
   },
 };
 </script>
@@ -591,271 +1001,752 @@ export default {
 <style lang="less" scoped>
 .main {
   width: 100%;
-  // height: 100vh;
+  height: 100vh;
   background-color: #fff;
   box-sizing: border-box;
-  padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS 11.2+ */
+  padding-bottom: env(safe-area-inset-bottom);
   padding-bottom: constant(safe-area-inset-bottom);
-  .pageHeader {
-    height: 120rpx;
+  .pageScroll {
     width: 100%;
-    background-color: rgb(246, 246, 246);
-    box-shadow: rgb(214, 207, 207) 4rpx 0px 20rpx;
-    background: url("../../static/images/mbwa/bj_logo.png") no-repeat bottom
-      right;
-    background-size: 34%;
-    padding-left: 30rpx;
+    height: calc(100% - 120rpx);
+    background-color: #f6f7f9;
     box-sizing: border-box;
-    .hederContent {
-      display: flex;
-      align-items: center;
-      img {
-        width: 100rpx;
-        height: 100rpx;
-        border-radius: 50%;
-        margin-top: 10rpx;
-        margin-right: 20rpx;
-      }
-    }
-  }
-
-  .addressBox {
-    color: #727272;
-    padding: 30rpx;
-    .contentBox {
-      display: flex;
-      .addressIcon {
-        display: inline-block;
-        width: 49rpx;
-        height: 48rpx;
-        border-radius: 10rpx;
-        margin-right: 6rpx;
-      }
-      .xuncha {
-        font-size: 26rpx;
-        color: #1b1c20;
-      }
-    }
-  }
-
-  .formBox {
-    position: relative;
-    margin-left: 24rpx;
-    box-sizing: border-box;
-    ul {
-      li {
+    padding-bottom: 32rpx;
+    .topContent {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 16rpx 32rpx 0;
+      background: linear-gradient(#e6eefd 0%, #f6f7f9 100%);
+      .placeBox {
         width: 100%;
-        position: relative;
-        margin-top: 16rpx;
-
-        .circle {
-          background-color: #b2b2b2;
-          height: 16rpx;
-          width: 16rpx;
-          border-radius: 50%;
-          position: absolute;
-          top: 16rpx;
-          left: 1rpx;
-        }
-        .circle-first {
-          top: 14rpx;
-        }
-        .circle-last {
-          top: 46rpx;
-        }
-        .circleActive {
-          height: 16rpx;
-          width: 16rpx;
-          border-radius: 50%;
-          position: absolute;
-          left: 1rpx;
-          background-color: #409eff;
+        box-sizing: border-box;
+        padding: 24rpx;
+        border-radius: 16rpx;
+        background: #fff;
+        background-image: url("https://eshangtech.com/minTestImg/placeBg.png");
+        background-size: 100% 100%;
+        background-position: 2rpx 2rpx;
+        background-repeat: no-repeat;
+        .placeName {
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 26rpx;
+          color: #010b18;
+          line-height: 40rpx;
+          text-align: left;
+          font-style: normal;
         }
 
-        .examineContent {
+        .userBox {
           width: 100%;
-          box-sizing: border-box;
-          padding-left: 40rpx;
-          .titleBox {
+          margin-top: 12rpx;
+          .userTop {
+            .userName {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 26rpx;
+              color: #010b18;
+              line-height: 40rpx;
+              text-align: left;
+              font-style: normal;
+              margin-right: 12rpx;
+            }
+            .labelBox {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #676d74;
+              line-height: 32rpx;
+              text-align: left;
+              font-style: normal;
+              padding: 2rpx 8rpx;
+              background: #f0f2f7;
+              border-radius: 4rpx;
+            }
+          }
+
+          .timeBox {
             display: flex;
             align-items: center;
-
-            .img-zds {
-              display: inline-block;
+            margin-top: 8rpx;
+            .timeIcon {
               width: 32rpx;
               height: 32rpx;
-              background: url("../../static/images/mbwa/content_img_gray.png")
-                no-repeat center;
-              background-size: contain;
-              margin-right: 6rpx;
+              margin-right: 4rpx;
             }
-
-            .img-upload {
-              display: inline-block;
-              width: 32rpx;
-              height: 32rpx;
-              background: url("../../static/images/mbwa/pic_img_gray.png")
-                no-repeat center;
-              background-size: contain;
-              margin-right: 6rpx;
-            }
-
-            .activezds {
-              background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
-            }
-
-            .activeupload {
-              background-image: url("../../static/images/mbwa/zdsgl_sm_pic.png");
-            }
-
-            .titleText {
-              font-size: 26rpx;
-              color: #7a7a7a;
-            }
-            .titleTextActive {
-              font-size: 26rpx;
-              color: #409eff;
-            }
-          }
-
-          .inputBox {
-            color: #939393;
-            font-size: 24rpx;
-            padding-bottom: 40rpx;
-            width: 100%;
-            box-sizing: border-box;
-            textarea {
-              min-height: 50rpx;
+            .nowTime {
+              font-family: "PingFangSC";
+              font-weight: 400;
               font-size: 24rpx;
-              line-height: 1.8;
-              border-bottom: 1rpx solid #eee;
-              margin-top: 20rpx;
-              color: #727272;
+              color: #676d74;
+              line-height: 32rpx;
+              text-align: left;
+              font-style: normal;
             }
           }
+        }
+      }
 
-          .tagList {
+      .inspectionContent {
+        width: 100%;
+        margin-top: 24rpx;
+        background: #fff;
+        border-radius: 16rpx;
+        box-sizing: border-box;
+        padding: 24rpx;
+        .contentTop {
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 26rpx;
+          color: #010b18;
+          line-height: 40rpx;
+          text-align: left;
+          font-style: normal;
+          .required {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #ff0000;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+            margin-left: 4rpx;
+          }
+        }
+        .contentBox {
+          width: 100%;
+          margin-top: 16rpx;
+        }
+        .uploadImgBox {
+          width: 100%;
+          margin-top: 16rpx;
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+          .submitImgBox {
+            width: 148rpx;
+            height: 148rpx;
+            background: #f7f7f8;
+            border-radius: 8rpx;
             display: flex;
-            font-size: 24rpx;
-            color: #606266;
-            width: 100%;
-            box-sizing: border-box;
-            .tagName {
-              width: 200rpx;
-              margin-right: 16rpx;
-              font-size: 22rpx;
-              line-height: 2.9;
-            }
-            .tagsBox {
-              width: calc(100% - 200rpx);
-              // width: 546rpx;
-              padding: 0 24rpx 0 12rpx;
-            }
-            .tagUnit {
-              padding: 4rpx 16rpx;
-              background-color: #f4f4f4;
-              color: #606266;
-              border-radius: 24rpx;
-              margin: 8rpx;
-              font-size: 22rpx;
-              display: inline-block;
-              vertical-align: middle;
-            }
-            .active {
-              color: #ed7043;
-              background-color: #fdf1ec;
+            align-items: center;
+            justify-content: center;
+            margin-right: 16rpx;
+            .addIcon {
+              width: 48rpx;
+              height: 48rpx;
+              color: #b4b5ba;
             }
           }
-
-          .uploadBox {
-            display: flex;
-            flex-flow: row wrap;
-            justify-content: flex-start;
-            align-items: flex-start;
-            width: 100%;
-            box-sizing: border-box;
-            padding: 20rpx 0;
-            /* padding-left: 54rpx; */
-            min-height: 160rpx;
-            .uploadList {
-              position: relative;
+          .imgItem {
+            width: 148rpx;
+            height: 148rpx;
+            margin-right: 16rpx;
+            position: relative;
+            border-radius: 8rpx;
+            overflow: hidden;
+            image {
+              width: 100%;
+              height: 100%;
+            }
+            .closeBox {
+              width: 32rpx;
+              height: 32rpx;
+              border-radius: 0rpx 8rpx 0rpx 8rpx;
+              background: rgba(6, 10, 25, 0.5);
               display: flex;
-              flex-flow: row nowrap;
-              justify-content: center;
               align-items: center;
-              background-color: #f1f1f1;
-              box-sizing: border-box;
-              width: 160rpx;
-              height: 160rpx;
-              border-radius: 6rpx;
-              margin-top: 16rpx;
-            }
-            .uploadList:nth-child(3n-1) {
-              margin-left: 16rpx;
-              margin-right: 16rpx;
-            }
-            .uploadList image {
-              width: 160rpx;
-              height: 160rpx;
-              border-radius: 6rpx;
-            }
-
-            .uploadAdd {
-              width: 26%;
-              box-sizing: border-box;
-              .upload-file-add-container {
-                display: flex;
-                flex-flow: column nowrap;
-                justify-content: center;
-                align-items: center;
-                border: 1rpx dashed #c6c6c6;
-                height: 160rpx;
-                width: 160rpx;
-                margin-top: 15rpx;
-                border-radius: 6rpx;
-                margin-left: 12rpx;
-                .walk-manage-plus {
-                  line-height: 60rpx;
-                  width: 62rpx;
-                  height: 62rpx;
-                  text-align: center;
-                  border-radius: 50%;
-                  background-color: #409eff;
-                  color: #ffffff;
-                  font-size: 48rpx;
-                  box-shadow: 0 2rpx 6rpx 0 #eee;
-                }
+              justify-content: center;
+              position: absolute;
+              top: 0;
+              right: 0;
+              .closeIcon {
+                width: 24rpx;
+                height: 24rpx;
               }
             }
           }
+        }
+      }
+    }
 
-          .uni-list-cell {
-            justify-content: unset;
-            margin-top: 28rpx;
+    .qusetionBox {
+      width: 100%;
+      margin-top: 24rpx;
+      box-sizing: border-box;
+      padding: 0 32rpx;
+      .questionItem {
+        width: 100%;
+        background: #fff;
+        box-sizing: border-box;
+        padding: 24rpx;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+        .quetionTitle {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .quetionLeft {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #010b18;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+            .required {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 28rpx;
+              color: #ff0000;
+              line-height: 40rpx;
+              text-align: left;
+              font-style: normal;
+              margin-left: 4rpx;
+            }
           }
 
-          .uni-list-cell:after {
-            background-color: #f9f9f9;
+          .quetionRight {
+            display: flex;
+            align-items: center;
+            .placeSelect {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #d6d7da;
+              line-height: 40rpx;
+              text-align: left;
+              font-style: normal;
+            }
+            .rightArrow {
+              width: 32rpx;
+              height: 32rpx;
+              margin-left: 8rpx;
+            }
+          }
+        }
+        .checkedBottom {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+          margin-top: 16rpx;
+          .bottomItem {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #676d74;
+            line-height: 36rpx;
+            text-align: left;
+            font-style: normal;
+            padding: 8rpx 16rpx;
+            border-radius: 6rpx;
+            background: #f6f6f7;
+            margin-right: 16rpx;
+            margin-bottom: 16rpx;
+            .closeIcon {
+              width: 24rpx;
+              height: 24rpx;
+              margin-left: 16rpx;
+            }
+          }
+        }
+        .radioGroup {
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+          .radioItem {
+            display: flex;
+            align-items: center;
+            padding: 8rpx;
+            font-size: 24rpx;
           }
         }
       }
 
-      .active .img-zds {
-        background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
+      .requestionCheckedItem {
+        width: 100%;
+        box-sizing: border-box;
+        padding: 24rpx;
+        background: #ffffff;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+        .checkedTop {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .topLeft {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 26rpx;
+            color: #010b18;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+            .required {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #ff0000;
+              line-height: 40rpx;
+              text-align: left;
+              font-style: normal;
+              margin-left: 4rpx;
+            }
+          }
+          .topRight {
+            display: flex;
+            align-items: center;
+            .placeSelect {
+              font-family: "PingFangSC";
+              font-weight: 400;
+              font-size: 24rpx;
+              color: #d6d7da;
+              line-height: 40rpx;
+              text-align: left;
+              font-style: normal;
+            }
+            .rightArrow {
+              width: 32rpx;
+              height: 32rpx;
+              margin-left: 8rpx;
+            }
+          }
+        }
+
+        .checkedBottom {
+          width: 100%;
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+          margin-top: 16rpx;
+          .bottomItem {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 24rpx;
+            color: #676d74;
+            line-height: 36rpx;
+            text-align: left;
+            font-style: normal;
+            padding: 8rpx 16rpx;
+            border-radius: 6rpx;
+            background: #f6f6f7;
+            margin-right: 16rpx;
+            margin-bottom: 16rpx;
+            .closeIcon {
+              width: 24rpx;
+              height: 24rpx;
+              margin-left: 16rpx;
+            }
+          }
+        }
       }
     }
 
-    .btn {
-      width: 80%;
-      margin: 0 auto;
-      margin-top: 50rpx;
-      background-color: #409eff;
-      border-radius: 10rpx;
-      color: #fff;
-      font-size: 28rpx;
-      line-height: 2.8;
-      margin-top: 96rpx;
+    .otherBox {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 16rpx 32rpx 0;
+      .questionItem {
+        width: 100%;
+        background: #fff;
+        box-sizing: border-box;
+        padding: 24rpx;
+        border-radius: 16rpx;
+        margin-bottom: 24rpx;
+        .quetionTitle {
+          font-family: "PingFangSC";
+          font-weight: 400;
+          font-size: 26rpx;
+          color: #010b18;
+          line-height: 40rpx;
+          text-align: left;
+          font-style: normal;
+          .required {
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #ff0000;
+            line-height: 40rpx;
+            text-align: left;
+            font-style: normal;
+            margin-left: 4rpx;
+          }
+        }
+        .radioGroup {
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+          .radioItem {
+            display: flex;
+            align-items: center;
+            padding: 8rpx;
+            font-size: 24rpx;
+          }
+        }
+      }
     }
   }
+
+  .bottomBtnBox {
+    width: 100%;
+    height: 120rpx;
+    box-sizing: border-box;
+    padding: 16rpx 40rpx;
+    background: #fff;
+    .bottomBtn {
+      width: 100%;
+      height: 100%;
+      font-family: "PingFangSC";
+      font-weight: 400;
+      font-size: 32rpx;
+      color: #ffffff;
+      font-style: normal;
+      background: #3b72ff;
+      border-radius: 6rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  .popupBox {
+    width: 100%;
+    height: 60vh;
+    box-sizing: border-box;
+    padding-bottom: env(safe-area-inset-bottom);
+    padding-bottom: constant(safe-area-inset-bottom);
+    .checkPopupContent {
+      width: 100%;
+      height: calc(100% - 100rpx);
+      background: #fff;
+      border-radius: 24rpx 24rpx 0rpx 0rpx;
+      box-sizing: border-box;
+      padding: 32rpx;
+      .anwersList {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        .anwersItem {
+          .anwers {
+            min-width: calc((100% - 48rpx) / 3);
+            background: #f6f6f7;
+            border-radius: 6rpx;
+            text-align: center;
+            padding: 14rpx;
+            margin-right: 16rpx;
+            margin-bottom: 16rpx;
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #010b18;
+            line-height: 40rpx;
+            font-style: normal;
+          }
+          .selectAnwersItem {
+            background: #e7eeff;
+            color: #3b72ff;
+          }
+        }
+      }
+      .radioGroup {
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        .radioItem {
+          display: flex;
+          align-items: center;
+          padding: 8rpx;
+          font-size: 24rpx;
+        }
+      }
+    }
+
+    .bottomBtnBox {
+      width: 100%;
+      height: 100rpx;
+      box-sizing: border-box;
+      padding: 12rpx 40rpx 0;
+      background: #fff;
+      .bottomBtn {
+        width: 100%;
+        height: 88rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-family: "PingFangSC";
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #ffffff;
+        line-height: 44rpx;
+        font-style: normal;
+        background: #3b72ff;
+        border-radius: 6rpx;
+      }
+    }
+  }
+
+  // .pageHeader {
+  //   height: 120rpx;
+  //   width: 100%;
+  //   background-color: rgb(246, 246, 246);
+  //   box-shadow: rgb(214, 207, 207) 4rpx 0px 20rpx;
+  //   background: url("../../static/images/mbwa/bj_logo.png") no-repeat bottom
+  //     right;
+  //   background-size: 34%;
+  //   padding-left: 30rpx;
+  //   box-sizing: border-box;
+  //   .hederContent {
+  //     display: flex;
+  //     align-items: center;
+  //     img {
+  //       width: 100rpx;
+  //       height: 100rpx;
+  //       border-radius: 50%;
+  //       margin-top: 10rpx;
+  //       margin-right: 20rpx;
+  //     }
+  //   }
+  // }
+
+  // .addressBox {
+  //   color: #727272;
+  //   padding: 30rpx;
+  //   .contentBox {
+  //     display: flex;
+  //     .addressIcon {
+  //       display: inline-block;
+  //       width: 49rpx;
+  //       height: 48rpx;
+  //       border-radius: 10rpx;
+  //       margin-right: 6rpx;
+  //     }
+  //     .xuncha {
+  //       font-size: 26rpx;
+  //       color: #1b1c20;
+  //     }
+  //   }
+  // }
+
+  // .formBox {
+  //   position: relative;
+  //   margin-left: 24rpx;
+  //   box-sizing: border-box;
+  //   ul {
+  //     li {
+  //       width: 100%;
+  //       position: relative;
+  //       margin-top: 16rpx;
+
+  //       .circle {
+  //         background-color: #b2b2b2;
+  //         height: 16rpx;
+  //         width: 16rpx;
+  //         border-radius: 50%;
+  //         position: absolute;
+  //         top: 16rpx;
+  //         left: 1rpx;
+  //       }
+  //       .circle-first {
+  //         top: 14rpx;
+  //       }
+  //       .circle-last {
+  //         top: 46rpx;
+  //       }
+  //       .circleActive {
+  //         height: 16rpx;
+  //         width: 16rpx;
+  //         border-radius: 50%;
+  //         position: absolute;
+  //         left: 1rpx;
+  //         background-color: #409eff;
+  //       }
+
+  //       .examineContent {
+  //         width: 100%;
+  //         box-sizing: border-box;
+  //         padding-left: 40rpx;
+  //         .titleBox {
+  //           display: flex;
+  //           align-items: center;
+
+  //           .img-zds {
+  //             display: inline-block;
+  //             width: 32rpx;
+  //             height: 32rpx;
+  //             background: url("../../static/images/mbwa/content_img_gray.png")
+  //               no-repeat center;
+  //             background-size: contain;
+  //             margin-right: 6rpx;
+  //           }
+
+  //           .img-upload {
+  //             display: inline-block;
+  //             width: 32rpx;
+  //             height: 32rpx;
+  //             background: url("../../static/images/mbwa/pic_img_gray.png")
+  //               no-repeat center;
+  //             background-size: contain;
+  //             margin-right: 6rpx;
+  //           }
+
+  //           .activezds {
+  //             background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
+  //           }
+
+  //           .activeupload {
+  //             background-image: url("../../static/images/mbwa/zdsgl_sm_pic.png");
+  //           }
+
+  //           .titleText {
+  //             font-size: 26rpx;
+  //             color: #7a7a7a;
+  //           }
+  //           .titleTextActive {
+  //             font-size: 26rpx;
+  //             color: #409eff;
+  //           }
+  //         }
+
+  //         .inputBox {
+  //           color: #939393;
+  //           font-size: 24rpx;
+  //           padding-bottom: 40rpx;
+  //           width: 100%;
+  //           box-sizing: border-box;
+  //           textarea {
+  //             min-height: 50rpx;
+  //             font-size: 24rpx;
+  //             line-height: 1.8;
+  //             border-bottom: 1rpx solid #eee;
+  //             margin-top: 20rpx;
+  //             color: #727272;
+  //           }
+  //         }
+
+  //         .tagList {
+  //           display: flex;
+  //           font-size: 24rpx;
+  //           color: #606266;
+  //           width: 100%;
+  //           box-sizing: border-box;
+  //           .tagName {
+  //             width: 200rpx;
+  //             margin-right: 16rpx;
+  //             font-size: 22rpx;
+  //             line-height: 2.9;
+  //           }
+  //           .tagsBox {
+  //             width: calc(100% - 200rpx);
+  //             // width: 546rpx;
+  //             padding: 0 24rpx 0 12rpx;
+  //           }
+  //           .tagUnit {
+  //             padding: 4rpx 16rpx;
+  //             background-color: #f4f4f4;
+  //             color: #606266;
+  //             border-radius: 24rpx;
+  //             margin: 8rpx;
+  //             font-size: 22rpx;
+  //             display: inline-block;
+  //             vertical-align: middle;
+  //           }
+  //           .active {
+  //             color: #ed7043;
+  //             background-color: #fdf1ec;
+  //           }
+  //         }
+
+  //         .uploadBox {
+  //           display: flex;
+  //           flex-flow: row wrap;
+  //           justify-content: flex-start;
+  //           align-items: flex-start;
+  //           width: 100%;
+  //           box-sizing: border-box;
+  //           padding: 20rpx 0;
+  //           /* padding-left: 54rpx; */
+  //           min-height: 160rpx;
+  //           .uploadList {
+  //             position: relative;
+  //             display: flex;
+  //             flex-flow: row nowrap;
+  //             justify-content: center;
+  //             align-items: center;
+  //             background-color: #f1f1f1;
+  //             box-sizing: border-box;
+  //             width: 160rpx;
+  //             height: 160rpx;
+  //             border-radius: 6rpx;
+  //             margin-top: 16rpx;
+  //           }
+  //           .uploadList:nth-child(3n-1) {
+  //             margin-left: 16rpx;
+  //             margin-right: 16rpx;
+  //           }
+  //           .uploadList image {
+  //             width: 160rpx;
+  //             height: 160rpx;
+  //             border-radius: 6rpx;
+  //           }
+
+  //           .uploadAdd {
+  //             width: 26%;
+  //             box-sizing: border-box;
+  //             .upload-file-add-container {
+  //               display: flex;
+  //               flex-flow: column nowrap;
+  //               justify-content: center;
+  //               align-items: center;
+  //               border: 1rpx dashed #c6c6c6;
+  //               height: 160rpx;
+  //               width: 160rpx;
+  //               margin-top: 15rpx;
+  //               border-radius: 6rpx;
+  //               margin-left: 12rpx;
+  //               .walk-manage-plus {
+  //                 line-height: 60rpx;
+  //                 width: 62rpx;
+  //                 height: 62rpx;
+  //                 text-align: center;
+  //                 border-radius: 50%;
+  //                 background-color: #409eff;
+  //                 color: #ffffff;
+  //                 font-size: 48rpx;
+  //                 box-shadow: 0 2rpx 6rpx 0 #eee;
+  //               }
+  //             }
+  //           }
+  //         }
+
+  //         .uni-list-cell {
+  //           justify-content: unset;
+  //           margin-top: 28rpx;
+  //         }
+
+  //         .uni-list-cell:after {
+  //           background-color: #f9f9f9;
+  //         }
+  //       }
+  //     }
+
+  //     .active .img-zds {
+  //       background-image: url("../../static/images/mbwa/zdsgl_sm_nr.png");
+  //     }
+  //   }
+
+  //   .btn {
+  //     width: 80%;
+  //     margin: 0 auto;
+  //     margin-top: 50rpx;
+  //     background-color: #409eff;
+  //     border-radius: 10rpx;
+  //     color: #fff;
+  //     font-size: 28rpx;
+  //     line-height: 2.8;
+  //     margin-top: 96rpx;
+  //   }
+  // }
 }
 </style>
\ No newline at end of file
diff --git a/pages/walkAroundManager/statusPage.vue b/pages/walkAroundManager/statusPage.vue
index d1032b2..0b591c5 100644
--- a/pages/walkAroundManager/statusPage.vue
+++ b/pages/walkAroundManager/statusPage.vue
@@ -1,7 +1,12 @@
 <template>
   <view class="main">
     <view class="content">
-      <image class="successImg" src="/static/images/submitSuccess.svg" />
+      <image class="successImg" src="/static/images/mbwa/successIcon.svg" />
+
+      <view class="messageBox">
+        <view class="title">提交成功</view>
+      </view>
+
       <view class="btnBox">
         <view class="detailBtn" @click="handleGoDetail">查看详情</view>
         <view class="continue" @click="handleBackHome">继续考核</view>
@@ -40,46 +45,112 @@ export default {
 .main {
   width: 100%;
   height: 100vh;
-  background: #f6f7f8;
+  background: #f6f7f9;
   box-sizing: border-box;
-  padding: 32rpx;
   .content {
     width: 100%;
-    height: 100%;
+    background: linear-gradient(#e6eefd 0%, #f6f7f9 60%);
     display: flex;
     flex-direction: column;
     align-items: center;
+    justify-content: center;
     box-sizing: border-box;
-    padding-top: 150rpx;
+    padding-top: 160rpx;
     .successImg {
-      width: 500rpx;
-      height: 500rpx;
+      width: 224rpx;
+      height: 168rpx;
     }
-    .btnBox {
-      .detailBtn {
+    .messageBox {
+      width: 100%;
+      margin-top: 40rpx;
+      .title {
         font-family: "PingFangSC";
-        font-size: 32rpx;
-        color: #feffff;
-        line-height: 44rpx;
-        text-align: left;
+        font-weight: 400;
+        font-size: 36rpx;
+        color: #130f05;
+        line-height: 48rpx;
+        text-align: center;
         font-style: normal;
-        padding: 12rpx 36rpx;
-        border-radius: 48rpx;
-        background: #7d5632;
-        margin-bottom: 24rpx;
+      }
+    }
+
+    .btnBox {
+      width: 100%;
+      margin-top: 62rpx;
+      box-sizing: border-box;
+      padding: 0 80rpx;
+
+      .detailBtn {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #3b72ff;
+        border-radius: 6rpx;
+        font-family: "PingFangSC";
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #ffffff;
+        line-height: 44rpx;
+        font-style: normal;
+        margin-bottom: 32rpx;
+        padding: 22rpx 0;
       }
       .continue {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #ffffff;
+        border-radius: 6rpx;
         font-family: "PingFangSC";
+        font-weight: 400;
         font-size: 32rpx;
-        color: #7d5632;
+        color: #010b18;
         line-height: 44rpx;
-        text-align: left;
         font-style: normal;
-        padding: 8rpx 32rpx;
-        border-radius: 48rpx;
-        border: 4rpx solid #7d5632;
+        padding: 22rpx 0;
       }
     }
   }
+
+  // .content {
+  //   width: 100%;
+  //   height: 100%;
+  //   display: flex;
+  //   flex-direction: column;
+  //   align-items: center;
+  //   box-sizing: border-box;
+  //   padding-top: 150rpx;
+  //   .successImg {
+  //     width: 500rpx;
+  //     height: 500rpx;
+  //   }
+  //   .btnBox {
+  //     .detailBtn {
+  //       font-family: "PingFangSC";
+  //       font-size: 32rpx;
+  //       color: #feffff;
+  //       line-height: 44rpx;
+  //       text-align: left;
+  //       font-style: normal;
+  //       padding: 12rpx 36rpx;
+  //       border-radius: 48rpx;
+  //       background: #7d5632;
+  //       margin-bottom: 24rpx;
+  //     }
+  //     .continue {
+  //       font-family: "PingFangSC";
+  //       font-size: 32rpx;
+  //       color: #7d5632;
+  //       line-height: 44rpx;
+  //       text-align: left;
+  //       font-style: normal;
+  //       padding: 8rpx 32rpx;
+  //       border-radius: 48rpx;
+  //       border: 4rpx solid #7d5632;
+  //     }
+  //   }
+  // }
 }
 </style>
\ No newline at end of file
diff --git a/static/images/mbwa/addImageIcon.svg b/static/images/mbwa/addImageIcon.svg
new file mode 100644
index 0000000..d99d4c1
--- /dev/null
+++ b/static/images/mbwa/addImageIcon.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1742524490484" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2590" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M864 448 512 448 512 96C512 78.08 497.92 64 480 64 462.08 64 448 78.08 448 96L448 448 96 448C78.08 448 64 462.08 64 480 64 497.92 78.08 512 96 512L448 512l0 352C448 881.92 462.08 896 480 896 497.92 896 512 881.92 512 864L512 512l352 0C881.92 512 896 497.92 896 480 896 462.08 881.92 448 864 448z" p-id="2591" fill="#b4b5ba"></path></svg>
\ No newline at end of file
diff --git a/static/images/mbwa/closeIcon.svg b/static/images/mbwa/closeIcon.svg
new file mode 100644
index 0000000..b5aeba4
--- /dev/null
+++ b/static/images/mbwa/closeIcon.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组_29备份@2x</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-190.000000, -29.000000)">
+            <g id="编组-29备份" transform="translate(190.000000, 29.000000)">
+                <rect id="矩形" x="0" y="0" width="12" height="12"></rect>
+                <g id="通用图标/关闭" transform="translate(1.000000, 1.000000)">
+                    <rect id="矩形" x="0" y="0" width="10" height="10"></rect>
+                    <g id="close" transform="translate(0.625000, 0.625000)" stroke="#999DA3" stroke-width="0.975">
+                        <path d="M8.83875,0 L4.419375,4.419375 L0,8.83875 M0,0 L4.419375,4.419375 L8.83875,8.83875" id="形状"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/mbwa/fixed.svg b/static/images/mbwa/fixed.svg
new file mode 100644
index 0000000..f35de1c
--- /dev/null
+++ b/static/images/mbwa/fixed.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组_8@2x</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-50.000000, -25.000000)">
+            <g id="编组-8" transform="translate(50.000000, 25.000000)">
+                <rect id="矩形" x="0" y="0" width="20" height="20"></rect>
+                <path d="M10,2 C13.8659932,2 17,5.13400675 17,9 C17,11.5773288 14.6666667,14.5773288 10,18 C5.33333333,14.5773288 3,11.5773288 3,9 C3,5.13400675 6.13400675,2 10,2 Z M10,7 C8.8954305,7 8,7.8954305 8,9 C8,10.1045695 8.8954305,11 10,11 C11.1045695,11 12,10.1045695 12,9 C12,7.8954305 11.1045695,7 10,7 Z" id="形状结合" fill="#3B72FF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/mbwa/rightArrow.svg b/static/images/mbwa/rightArrow.svg
new file mode 100644
index 0000000..fe881d1
--- /dev/null
+++ b/static/images/mbwa/rightArrow.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>图标/通用/更多_2@2x</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-162.000000, -27.000000)">
+            <g id="图标/通用/更多" transform="translate(162.000000, 27.000000)">
+                <rect id="矩形" x="0" y="0" width="16" height="16"></rect>
+                <path d="M10.5,2.5 L5.5,8 L10.5,13.5" id="路径" stroke="#B4B5BA" stroke-width="1.3" transform="translate(8.000000, 8.000000) scale(-1, 1) translate(-8.000000, -8.000000) "></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/mbwa/successIcon.svg b/static/images/mbwa/successIcon.svg
new file mode 100644
index 0000000..75f7962
--- /dev/null
+++ b/static/images/mbwa/successIcon.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="112px" height="84px" viewBox="0 0 112 84" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组_196@2x</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-22.000000, -241.000000)">
+            <g id="编组-196" transform="translate(22.000000, 241.000000)">
+                <g id="编组-194" transform="translate(16.000000, 2.000000)">
+                    <circle id="椭圆形备份-20" fill="#3B72FF" cx="40" cy="40" r="40"></circle>
+                    <rect id="矩形" fill="#FFFFFF" x="24" y="24" width="32" height="32" rx="8"></rect>
+                    <path d="M47.995689,34.4393398 C48.5814755,35.0251263 48.5814755,35.9748737 47.995689,36.5606602 L38.8033009,45.7530483 C38.2175144,46.3388348 37.267767,46.3388348 36.6819805,45.7530483 C36.6321647,45.7032325 36.5865852,45.6507845 36.5452421,45.596152 C36.491581,45.5557501 36.4390123,45.5100801 36.3890873,45.4601551 L31.4393398,40.5104076 C30.8535534,39.9246212 30.8535534,38.9748737 31.4393398,38.3890873 C32.0251263,37.8033009 32.9748737,37.8033009 33.5606602,38.3890873 L37.742,42.57 L45.8743687,34.4393398 C46.4601551,33.8535534 47.4099026,33.8535534 47.995689,34.4393398 Z" id="形状结合" fill="#1470FF"></path>
+                </g>
+                <circle id="椭圆形备份-23" fill="#1470FF" opacity="0.100000001" cx="97" cy="3" r="3"></circle>
+                <circle id="椭圆形" fill="#1470FF" opacity="0.100000001" cx="106.5" cy="61.5" r="5.5"></circle>
+                <circle id="椭圆形备份-17" fill="#1470FF" opacity="0.100000001" cx="22.5" cy="80.5" r="3.5"></circle>
+                <circle id="椭圆形备份-26" fill="#1470FF" opacity="0.100000001" cx="6" cy="28" r="6"></circle>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/mbwa/successSmallIcon.svg b/static/images/mbwa/successSmallIcon.svg
new file mode 100644
index 0000000..2a9038d
--- /dev/null
+++ b/static/images/mbwa/successSmallIcon.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>通过小程序@2x</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-22.000000, -27.000000)">
+            <g id="通过(小程序)" transform="translate(22.000000, 27.000000)">
+                <circle id="椭圆形" fill="#FFFFFF" cx="8" cy="8" r="8"></circle>
+                <path d="M14,8 C14,11.31372 11.31372,14 8,14 C4.686292,14 2,11.31372 2,8 C2,4.686292 4.686292,2 8,2 C11.31372,2 14,4.686292 14,8 Z M10.82424,6.92424 C11.05856,6.68992 11.05856,6.31004 10.82424,6.07572 C10.58992,5.8414 10.21004,5.8414 9.97572,6.07572 L7.1,8.95148 L6.02424,7.87572 C5.78992,7.6414 5.41004,7.6414 5.17572,7.87572 C4.9414,8.11004 4.9414,8.48992 5.17572,8.72424 L6.67572,10.22424 C6.91004,10.45856 7.28992,10.45856 7.52424,10.22424 L10.82424,6.92424 Z" id="形状" fill="#15BC83"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/mbwa/timeIcon.svg b/static/images/mbwa/timeIcon.svg
new file mode 100644
index 0000000..aad98c6
--- /dev/null
+++ b/static/images/mbwa/timeIcon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组@2x</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-110.000000, -27.000000)">
+            <g id="编组" transform="translate(110.000000, 27.000000)">
+                <rect id="矩形" x="0" y="0" width="16" height="16"></rect>
+                <g id="编组-84" transform="translate(2.166667, 2.166667)" stroke="#999DA3">
+                    <path d="M11.6666667,5.83333333 C11.6666667,9.0549537 9.0549537,11.6666667 5.83333333,11.6666667 C2.61171296,11.6666667 0,9.0549537 0,5.83333333 C0,2.61171296 2.61171296,0 5.83333333,0 C9.0549537,0 11.6666667,2.61171296 11.6666667,5.83333333 Z" id="路径"></path>
+                    <polyline id="路径" points="5.83333333 2.59259259 5.83333333 5.83333333 8.91203704 5.83333333"></polyline>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/wechat_yxcl.zip b/wechat_yxcl.zip
deleted file mode 100644
index 309d0ea..0000000
Binary files a/wechat_yxcl.zip and /dev/null differ