diff --git a/pages.json b/pages.json
index 780693a..592818c 100644
--- a/pages.json
+++ b/pages.json
@@ -240,6 +240,12 @@
                     "style": {
                         "navigationBarTitleText": "上传走动式管理"
                     }
+                },
+                {
+                    "path": "newMap",
+                    "style": {
+                        "navigationBarTitleText": "选择服务区"
+                    }
                 }
             ]
         },
diff --git a/pages/everdayRenven/components/RankContent.vue b/pages/everdayRenven/components/RankContent.vue
index a855195..535ade4 100644
--- a/pages/everdayRenven/components/RankContent.vue
+++ b/pages/everdayRenven/components/RankContent.vue
@@ -6,11 +6,11 @@
 				<view class="tab-icon">🏪</view>
 				<text class="tab-text">商超</text>
 			</view>
-			<view class="tab-item" @tap="selectTab(2000)" :class="{ 'active': nowRank == 2000 }">
+			<view class="tab-item" @tap="selectTab(3000)" :class="{ 'active': nowRank == 3000 }">
 				<view class="tab-icon">🍽️</view>
 				<text class="tab-text">餐饮</text>
 			</view>
-			<view class="tab-item" @tap="selectTab(3000)" :class="{ 'active': nowRank == 3000 }">
+			<view class="tab-item" @tap="selectTab(2000)" :class="{ 'active': nowRank == 2000 }">
 				<view class="tab-icon">🍿</view>
 				<text class="tab-text">小吃</text>
 			</view>
diff --git a/pages/mbwa/mbwa.vue b/pages/mbwa/mbwa.vue
index fa610e0..73a5631 100644
--- a/pages/mbwa/mbwa.vue
+++ b/pages/mbwa/mbwa.vue
@@ -1,868 +1,642 @@
 <template>
-  <view class="main">
-    <!-- <view class="tabBox">
-      <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 class="main">
+        <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>
+
+        <view class="selectServerpartBox">
+            <view class="leftNameBox" @click="handleGoSelectServerPart">
+                {{ currentServerPart ? currentServerPart : "- 请选择服务区 -" }}
+            </view>
+            <view class="rightTimeBox">
+                <picker mode="date" @change="handleTimeChange">{{ selectDay }}</picker>
+            </view>
+        </view>
+
+        <!-- 今日未巡检内容 -->
+        <div class="errorMessage" v-if="notInspectedName">{{
+            `当前服务区${notInspectedName},共${notInspectedList.length}个点位，还未进行巡检` }}</div>
+
+        <!-- 今日已巡检内容 -->
+        <view class="dataList">
+            <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.placeName || "-" }}</view>
+                    <view v-if="item.situation !== 0" class="stateName" :style="{
+                        color:
+                            item.errorStatus === 0
+                                ? 'red'
+                                : item.errorStatus === 1
+                                    ? '#3B72FF'
+                                    : item.errorStatus === 2
+                                        ? '#139942'
+                                        : '',
+                    }">
+                        {{
+                            item.errorStatus === 0
+                                ? "待处理"
+                                : item.errorStatus === 1
+                                    ? "处理中"
+                                    : item.errorStatus === 2
+                                        ? "已处理"
+                                        : ""
+                        }}</view>
+                </view>
+                <view class="itemCenterRow" style="margin: 60rpx 0 20rpx">
+                    <view class="value">{{ item.uploadResult || "-" }}</view>
+                </view>
+                <view class="itemRow">
+                    <view class="leftName"></view>
+
+                    <view class="rightName"><span :style="{
+                        color:
+                            item.situation === 0
+                                ? '#139942'
+                                : item.situation === 1
+                                    ? '#F75031'
+                                    : '',
+                    }">{{
+                        item.errorStatus === 2
+                            ? ""
+                            : item.situation === 0
+                                ? "正常情况"
+                                : item.situation === 1
+                                    ? "急需处理"
+                                    : "-"
+                    }}</span>
+                    </view>
+                </view>
+
+                <view class="line"></view>
+                <view class="itemRow">
+                    <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.createdAt
+                            ? $moment(item.createdAt).format("YYYY-MM-DD HH:mm:ss")
+                            : "-"
+                    }}</view>
+                </view>
+            </view>
+        </view>
     </view>
-
-    <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)">
-          <div class="content-index">{{ index + 1 }}</div>
-          <view class="itemRow">
-            <view class="projectName">{{ item.placeName || "-" }}</view>
-            <view v-if="item.situation !== 0" class="stateName" :style="{
-              color:
-                item.errorStatus === 0
-                  ? 'red'
-                  : item.errorStatus === 1
-                    ? '#3B72FF'
-                    : item.errorStatus === 2
-                      ? '#139942'
-                      : '',
-            }">
-              {{
-                item.errorStatus === 0
-                  ? "待处理"
-                  : item.errorStatus === 1
-                    ? "处理中"
-                    : item.errorStatus === 2
-                      ? "已处理"
-                      : ""
-              }}</view>
-          </view>
-          <view class="itemCenterRow" style="margin: 60rpx 0 20rpx">
-            <view class="value">{{ item.uploadResult || "-" }}</view>
-          </view>
-          <view class="itemRow">
-            <view class="leftName"></view>
-            <!--          <view class="rightName">{{ $util.getMoney(item.REVENUE_AMOUNT) }}</view>-->
-
-            <view class="rightName"><span :style="{
-              color:
-                item.situation === 0
-                  ? '#139942'
-                  : item.situation === 1
-                    ? '#F75031'
-                    : '',
-            }">{{
-              item.errorStatus === 2
-                ? ""
-                : item.situation === 0
-                  ? "正常情况"
-                  : item.situation === 1
-                    ? "急需处理"
-                    : "-"
-            }}</span>
-            </view>
-          </view>
-
-          <view class="line"></view>
-          <view class="itemRow">
-            <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.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.title || "-" }}</span>
-            </view>
-            <view class="topRight" :style="{
-              color:
-                item.errorStatus === 0
-                  ? 'red'
-                  : item.errorStatus === 1
-                    ? '#3B72FF'
-                    : item.errorStatus === 2
-                      ? '#139942'
-                      : '',
-            }">
-              {{
-                item.errorStatus === 0
-                  ? "待处理"
-                  : item.errorStatus === 1
-                    ? "处理中"
-                    : item.errorStatus === 2
-                      ? "已处理"
-                      : ""
-              }}
-            </view>
-          </view>
-
-          <view class="dataBottom">
-            <view class="statusBox" :style="{
-              color:
-                item.situation === 0
-                  ? '#139942'
-                  : item.situation === 1
-                    ? '#F75031'
-                    : '',
-              background:
-                item.situation === 0
-                  ? '#EBF7EF'
-                  : item.situation === 1
-                    ? '#FEF0ED'
-                    : '',
-            }">{{
-              item.situation === 0
-                ? "正常情况"
-                : item.situation === 1
-                  ? "急需处理"
-                  : "-"
-            }}</view>
-
-            <view class="itemContent">{{
-              item.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>
-      </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
+    data() {
+        const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD')
 
-      menu: {}, //当前的手机样式
-      searchTime: stime, // 查询的时间
-      selectIndex: 0, // 选择的服务区
-      selectServiceList: [], // 服务区列表
-      selectServerpartObj: {}, // 选择的服务区对象 label value
-
-      dataList: [], // 下面的数据
-      useInfo: {}, // 用户详情
-      isEnd: false, // 判断是否到底了
-      PageIndex: 1, // 默认的页数
-    };
-  },
-  components: {
-    MenuItem,
-  },
-  onLoad() {
-    this.menu = uni.getMenuButtonBoundingClientRect();
-    let userInfo = uni.getStorageSync("vuex");
-    userInfo = JSON.parse(userInfo);
-    if (userInfo) {
-      this.useInfo = JSON.parse(JSON.stringify(userInfo));
-    }
-    // 拿到服务区的数据
-    this.handleGetServerpartList();
-  },
-  methods: {
-    // 跳转详情进行操作
-    handleGoDetail(obj) {
-      //   判断是否是异常的
-      if (obj.situation === 1) {
-        this.$util.toNextRoute(
-          "navigateTo",
-          `/pages/walkAroundManager/detail?id=${obj.id}&pageType=error`
-        );
-      } else if (obj.situation === 0) {
-        // 正常的 查看详情
-        this.$util.toNextRoute(
-          "navigateTo",
-          `/pages/walkAroundManager/detail?id=${obj.id}`
-        );
-      }
-    },
-    // 滚动到底部
-    handleScrollBottom() {
-      if (!this.isEnd) {
-        this.PageIndex = this.PageIndex + 1;
-        this.handleGetDataList();
-      }
-    },
-    // 拿到时间
-    handleGetTime(e) {
-      console.log("e", e);
-      this.searchTime = e.detail.value;
-      this.dataList = [];
-      this.handleGetDataList();
-    },
-    // 修改服务区
-    handleChangeService(e) {
-      console.log("e", e);
-      this.selectIndex = Number(e.detail.value);
-      this.dataList = [];
-      this.handleGetDataList();
-    },
-    // 返回上一页
-    handleBack() {
-      uni.switchTab({ url: "/pages/index/index" });
-    },
-    // 改变tab
-    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: 0,
-        // startTime: "",
-        // endTime: "",
-        startTime: this.$moment().subtract(1, 'months').format('YYYY-MM-DD'),
-        endTime: this.$moment().format('YYYY-MM-DD'),
-        pageNum: 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 === 1
-            ? null
-            : this.selectFilter === 2
-              ? [
+        return {
+            currentServerPart: "",
+            currentServerPartObj: {},
+            tabList: [
                 {
-                  key: "situation",
-                  value: 0,
+                    name: "全部",
+                    src: "/static/images/expense/type/shenp.png",
+                    active: "/static/images/expense/type/shenpz.png",
+                    id: 1,
                 },
-              ]
-              : this.selectFilter === 3
-                ? [
-                  {
-                    key: "situation",
-                    value: 1,
-                  },
-                ]
-                : this.selectFilter === 4
-                  ? [
-                    {
-                      key: "person.STAFF_NAME",
-                      value: this.useInfo.userData.UserName,
-                      //   this.useInfo.userData.UserId
-                    },
-                  ]
-                  : null,
+                {
+                    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,
+                }
+            ],
+            selectFilter: 1, // 选择的tab
+            selectDay: lastDay,// 选择的时间
+            PageIndex: 1, // 默认的页数
+            dataList: [],// 实际数据
+            notInspectedList: [],// 未巡检站点数据
+            notInspectedName: "",// 未巡检站点名称合计
+            useInfo: {}, // 用户详情
+        }
+    },
+    components: {
+        MenuItem,
+    },
+    onLoad() {
+        let userInfo = uni.getStorageSync("vuex");
+        userInfo = JSON.parse(userInfo);
+        if (userInfo) {
+            this.useInfo = JSON.parse(JSON.stringify(userInfo));
+        }
+    },
+    onShow() {
+        let currentServiceObj = uni.getStorageSync('currentServerPart')
+        console.log('currentServiceObjcurrentServiceObj', currentServiceObj);
+        // 判断是否需要重新请求
+        let isReady = true
+        if (currentServiceObj.label) {
+            if (currentServiceObj.value === this.currentServerPartObj.value) {
+                isReady = false
+            }
 
-        // 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("req323131", req);
-
-      const data = await this.$request.$webJavaPOST(
-        `questionnaire-responses/getList`,
-        req
-      );
-      console.log("datadatadatadata", data);
-
-      let list = data.Result_Data.List;
-      if (list && list.length > 0) {
-        if (list.length < 10) {
-          this.isEnd = true;
+            this.currentServerPart = currentServiceObj.label
+            this.currentServerPartObj = currentServiceObj
+        } else {
+            this.$util.toNextRoute("navigateTo", `/pages/mbwa/newMap`);
         }
 
-        // list.forEach((item) => {
-        // let extendObj = {};
-        // if (item.extend) {
-        //   extendObj = JSON.parse(item.extend);
-        // }
-        // item.extendObj = extendObj;
-        // });
-      } else {
-        this.isEnd = true;
-      }
-
-      this.dataList = this.dataList.concat(list);
-      console.log("this.dataList", this.dataList);
-      uni.hideLoading();
+        if (isReady) {
+            this.handleGetDataList();
+            this.handleGetNotInspected()
+        }
     },
-    // 拿到服务区的数据
-    async handleGetServerpartList() {
-      const req = {
-        UserIdEncrypted: this.useInfo.userData.UserIdEncrypted,
-      };
-      const data = await this.$request.$webGet(
-        "EShangApiMain/Logging/GetPassportInfoById",
-        req
-      );
-      console.log("Info", data);
-      const secondReq = {
-        ServerpartCodes: data.Result_Data.CityAuthority || "",
-        ServerpartType: 1000,
-        StatisticsType: "1000,2000",
-      };
-      const secondData = await this.$request.$webGet(
-        "EShangApiMain/BaseInfo/GetServerpartDDL",
-        secondReq
-      );
-      console.log("secondData", secondData);
-      secondData.Result_Data.List.unshift({
-        label: "蜀越公司",
-        value: 530,
-      });
-      this.selectServiceList = secondData.Result_Data.List;
+    methods: {
+        // 改变时间
+        handleTimeChange(e) {
+            console.log('eeee', e);
+            let newTime = this.$util.cutDate(new Date(e.detail.value), 'YYYY-MM-DD')
+            console.log('newTimenewTimenewTime', newTime);
+            this.selectDay = newTime
 
-      // 拿到下面实际数据
-      this.handleGetDataList();
-    },
-  },
-};
+            this.handleGetDataList();
+            this.handleGetNotInspected()
+        },
+        // 跳转到选择服务区
+        handleGoSelectServerPart() {
+            this.$util.toNextRoute("navigateTo", `/pages/mbwa/newMap`);
+        },
+        // 改变tab
+        handleChangeSelect(value) {
+            this.selectFilter = value;
+            this.dataList = [];
+            this.isEnd = false;
+            this.PageIndex = 1;
+            // this.handleGetDataList();
+
+            this.handleGetDataList();
+            this.handleGetNotInspected()
+        },
+        // 跳转详情进行操作
+        handleGoDetail(obj) {
+            //   判断是否是异常的
+            if (obj.situation === 1) {
+                this.$util.toNextRoute(
+                    "navigateTo",
+                    `/pages/walkAroundManager/detail?id=${obj.id}&pageType=error`
+                );
+            } else if (obj.situation === 0) {
+                // 正常的 查看详情
+                this.$util.toNextRoute(
+                    "navigateTo",
+                    `/pages/walkAroundManager/detail?id=${obj.id}`
+                );
+            }
+        },
+        // 拿到滚动框里面的数据
+        async handleGetDataList() {
+            console.log("this.selectFilter", this.selectFilter);
+            uni.showLoading({
+                title: "加载中...",
+            });
+            const req = {
+                // startTime: this.$moment().subtract(1, 'months').format('YYYY-MM-DD'),
+                // endTime: this.$moment().format('YYYY-MM-DD'),
+                // selectFilter 3 和 4 为 异常和 待我处理 那么都会是前一天的数据  当为异常时 时间就变为 最近一个月 
+                // 当为待我处理时 那么服务区也不传了 时间还是最近一个月
+                serverPartId: this.selectFilter === 4 ? '' : this.currentServerPartObj.value,
+                startTime: this.selectFilter === 3 || this.selectFilter === 4 ? this.$moment().subtract(1, 'months').format('YYYY-MM-DD') : this.selectDay,
+                endTime: this.selectFilter === 3 || this.selectFilter === 4 ? this.$moment().format('YYYY-MM-DD') : this.selectDay,
+                pageNum: this.PageIndex,
+                pageSize: 100,
+                extend:
+                    this.selectFilter === 1
+                        ? null
+                        : this.selectFilter === 2
+                            ? [
+                                {
+                                    key: "situation",
+                                    value: 0,
+                                },
+                            ]
+                            : this.selectFilter === 3
+                                ? [
+                                    {
+                                        key: "situation",
+                                        value: 1,
+                                    },
+                                ]
+                                : this.selectFilter === 4
+                                    ? [
+                                        {
+                                            key: "person.STAFF_NAME",
+                                            value: this.useInfo.userData.UserName,
+                                        },
+                                    ]
+                                    : null,
+            };
+            console.log("req323131", req);
+
+            const data = await this.$request.$webJavaPOST(
+                `questionnaire-responses/getList`,
+                req
+            );
+            console.log("datadatadatadata", data);
+
+            let list = data.Result_Data.List;
+            if (list && list.length > 0) {
+                if (list.length < 10) {
+                    this.isEnd = true;
+                }
+            } else {
+                this.isEnd = true;
+            }
+
+            // this.dataList = this.dataList.concat(list);
+            this.dataList = list
+            console.log("this.dataList", this.dataList);
+            uni.hideLoading();
+        },
+        // 当前服务区 今日 是否还有点位未巡检
+        async handleGetNotInspected() {
+            // 拿到当前服务区下的全部点位数据
+            const req = {
+                serverPartIds: [this.currentServerPartObj.value],
+                status: true
+            }
+            const data = await this.$request.$webJavaPOST(
+                `questionnaire-templates/search/tree`,
+                req
+            );
+            let list = data.Result_Data.List
+            let pointList = []
+            if (list && list.length > 0) {
+                list.forEach((item) => {
+                    if (item.children && item.children.length > 0) {
+                        item.children.forEach((subItem) => {
+                            if (subItem.children && subItem.children.length > 0) {
+                                subItem.children.forEach((thirdItem) => {
+                                    pointList.push(thirdItem)
+                                })
+                            }
+                        })
+                    }
+                })
+            }
+
+            // pointList  就是这个服务区的全部点位数据
+            // 下面拿到这个服务区 今日的巡检情况
+            const recordReq = {
+                startTime: this.selectDay,
+                endTime: this.selectDay,
+                serverPartIds: [this.currentServerPartObj.value]
+            }
+
+            const recordData = await this.$request.$webJavaPOST(
+                `questionnaire-responses/tree/list`,
+                recordReq
+            );
+            let recordList = recordData.Result_Data.List
+            let recordDataList = []
+            // 拿到当前已经完成了的站点id
+            let pointDataList = []
+            if (recordList && recordList.length > 0) {
+                recordList.forEach((item) => {
+                    if (item.children && item.children.length > 0) {
+                        item.children.forEach((subItem) => {
+                            if (subItem.children && subItem.children.length > 0) {
+                                subItem.children.forEach((thirdItem) => {
+                                    recordDataList.push(thirdItem)
+                                    pointDataList.push(thirdItem.template.id)
+                                })
+                            }
+                        })
+                    }
+                })
+            }
+
+
+            let notInspectedList = []
+            let notInspectedName = ''
+            if (pointList && pointList.length > 0) {
+                pointList.forEach((item) => {
+                    if (pointDataList.indexOf(item.id) === -1) {
+                        notInspectedList.push(item)
+                        if (notInspectedName) {
+                            notInspectedName += `、${item.title}`
+                        } else {
+                            notInspectedName = item.title
+                        }
+                    }
+                })
+            }
+            this.notInspectedList = notInspectedList
+            this.notInspectedName = notInspectedName
+
+            console.log('this.notInspectedNamethis.notInspectedNamethis.notInspectedName', this.notInspectedName);
+
+        }
+    }
+}
 </script>
+
 <style lang="less" scoped>
 .main {
-  width: 100vw;
-  min-height: 100vh;
-  background: #f5f7f9;
-  box-sizing: border-box;
-
-  .tabBox {
-    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;
-      font-family: "PingFangSC";
-      font-weight: 400;
-      font-size: 30rpx;
-      color: #010b18;
-      line-height: 40rpx;
-      font-style: normal;
-    }
-
-    .selectTab {
-      position: relative;
-    }
-
-    .selectTab::after {
-      content: "";
-      width: 2rem;
-      height: 6rpx;
-      background: #3b72ff;
-      position: absolute;
-      bottom: -18rpx;
-      left: 50%;
-      transform: translateX(-50%);
-    }
-  }
-
-  .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);
+    height: 100%;
 
-    .dataList {
-      width: 100%;
-      box-sizing: border-box;
-      padding: 24rpx 24rpx 0;
-
-      .dataItem {
+    .selectServerpartBox {
         width: 100%;
+        height: 80rpx;
         box-sizing: border-box;
         background: #fff;
-        padding: 16rpx;
-        margin: 24rpx 0;
-        border-radius: 8rpx;
-        box-shadow: 0 0px 6rpx #e2e2e2;
-        position: relative;
+        padding: 0 24rpx;
+        margin-top: 200rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        border-radius: 16rpx;
+        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
+        transition: all 0.3s ease;
 
-        .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);
+        &:hover {
+            box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.1);
         }
 
-        .itemRow {
-          width: 100%;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-
-          .projectName {
-            width: 60%;
-            font-size: 30rpx;
-            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 {
+        .leftNameBox {
+            width: 50%;
+            padding: 16rpx 20rpx;
+            background: #f8f9fa;
+            border-radius: 12rpx;
             font-size: 28rpx;
-            color: #999999;
-          }
+            color: #333;
+            font-weight: 500;
+            cursor: pointer;
+            display: flex;
+            align-items: center;
+            border: 2rpx solid transparent;
 
-          .rightName {
-            color: #686868;
-            font-size: 24rpx;
-
-            .radio {
-              display: inline-block;
-              width: 14rpx;
-              height: 14rpx;
-              border-radius: 14rpx;
-              margin: 0 8px 0 5px;
+            &:hover {
+                background: #e8f4ff;
+                border-color: #ff814f;
+                color: #ff814f;
             }
 
-            .month {
-              font-family: DINAlternate-Bold, DINAlternate;
+            &::before {
+                content: '📍';
+                margin-right: 12rpx;
+                font-size: 24rpx;
             }
-          }
         }
 
-        .itemCenterRow {
-          width: 100%;
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-
-          .value {
-            font-family: DINAlternate-Bold, DINAlternate;
+        .rightTimeBox {
+            width: 50%;
+            display: flex;
+            justify-content: flex-end;
+            padding: 16rpx 20rpx;
+            background: #f8f9fa;
+            border-radius: 12rpx;
             font-size: 28rpx;
-            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;
-          }
-        }
+            color: #333;
+            font-weight: 500;
+            cursor: pointer;
+            border: 2rpx solid transparent;
 
-        .line {
-          height: 2rpx;
-          width: 100%;
-          background-color: #eee;
-          margin-bottom: 18rpx;
-          margin-top: 16rpx;
+            &:hover {
+                background: #e8f4ff;
+                border-color: #1890ff;
+                color: #1890ff;
+            }
+
+            picker {
+                width: 100%;
+                text-align: center;
+            }
+
+            &::before {
+                content: '📅';
+                margin-right: 12rpx;
+                font-size: 24rpx;
+            }
         }
-      }
     }
-  }
 
-  .scrollbox ::-webkit-scrollbar {
-    display: none;
-    width: 0;
-  }
+    .errorMessage {
+        width: calc(100% - 48rpx);
+        margin: 24rpx 24rpx 0;
+        box-sizing: border-box;
+        padding: 24rpx;
+        font-size: 28rpx;
+        color: #ff4d4f;
+        background: linear-gradient(135deg, #fff2f0 0%, #ffebe8 100%);
+        border: 2rpx solid #ffccc7;
+        border-radius: 16rpx;
+        position: relative;
+        overflow: hidden;
+        transition: all 0.3s ease;
+        box-shadow: 0 2px 8px 0 rgba(255, 77, 79, 0.15);
 
-  //   .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;
-  //           }
-  //         }
-  //       }
-  //     }
+        &::before {
+            content: '⚠️';
+            position: absolute;
+            left: 24rpx;
+            top: 50%;
+            transform: translateY(-50%);
+            font-size: 32rpx;
+        }
 
-  //     .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;
-  //         }
-  //       }
+        &::after {
+            content: '';
+            position: absolute;
+            left: 0;
+            top: 0;
+            height: 100%;
+            width: 6rpx;
+            background: linear-gradient(180deg, #ff4d4f 0%, #ff7875 100%);
+        }
 
-  //       .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;
-  //       }
-  //     }
-  //   }
+        font-weight: 500;
+        padding-left: 70rpx;
+        line-height: 40rpx;
+    }
 
-  //   .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;
-  //     }
-  //   }
+    .tabBox {
+        position: fixed;
+        z-index: 99;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 200rpx;
+        display: flex;
+        align-items: center;
+        background: #fff;
+        box-shadow: 0 2rpx 4rpx rgba(167, 166, 166, 0.3);
+
+        .tabItem {
+            width: 25%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-family: "PingFangSC";
+            font-weight: 400;
+            font-size: 30rpx;
+            color: #010b18;
+            line-height: 40rpx;
+            font-style: normal;
+        }
+
+        .selectTab {
+            position: relative;
+        }
+
+        .selectTab::after {
+            content: "";
+            width: 2rem;
+            height: 6rpx;
+            background: #3b72ff;
+            position: absolute;
+            bottom: -18rpx;
+            left: 50%;
+            transform: translateX(-50%);
+        }
+    }
+
+    .dataList {
+        width: 100%;
+        height: cac(100% - 280rpx);
+        box-sizing: border-box;
+        padding: 24rpx 24rpx 0;
+        overflow-y: auto;
+        padding-bottom: env(safe-area-inset-bottom);
+
+        .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: 30rpx;
+                    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: 28rpx;
+                    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;
+                }
+            }
+
+            .line {
+                height: 2rpx;
+                width: 100%;
+                background-color: #eee;
+                margin-bottom: 18rpx;
+                margin-top: 16rpx;
+            }
+        }
+    }
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/mbwa/newMap.vue b/pages/mbwa/newMap.vue
new file mode 100644
index 0000000..7109398
--- /dev/null
+++ b/pages/mbwa/newMap.vue
@@ -0,0 +1,246 @@
+<template>
+    <div class="main">
+        <!-- <div class="top">
+            <div class="search">
+                <div class="right">
+                    <input class="searchText" v-model="searchText" confirm-type="search" @confirm="handleSearch"
+                        placeholder="搜索服务区" placeholder-style="font-size: 14px;color: #A69E9F;" />
+                </div>
+            </div>
+        </div> -->
+
+        <div class="serverPartListBox">
+            <div class="serverPartItemBox" v-for="(item, index) in serviceList" :key="index">
+                <div class="serverPartItemBoxTitle" v-if="item.type === 0">{{ item.label }}</div>
+                <div class="serverPartItemBoxSmallTitle"
+                    :class="{ 'selected': item.type === 1 && currentSelect === item.value }" v-if="item.type === 1"
+                    @click="handleSelectServerPart(item)">{{
+                        item.label }}</div>
+
+                <div class="serverPartItemBoxChildren" v-if="item.children && item.children.length > 0">
+                    <div class="serverPartItemBoxChildrenTitle"
+                        :class="{ 'selected': subItem.type === 1 && currentSelect === subItem.value }"
+                        v-for="subItem in item.children" @click="handleSelectServerPart(subItem)">{{
+                            subItem.label }}</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            useInfo: {},// 当前用户信息
+            serviceList: [],// 当前的服务区数据
+            currentSelect: "",// 当前选择的服务区id
+            searchText: "",// 当前查询的服务区内容
+        };
+    },
+
+    async onLoad() {
+        let userInfo = uni.getStorageSync('vuex')
+        userInfo = JSON.parse(userInfo)
+        this.useInfo = JSON.parse(JSON.stringify(userInfo))
+
+
+        let serviceList = uni.getStorageSync('serviceList')
+        if (serviceList) {
+            this.serviceList = serviceList
+            this.handleGetServerPartList()
+        } else {
+            this.handleGetServerPartList()
+        }
+    },
+    onShow() {
+        let currentServiceObj = uni.getStorageSync('currentServerPart')
+        if (currentServiceObj.label) {
+            this.currentSelect = currentServiceObj.value
+        }
+    },
+    methods: {
+        // 获取服务区列表数据
+        async handleGetServerPartList() {
+            const req = {
+                ProvinceCode: '510000',
+                ShowWholePower: false,
+                ShowWholePower: true,
+                ShowRoyalty: false,
+                ShowCompactCount: false
+            }
+            const secondData = await this.$request.$webGet('EShangApiMain/BaseInfo/GetServerpartTree', req)
+            let list = secondData.Result_Data.List
+            console.log('listlistlistlistlist', list);
+            this.serviceList = list
+            uni.setStorageSync('serviceList', list)
+        },
+        // 选择一个服务区 存入缓存  并返回上一级
+        handleSelectServerPart(obj) {
+            console.log('objdsada', obj);
+            uni.setStorageSync('currentServerPart', obj)
+            uni.navigateBack({
+                delta: 1
+            });
+        },
+        handleSearch() {
+            console.log('searchTextsearchTextsearchText', this.searchText);
+        }
+    },
+};
+</script>
+<style scoped lang="less">
+.main {
+    width: 100vw;
+    height: 100vh;
+    background: #f8f9fa;
+
+    .top {
+        width: 100%;
+        padding: 16rpx 32rpx;
+        box-sizing: border-box;
+        background: #fff;
+        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
+
+        .search {
+            width: 100%;
+            height: 72rpx;
+            background: #F7F8FA;
+            border-radius: 36rpx;
+            box-sizing: border-box;
+            padding: 0 32rpx;
+            display: flex;
+            align-items: center;
+            transition: all 0.3s ease;
+
+            &:focus-within {
+                background: #fff;
+                border: 2rpx solid #1890ff;
+            }
+
+            .right {
+                width: 100%;
+
+                .searchText {
+                    width: 100%;
+                    height: 100%;
+                    border: none;
+                    background: transparent;
+                    font-size: 28rpx;
+                    font-family: PingFangSC-Regular, PingFang SC;
+                    font-weight: 400;
+                    color: #333;
+                    line-height: 40rpx;
+                    outline: none;
+
+                    &::placeholder {
+                        color: #999;
+                        font-size: 28rpx;
+                    }
+                }
+            }
+        }
+    }
+
+    .serverPartListBox {
+        width: 100%;
+        // height: calc(100vh - 104rpx);
+        height: 100vh;
+        box-sizing: border-box;
+        padding: 24rpx 32rpx;
+        overflow-y: auto;
+        padding-bottom: env(safe-area-inset-bottom);
+
+        .serverPartItemBox {
+            margin-bottom: 32rpx;
+            background: #fff;
+            border-radius: 16rpx;
+            padding: 24rpx;
+            box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.04);
+            transition: all 0.3s ease;
+
+            &:hover {
+                box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.08);
+            }
+
+            .serverPartItemBoxTitle {
+                font-size: 32rpx;
+                font-weight: 600;
+                color: #1a1a1a;
+                margin-bottom: 24rpx;
+                padding-bottom: 16rpx;
+                border-bottom: 2rpx solid #f0f0f0;
+                line-height: 44rpx;
+            }
+
+            .serverPartItemBoxSmallTitle {
+                display: inline-block;
+                padding: 16rpx 24rpx;
+                border: 2rpx solid #e8e8e8;
+                border-radius: 24rpx;
+                margin: 16rpx 16rpx 16rpx 0;
+                font-size: 28rpx;
+                color: #333;
+                background: #fff;
+                transition: all 0.3s ease;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
+
+                &:hover {
+                    border-color: #1890ff;
+                    color: #1890ff;
+                    transform: translateY(-2rpx);
+                    box-shadow: 0 4px 12px 0 rgba(24, 144, 255, 0.15);
+                }
+
+                &.selected {
+                    background: #ff814fff;
+                    color: #fff;
+                    border-color: #ff814f;
+                    font-weight: 500;
+                    box-shadow: 0 4px 16px 0 rgba(255, 129, 79, 0.3);
+                    transform: translateY(-2rpx);
+                }
+            }
+
+            .serverPartItemBoxChildren {
+                display: flex;
+                flex-wrap: wrap;
+                margin-top: 16rpx;
+
+                .serverPartItemBoxChildrenTitle {
+                    display: inline-block;
+                    padding: 12rpx 20rpx;
+                    border: 2rpx solid #e8e8e8;
+                    border-radius: 20rpx;
+                    margin: 0 16rpx 16rpx 0;
+                    font-size: 26rpx;
+                    color: #666;
+                    background: #fafafa;
+                    transition: all 0.3s ease;
+                    cursor: pointer;
+                    position: relative;
+
+                    &:hover {
+                        border-color: #1890ff;
+                        color: #1890ff;
+                        background: #f6ffed;
+                        transform: translateY(-1rpx);
+                        box-shadow: 0 2px 8px 0 rgba(24, 144, 255, 0.12);
+                    }
+
+                    &.selected {
+                        background: #ff814fff;
+                        color: #fff;
+                        border-color: #ff814f;
+                        font-weight: 500;
+                        box-shadow: 0 2px 12px 0 rgba(255, 129, 79, 0.25);
+                        transform: translateY(-1rpx);
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
diff --git a/pages/mbwa/oldmbwa.vue b/pages/mbwa/oldmbwa.vue
new file mode 100644
index 0000000..cdf88ca
--- /dev/null
+++ b/pages/mbwa/oldmbwa.vue
@@ -0,0 +1,868 @@
+<template>
+  <view class="main">
+    <!-- <view class="tabBox">
+      <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="scrollbox" :scroll-y="true" @scrolltolower="handleScrollBottom">
+      <view class="dataList">
+        <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.placeName || "-" }}</view>
+            <view v-if="item.situation !== 0" class="stateName" :style="{
+              color:
+                item.errorStatus === 0
+                  ? 'red'
+                  : item.errorStatus === 1
+                    ? '#3B72FF'
+                    : item.errorStatus === 2
+                      ? '#139942'
+                      : '',
+            }">
+              {{
+                item.errorStatus === 0
+                  ? "待处理"
+                  : item.errorStatus === 1
+                    ? "处理中"
+                    : item.errorStatus === 2
+                      ? "已处理"
+                      : ""
+              }}</view>
+          </view>
+          <view class="itemCenterRow" style="margin: 60rpx 0 20rpx">
+            <view class="value">{{ item.uploadResult || "-" }}</view>
+          </view>
+          <view class="itemRow">
+            <view class="leftName"></view>
+            <!--          <view class="rightName">{{ $util.getMoney(item.REVENUE_AMOUNT) }}</view>-->
+
+            <view class="rightName"><span :style="{
+              color:
+                item.situation === 0
+                  ? '#139942'
+                  : item.situation === 1
+                    ? '#F75031'
+                    : '',
+            }">{{
+              item.errorStatus === 2
+                ? ""
+                : item.situation === 0
+                  ? "正常情况"
+                  : item.situation === 1
+                    ? "急需处理"
+                    : "-"
+            }}</span>
+            </view>
+          </view>
+
+          <view class="line"></view>
+          <view class="itemRow">
+            <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.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.title || "-" }}</span>
+            </view>
+            <view class="topRight" :style="{
+              color:
+                item.errorStatus === 0
+                  ? 'red'
+                  : item.errorStatus === 1
+                    ? '#3B72FF'
+                    : item.errorStatus === 2
+                      ? '#139942'
+                      : '',
+            }">
+              {{
+                item.errorStatus === 0
+                  ? "待处理"
+                  : item.errorStatus === 1
+                    ? "处理中"
+                    : item.errorStatus === 2
+                      ? "已处理"
+                      : ""
+              }}
+            </view>
+          </view>
+
+          <view class="dataBottom">
+            <view class="statusBox" :style="{
+              color:
+                item.situation === 0
+                  ? '#139942'
+                  : item.situation === 1
+                    ? '#F75031'
+                    : '',
+              background:
+                item.situation === 0
+                  ? '#EBF7EF'
+                  : item.situation === 1
+                    ? '#FEF0ED'
+                    : '',
+            }">{{
+              item.situation === 0
+                ? "正常情况"
+                : item.situation === 1
+                  ? "急需处理"
+                  : "-"
+            }}</view>
+
+            <view class="itemContent">{{
+              item.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>
+      </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
+
+      dataList: [], // 下面的数据
+      useInfo: {}, // 用户详情
+      isEnd: false, // 判断是否到底了
+      PageIndex: 1, // 默认的页数
+    };
+  },
+  components: {
+    MenuItem,
+  },
+  onLoad() {
+    this.menu = uni.getMenuButtonBoundingClientRect();
+    let userInfo = uni.getStorageSync("vuex");
+    userInfo = JSON.parse(userInfo);
+    if (userInfo) {
+      this.useInfo = JSON.parse(JSON.stringify(userInfo));
+    }
+    // 拿到服务区的数据
+    this.handleGetServerpartList();
+  },
+  methods: {
+    // 跳转详情进行操作
+    handleGoDetail(obj) {
+      //   判断是否是异常的
+      if (obj.situation === 1) {
+        this.$util.toNextRoute(
+          "navigateTo",
+          `/pages/walkAroundManager/detail?id=${obj.id}&pageType=error`
+        );
+      } else if (obj.situation === 0) {
+        // 正常的 查看详情
+        this.$util.toNextRoute(
+          "navigateTo",
+          `/pages/walkAroundManager/detail?id=${obj.id}`
+        );
+      }
+    },
+    // 滚动到底部
+    handleScrollBottom() {
+      if (!this.isEnd) {
+        this.PageIndex = this.PageIndex + 1;
+        this.handleGetDataList();
+      }
+    },
+    // 拿到时间
+    handleGetTime(e) {
+      console.log("e", e);
+      this.searchTime = e.detail.value;
+      this.dataList = [];
+      this.handleGetDataList();
+    },
+    // 修改服务区
+    handleChangeService(e) {
+      console.log("e", e);
+      this.selectIndex = Number(e.detail.value);
+      this.dataList = [];
+      this.handleGetDataList();
+    },
+    // 返回上一页
+    handleBack() {
+      uni.switchTab({ url: "/pages/index/index" });
+    },
+    // 改变tab
+    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: 0,
+        // startTime: "",
+        // endTime: "",
+        startTime: this.$moment().subtract(1, 'months').format('YYYY-MM-DD'),
+        endTime: this.$moment().format('YYYY-MM-DD'),
+        pageNum: 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 === 1
+            ? null
+            : this.selectFilter === 2
+              ? [
+                {
+                  key: "situation",
+                  value: 0,
+                },
+              ]
+              : this.selectFilter === 3
+                ? [
+                  {
+                    key: "situation",
+                    value: 1,
+                  },
+                ]
+                : this.selectFilter === 4
+                  ? [
+                    {
+                      key: "person.STAFF_NAME",
+                      value: this.useInfo.userData.UserName,
+                      //   this.useInfo.userData.UserId
+                    },
+                  ]
+                  : null,
+
+        // 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("req323131", req);
+
+      const data = await this.$request.$webJavaPOST(
+        `questionnaire-responses/getList`,
+        req
+      );
+      console.log("datadatadatadata", data);
+
+      let list = data.Result_Data.List;
+      if (list && list.length > 0) {
+        if (list.length < 10) {
+          this.isEnd = true;
+        }
+
+        // list.forEach((item) => {
+        // let extendObj = {};
+        // if (item.extend) {
+        //   extendObj = JSON.parse(item.extend);
+        // }
+        // item.extendObj = extendObj;
+        // });
+      } else {
+        this.isEnd = true;
+      }
+
+      this.dataList = this.dataList.concat(list);
+      console.log("this.dataList", this.dataList);
+      uni.hideLoading();
+    },
+    // 拿到服务区的数据
+    async handleGetServerpartList() {
+      const req = {
+        UserIdEncrypted: this.useInfo.userData.UserIdEncrypted,
+      };
+      const data = await this.$request.$webGet(
+        "EShangApiMain/Logging/GetPassportInfoById",
+        req
+      );
+      console.log("Info", data);
+      const secondReq = {
+        ServerpartCodes: data.Result_Data.CityAuthority || "",
+        ServerpartType: 1000,
+        StatisticsType: "1000,2000",
+      };
+      const secondData = await this.$request.$webGet(
+        "EShangApiMain/BaseInfo/GetServerpartDDL",
+        secondReq
+      );
+      console.log("secondData", secondData);
+      secondData.Result_Data.List.unshift({
+        label: "蜀越公司",
+        value: 530,
+      });
+      this.selectServiceList = secondData.Result_Data.List;
+
+      // 拿到下面实际数据
+      this.handleGetDataList();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.main {
+  width: 100vw;
+  min-height: 100vh;
+  background: #f5f7f9;
+  box-sizing: border-box;
+
+  .tabBox {
+    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;
+      font-family: "PingFangSC";
+      font-weight: 400;
+      font-size: 30rpx;
+      color: #010b18;
+      line-height: 40rpx;
+      font-style: normal;
+    }
+
+    .selectTab {
+      position: relative;
+    }
+
+    .selectTab::after {
+      content: "";
+      width: 2rem;
+      height: 6rpx;
+      background: #3b72ff;
+      position: absolute;
+      bottom: -18rpx;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+  }
+
+  .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;
+        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: 30rpx;
+            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: 28rpx;
+            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;
+          }
+        }
+
+        .line {
+          height: 2rpx;
+          width: 100%;
+          background-color: #eee;
+          margin-bottom: 18rpx;
+          margin-top: 16rpx;
+        }
+      }
+    }
+  }
+
+  .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/util/api.js b/util/api.js
index 864389c..d016aa9 100644
--- a/util/api.js
+++ b/util/api.js
@@ -32,6 +32,10 @@ export default {
 			data.WeChat_MiniProToken = Store.state.userData.WeChat_MiniProToken || ''
 			data.WeChatAppId = 'wxa99ef047735c031e'
 			data.memberShipId = !data.memberShipId ? (Store.state.userData.Membership_Id || '') : data.memberShipId // ||'3255' 1170386 1125717 //
+			// 加点公参
+			data.MembershipName = Store.state.userData.Membership_Name
+			data.MembershipPhone = Store.state.userData.Membership_Phone
+
 			// ModuleGuid:"60ee4604-0830-4056-931d-d1f7e111810c,1d46081b-6ff8-44d5-9205-31c72bdb4328",
 			let str = ''
 			if (Store.state.userData.AuthorityInfo) {
@@ -104,7 +108,7 @@ export default {
 				//服务器返回数据
 				else if (res && (res.statusCode === 200 || res.statusCode === 304 || res.statusCode === 400)) {
 					if (res.data && ((res.data.ResultCode != '999' && res.data.ResultCode != undefined) ||
-							(res.data.Result_Code != '999' && res.data.Result_Code != undefined))) {
+						(res.data.Result_Code != '999' && res.data.Result_Code != undefined))) {
 						resolve(res.data);
 					} else if (typeof res.data == 'object') { // 兼容招标投标模块
 						resolve(res.data);
diff --git a/util/apiPath.js b/util/apiPath.js
index 6409c2d..428e739 100644
--- a/util/apiPath.js
+++ b/util/apiPath.js
@@ -30,10 +30,11 @@ export default {
 
     // JavaApiurl: 'https://admin.es.eshangtech.com/platform/', // web api测试接口地址
 
-    // JavaApiurl: 'http://111.229.213.193:18072/', // web api测试接口地址
+
     // JavaApiurl: 'http://111.229.213.193:18075/', // web api测试接口地址
 
     JavaApiurl: 'https://java.es.eshangtech.com:443/', // web api测试接口地址
+    // JavaApiurl: 'http://111.229.213.193:18071/', // web api测试接口地址
 
     // JavaApiurl: 'http://10.104.1.175:8070/platform/', // web api测试接口地址
 }
\ No newline at end of file