diff --git a/babel.config.js b/babel.config.js
index eed6eb160df31dd96d039ffbbf1c966678fbf2f5..cd96b1d6d466857ed3a39070c58daf8db13693c0 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -32,16 +32,14 @@ module.exports = {
       "@taroify/icons",
     ],
     [
-      'import',
+      "import",
       {
-        libraryName: '@nutui/nutui-react-taro',
-        style: 'css',
+        libraryName: "@nutui/nutui-react-taro",
+        libraryDirectory: "dist/esm",
+        style: "css",
         camel2DashComponentName: false,
-        customName: (name, file) => {
-          return `@nutui/nutui-react-taro/dist/es/packages/${name.toLowerCase()}`
-        },
       },
-      'nutui-react-taro',
+      "nutui-react-taro",
     ],
 
   ],
diff --git a/config/index.ts b/config/index.ts
index e34cb5ffb81cb11d8f717a3b5ccf1528264cdf01..4235e6cdfe78804762add8ae7712eda288898181 100644
--- a/config/index.ts
+++ b/config/index.ts
@@ -9,7 +9,15 @@ export default defineConfig<"vite">(async (merge, {}) => {
   const baseConfig: UserConfigExport<"vite"> = {
     projectName: "xindu-citizen-applet",
     date: "2024-7-29",
-    designWidth: 750,
+
+    designWidth(input) {
+      // 配置 NutUI 375 尺寸
+      if (input?.file?.replace(/\\+/g, "/").indexOf("@nutui") > -1) {
+        return 375;
+      }
+      // 全局使用 Taro 默认的 750 尺寸
+      return 750;
+    },
     deviceRatio: {
       640: 2.34 / 2,
       750: 1,
@@ -18,7 +26,7 @@ export default defineConfig<"vite">(async (merge, {}) => {
     },
     sourceRoot: "src",
     outputRoot: "dist",
-    plugins: ['@tarojs/plugin-html'],
+    plugins: ["@tarojs/plugin-html"],
     defineConstants: {},
     copy: {
       patterns: [],
@@ -30,6 +38,7 @@ export default defineConfig<"vite">(async (merge, {}) => {
       "@/utils": path.resolve(__dirname, "../src/utils"),
       "@/store": path.resolve(__dirname, "../src/store"),
       "@/components": path.resolve(__dirname, "../src/components"),
+      "@/hooks": path.resolve(__dirname, "../src/hooks"),
     },
     framework: "react",
     compiler: "vite",
diff --git a/package.json b/package.json
index 482ca3ebd2b880ccc40b3568cee54b5e2d714e80..2bd4624a12169f7f4fdc25619385b55b59678177 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,8 @@
   "author": "",
   "dependencies": {
     "@babel/runtime": "^7.24.4",
-    "@nutui/nutui-react-taro": "^3.0.4",
+    "@nutui/icons-react-taro": "^3.0.1",
+    "@nutui/nutui-react-taro": "^2.6.21",
     "@taroify/core": "^0.3.1-alpha.0",
     "@taroify/icons": "0.4.1-alpha.0",
     "@tarojs/components": "4.0.3",
diff --git a/src/app.config.ts b/src/app.config.ts
index aca138f59053089f3962fd35b4ff733c15fafc72..e96086a0723e7be8aa7a853566c081d53c1eae31 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -43,12 +43,23 @@ export default defineAppConfig({
     },
     {
       root: "pages/Approve",
-      pages: ["Apply/index", "ApplyDesc/index",'applyRecord/applyRecord','applyRecordDetail/index'],
+      pages: [
+        "Apply/index",
+        "ApplyDesc/index",
+        "applyRecord/applyRecord",
+        "applyRecordDetail/index",
+      ],
     },
 
     {
       root: "pages/Feedback",
-      pages: ["Record/index", "RecordDetail/index", "Report/index",'suggestAndConsult/suggestAndConsult','usageRecord/usageRecord'],
+      pages: [
+        "Record/index",
+        "RecordDetail/index",
+        "Report/index",
+        "suggestAndConsult/suggestAndConsult",
+        "usageRecord/usageRecord",
+      ],
     },
     {
       root: "pages/kitchenWaste",
@@ -58,18 +69,22 @@ export default defineAppConfig({
         "pages/addCollection/index",
         "pages/contracted/index",
         "pages/addMerchants/index",
+        "pages/newStoreEntry/newStoreEntry",
+        "pages/shopPerfectInfo/shopPerfectInfo",
+        "pages/shopList/shopList",
+        "pages/cameraComp/cameraComp"
       ],
     },
     {
       root: "pages/Event",
       pages: [
-        "index",//事件列表
-        "view/cameraComp/index",//拍照页
-        "view/miniAiIdentify/index",//极简上报（AI识别）
-        "view/confirmLocation/index",//确认位置
-        "view/autoDispatch/index",//自动派遣
-        "view/orderDirect/index",//单兵直达
-        "view/detail/index",//事件详情
+        "index", //事件列表
+        "view/cameraComp/index", //拍照页
+        "view/miniAiIdentify/index", //极简上报（AI识别）
+        "view/confirmLocation/index", //确认位置
+        "view/autoDispatch/index", //自动派遣
+        "view/orderDirect/index", //单兵直达
+        "view/detail/index", //事件详情
       ],
     },
   ],
diff --git a/src/app.less b/src/app.less
index c65499f683dab630bc0017f6506a1dcdc6c9825d..ead9a0c71a80bdba22bcfc633fdf3de06f081d9a 100644
--- a/src/app.less
+++ b/src/app.less
@@ -3,7 +3,8 @@ page {
   height: 100%;
   position: relative;
   --nutui-color-primary: #3E6BDA; //主要内容用色，常用语常规标题内容、细文浏览、常规按钮文字以及图表引导
-  --badge-background-color: red
+  --badge-background-color: red;
+  --nutui-form-item-required-color:'red'
 }
 
 /* 下面样式代码餐厨垃圾页面需要请勿删除 */
@@ -12,7 +13,9 @@ Button,
 Image {
   box-sizing: border-box;
 }
-
+.nut-form-item-label-required{
+  color: red !important;
+}
 .placeholder {
   font-size: 31px;
   color: #999999;
diff --git a/src/assets/images/address.png b/src/assets/images/address.png
new file mode 100644
index 0000000000000000000000000000000000000000..d87213a0dceb23488f7d9738af9ea9d07adf55b4
Binary files /dev/null and b/src/assets/images/address.png differ
diff --git a/src/assets/images/audio.png b/src/assets/images/audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..43552205a4ad7886cd3fef616f920e15c26cab81
Binary files /dev/null and b/src/assets/images/audio.png differ
diff --git a/src/assets/images/dragPoint.png b/src/assets/images/dragPoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..75c2224a03eed171b112f37f759fe5b6a623a8e9
Binary files /dev/null and b/src/assets/images/dragPoint.png differ
diff --git a/src/assets/images/empty.png b/src/assets/images/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9ff21fbe3c16728c1c737f9065b0b8deaa3f688
Binary files /dev/null and b/src/assets/images/empty.png differ
diff --git a/src/assets/images/empty2.png b/src/assets/images/empty2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7edb4242f44e8768b410aad26984e1f8926e4a4e
Binary files /dev/null and b/src/assets/images/empty2.png differ
diff --git a/src/assets/images/event/location.png b/src/assets/images/event/locationIcon.png
similarity index 100%
rename from src/assets/images/event/location.png
rename to src/assets/images/event/locationIcon.png
diff --git a/src/assets/images/kitchenWaste/localPoint.png b/src/assets/images/kitchenWaste/localPoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb986a5c288ddba768a59b360fc46ee10ee49b2b
Binary files /dev/null and b/src/assets/images/kitchenWaste/localPoint.png differ
diff --git a/src/assets/images/kitchenWaste/saomiao.png b/src/assets/images/kitchenWaste/saomiao.png
new file mode 100644
index 0000000000000000000000000000000000000000..9901e73051542d566a1a2ae718980313feb7043f
Binary files /dev/null and b/src/assets/images/kitchenWaste/saomiao.png differ
diff --git a/src/assets/images/paizhao.png b/src/assets/images/paizhao.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fd5c4a30ffe1df4ce28d35284c15aa8860b1e27
Binary files /dev/null and b/src/assets/images/paizhao.png differ
diff --git a/src/assets/images/photoBtn.png b/src/assets/images/photoBtn.png
new file mode 100644
index 0000000000000000000000000000000000000000..9683f0123b6fa7a0393ae400dd15f042a3ea9565
Binary files /dev/null and b/src/assets/images/photoBtn.png differ
diff --git a/src/assets/images/region.png b/src/assets/images/region.png
new file mode 100644
index 0000000000000000000000000000000000000000..812341ee112b05863cd853f95bd1a38e60710f20
Binary files /dev/null and b/src/assets/images/region.png differ
diff --git a/src/assets/images/report.png b/src/assets/images/report.png
new file mode 100644
index 0000000000000000000000000000000000000000..c40b753f3fbf2e67e2e68d6d9f4d6529640333be
Binary files /dev/null and b/src/assets/images/report.png differ
diff --git a/src/components/AddressSelect/AddressSelect.module.less b/src/components/AddressSelect/AddressSelect.module.less
new file mode 100644
index 0000000000000000000000000000000000000000..65d4071f709d83fca9ffa2dddfeffc4d82a38154
--- /dev/null
+++ b/src/components/AddressSelect/AddressSelect.module.less
@@ -0,0 +1,154 @@
+.mapBox {
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 100;
+
+    .drag {
+        position: fixed;
+        top: 50%;
+        left: 50%;
+        width: 180px;
+        height: 60px;
+        margin-left: -90px;
+        margin-top: -60px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .drag-img {
+            width: 25px;
+            height: 38px;
+        }
+    }
+
+    .top-info,
+    .bottom-confrim,
+    .right-control,
+    .right-lacate {
+        position: absolute;
+        top: 30px;
+        left: 22%;
+        margin-left: -170px;
+        width: 340px;
+        padding: 15px;
+        border-radius: 10px;
+        background-color: #ffffff;
+        box-shadow: 1px 1px 10px 2px #e4e7e9;
+        display: flex;
+
+        .picture {
+            width: 60px;
+            height: 70px;
+            border-radius: 10px;
+            background: #f6f7f8;
+            overflow: hidden;
+        }
+
+        .text {
+            flex: 1;
+            text-align: justify;
+            line-height: 26px;
+            margin-left: 20px;
+            color: #1d2541;
+            font-size: 15px;
+
+            .name {
+                color: #ff5167;
+            }
+
+            .address_1 {
+                color: #2c63ff;
+            }
+
+            .tip {
+                display: block;
+            }
+        }
+
+        &.right-control {
+            width: 40px;
+            top: auto;
+            bottom: 260px;
+            left: auto;
+            right: 20px;
+            flex-direction: column;
+            align-items: center;
+            justify-content: space-between;
+            font-size: 26px;
+            font-weight: bold;
+            padding: 6px;
+        }
+
+        &.right-lacate {
+            width: 40px;
+            top: auto;
+            bottom: 210px;
+            left: auto;
+            right: 20px;
+            padding: 6px;
+            justify-content: center;
+
+            .lacate-icon {
+                width: 24px;
+                height: 24px;
+            }
+        }
+
+        &.bottom-confrim {
+            top: auto;
+            bottom: 60px;
+            gap: 15px;
+            font-size: 34px;
+            color: #1d2541;
+            font-weight: bold;
+            flex-direction: column;
+            width: 100%;
+
+            .icon {
+                width: 14px;
+                height: 16px;
+                margin-right: 4px;
+            }
+
+            .editTxt {
+                padding-left: 10px;
+                color: #3e6bda;
+            }
+        }
+    }
+}
+
+.title {
+    font-weight: bold;
+    color: #1d2541;
+    font-size: 36px;
+}
+
+.text-area {
+    margin-top: 10px;
+    background: #f5f6fa;
+    border-radius: 10px;
+    padding: 10px;
+}
+
+.audio-icon {
+    width: 10px;
+    height: 15px;
+    margin-right: 4px;
+}
+
+.audio {
+    width: 100%;
+    height: 38px;
+    color: #66c164;
+    background: #d6e3ff !important;
+}
+
+.btn {
+    width: 100%;
+    height: 76px;
+    background-color: #66c164;
+}
\ No newline at end of file
diff --git a/src/components/AddressSelect/AddressSelect.tsx b/src/components/AddressSelect/AddressSelect.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..e9323b249fe0152779b0297d62ae71fd6225fb1e
--- /dev/null
+++ b/src/components/AddressSelect/AddressSelect.tsx
@@ -0,0 +1,245 @@
+import { View, Map, Image, Text } from "@tarojs/components";
+import { Button, Col, Dialog, Row, TextArea } from "@nutui/nutui-react-taro";
+import { FC, useEffect, useRef, useState } from "react";
+import styles from "./AddressSelect.module.less";
+import locationImg from "@/assets/images/kitchenWaste/localPoint.png";
+import Taro, { requirePlugin } from "@tarojs/taro";
+import { baiduLocationAnalysis } from "@/services/kitchenWaste";
+import Flex from "../Flex/Flex";
+
+type LocationSelectProps = {
+  show: boolean;
+  onConfirm: (data: any) => void;
+  onCancale: () => void;
+};
+
+const AddressSelect: FC<LocationSelectProps> = (props) => {
+  const { show, onConfirm, onCancale } = props;
+
+  useEffect(() => {
+    Taro.getLocation({
+      type: "gcj02",
+      success: ({ longitude, latitude }) => {
+        setMarketPoint({ longitude, latitude });
+        getAnalysisAddress(longitude, latitude);
+      },
+    });
+  }, []);
+
+  const [marketPoint, setMarketPoint] = useState({
+    longitude: 104.164987,
+    latitude: 30.829873,
+  });
+  const regionChange = async (e) => {
+    if (e.causedBy === "drag") {
+      if (e.detail.type === "end") {
+        const { longitude, latitude } = e.detail.centerLocation;
+        await getAnalysisAddress(longitude, latitude);
+        setMarketPoint({ longitude, latitude });
+      }
+    }
+  };
+
+  const [addressInfo, setAddressInfo] = useState<any>({});
+  const getAnalysisAddress = async (longitude: number, latitude: number) => {
+    return new Promise(async (resolve, _reject) => {
+      const res = await baiduLocationAnalysis(longitude, latitude);
+      if (res.code === 200) {
+        if (res.data.status !== 0) {
+          Taro.showToast({ title: "地址解析失败", icon: "none", mask: true });
+          return;
+        }
+        const result = res.data.result;
+        const addressInfo = {
+          cityCode: "5101",
+          cityName: result.addressComponent.city,
+          districtCode: result.addressComponent.adcode,
+          districtName: result.addressComponent.district,
+          streetCode: result.addressComponent.town_code,
+          streetName: result.addressComponent.street,
+          communityCode: "",
+          communityName: "",
+          lon: longitude,
+          lat: latitude,
+          coordinateType: "GCJ-02",
+          address: result.formatted_address_poi,
+        };
+        setAddressInfo(addressInfo);
+        resolve(addressInfo);
+      }
+    });
+  };
+
+  const [editShow, setEditShow] = useState(false);
+  const [editStr, setEditStr] = useState<string>();
+//   const plugin = requirePlugin("QCloudAIVoice");
+//   const speechRecognizerManager = useRef<any>(plugin.speechRecognizerManager());
+//   const handleAudioToText = () => {
+//     speechRecognizerManager.current.start({
+//       // 用户参数
+//       secretkey: "jBMGtGMBizziAMHuGL9fvuc3D6i49xUk",
+//       secretid: "AKIDAIAm7ByVkiPqzrSnreAQP7YhaCXaNt85",
+//       appid: 1308579967,
+//       // 实时识别接口参数
+//       engine_model_type: "16k_zh",
+//       filter_punc: 1,
+//       filter_modal: 2,
+//       word_info: 2,
+//     });
+//   };
+//   const handleCloseAudio = () => {
+//     console.log("停止");
+//     speechRecognizerManager.current.stop();
+//   };
+//   // 开始识别
+//   speechRecognizerManager.current.OnRecognitionStart = (res) => {
+//     console.log("开始识别", res);
+//   };
+//   // 一句话开始
+//   speechRecognizerManager.current.OnSentenceBegin = (res) => {
+//     console.log("一句话开始", res);
+//   };
+//   // 识别变化时
+//   speechRecognizerManager.current.OnRecognitionResultChange = (res) => {
+//     console.log("识别变化", res);
+//     if (res.code === 0) {
+//       const text = res.result.voice_text_str;
+//       setEditStr((val) => val + text.slice(0, 100));
+//     }
+//   };
+//   // 一句话结束
+//   speechRecognizerManager.current.OnSentenceEnd = (res) => {
+//     console.log("一句话结束", res.result.voice_text_str);
+//   };
+//   // 识别结束
+//   speechRecognizerManager.current.OnRecognitionComplete = (res) => {
+//     console.log("识别结束", res);
+//   };
+//   // 识别错误
+//   speechRecognizerManager.current.OnError = (res) => {
+//     // code为6001时，国内站用户请检查是否使用境外代理，如果使用请关闭。境外调用需开通国际站服务
+//     console.log("识别失败", res);
+//   };
+//   // 录音结束（最长10分钟）时回调
+//   speechRecognizerManager.current.OnRecorderStop = (res) => {
+//     console.log("录音结束", res);
+//   };
+
+  return (
+    <View
+      className={styles.mapBox}
+      style={{ display: `${show ? "block" : "none"}` }}
+    >
+      <Map
+        style={{ width: "100%", height: "100%" }}
+        longitude={104.164987}
+        latitude={30.829873}
+        markers={[
+          {
+            id: 1,
+            longitude: Number(marketPoint?.longitude),
+            latitude: Number(marketPoint?.latitude),
+            iconPath: locationImg,
+            width: "76rpx",
+            height: "100rpx",
+          },
+        ]}
+        onRegionChange={regionChange}
+        setting={{}}
+        onError={() => {}}
+      />
+      <View className={styles.drag}>
+        {/* <Image src={require('@/assets/image/discover/dragPoint.png')} className={styles["drag-img"]} /> */}
+      </View>
+      <View className={styles["bottom-confrim"]}>
+        <View>
+          {/* <Image src={require('@/assets/image/discover/location.png')} className={styles.icon} /> */}
+          {addressInfo?.address}
+          {`（${addressInfo?.streetName || ""}）`}
+          <Text
+            className={styles.editTxt}
+            onClick={() => {
+              setEditStr(addressInfo?.address);
+              setEditShow(true);
+            }}
+          >
+            编辑地址
+          </Text>
+        </View>
+
+        <Flex gap={20}>
+          <Button
+            style={{ flex: 1 }}
+            type="info"
+            size="large"
+            onClick={() => {
+              onConfirm(addressInfo);
+            }}
+          >
+            确认位置
+          </Button>
+          <Button
+            style={{ flex: 1 }}
+            size="large"
+            color="#cccccc"
+            onClick={() => {
+              onCancale();
+            }}
+          >
+            取消
+          </Button>
+        </Flex>
+      </View>
+      <Dialog
+        title={<Text className={styles.title}>位置信息</Text>}
+        visible={editShow}
+        style={{ zIndex: 999999 }}
+        closeOnOverlayClick={false}
+        footer={
+          <Row gutter="10">
+            {/* <Col span="12">
+                    <Button
+                        type="info"
+                        className={styles.audio}
+                        icon={<img className={styles["audio-icon"]} src={require(`@/assets/image/audio.png`)} />}
+                        onTouchStart={handleAudioToText}
+                        onTouchEnd={handleCloseAudio}
+                    >按住说话</Button>
+                </Col> */}
+            <Col span="24">
+              <Button
+                type="info"
+                className={styles.btn}
+                onClick={() => {
+                  if (!editStr) {
+                    Taro.showToast({ title: "请输入位置信息", icon: "none" });
+                    return;
+                  }
+                  addressInfo.address = editStr;
+                  setAddressInfo({ ...addressInfo });
+                  setEditShow(false);
+                }}
+              >
+                完成
+              </Button>
+            </Col>
+          </Row>
+        }
+        onConfirm={() => setEditShow(false)}
+        onCancel={() => setEditShow(false)}
+      >
+        <TextArea
+          placeholder="请输入位置信息"
+          maxLength={100}
+          showCount
+          className={styles["text-area"]}
+          rows={1}
+          value={editStr}
+          onChange={(value) => setEditStr(value)}
+        />
+      </Dialog>
+    </View>
+  );
+};
+
+export default AddressSelect;
diff --git a/src/components/RotatingCanvas/RotatingCanvas.tsx b/src/components/RotatingCanvas/RotatingCanvas.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..75be737f6d17a45b500c320ed23aa3bfcc6f893c
--- /dev/null
+++ b/src/components/RotatingCanvas/RotatingCanvas.tsx
@@ -0,0 +1,98 @@
+import { Canvas } from "@tarojs/components"
+import Taro from "@tarojs/taro";
+import { forwardRef, useImperativeHandle, useState } from "react";
+
+type RotatingCanvasProps = {
+
+}
+export type RotatingCanvasRef = {
+    rotateImage: (image: string, angle: 90 | -90) => Promise<string>
+}
+
+const canvasId = 'RotatingCanvas'
+const RotatingCanvas = forwardRef<RotatingCanvasRef, RotatingCanvasProps>((_props, ref) => {
+
+    const [canvasData, setCanvasData] = useState({
+        width: '0px',
+        height: '0px',
+    })
+    const rotateImage: RotatingCanvasRef['rotateImage'] = (image, angle) => {
+        Taro.showLoading({ title: '正在加载', mask: true })
+        return new Promise((resolve) => {
+            const ctx = Taro.createCanvasContext(canvasId)
+            Taro.getImageInfo({
+                src: image,
+                success: ({ width, height, path }) => {
+                    let w = 0
+                    let h = 0
+                    if (Math.abs(angle) === 90) {
+                        w = height
+                        h = width
+                    } else {
+                        w = width
+                        h = height
+                    }
+                    setCanvasData({ width: w + 'px', height: h + 'px' })
+                    if (angle === 90) {
+                        ctx.translate(w, 0)
+                        ctx.rotate(Math.PI / 2)
+                    }
+                    if (angle === -90) {
+                        ctx.translate(0, h)
+                        ctx.rotate(-Math.PI / 2)
+                    }
+                    ctx.drawImage(path, 0, 0)
+                    setTimeout(() => {
+                        ctx.draw(false, () => {
+                            Taro.canvasToTempFilePath({
+                                canvasId,
+                                x: 0,
+                                y: 0,
+                                width: w,
+                                height: h,
+                                destWidth: w,
+                                destHeight: h,
+                                fileType: 'jpg',
+                                quality: 0.2,
+                                success: async (res) => {
+                                    setTimeout(() => {
+                                        console.log(res);
+                                        Taro.showLoading()
+                                        resolve(res.tempFilePath)
+                                    }, 200)
+                                },
+                                fail: (err) => {
+                                    console.log(err)
+                                }
+                            })
+                        })
+                    }, 200)
+                }
+            })
+        })
+    }
+
+    useImperativeHandle(ref, () => {
+        return {
+            rotateImage
+        }
+    })
+
+    return <Canvas
+        canvasId={canvasId}
+        style={{
+            position: 'fixed',
+            // left: 0,
+            // top: 0,
+            // zIndex: 10,
+            left: '-10000000px',
+            top: '-10000000px',
+            zIndex: -10,
+            width: canvasData.width,
+            height: canvasData.height
+        }}
+    />
+
+})
+
+export default RotatingCanvas
\ No newline at end of file
diff --git a/src/components/ZoomView/ZoomView.tsx b/src/components/ZoomView/ZoomView.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..a01d154ae2def2a186d9f09fc85ed9c3b4f48b2d
--- /dev/null
+++ b/src/components/ZoomView/ZoomView.tsx
@@ -0,0 +1,62 @@
+import { ITouch, View } from "@tarojs/components";
+import { CSSProperties, FC, memo, useCallback, useRef } from "react"
+import { throttle } from "lodash";
+
+type ZoomViewProps = {
+    width: CSSProperties['width']
+    height: CSSProperties['height']
+    zIndex?: CSSProperties['zIndex']
+    onZoom?: (zoom: number) => void
+}
+
+const getDistance = (arr1, arr2) => {//计算缩放
+    if (arr1 && arr2) {
+        let x = arr2.pageX - arr1.pageX;
+        let y = arr2.pageY - arr1.pageY;
+        return (x * x) + (y * y);
+    } else {
+        return 1
+    }
+}
+
+const ZoomView: FC<ZoomViewProps> = memo((props) => {
+    const { width, height, zIndex = 2, onZoom } = props
+    const nowZoom = useRef(1)  // 手势停止时的zoom
+
+    const realTimeZoom = useRef(1)  // 手势变化时的实时zoom
+    const touchStart = useRef<ITouch[]>([])
+    const touchStartCallback = (e) => {
+        if (e.touches.length === 2) {
+            touchStart.current = e.touches
+        }
+    }
+
+    const touchMoveCallback = useCallback(throttle((e) => {
+        if (e.changedTouches.length === 2) {
+            const now = e.changedTouches;
+            const now1 = getDistance(now[0], now[1]);
+            const now2 = getDistance(touchStart.current[0], touchStart.current[1]);
+            realTimeZoom.current = now1 / now2 * nowZoom.current
+            onZoom && onZoom(realTimeZoom.current)
+        }
+    }, 10), [])
+    return <View
+        onTouchStart={(e) => touchStartCallback(e)}
+        onTouchEnd={() => {
+            nowZoom.current = realTimeZoom.current
+        }}
+        onTouchMove={(e) => touchMoveCallback(e)}
+        style={{
+            width,
+            height,
+            zIndex,
+            backgroundColor: 'transparent',
+            position: 'absolute',
+            top: 0,
+            left: 0
+        }}
+    />
+})
+
+export default ZoomView
+
diff --git a/src/hooks/useMapLocation.tsx b/src/hooks/useMapLocation.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..060e3a488f904ec22cfae249b02239f51b2ac2f6
--- /dev/null
+++ b/src/hooks/useMapLocation.tsx
@@ -0,0 +1,80 @@
+//获取位置信息和地址
+import { getAuth } from '@/utils/comm';
+import Taro from '@tarojs/taro';
+interface AddressInfo {
+  cityCode: string;
+  cityName: string;
+  districtCode: string;
+  districtName: string;
+  streetCode: string;
+  streetName: string;
+  communityCode: string;
+  communityName: string;
+  lon: number;
+  lat: number;
+  coordinateType: string;
+  address: string;
+}
+
+function useMapLocation() {
+  const getLocationAndAddress = async () => {
+    try {
+      const auth = await getAuth('scope.userLocation','请打开位置权限',()=>{
+        Taro.navigateBack()
+      })
+      if(!auth){
+        throw '请打开位置权限'
+      }
+      const res = await Taro.getLocation({ type: 'gcj02' }).catch(()=>{
+        Taro.showModal({
+          title: '提示',
+          content: '请打开手机位置信息',
+          confirmText: "确定",
+          showCancel: false,
+          complete: () => {
+            Taro.navigateBack()
+          }
+        })
+      })
+      if(!res)return
+      const { latitude, longitude } = res; 
+      const response = await Taro.request({
+        url: `https://apis.map.qq.com/ws/geocoder/v1?location=${latitude},${longitude}&key=ZCMBZ-EMXKZ-GQEXH-TQNKQ-IHFAO-KQF3S`,
+        method: 'GET',
+        success: (res) => res,
+        fail: (err) => {
+          console.error('获取失败:', err);
+        },
+      });
+
+      const { status, result } = response.data;
+      if (status !== 0) {
+        console.log(response);
+        throw new Error('解析失败');
+      }
+
+      const addressInfo: AddressInfo = {
+        cityCode: '5101',
+        cityName: result.address_component.city,
+        districtCode: result.ad_info.adcode,
+        districtName: result.ad_info.district,
+        streetCode: result.address_reference?.town?.id,
+        streetName: result.address_component.street,
+        communityCode: '',
+        communityName: '',
+        lon: result.location.lng, //事件经度
+        lat: result.location.lat, //事件纬度
+        coordinateType: 'GCJ-02', //坐标类型
+        address: result.formatted_addresses.recommend,
+      };
+
+      return addressInfo;
+    } catch (error) {
+      throw error; 
+    }
+  };
+
+  return { getLocationAndAddress };
+}
+
+export default useMapLocation;
diff --git a/src/pages/Event/view/confirmLocation/index.tsx b/src/pages/Event/view/confirmLocation/index.tsx
index ccced6d3134da62a702e4ace65d1c485d1085ca5..a50271e9c9c2a17b4397e6c1ca92bb2d18528fd7 100644
--- a/src/pages/Event/view/confirmLocation/index.tsx
+++ b/src/pages/Event/view/confirmLocation/index.tsx
@@ -8,7 +8,7 @@ import useReportStore from "@/store/report";
 import locationImg from "@/assets/images/event/localPoint.png";
 import dragPoint from "@/assets/images/event/dragPoint.png";
 import lacate from "@/assets/images/event/lacate.png";
-import locationIcon from "@/assets/images/event/location.png";
+import locationIcon from "@/assets/images/event/locationIcon.png";
 import { Button } from "@taroify/core";
 function ConfirmLocation() {
   const { discoverEntry, eventReportInfoExtend, standardEventContent } =
diff --git a/src/pages/kitchenWaste/index.less b/src/pages/kitchenWaste/index.less
index e3ea6b27deaa3ca9a015267a96d0871417d26f86..c35c014e947178687e5de2a11dc5778c51bb6bad 100644
--- a/src/pages/kitchenWaste/index.less
+++ b/src/pages/kitchenWaste/index.less
@@ -50,7 +50,8 @@
   &:active {
     opacity: 0.8;
   }
-  > Image {
+
+  >Image {
     width: 120px;
     height: 120px;
   }
@@ -164,3 +165,27 @@
 .mar-t-0 {
   margin-top: 0;
 }
+
+.commercial-census {
+  width: 100%;
+
+  .bottom {
+    margin-top: 30px;
+    justify-content: space-between;
+    color: #3db35d;
+    .item {
+      height: 170px;
+      background: #FFFFFF;
+      border-radius: 13px;
+  
+      padding: 0;
+      width: 31%;
+      box-shadow: 0px 4px 13px 0px rgba(178, 227, 190, 0.5);
+    
+      .img {
+        width: 100px;
+        height: 100px;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/pages/kitchenWaste/index.tsx b/src/pages/kitchenWaste/index.tsx
index 5f8d0728a581baa3bea48af0bed2296da29ef0e5..25b648ce6c2be26cb21b846dd0c838b2a9c15713 100644
--- a/src/pages/kitchenWaste/index.tsx
+++ b/src/pages/kitchenWaste/index.tsx
@@ -6,8 +6,10 @@ import api from "@/services";
 import globalStore from "@/store/index";
 import def_dp from "@/assets/images/kitchenWaste/def_dp.png";
 import { Flex } from "@taroify/core";
-import { getUrlParams } from "@/utils/comm";
-import icon41 from '@/assets/icon/icon41.png'
+import { getUrlParams, queryParams } from "@/utils/comm";
+import icon41 from "@/assets/icon/icon41.png";
+import services from "@/services";
+import urls from "@/services/core/api";
 
 interface ImgNumProps {
   title: string;
@@ -47,8 +49,17 @@ const Index: FC = () => {
   const [qData, setQData] = useState<API.StatisticsDto>();
   const [recommendData, setRecommendData] = useState<API.RecommendDto[]>();
   const { upCollectionInfo, collectionInfo } = globalStore();
-
+  const [configInfo, setConfigInfo] = useState<any>(); //配置信息
+  //查询巡查配置
+  const getInspectionModeConfig = () => {
+    services.event.getInspectionModeByPerson().then((res) => {
+      setConfigInfo(
+        res.data
+      );
+    });
+  };
   useDidShow(() => {
+    getInspectionModeConfig();
     api.kitchenWaste.queryStatisticsForWeChat().then((res) => {
       if (res.code === 200) {
         setQData(res.data);
@@ -58,7 +69,7 @@ const Index: FC = () => {
     api.kitchenWaste.getEntitieInfo().then((res) => {
       if (res.code === 200) {
         console.log(res);
-        
+
         upCollectionInfo(res.data);
       }
     });
@@ -79,16 +90,18 @@ const Index: FC = () => {
     });
   });
 
-  const scanCodesInning = ()=>{
+  const scanCodesInning = () => {
     Taro.scanCode({
-        success:({result})=>{
-            const {merchantId}=getUrlParams(result)
-            Taro.navigateTo({
-                url:'/pages/kitchenWaste/pages/addCollection/index?merchantId='+merchantId
-            })
-        }
-    })
-  }
+      success: ({ result }) => {
+        const { merchantId } = getUrlParams(result);
+        Taro.navigateTo({
+          url:
+            "/pages/kitchenWaste/pages/addCollection/index?merchantId=" +
+            merchantId,
+        });
+      },
+    });
+  };
 
   return (
     <View className={"wrap"}>
@@ -121,40 +134,79 @@ const Index: FC = () => {
             color="#04BDEB"
           />
         </View>
-
-        <Flex gutter={20}>
-            <Flex.Item span={12}>
-                <Button
-                    className="def-btn"
-                    plain
-                    onTap={() => {
+        {/* 商户普查 */}
+        {configInfo?.entityInspection === "1" && (
+          <View className="commercial-census">
+            <Flex className="bottom" gap={15} justify="between">
+              {configInfo.entityInspections.map((v) => {
+                const { id, title, inspectionCoverPhoto } = v;
+                return (
+                  <View
+                    className="item"
+                    key={id}
+                    onClick={() => {
+                      const { code, name } = v;
+                      if (title === "新店录入") {
+                        const query = {
+                          entityTypeId: code,
+                          entityTypeName: name,
+                        };
+                        Taro.navigateTo({
+                          url:
+                            "/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry" +
+                            queryParams(query),
+                        });
+                      } else {
+                        const query = {
+                          title,
+                          entityType: configInfo.entityInspections
+                            .map((v) => v.code)
+                            .join(","),
+                        };
                         Taro.navigateTo({
-                            url: "/pages/kitchenWaste/pages/addCollection/index",
+                          url:
+                            "/pages/kitchenWaste/pages/shopList/shopList" +
+                            queryParams(query),
                         });
+                      }
                     }}
-                >
+                  >
                     <Image
-                        className="btn-icon"
-                        src="https://xct.cdhncy.cn/file/xindu/2024/9/4/add.png"
+                      className="img"
+                      src={urls.assetsUrl + inspectionCoverPhoto}
                     />
-                    <Text className="btn-text">添加收运</Text>
-                </Button>
-            </Flex.Item>
-            <Flex.Item span={12}>
-                <Button
-                    className="def-btn"
-                    plain
-                    onTap={scanCodesInning}
-                >
-                    <Image
-                        className="btn-icon"
-                        src={icon41}
-                    />
-                    <Text className="btn-text">扫码收运</Text>
-                </Button>
-            </Flex.Item>
+                    <View className="title">{title}</View>
+                  </View>
+                );
+              })}
+            </Flex>
+          </View>
+        )}
+        <Flex gutter={20}>
+          <Flex.Item span={12}>
+            <Button
+              className="def-btn"
+              plain
+              onTap={() => {
+                Taro.navigateTo({
+                  url: "/pages/kitchenWaste/pages/addCollection/index",
+                });
+              }}
+            >
+              <Image
+                className="btn-icon"
+                src="https://xct.cdhncy.cn/file/xindu/2024/9/4/add.png"
+              />
+              <Text className="btn-text">添加收运</Text>
+            </Button>
+          </Flex.Item>
+          <Flex.Item span={12}>
+            <Button className="def-btn" plain onTap={scanCodesInning}>
+              <Image className="btn-icon" src={icon41} />
+              <Text className="btn-text">扫码收运</Text>
+            </Button>
+          </Flex.Item>
         </Flex>
-        
 
         <View className="tjText">
           <Text>推荐产生单位</Text>
diff --git a/src/pages/kitchenWaste/pages/cameraComp/cameraComp.config.ts b/src/pages/kitchenWaste/pages/cameraComp/cameraComp.config.ts
new file mode 100644
index 0000000000000000000000000000000000000000..457d7f4664284974d3b14e08c06e7de1fd3d5612
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/cameraComp/cameraComp.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '',
+})
diff --git a/src/pages/kitchenWaste/pages/cameraComp/cameraComp.less b/src/pages/kitchenWaste/pages/cameraComp/cameraComp.less
new file mode 100644
index 0000000000000000000000000000000000000000..f2d666adf3def59e3ac69227e5911c145904e2d5
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/cameraComp/cameraComp.less
@@ -0,0 +1,120 @@
+@keyframes diagonalMove {
+  0% {
+    width: 100vw;
+    height: 100vh;
+    transform: translate(100vw, -100vh);
+    opacity: 0.6;
+  }
+
+  100% {
+    width: 142px;
+    height: 200px;
+    opacity: 1;
+  }
+}
+
+@keyframes showClear {
+  0% {
+    opacity: 0;
+  }
+
+  100% {
+    opacity: 1;
+  }
+}
+
+.wrap {
+  width: 100%;
+  height: 100vh;
+  position: relative;
+}
+
+.region-icon {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 80vw;
+  height: 80vw;
+  margin-left: 10vw;
+  top: 20vh;
+}
+
+.footer {
+  position: absolute;
+  width: 100%;
+  height: 440px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  bottom: 0;
+  left: 0;
+  z-index: 999;
+
+  .img-wrap {
+    gap: 36px;
+    // width: 100%;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .img-box {
+    width: 144px;
+    height: 200px;
+    border-radius: 20px;
+    background-color: rgba(255, 255, 255, 0.1);
+    border: 2px solid #fff;
+    color: #fff;
+    font-size: 30px;
+    position: relative;
+
+    .text {
+      position: absolute;
+      display: inline-block;
+      width: 120px;
+      height: 80px;
+      top: 50%;
+      left: 50%;
+      margin-left: -60px;
+      margin-top: -40px;
+      text-align: center;
+      line-height: 80px;
+      z-index: 999;
+    } 
+    &.active {
+      border: 2px solid #fed700;
+    }
+  }
+}
+
+.thumb-wrap {
+  position: absolute;
+  inset: 0;
+  width: 100%;
+  height: 100%;
+  border-radius: 20px;
+  overflow: hidden;
+}
+
+.img-thumb {
+  animation: diagonalMove 0.1s ease-in forwards;
+}
+
+.clear-icon {
+  position: absolute;
+  top: -20px;
+  right: -20px;
+  z-index: 9999;
+  animation: showClear 0.2s ease-in forwards;
+}
+
+.photo-icon {
+  width: 100px;
+  height: 100px;
+  margin-top: 40px;
+}
+
+.next-btn {
+  position: absolute;
+  bottom: 100px;
+  right: 60px;
+}
\ No newline at end of file
diff --git a/src/pages/kitchenWaste/pages/cameraComp/cameraComp.tsx b/src/pages/kitchenWaste/pages/cameraComp/cameraComp.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..9db8233f4c4c6164271a6e68380d6d43307a13ff
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/cameraComp/cameraComp.tsx
@@ -0,0 +1,303 @@
+import { View, Camera, Icon, Text, Image } from "@tarojs/components";
+import _ from "lodash";
+import { Button } from "@nutui/nutui-react-taro";
+import { useEffect, useMemo, useRef, useState } from "react";
+import Taro, { useDidShow, useLoad, useUnload } from "@tarojs/taro";
+import api from "@/services/core/api";
+import "./cameraComp.less";
+import useReportStore from "@/store/report";
+import { getAuth, queryParams } from "@/utils/comm";
+import region from "@/assets/images/region.png"
+import photoBtn from "@/assets/images/photoBtn.png"
+import ZoomView from "@/components/ZoomView/ZoomView";
+import RotatingCanvas, {
+  RotatingCanvasRef,
+} from "@/components/RotatingCanvas/RotatingCanvas";
+import compressImg from "@/utils/compressImg";
+import { closeForRenewal, specialProject } from "@/services/kitchenWaste";
+interface ImgPathDto {
+  type: 1 | 2 | 3;
+  path: string;
+}
+//举手之劳
+const liftFingerImgConfig = [
+  {
+    text: "处置前",
+    type: 1.1,
+  },
+  {
+    text: "处置后",
+    type: 1.2,
+  },
+];
+
+//拍照图片集
+const commImgConfig = [
+  {
+    text: "近景",
+    type: 2,
+  },
+  {
+    text: "远景",
+    type: 0.5,
+  },
+  {
+    text: "其他",
+    type: 1,
+  },
+];
+
+function CameraComp() {
+  // const { reportStore } = reportStore; //上报事件全局数据
+  const { discoverEntry, discoverEntryName ,eventReportInfoExtend} = useReportStore(); //巡查入口
+  const pathDefault: ImgPathDto[] = [
+    {
+      type: 1,
+      path: "",
+    },
+    {
+      type: 2,
+      path: "",
+    },
+    {
+      type: 3,
+      path: "",
+    },
+  ];
+  const ctx = Taro.createCameraContext();
+  //设置选中图片的标识
+  const [zoom, setZoom] = useState(() => {
+    return discoverEntry === "liftFinger" ? 1.1 : 2;
+  });
+  const [imgPath, setImgPath] = useState<ImgPathDto[]>(pathDefault);
+
+  //附件图片
+  const attmentPreUrlList = useRef<ImgPathDto[]>(pathDefault);
+  useDidShow(() => {
+    getAuth("scope.camera", "请打开相机权限", () => {
+      Taro.navigateBack();
+    });
+  });
+  useEffect(() => {
+    ctx.setZoom({
+      zoom,
+    });
+  }, [zoom]);
+
+  const rotateRef = useRef<RotatingCanvasRef>(null);
+  const deviceType = useRef("");
+  //拍照
+  const takePhoto = async () => {
+    ctx.takePhoto({
+      quality: "high",
+      success: async ({ tempImagePath }) => {
+        // const { tempFiles: [tempImagePath] } = await Taro.chooseMedia({ mediaType: ['image'] })
+        // const { tempFilePath } = tempImagePath
+
+        const screenDirection = screenStatus.current;
+        const { filePath: path } = await compressImg.set(tempImagePath, 2048);
+        let filePath = path;
+        if (screenDirection === "1") {
+          console.log("逆时针旋转");
+          const angle = deviceType.current === "ios" ? 90 : -90;
+          filePath = await rotateRef.current?.rotateImage(filePath, angle)!;
+        } else if (screenDirection === "2") {
+          console.log("顺时针旋转");
+          const angle = deviceType.current === "ios" ? -90 : 90;
+          filePath = await rotateRef.current?.rotateImage(filePath, angle)!;
+        }
+
+        //上传图片
+        Taro.showLoading({ title: "正在上传", mask: true });
+        console.log("文件上传：", api.uploadUrl);
+        Taro.uploadFile({
+          url: api.uploadUrl,
+          filePath,
+          header: { authorization: "Bearer " + Taro.getStorageSync("token") },
+          name: "file",
+          success(imgRes) {
+            if (imgRes.statusCode === 200) {
+              const imgResultReq = JSON.parse(imgRes.data);
+              console.log("文件上传响应：", imgResultReq);
+              const attmentImg = api.assetsUrl + imgResultReq.data;
+              console.log(attmentImg);
+
+              //焦距缩放配置
+              const zoomConfig =
+                discoverEntry === "liftFinger" ? [1.1, 1.2] : [2, 0.5, 1];
+              const pathList = _.cloneDeep(imgPath);
+              const zoomIndex = zoomConfig.findIndex((it) => it === zoom); //当前zoom的索引
+              pathList[zoomIndex].path = filePath;
+              attmentPreUrlList.current[zoomIndex].path = attmentImg;
+              const nextZoom = zoomConfig[zoomIndex > 1 ? 2 : zoomIndex + 1]; //下个zoom
+
+              setZoom(nextZoom);
+              setImgPath(pathList);
+              Taro.hideLoading();
+            } else {
+              Taro.showToast({
+                title: "文件上传失败，请重新上传",
+                icon: "none",
+                mask: true,
+              });
+            }
+          },
+          fail: () => {
+            Taro.showToast({
+              title: "文件上传失败，请重新上传",
+              icon: "none",
+              mask: true,
+            });
+          },
+        });
+      },
+    });
+  };
+  //设置缩放级别
+  const setScaleZoom = (zoom: number) => {
+    setZoom(zoom);
+  };
+  //删除图片
+  const handleClearImg = (index: number) => {
+    let pathList = _.cloneDeep(imgPath);
+    pathList[index].path = "";
+    setImgPath(pathList);
+  };
+  const showNextBtn = () => {
+    const arr = imgPath.filter((it) => it.path.length > 1);
+    if (discoverEntry === "closePhoto") {
+      return arr.length >= 1;
+    }
+    return arr.length > 1;
+  };
+console.log(imgPath);
+
+  //下一步，拿第一张照片去获取类别
+  const handleNextPage = async () => {
+    let fileimgList = attmentPreUrlList.current?.map((it) => it.path);
+    if (discoverEntry === "closePhoto") {
+      const res = await closeForRenewal({
+        entitieId: discoverEntryName,
+        photos: fileimgList[0],
+      });
+      if (res.code === 200) {
+        Taro.showToast({ title: "操作成功", icon: "none", mask: true });
+        setTimeout(() => {
+          Taro.navigateBack();
+        }, 1000);
+      }
+      return;
+    }
+   
+
+  };
+
+  //上传图片配置
+  const cameraImgConfig = useMemo(() => {
+    if (discoverEntry === "closePhoto") {
+      return [{ text: "关店照", type: 1 }];
+    }
+    return discoverEntry === "liftFinger" ? liftFingerImgConfig : commImgConfig;
+  }, []);
+
+  const screenStatus = useRef("0");
+  useLoad(() => {
+    compressImg.clearTempImg();
+    Taro.getSystemInfo({
+      success: ({ platform }) => {
+        deviceType.current = platform;
+      },
+    });
+    Taro.startDeviceMotionListening({
+      interval: "normal",
+      success: () => {
+        Taro.onDeviceMotionChange(({ beta, gamma }) => {
+          screenStatus.current = "0";
+          if (Math.abs(beta) < 45 && Math.abs(gamma - 90) < 45) {
+            screenStatus.current = "1";
+          } else if (Math.abs(beta) < 45 && Math.abs(gamma + 90) < 45) {
+            screenStatus.current = "2";
+          }
+        });
+      },
+    });
+  });
+
+  useUnload(() => {
+    Taro.offDeviceMotionChange();
+    compressImg.clearTempImg();
+  });
+
+  return (
+    <View className="wrap">
+      <Camera
+        outputDimension="1080P"
+        device-position="back"
+        flash="off"
+        style="width: 100%; height: 100%"
+      />
+      <ZoomView
+        width="100vw"
+        height="100vh"
+        zIndex={998}
+        onZoom={(zoom) => {
+          ctx.setZoom({ zoom });
+        }}
+      />
+      <RotatingCanvas ref={rotateRef} />
+      <Image
+        className="region-icon"
+        src={region}
+      />
+      <View className="footer">
+        <View className="img-wrap dflex">
+          {/* 举手之劳显示处置前和处置后的图片，其他拍照显示近/远/其他，逻辑不变 */}
+          {cameraImgConfig?.map((it, index) => (
+            <View
+              key={it.type}
+              className={
+                zoom === it.type ? "img-box active" : "img-box imgpre-box"
+              }
+              onClick={() => setScaleZoom(it.type)}
+            >
+              <Text className="text"> {it.text}</Text>
+              {imgPath[index]?.path && (
+                <>
+                  <Icon
+                    size={18}
+                    type="clear"
+                    className="clear-icon"
+                    color="red"
+                    onClick={() => handleClearImg(index)}
+                  />
+                  <View className="thumb-wrap">
+                    <Image src={imgPath[index].path} className="img-thumb" />
+                  </View>
+                </>
+              )}
+            </View>
+          ))}
+        </View>
+
+        <Image
+          onClick={takePhoto}
+          className="photo-icon"
+          src={photoBtn}
+        />
+
+        <Button
+          type="info"
+          className="next-btn"
+          style={{
+            opacity: showNextBtn() ? 1 : 0,
+          }}
+          onClick={handleNextPage}
+        >
+          下一步
+        </Button>
+      </View>
+    </View>
+  );
+}
+
+export default CameraComp;
diff --git a/src/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry.config.ts b/src/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry.config.ts
new file mode 100644
index 0000000000000000000000000000000000000000..fc1dce1478d2d17ced8bc4b56cffe120ef12cc6e
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+    navigationStyle: 'custom'
+})
\ No newline at end of file
diff --git a/src/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry.module.less b/src/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry.module.less
new file mode 100644
index 0000000000000000000000000000000000000000..d0a1f6ca183b7c6553f46a034fc3326e786cd8e8
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry.module.less
@@ -0,0 +1,53 @@
+    .wrap {
+        padding: 20px;
+
+        .inpBox {
+            background: #FFFFFF;
+            border-radius: 34px;
+            height: 114px;
+            margin-top: 40px;
+            padding: 0 20px;
+            border: 1px solid #75c274;
+
+            .inp {
+                flex: 1;
+                height: 100%;
+            }
+
+            .fg {
+                height: 38px;
+                width: 1px;
+                background-color: #D6D9E3;
+            }
+
+            .img {
+                width: 46px;
+                height: 46px;
+            }
+        }
+
+
+        .btn {
+            height: 114px;
+            background: #FFFFFF;
+            border-radius: 34px;
+            border: 1px solid #75c274;
+            font-weight: 500;
+            font-size: 30px;
+            color: #75c274;
+            margin-top: 40px;
+            width: 100%;
+        }
+
+        .submit {
+            height: 94px;
+            width: 100%;
+            background: #75c274;
+            border-radius: 46px;
+            font-weight: 500;
+            font-size: 32px;
+            color: #FFFFFF;
+            margin-top: 30px;
+            border: 0;
+        }
+    }
\ No newline at end of file
diff --git a/src/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry.tsx b/src/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..3f893e6faf7fec0e0eea2ad9e20e4b22c001942d
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/newStoreEntry/newStoreEntry.tsx
@@ -0,0 +1,64 @@
+import { View, Input, Image } from "@tarojs/components";
+import styles from "./newStoreEntry.module.less";
+import saomiao from "@/assets/images/kitchenWaste/saomiao.png";
+import { Button } from "@nutui/nutui-react-taro";
+import Flex from "@/components/Flex/Flex";
+import Taro, { useRouter } from "@tarojs/taro";
+import { useState } from "react";
+import { queryParams } from "@/utils/comm";
+import Container from "@/components/Container";
+
+const NewStoreEntry = () => {
+  const {
+    params: { entityTypeId, entityTypeName },
+  } = useRouter();
+  const [code, setCode] = useState("");
+
+  const toPerfectInfo = (creditCode?: string) => {
+    Taro.navigateTo({
+      url:
+        "/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo" +
+        queryParams({ creditCode, entityTypeId, entityTypeName }),
+    });
+  };
+
+  return (
+    <Container title="新店录入">
+      <View className={styles.wrap}>
+        <Flex className={styles.inpBox} align="center" gap={10}>
+          <Input
+            className={styles.inp}
+            placeholder="填写营业执照统一信用代码"
+            onInput={(e) => setCode(e.detail.value)}
+          />
+          <View className={styles.fg} />
+          <Image className={styles.img} src={saomiao} />
+        </Flex>
+
+        <Button className={styles.btn} onClick={() => toPerfectInfo()}>
+          录入暂未取得营业执照的商户
+        </Button>
+        <View>
+          <Button
+            className={styles.submit}
+            onClick={() => {
+              if (!code) {
+                Taro.showToast({
+                  title: "请输入统一代码",
+                  icon: "none",
+                  mask: true,
+                });
+                return;
+              }
+              toPerfectInfo(code);
+            }}
+          >
+            提交
+          </Button>
+        </View>
+      </View>
+    </Container>
+  );
+};
+
+export default NewStoreEntry;
diff --git a/src/pages/kitchenWaste/pages/shopList/shopList.config.ts b/src/pages/kitchenWaste/pages/shopList/shopList.config.ts
new file mode 100644
index 0000000000000000000000000000000000000000..fc1dce1478d2d17ced8bc4b56cffe120ef12cc6e
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/shopList/shopList.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+    navigationStyle: 'custom'
+})
\ No newline at end of file
diff --git a/src/pages/kitchenWaste/pages/shopList/shopList.module.less b/src/pages/kitchenWaste/pages/shopList/shopList.module.less
new file mode 100644
index 0000000000000000000000000000000000000000..1f40e14cb3f4756bac58499189233c20bdfaadbe
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/shopList/shopList.module.less
@@ -0,0 +1,93 @@
+.inpBox {
+    height: 100px;
+    background: #FFFFFF;
+    border-radius: 34px;
+    padding: 0 30px;
+    margin-bottom: 30px;
+
+    .inp {
+        flex: 1;
+        height: 100%;
+    }
+}
+
+.listItem {
+    height: 470px;
+    margin-bottom: 30px;
+    background: #FFFFFF;
+    border-radius: 26px;
+
+    .img {
+        height: 320px;
+    }
+
+    .bottom {
+        padding: 30px;
+
+        .title {
+            font-weight: 800;
+            font-size: 30px;
+            color: #1D2541;
+        }
+
+        .distance {
+            font-weight: 500;
+            font-size: 24px;
+            color: #7C8294;
+        }
+
+        .shopAddress {
+            font-weight: 500;
+            font-size: 28px;
+            color: #7B8193;
+
+            image {
+                width: 20px;
+                height: 28px;
+            }
+        }
+    }
+}
+
+.closePopup {
+    width: 690px;
+    height: 430px;
+    background: #FFFFFF;
+    border-radius: 40px;
+    padding: 50px 30px;
+
+    .title {
+        font-weight: 800;
+        font-size: 44px;
+        color: #1D2541;
+        text-align: center;
+    }
+
+    .content {
+        font-weight: 500;
+        font-size: 28px;
+        color: #4A5168;
+        text-align: center;
+    }
+
+    .cancel {
+        width: 226px;
+        height: 94px;
+        background: #F5F6FA;
+        border-radius: 46px;
+        border: 1px solid #DBDEE7;
+        font-weight: 500;
+        font-size: 32px;
+        color: #52586E;
+    }
+
+    .shopconfirm {
+        width: 370px;
+        height: 94px;
+        background: #3E6BDA;
+        border-radius: 46px;
+        font-weight: 500;
+        font-size: 32px;
+        color: #FFFFFF;
+    }
+}
\ No newline at end of file
diff --git a/src/pages/kitchenWaste/pages/shopList/shopList.tsx b/src/pages/kitchenWaste/pages/shopList/shopList.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..65dcd8161de7fcf59cdf24b4703816cd897e6a0b
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/shopList/shopList.tsx
@@ -0,0 +1,222 @@
+import Taro, { useDidShow, useLoad, useRouter } from "@tarojs/taro";
+import styles from "./shopList.module.less";
+import { Input, ScrollView, Text, Image, View } from "@tarojs/components";
+import { Search } from "@nutui/icons-react-taro";
+import Flex from "@/components/Flex/Flex";
+import map from "@/assets/images/event/map.png";
+import { useCallback, useRef, useState } from "react";
+import { nearbyBusinessesPageList } from "@/services/kitchenWaste";
+import useMapLocation from "@/hooks/useMapLocation";
+import { wgs84ToBd09 } from "@/utils/coordinateTransformation";
+import api from "@/services/core/api";
+import { debounce } from "lodash";
+import { Button, Empty, Popup } from "@nutui/nutui-react-taro";
+import paizhao from "@/assets/images/paizhao.png";
+import useReportStore from "@/store/report";
+import { queryParams } from "@/utils/comm";
+import emptyImg from "@/assets/images/empty2.png";
+import Container from "@/components/Container";
+import emptyImg1 from "@/assets/images/empty.png";
+const ShopList = () => {
+  const {
+    params: { title, entityType },
+  } = useRouter();
+  const { updateDiscover } = useReportStore();
+  const { getLocationAndAddress } = useMapLocation();
+  const searchText = useRef("");
+
+  // const locations = useRef({ latitude: 30.891552545223195, longitude: 104.00907261600372 })
+  const lo = useRef({ latitude: 0, longitude: 0 });
+  const page = useRef(1);
+  const [list, setList] = useState<any[]>([]);
+  const [total, setTotal] = useState(0);
+  const getList = async () => {
+    const query = {
+      page: page.current,
+      count: 10,
+      // entityType: '0bc46fb4-a3c5-11ee-b5a6-0242ac120005',
+      entityType,
+      searchText: searchText.current,
+      ...lo.current,
+    };
+    const res = await nearbyBusinessesPageList(query);
+    if (res.code === 200) {
+      const lists = res.data.items;
+      if (page.current === 1) {
+        setList(lists);
+      } else {
+        setList([...list, ...res.data.items]);
+      }
+      setTotal(Number(res.data.total));
+    }
+  };
+  useDidShow(() => {
+    if (lo.current.latitude !== 0) {
+      page.current = 1;
+      setList([]);
+      getList();
+    }
+  });
+
+  useLoad(async () => {
+    const { lon, lat } = await getLocationAndAddress();
+    const { longitude, latitude } = wgs84ToBd09(lon, lat);
+    lo.current = { longitude, latitude };
+    page.current = 1;
+    setList([]);
+    getList();
+  });
+
+  const getList2 = useCallback(
+    debounce(
+      () => {
+        page.current = 1;
+        getList();
+      },
+      500,
+      {}
+    ),
+    []
+  );
+
+  const [activeIndex, setActiveIndex] = useState(0);
+  const [closeShow, setCloseShow] = useState(false);
+
+  return (
+    <Container title={title} style={{padding:10}}>
+      <Flex className={styles.inpBox} align="center">
+        <Input
+          className={styles.inp}
+          placeholder="请输入门头名称搜索"
+          onInput={(e) => {
+            searchText.current = e.detail.value;
+            getList2();
+          }}
+        />
+        <Search color="#3E6BDA" />
+      </Flex>
+      {list.length === 0 && (
+        <Empty
+          style={{ backgroundColor: "transparent" }}
+          title=" "
+          description="附近一公里没有店铺"
+          image={<img src={emptyImg1} />}
+        />
+      )}
+
+      <ScrollView
+        style={{ height: "calc(100vh - 50px - 85PX)" }}
+        scrollY
+        onScrollToLower={() => {
+          if (list.length >= total) {
+            Taro.showToast({ title: "没有更多了", mask: true, icon: "none" });
+            return;
+          }
+          page.current += 1;
+          getList();
+        }}
+      >
+        {list.map((v, i) => {
+          const {
+            id,
+            attachmentList,
+            name,
+            address,
+            distanceMeters,
+            entityTypeId,
+            entityTypeName,
+            unifiedSocialCreditCode,
+          } = v;
+          const imgUrl = attachmentList
+            ? api.assetsUrl + attachmentList[0]?.pictures[0]
+            : "";
+
+          return (
+            <Flex
+              className={styles.listItem}
+              key={i}
+              vertical
+              align="center"
+              onClick={() => {
+                if (title === "店铺更新") {
+                  console.log(v);
+                  const query = {
+                    creditCode: unifiedSocialCreditCode,
+                    entityTypeId,
+                    entityTypeName,
+                    id,
+                  };
+                  Taro.navigateTo({
+                    url:
+                      "/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo" +
+                      queryParams(query),
+                  });
+                } else {
+                  setActiveIndex(i);
+                  setCloseShow(true);
+                }
+              }}
+            >
+              <Image
+                className={styles.img}
+                src={imgUrl || emptyImg}
+                mode="heightFix"
+              />
+              <Flex
+                className={styles.bottom}
+                flex={1}
+                vertical
+                justify="space-between"
+              >
+                <Flex justify="space-between">
+                  <Text className={styles.title}>{name}</Text>
+                  {/* <Text className={styles.distance}>&lt; {distanceMeters}米</Text> */}
+                  <Text className={styles.distance}>{distanceMeters}米</Text>
+                </Flex>
+                <Flex className={styles.shopAddress} align="center" gap={10}>
+                  <Image src={map} />
+                  {address}
+                </Flex>
+              </Flex>
+            </Flex>
+          );
+        })}
+      </ScrollView>
+      <Popup
+        visible={closeShow}
+        onClose={() => setCloseShow(false)}
+        className={styles.closePopup}
+      >
+        <Flex vertical justify="space-between" style={{ height: "100%" }}>
+          <View className={styles.title}>确认</View>
+          <View className={styles.content}>
+            确认{list[activeIndex]?.name}已经关闭？
+          </View>
+          <Flex className={styles.btnBox} justify="space-between">
+            <Button
+              className={styles.cancel}
+              onClick={() => setCloseShow(false)}
+            >
+              取消
+            </Button>
+            <Button
+              className={styles.shopconfirm}
+              icon={<Image style={{ width: 20, height: 17 }} src={paizhao} />}
+              onClick={() => {
+                setCloseShow(false);
+                updateDiscover("closePhoto", list[activeIndex].id);
+                Taro.navigateTo({
+                  url: "/pages/kitchenWaste/pages/cameraComp/cameraComp",
+                });
+              }}
+            >
+              去拍一张关店照
+            </Button>
+          </Flex>
+        </Flex>
+      </Popup>
+    </Container>
+  );
+};
+
+export default ShopList;
diff --git a/src/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo.config.ts b/src/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo.config.ts
new file mode 100644
index 0000000000000000000000000000000000000000..fc1dce1478d2d17ced8bc4b56cffe120ef12cc6e
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+    navigationStyle: 'custom'
+})
\ No newline at end of file
diff --git a/src/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo.module.less b/src/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo.module.less
new file mode 100644
index 0000000000000000000000000000000000000000..c50320f30455be9324b6fd45afd9fa0e18e03c70
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo.module.less
@@ -0,0 +1,125 @@
+:global {
+
+    .nut-cell,
+    .nut-cell-group-wrap {
+        background-color: transparent;
+    }
+
+    .required::before,
+    .nut-form-item-body-tips {
+        color: red !important;
+        font-size: 28px;
+    }
+
+    .nut-uploader-upload {
+        background: #fff;
+        border-radius: 10px;
+        margin: 0;
+    }
+
+
+    .nut-uploader-preview-img-c {
+        height: 100%;
+        width: 100% !important;
+    }
+}
+
+.nutui-cell--clickable,
+.inp {
+    height: 100px;
+    background: #FFFFFF;
+    border-radius: 34px !important;
+    padding: 0 30px !important;
+    flex: initial !important;
+
+    .nut-cell-title,
+    input::placeholder {
+        font-weight: 500;
+        font-size: 30px;
+        color: #7B8193;
+    }
+}
+
+.attachmentBox {
+    margin: 20px 0;
+
+    .attachmentItem {
+        margin-bottom: 20px;
+        position: relative;
+        border-bottom: 2px solid #ededed;
+        padding-bottom: 20px;
+
+        :global {
+            .nut-uploader-preview-img-c {
+                width: 100%;
+                height: 100%;
+            }
+        }
+
+        .delBtn {
+            position: absolute;
+            top: 0px;
+            right: 0px;
+            height: 50px;
+            background: #3E6BDA;
+            font-weight: 500;
+            font-size: 32px;
+            color: #FFFFFF;
+            z-index: 10;
+        }
+    }
+}
+
+.saveTagBtn {
+    height: 100px;
+    background: #FFFFFF;
+    border-radius: 34px;
+    color: #3E6BDA;
+    border: 0;
+}
+
+.tagsBox {
+    padding: var(--nutui-cell-padding, 26rpx 32rpx);
+
+    .tagItem {
+        min-width: 180px;
+        max-width: 180px;
+        height: 80px;
+        background-color: #b8dcff;
+        position: relative;
+        border-radius: 20px;
+        color: #3188fd;
+        line-height: 80px;
+        padding: 0 20px;
+        text-align: center;
+        font-size: 28px;
+
+        .close {
+            width: 40px;
+            height: 40px;
+            position: absolute;
+            right: -20px;
+            top: -20px;
+        }
+    }
+}
+
+.textArea {
+    border-radius: 34px;
+
+    :global {
+        .nut-textarea-textarea {
+            border-radius: 34px;
+            padding: 30px;
+        }
+    }
+}
+
+.btn {
+    height: 94px;
+    background: #66c164;
+    border-radius: 46px;
+    font-weight: 500;
+    font-size: 32px;
+    color: #FFFFFF;
+}
\ No newline at end of file
diff --git a/src/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo.tsx b/src/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..702ec2678c908460899c75f6c93b6d16ab021c3a
--- /dev/null
+++ b/src/pages/kitchenWaste/pages/shopPerfectInfo/shopPerfectInfo.tsx
@@ -0,0 +1,261 @@
+import {
+  Button,
+  DatePicker,
+  Form,
+  Input,
+  Uploader,
+} from "@nutui/nutui-react-taro";
+import Taro, { useDidShow, useLoad, useRouter } from "@tarojs/taro";
+import styles from "./shopPerfectInfo.module.less";
+import { useState } from "react";
+import Flex from "@/components/Flex/Flex";
+import { View, Image } from "@tarojs/components";
+// import useMapLocation from "@/hooks/useMapLocation";
+import { getAuth } from "@/utils/comm";
+import { wgs84ToBd09 } from "@/utils/coordinateTransformation";
+import dayjs from "dayjs";
+
+import Container from "@/components/Container";
+import api from "@/services/core/api";
+import services from "@/services";
+import address from "@/assets/images/address.png";
+import AddressSelect from "@/components/AddressSelect/AddressSelect";
+const headers = { authorization: "Bearer " + Taro.getStorageSync("token") };
+const ShopPerfectInfo = () => {
+  const {
+    params: { id, creditCode, entityTypeId, entityTypeName },
+  } = useRouter();
+  const [form] = Form.useForm();
+  const [locationShow, setLocationShow] = useState(false);
+
+  const getDetail = async () => {
+    const res = await services.kitchenWaste.postDetailEntites(id as string);
+    if (res.code === 200) {
+      const data = res.data;
+      const attachmentList = data.attachmentList
+        ? data.attachmentList.map((v) => {
+            const { name, pictures } = v;
+            const obj = {
+              name,
+              pictures: pictures
+                ? pictures.map((item) => {
+                    return {
+                      type: "image",
+                      uid: item,
+                      name: item,
+                      url: api.assetsUrl + item,
+                      status: "success",
+                      message: "success",
+                    };
+                  })
+                : [],
+            };
+            return obj;
+          })
+        : [];
+
+      data.tags && setTagsName(data.tags);
+      setAttachmentList(attachmentList);
+      data.attachment = data.attachmentList?.[0].pictures?.map((item) => ({
+        type: "image",
+        uid: item,
+        name: item,
+        url: api.assetsUrl + item,
+        id: item,
+        status: "success",
+        message: "success",
+      }));
+      form.setFieldsValue(data);
+    }
+  };
+
+  useLoad(() => {
+    if (id) {
+      getDetail();
+    }
+  });
+
+  useDidShow(() => {
+    getAuth("scope.userLocation", "请设置位置权限", () => {
+      Taro.navigateBack();
+    });
+  });
+
+  const [dateShow, setDateShow] = useState(false);
+
+  const [tagsName, setTagsName] = useState<string[]>([]);
+  // const { getLocationAndAddress } = useMapLocation();
+
+  const [attachmentList, setAttachmentList] = useState<
+    { pictures: any[]; name: string }[]
+  >([]);
+
+  return (
+    <Container title="完善店铺信息" style={{ padding: 10 }}>
+      <Form
+        form={form}
+        labelPosition="top"
+        footer={
+          <Button
+            className={styles.btn}
+            nativeType="submit"
+            block
+            type="primary"
+          >
+            提交
+          </Button>
+        }
+        initialValues={{
+          unifiedSocialCreditCode: creditCode,
+          registerTime: dayjs().format("YYYY-MM-DD"),
+        }}
+        onFinish={async (values) => {
+          values.businessStatus = 1;
+          values.tagsList = tagsName;
+          values.registerTime =
+            dayjs(values.registerTime).format("YYYY-MM-DD") + " 00:00:00";
+
+          values.attachmentList = values?.attachment
+            ? [
+                {
+                  name: "店铺图片",
+                  pictures: values?.attachment?.map((item) => item?.uid),
+                },
+              ]
+            : undefined;
+          values.entityTypeId = entityTypeId;
+          values.entityTypeName = entityTypeName;
+          values.infoSource = "XCT";
+          delete values.tags;
+          const res = await services.kitchenWaste.postSaveOrUpdateEntites(
+            values
+          );
+          if (res.code === 200) {
+            Taro.navigateBack();
+          }
+        }}
+      >
+        <Form.Item
+          label="门头名称"
+          name="alias"
+          rules={[{ required: true, message: "请输入" }]}
+        >
+          <Input className={styles.inp} placeholder="请输入" />
+        </Form.Item>
+        <Form.Item
+          label="营业执照名称"
+          name="name"
+          rules={[{ required: true, message: "请输入" }]}
+        >
+          <Input className={styles.inp} placeholder="请输入" />
+        </Form.Item>
+
+        <Form.Item label="联系人" name="contactName">
+          <Input className={styles.inp} placeholder="请输入" />
+        </Form.Item>
+        <Form.Item label="联系电话" name="phone">
+          <Input className={styles.inp} placeholder="请输入" maxLength={11} />
+        </Form.Item>
+        <Form.Item
+          label="企业类别"
+          name="industry"
+          rules={[{ required: true, message: "请输入" }]}
+        >
+          <Input className={styles.inp} placeholder="请输入" />
+        </Form.Item>
+
+        <Flex align="flex-end">
+          <Form.Item label="位置" name="address">
+            <Input
+              className={styles.inp}
+              placeholder="点击右侧选择位置"
+              style={{ width: 272 }}
+            />
+          </Form.Item>
+          <View style={{ paddingBottom: 10 }}>
+            <Image
+              src={address}
+              style={{ width: 50, height: 50 }}
+              onClick={() => {
+                setLocationShow(true);
+              }}
+            />
+          </View>
+        </Flex>
+        <Form.Item label="店铺图片" name="attachment">
+          <Uploader
+            style={{ marginTop: 15 }}
+            url={api.uploadUrl}
+            maxCount="3"
+            headers={headers}
+            onDelete={(file) => {
+              const attachment = form.getFieldValue("attachment");
+              const list = attachment.filter((v) => {
+                return v.uid !== file.uid;
+              });
+              form.setFieldsValue({ attachment: list });
+            }}
+            onSuccess={(e) => {
+              // @ts-ignore
+              if (e.responseText.statusCode === 200) {
+                // @ts-ignore
+                const uploadRes = JSON.parse(e.responseText.data);
+                if (uploadRes.code === 200) {
+                  const attachment = form
+                    .getFieldValue("attachment")
+                    ?.filter((item) => !!item?.id);
+                  console.log(attachment);
+
+                  attachment.push({
+                    url: api.assetsUrl + uploadRes.data,
+                    status: "success",
+                    type: "image",
+                    name: uploadRes.data,
+                    uid: uploadRes.data,
+                    message: "正在上传",
+                    id: uploadRes.data,
+                  });
+                  form.setFieldsValue({ attachment });
+                }
+              }
+            }}
+          />
+        </Form.Item>
+      </Form>
+      <DatePicker
+        title="日期选择"
+        visible={dateShow}
+        defaultValue={new Date()}
+        showChinese
+        onClose={() => setDateShow(false)}
+        threeDimensional={false}
+        onConfirm={(_, values) => {
+          form.setFieldsValue({ registerTime: values.join("-") });
+        }}
+      />
+      
+        <AddressSelect
+          show={locationShow}
+          onConfirm={(addressInfo) => {
+            const { lon, lat, address } = addressInfo;
+            const { longitude, latitude } = wgs84ToBd09(
+              Number(lon),
+              Number(lat)
+            );
+            form.setFieldsValue({
+              address,
+              lon: longitude,
+              lat: latitude,
+            });
+            setLocationShow(false);
+          }}
+          onCancale={() => {
+            setLocationShow(false);
+          }}
+        />
+      
+    </Container>
+  );
+};
+
+export default ShopPerfectInfo;
diff --git a/src/services/core/api.ts b/src/services/core/api.ts
index 289fd511d54437191b44e57886c2a21025f87523..eb77d5a5f7d5c5ecfb85b90a467dddfad163e5c4 100644
--- a/src/services/core/api.ts
+++ b/src/services/core/api.ts
@@ -14,15 +14,26 @@ if (envVersion === 'develop') {  // 开发版（开发者工具、预览码、
         eventUrl: "https://api.xinducg.cn",
     }
 } else if (envVersion === 'trial') {   // 体验版（体验码）
+    // urls = {
+    //     dev: "http://171.217.92.33:21511",
+    //     uploadUrl: "https://xct.cdhncy.cn/citizen-voice/oss/upload?bucketName=cgtf",
+    //     loginDev: "http://171.217.92.33:21511",
+    //     authenticationUrl: "http://171.217.92.33:21511/violating-subject",
+    //     reportUrl: "http://171.217.92.33:21511/citizen-voice",
+    //     assetsUrl: "https://xct.cdhncy.cn/file",
+    //     kitchenWasteUrl: "http://171.217.92.33:21511/waste",
+    //     eventUrl: "http://171.217.92.33:21511",
+    // }
+    //正式服
     urls = {
-        dev: "http://171.217.92.33:21511",
-        uploadUrl: "https://xct.cdhncy.cn/citizen-voice/oss/upload?bucketName=cgtf",
-        loginDev: "http://171.217.92.33:21511",
-        authenticationUrl: "http://171.217.92.33:21511/violating-subject",
-        reportUrl: "http://171.217.92.33:21511/citizen-voice",
-        assetsUrl: "https://xct.cdhncy.cn/file",
-        kitchenWasteUrl: "http://171.217.92.33:21511/waste",
-        eventUrl: "http://171.217.92.33:21511",
+        dev: "https://api.xinducg.cn",
+        uploadUrl: "https://xinducg.cn/citizen-voice/oss/upload",
+        loginDev: "https://api.xinducg.cn",
+        authenticationUrl: "https://api.xinducg.cn/violating-subject",
+        reportUrl: "https://api.xinducg.cn/citizen-voice",
+        assetsUrl: "https://xinducg.cn/file",
+        kitchenWasteUrl: "https://api.xinducg.cn/waste",
+        eventUrl: "https://api.xinducg.cn",
     }
 } else {  // 正式版（发布后）    新都正式服务
     urls = {
diff --git a/src/services/core/request.ts b/src/services/core/request.ts
index b49390ea3656e5c4d0aea2a85afcabaf2cff6b55..1cec81377d4f51233c2b8881bda8b421d104a7d4 100644
--- a/src/services/core/request.ts
+++ b/src/services/core/request.ts
@@ -9,6 +9,8 @@ export function objectToQuery(obj: Record<string, any>) {
 }
 /** 深度合并 */
 function deepMerge<T extends Record<string, any>>(...objects: T[]): T {
+
+  
   return objects.reduce((prev, obj) => {
     Object.keys(obj).forEach((key) => {
       const prevValue = prev[key];
@@ -36,15 +38,18 @@ function urlRegExp(value: string) {
 }
 
 /** 请求拦截器 */
-const HttpRequestInterceptor = () => { };
+const HttpRequestInterceptor = () => {};
 
 /** 响应拦截器 */
-const HttpResponseInterceptor = () => { };
+const HttpResponseInterceptor = () => {};
 
 /** 简单封装 */
 export default function request<T>(
   url: string,
-  option: Partial<Taro.request.Option> & { params?: any }
+  option: Partial<Taro.request.Option> & {
+    params?: any;
+    header?:TaroGeneral.IAnyObject
+  }
 ): Promise<T> {
   const params = option.params;
 
@@ -60,6 +65,8 @@ export default function request<T>(
       mask: true,
     });
     console.log(url);
+    console.log(option);
+    
     Taro.request({
       method: "POST",
       ...option,
@@ -80,7 +87,7 @@ export default function request<T>(
         console.log(err);
         reject(err);
       },
-      complete(err) { 
+      complete(err) {
         setTimeout(function () {
           Taro.hideLoading();
         }, 500);
diff --git a/src/services/event.ts b/src/services/event.ts
index ae57a01009bc12ee9c149c419b7c7e407975737d..7e0fbd39651e39f158ee68809954f388be00cd19 100644
--- a/src/services/event.ts
+++ b/src/services/event.ts
@@ -25,16 +25,19 @@ export async function postReportEventSourceInfo(
   });
 }
 
-  // 道路列表
- export async function wayPageList(data:any): Promise<Resp<any>> {
-    return request(api.eventUrl + "/preprocessing/region-info/getStreetSelection",{
-        method: 'GET',
-        data,
-        header: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-        },
-    })
-  }
+// 道路列表
+export async function wayPageList(data: any): Promise<Resp<any>> {
+  return request(
+    api.eventUrl + "/preprocessing/region-info/getStreetSelection",
+    {
+      method: "GET",
+      data,
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+    }
+  );
+}
 
 //事件列表
 export async function postEventList(
@@ -73,7 +76,16 @@ export async function getEventAttachmentInfo(
     }
   );
 }
-
+//根据人员获取巡查方式配置
+export async function getInspectionModeByPerson(): Promise<Resp<any>> {
+  return request(
+    api.eventUrl +
+      "/cgtfoperation/operation/inspection/getInspectionModeByPerson",
+    {
+      method: "GET",
+    }
+  );
+}
 //获取事件流转记录
 export async function getEventCirculation(
   eventId: string
diff --git a/src/services/kitchenWaste.ts b/src/services/kitchenWaste.ts
index d111160acb241f65faad6701c4d8a3bc0a1eaecb..7abc34a488d74c17701b4044b33f6cf952af8e84 100644
--- a/src/services/kitchenWaste.ts
+++ b/src/services/kitchenWaste.ts
@@ -4,99 +4,217 @@ import request from "./core/request";
 /**
  * @description: 首页-商户、签约、收运统计
  */
-export async function queryStatisticsForWeChat(): Promise<Resp<API.StatisticsDto>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionContract/statisticsForWeChat', { method: 'GET' });
+export async function queryStatisticsForWeChat(): Promise<
+  Resp<API.StatisticsDto>
+> {
+  return request(
+    api.kitchenWasteUrl + "/wasteCollectionContract/statisticsForWeChat",
+    { method: "GET" }
+  );
 }
 
 /**
  * @description: 首页-推荐产生单位
  */
-export async function queryRecommendForWeChat(lat: number, lon: number): Promise<Resp<API.RecommendDto[]>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionRecord/recommendForWeChat', {
-        method: 'GET',
-        data: {
-            lat,
-            lon
-        }
-    });
+export async function queryRecommendForWeChat(
+  lat: number,
+  lon: number
+): Promise<Resp<API.RecommendDto[]>> {
+  return request(
+    api.kitchenWasteUrl + "/wasteCollectionRecord/recommendForWeChat",
+    {
+      method: "GET",
+      data: {
+        lat,
+        lon,
+      },
+    }
+  );
 }
 
 /**
  * @description: 首页-获取收运公司信息
  */
 export async function getEntitieInfo(): Promise<Resp<any>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionContract/getEntitieInfo', { method: 'GET' });
+  return request(
+    api.kitchenWasteUrl + "/wasteCollectionContract/getEntitieInfo",
+    { method: "GET" }
+  );
 }
 
 /**
  * @description: 电子五连-获取车辆
  */
 export async function queryCarList(): Promise<Resp<API.CarListDot[]>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionRecord/getCar', {
-        method: 'GET'
-    });
+  return request(api.kitchenWasteUrl + "/wasteCollectionRecord/getCar", {
+    method: "GET",
+  });
 }
 
 /**
  * @description: 电子五连-提交
  */
 export async function submitForWl(data: any): Promise<Resp<any>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionRecord/addWasteCollectionRecord', {
-        method: 'POST',
-        data
-    });
+  return request(
+    api.kitchenWasteUrl + "/wasteCollectionRecord/addWasteCollectionRecord",
+    {
+      method: "POST",
+      data,
+    }
+  );
 }
 
-
 /**
  * @description: 以签约商户列表
  */
 export async function getSignListForWeChat(): Promise<Resp<API.SignListDto[]>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionContract/getSignListForWeChat', {
-        method: 'GET'
-    });
+  return request(
+    api.kitchenWasteUrl + "/wasteCollectionContract/getSignListForWeChat",
+    {
+      method: "GET",
+    }
+  );
 }
 
 /**
  * @description: 未签约商户下拉
  */
-export async function getNotSignEntities(): Promise<Resp<API.MerchantsListDot[]>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionContract/getNotSignEntitiesForWeChat', {
-        method: 'GET'
-    });
+export async function getNotSignEntities(): Promise<
+  Resp<API.MerchantsListDot[]>
+> {
+  return request(
+    api.kitchenWasteUrl +
+      "/wasteCollectionContract/getNotSignEntitiesForWeChat",
+    {
+      method: "GET",
+    }
+  );
 }
 
 /**
  * @description: 已经签约商户下拉
  */
 export async function getSignEntities(): Promise<Resp<API.MerchantsListDot[]>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionContract/getSignEntitiesForWeChat', {
-        method: 'GET'
-    });
+  return request(
+    api.kitchenWasteUrl + "/wasteCollectionContract/getSignEntitiesForWeChat",
+    {
+      method: "GET",
+    }
+  );
 }
 
 /**
  * @description: 添加商户-提交
  */
-export async function addWasteCollectionContract(data: any): Promise<Resp<any>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionContract/addWasteCollectionContract', {
-        method: 'POST',
-        data
-    });
+export async function addWasteCollectionContract(
+  data: any
+): Promise<Resp<any>> {
+  return request(
+    api.kitchenWasteUrl + "/wasteCollectionContract/addWasteCollectionContract",
+    {
+      method: "POST",
+      data,
+    }
+  );
 }
 
 /**
  * @description: 收运记录
  */
-export async function getCollectionListForWeChat(): Promise<Resp<API.CollectionListDto[]>> {
-    return request(api.kitchenWasteUrl + '/wasteCollectionRecord/getCollectionListForWeChat', {
-        method: 'GET',
-    });
+export async function getCollectionListForWeChat(): Promise<
+  Resp<API.CollectionListDto[]>
+> {
+  return request(
+    api.kitchenWasteUrl + "/wasteCollectionRecord/getCollectionListForWeChat",
+    {
+      method: "GET",
+    }
+  );
 }
 
 // 获取主体详情
 export async function getSubjectDetail(id: string): Promise<Resp<any>> {
-    return request(api.authenticationUrl + `/hncy/entities/getSubjectName/${id}`, {
-        method: 'GET',
-    });
-}
\ No newline at end of file
+  return request(
+    api.authenticationUrl + `/hncy/entities/getSubjectName/${id}`,
+    {
+      method: "GET",
+    }
+  );
+}
+
+// 百度地址逆解析
+export async function baiduLocationAnalysis(
+  lon: string | number,
+  lat: string | number
+): Promise<any> {
+  return request(
+    api.eventUrl + `/preprocessing/region-info/baiduReverseGeocoding`,
+    {
+      method: "POST",
+      data: { lon, lat, coordinateSystem: "gcj02ll" },
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+    }
+  );
+}
+
+export async function postDetailEntites(id: string): Promise<any> {
+  return request(
+    api.eventUrl + `/violating-subject/hncy/entities/queryDetail?id=${id}`,
+    {
+      method: "POST",
+    }
+  );
+}
+
+// 添加/编辑  主体信息
+export async function postSaveOrUpdateEntites(data: any): Promise<any> {
+  return request(
+    api.eventUrl + `/violating-subject/hncy/entities/saveOrUpdateEntites`,
+    {
+      method: "POST",
+      data,
+    }
+  );
+}
+
+// 查询附近的商户 /violating-subject
+
+export async function nearbyBusinessesPageList(data: any): Promise<any> {
+  return request(
+    api.eventUrl + `/violating-subject/hncy/entities/nearbyEntitiesList`,
+    {
+      method: "POST",
+      data,
+      header: {
+        'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    }
+  );
+}
+//关店店铺更新
+
+export async function closeForRenewal(data: any): Promise<any> {
+  return request(
+    api.eventUrl + `/violating-subject/hncy/entities/closeStoreUpdateEntities`,
+    {
+      method: "POST",
+      data,
+      header: {
+        'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    }
+  );
+}
+  // 专项巡查-查询动态字段
+export async function specialProject(code: any): Promise<any> {
+  return request(
+    api.eventUrl + '/preprocessing/classify-info/getConditions?code=' + code,
+    {
+      method: "POST",
+     
+    }
+  );
+}
+
diff --git a/src/store/report.ts b/src/store/report.ts
index 469b866e814994887fd9feb8588f3521be399cc2..419231d5063032c2fd639499a90e5838f9fe4b3a 100644
--- a/src/store/report.ts
+++ b/src/store/report.ts
@@ -32,17 +32,28 @@ let eventReportForm: API.ReportEventSourceInfoReq = {
   beforeFilePath: [], //图片
 };
 
-export type DiscoverEntryDto =
-  | "take" //拍照发现 极简上报
-  | "liftFinger"; //举手之劳
 
+  export type DiscoverEntryDto =
+  | "take" //拍照发现 极简上报
+  | "liftFinger" //举手之劳
+  | 'industry' //行业
+  | 'register' //立案条件-专项巡查
+  | 'comprehensive' //拍照发现 综合发现
+  | 'minimalism' //拍照发现 极简上报
+  | 'scanCode' //扫部件二维码
+  | 'recordWork' //记录工作
+  | 'liftFinger' //举手之劳
+  | 'componentInspect'   // 部件检查
+  | 'closePhoto'   // 关店拍照
+  | 'safetyNattersRecord'   // 关店拍照
 const useReportStore = create<{
   standardEventContent: string;
   discoverEntry: DiscoverEntryDto;
+  discoverEntryName?:string;
   eventReportInfoExtend: API.ReportEventSourceInfoReq["eventReportInfoExtend"];
   updateReportEvent: (obj?: any) => void;
   updateContent: (text?: any) => void;
-  updateDiscover: (type: DiscoverEntryDto) => void;
+  updateDiscover: (type: DiscoverEntryDto,name?:string) => void;
   clearStore: () => void;
 }>((set) => ({
   standardEventContent: "",
@@ -61,9 +72,10 @@ const useReportStore = create<{
   },
 
   //修改入口，判断识别弹出框显示
-  updateDiscover(type: DiscoverEntryDto) {
+  updateDiscover(type: DiscoverEntryDto,name?:string) {
     set({
       discoverEntry: type,
+      discoverEntryName:name
     });
   },
 
diff --git a/src/utils/comm.ts b/src/utils/comm.ts
index f4155f889bb3cb7407e3614e450aad2c44fdb3f9..63276d1c8b2e2ce9529d6de4511d170f7ea1866c 100644
--- a/src/utils/comm.ts
+++ b/src/utils/comm.ts
@@ -104,3 +104,58 @@ export function getUrlParams(url: string) {
     });
     return paramsObj;
 }
+
+// 对象转url参数
+export function queryParams(data: any = {}, isPrefix = true, arrayFormat = 'brackets'): string {
+  const prefix = isPrefix ? '?' : ''
+  const _result: string[] = []
+  if (['indices', 'brackets', 'repeat', 'comma'].indexOf(arrayFormat) == -1) arrayFormat = 'brackets'
+  for (const key in data) {
+      const value = data[key]
+      // 去掉为空的参数
+      if (['', undefined, null].indexOf(value) >= 0) {
+          continue
+      }
+      // 如果值为数组，另行处理
+      if (value.constructor === Array) {
+          // e.g. {ids: [1, 2, 3]}
+          switch (arrayFormat) {
+              case 'indices':
+                  // 结果: ids[0]=1&ids[1]=2&ids[2]=3
+                  for (var i = 0; i < value.length; i++) {
+                      _result.push(`${key}[${i}]=${value[i]}`)
+                  }
+                  break
+              case 'brackets':
+                  // 结果: ids[]=1&ids[]=2&ids[]=3
+                  value.forEach((_value) => {
+                      _result.push(`${key}[]=${_value}`)
+                  })
+                  break
+              case 'repeat':
+                  // 结果: ids=1&ids=2&ids=3
+                  value.forEach((_value) => {
+                      _result.push(`${key}=${_value}`)
+                  })
+                  break
+              case 'comma':
+                  // 结果: ids=1,2,3
+                  var commaStr = ''
+                  value.forEach((_value) => {
+                      commaStr += (commaStr ? ',' : '') + _value
+                  })
+                  _result.push(`${key}=${commaStr}`)
+                  break
+              default:
+                  value.forEach((_value) => {
+                      _result.push(`${key}[]=${_value}`)
+                  })
+          }
+      } else {
+          _result.push(`${key}=${value}`)
+      }
+  }
+  return _result.length ? prefix + _result.join('&') : ''
+}
+
+
diff --git a/src/utils/compressImg.ts b/src/utils/compressImg.ts
new file mode 100644
index 0000000000000000000000000000000000000000..efb25b49dda96a45e3ad8eede04480fcd1999065
--- /dev/null
+++ b/src/utils/compressImg.ts
@@ -0,0 +1,132 @@
+import Taro from "@tarojs/taro"
+
+const offCanvas = Taro.createOffscreenCanvas({
+    type: '2d',
+    width: 300,
+    height: 300
+})
+const ctx = offCanvas.getContext('2d')
+const fs = Taro.getFileSystemManager()
+const dirPath = `${Taro.env.USER_DATA_PATH}/compress-img`
+
+let filePath = ''
+let imgWidth = 0
+let imgHeight = 0
+let imgSize = 0
+
+const compressImg = {       // 图片大小kb
+    async set(src: string, maxsize: number = 1024) {
+        filePath = src
+        let i = 0
+        let istrue = false
+        while (!istrue && i < 50) {
+            i++;
+            await new Promise((resolve) => {
+                fs.getFileInfo({
+                    filePath: filePath,
+                    success: async (res) => {
+                        imgSize = res.size
+                        if (res.size > maxsize * 1024) {
+                            await compressImg.compress(filePath)
+                        } else {
+                            await compressImg.compress(filePath, true)
+                            istrue = true
+                        }
+                        resolve('')
+                    }
+                })
+            });
+        }
+        return {
+            filePath: filePath,
+            width: imgWidth,
+            height: imgHeight,
+            size: imgSize,
+        };
+    },
+
+    async compress(src: string, onlyGetWH: boolean = false) {
+        const imageItem = offCanvas.createImage() // 图片对象
+        imageItem.src = src // 设置图片src
+        imageItem.onerror = err => {
+            console.log('err', err)
+            Taro.showModal({
+                title: '提示',
+                content: '照片加载失败',
+                confirmText: '关闭',
+                showCancel: false,
+            })
+        }
+
+        // 如果图片已经存在于缓存
+        if (imageItem.width > 0) {
+            if (onlyGetWH) {
+                imgWidth = imageItem.width;
+                imgHeight = imageItem.height;
+            } else {
+                compressImg._imgLoaded(imageItem)
+            }
+        } else {
+            await new Promise((resolve) => {
+                imageItem.onload = () => {
+                    if (onlyGetWH) {
+                        imgWidth = imageItem.width;
+                        imgHeight = imageItem.height;
+                    } else {
+                        compressImg._imgLoaded(imageItem)
+                    }
+                    resolve('')
+                }
+            });
+        }
+    },
+
+    async _imgLoaded(img) {
+        let yinzi = 0.95
+        if (img.width > 2048 || img.height > 2048) yinzi = img.height > img.width ? (2048 / img.height) : (2048 / img.width)
+
+        imgWidth = img.width * yinzi;
+        imgHeight = img.height * yinzi;
+
+        offCanvas.width = imgWidth
+        offCanvas.height = imgHeight
+        ctx.clearRect(0, 0, imgWidth, imgHeight);
+        ctx.drawImage(img, 0, 0, img.width, img.height, 0, 0, offCanvas.width, offCanvas.height)
+
+        fs.mkdir({
+            dirPath: dirPath,
+            recursive: false,
+            // fail(res) {
+            //   console.error(res)
+            // }
+        })
+
+        const tempPath = `${dirPath}/${new Date().getTime()}.jpg`
+        const dataURL = offCanvas.toDataURL('image/jpeg', 0.92).replace('data:image/jpeg;base64,', '')
+        try {
+            fs.writeFileSync(tempPath, dataURL, 'base64')
+            filePath = tempPath
+        } catch (e) {
+            console.error(e)
+        }
+    },
+    clearTempImg() {
+        try {
+            // 适当的时候删除临时文件
+            Taro.getFileSystemManager().rmdir({
+                dirPath: dirPath,
+                recursive: true,
+                // fail(res) {
+                //   console.error(res)
+                // }
+            })
+        } catch (error) {
+            console.info(error)
+        }
+    }
+}
+
+export default {
+    set: compressImg.set,
+    clearTempImg: compressImg.clearTempImg
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index cc9c2ead98e9813ea95ed35a198a10f06ac224e1..4a2d7de309aeaf01586798421318006d19d3da92 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1375,6 +1375,11 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@nutui/icons-react-taro@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.npmmirror.com/@nutui/icons-react-taro/-/icons-react-taro-1.0.5.tgz#c0bbe6ef54bad06adeb8a17448cfcf45c6798bcb"
+  integrity sha512-p7dCW29wASH/qQ1OaUGGKA6PRV33wDPb80+qrHnWtT40syIb0W+e92mpplbULWM01s+GYVGyUU3i8b7Iy7qfvw==
+
 "@nutui/icons-react-taro@^3.0.1":
   version "3.0.1"
   resolved "https://registry.npmmirror.com/@nutui/icons-react-taro/-/icons-react-taro-3.0.1.tgz#d696893c38872d1caa7e60ebb17a06a48f2299b7"
@@ -1385,26 +1390,22 @@
   resolved "https://registry.npmmirror.com/@nutui/jdesign-icons-react-taro/-/jdesign-icons-react-taro-1.0.6-beta.2.tgz#3d044d08b4bb460a5ee7dadcc02c03560aa14ac2"
   integrity sha512-2Scz5c9o14gA7Mw5JdiEkc/KEbNlNWMcJMuqVyFVipYeeYN/118N/fvHVpocmJviN0Gc4P+u3ZB3dIQSA2j4Fw==
 
-"@nutui/nutui-react-taro@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.npmmirror.com/@nutui/nutui-react-taro/-/nutui-react-taro-3.0.4.tgz#d5c24a99a6be056c308daf08ae015e11e11c76c0"
-  integrity sha512-22BbD/mmu8PnkYz6ATQayYj/L9pU+4YMvK60fZi7MiTXqIJHfAPT8SfV2szv6At9QWXehCMp+Twwud9qXygk0Q==
+"@nutui/nutui-react-taro@^2.6.21":
+  version "2.7.10"
+  resolved "https://registry.npmmirror.com/@nutui/nutui-react-taro/-/nutui-react-taro-2.7.10.tgz#c97c9c798cceb9e028d08c068667380cf6c92475"
+  integrity sha512-gKmrp45OkJMteCqD2jtFITmkJK4jazuhnIjAZK3lQ/w4e1x7kP1Xwqhj6YnNM/I0PvJ5D5Ddr4KDjmktuUp7xg==
   dependencies:
     "@babel/runtime" "^7.23.9"
-    "@nutui/icons-react-taro" "^3.0.1"
+    "@nutui/icons-react-taro" "^1.0.5"
     "@nutui/jdesign-icons-react-taro" "1.0.6-beta.2"
     "@nutui/touch-emulator" "^1.0.0"
     "@react-spring/web" "~9.6.1"
-    "@swc/helpers" "^0.5.7"
     "@use-gesture/react" "10.2.20"
     async-validator "^4.2.5"
     classnames "^2.5.1"
+    lodash.isequal "^4.5.0"
     lodash.kebabcase "^4.1.1"
-    lottie-miniprogram "^1.0.12"
-    lottie-react "^2.4.0"
-    react-fast-compare "^3.2.2"
     react-transition-group "^4.4.5"
-    rehype-highlight "^7.0.2"
 
 "@nutui/touch-emulator@^1.0.0":
   version "1.0.0"
@@ -1710,13 +1711,6 @@
   resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
   integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
 
-"@swc/helpers@^0.5.7":
-  version "0.5.15"
-  resolved "https://registry.npmmirror.com/@swc/helpers/-/helpers-0.5.15.tgz#79efab344c5819ecf83a43f3f9f811fc84b516d7"
-  integrity sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==
-  dependencies:
-    tslib "^2.8.0"
-
 "@swc/register@0.1.10":
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/@swc/register/-/register-0.1.10.tgz#74a20b7559669e03479b05e9e5c6d1524d4d92a2"
@@ -2329,13 +2323,6 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/hast@^3.0.0":
-  version "3.0.4"
-  resolved "https://registry.npmmirror.com/@types/hast/-/hast-3.0.4.tgz#1d6b39993b82cea6ad783945b0508c25903e15aa"
-  integrity sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==
-  dependencies:
-    "@types/unist" "*"
-
 "@types/json-schema@^7.0.12":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
@@ -2408,11 +2395,6 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
   integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
 
-"@types/unist@*", "@types/unist@^3.0.0":
-  version "3.0.3"
-  resolved "https://registry.npmmirror.com/@types/unist/-/unist-3.0.3.tgz#acaab0f919ce69cce629c2d4ed2eb4adc1b6c20c"
-  integrity sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==
-
 "@typescript-eslint/eslint-plugin@^6.2.0":
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3"
@@ -3560,23 +3542,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-dequal@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.npmmirror.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
-  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
-
 detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
 
-devlop@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmmirror.com/devlop/-/devlop-1.1.0.tgz#4db7c2ca4dc6e0e834c30be70c94bbc976dc7018"
-  integrity sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==
-  dependencies:
-    dequal "^2.0.0"
-
 dingtalk-jsapi@~2.15.2:
   version "2.15.4"
   resolved "https://registry.yarnpkg.com/dingtalk-jsapi/-/dingtalk-jsapi-2.15.4.tgz#95426671568e834993408cb1b05d725f02e9d598"
@@ -4726,23 +4696,6 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
-hast-util-is-element@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmmirror.com/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz#6e31a6532c217e5b533848c7e52c9d9369ca0932"
-  integrity sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==
-  dependencies:
-    "@types/hast" "^3.0.0"
-
-hast-util-to-text@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.npmmirror.com/hast-util-to-text/-/hast-util-to-text-4.0.2.tgz#57b676931e71bf9cb852453678495b3080bfae3e"
-  integrity sha512-KK6y/BN8lbaq654j7JgBydev7wuNMcID54lkRav1P0CaE1e47P72AWWPiGKXTJU271ooYzcvTAn/Zt0REnvc7A==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    "@types/unist" "^3.0.0"
-    hast-util-is-element "^3.0.0"
-    unist-util-find-after "^5.0.0"
-
 he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -4761,11 +4714,6 @@ highlight.js@^10.7.1:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
   integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
-highlight.js@~11.11.0:
-  version "11.11.1"
-  resolved "https://registry.npmmirror.com/highlight.js/-/highlight.js-11.11.1.tgz#fca06fa0e5aeecf6c4d437239135fabc15213585"
-  integrity sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==
-
 history@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"
@@ -5453,6 +5401,11 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+
 lodash.kebabcase@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmmirror.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -5498,23 +5451,6 @@ loose-envify@^1.1.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lottie-miniprogram@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.npmmirror.com/lottie-miniprogram/-/lottie-miniprogram-1.0.12.tgz#637a315c6a3df2e908012fb2771ab47a342ca55e"
-  integrity sha512-2ITtXAyeDXbftvYYe5w0ayl8jTV8laylWMCdJofpka1q205NkjRNj7kX+iIZZ/YjKh1f8plWxb9gSFHkC7BLUQ==
-
-lottie-react@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.npmmirror.com/lottie-react/-/lottie-react-2.4.1.tgz#4bd3f2a8a5e48edbd43c05ca5080fdd50f049d31"
-  integrity sha512-LQrH7jlkigIIv++wIyrOYFLHSKQpEY4zehPicL9bQsrt1rnoKRYCYgpCUe5maqylNtacy58/sQDZTkwMcTRxZw==
-  dependencies:
-    lottie-web "^5.10.2"
-
-lottie-web@^5.10.2:
-  version "5.12.2"
-  resolved "https://registry.npmmirror.com/lottie-web/-/lottie-web-5.12.2.tgz#579ca9fe6d3fd9e352571edd3c0be162492f68e5"
-  integrity sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg==
-
 lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
@@ -5542,15 +5478,6 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
-lowlight@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.npmmirror.com/lowlight/-/lowlight-3.3.0.tgz#007b8a5bfcfd27cc65b96246d2de3e9dd4e23c6c"
-  integrity sha512-0JNhgFoPvP6U6lE/UdVsSq99tn6DhjjpAj5MxG49ewd2mOBVtwWYIT8ClyABhq198aXXODMU6Ox8DrGy/CpTZQ==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    devlop "^1.0.0"
-    highlight.js "~11.11.0"
-
 lru-cache@^10.2.0:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
@@ -6556,17 +6483,6 @@ regjsparser@^0.11.0:
   dependencies:
     jsesc "~3.0.2"
 
-rehype-highlight@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.npmmirror.com/rehype-highlight/-/rehype-highlight-7.0.2.tgz#997e05e3a336853f6f6b2cfc450c5dad0f960b07"
-  integrity sha512-k158pK7wdC2qL3M5NcZROZ2tR/l7zOzjxXd5VGdcfIyoijjQqpHd3JKtYSBDpDZ38UI2WJWuFAtkMDxmx5kstA==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    hast-util-to-text "^4.0.0"
-    lowlight "^3.0.0"
-    unist-util-visit "^5.0.0"
-    vfile "^6.0.0"
-
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -7310,7 +7226,7 @@ tslib@^1.10.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.1, tslib@^2.6.2, tslib@^2.8.0:
+tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.1, tslib@^2.6.2:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -7444,45 +7360,6 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
   integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
-unist-util-find-after@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmmirror.com/unist-util-find-after/-/unist-util-find-after-5.0.0.tgz#3fccc1b086b56f34c8b798e1ff90b5c54468e896"
-  integrity sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-
-unist-util-is@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmmirror.com/unist-util-is/-/unist-util-is-6.0.0.tgz#b775956486aff107a9ded971d996c173374be424"
-  integrity sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-stringify-position@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmmirror.com/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz#449c6e21a880e0855bf5aabadeb3a740314abac2"
-  integrity sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-visit-parents@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.npmmirror.com/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz#4d5f85755c3b8f0dc69e21eca5d6d82d22162815"
-  integrity sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-
-unist-util-visit@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmmirror.com/unist-util-visit/-/unist-util-visit-5.0.0.tgz#a7de1f31f72ffd3519ea71814cccf5fd6a9217d6"
-  integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-    unist-util-visit-parents "^6.0.0"
-
 universal-router@^9.2.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/universal-router/-/universal-router-9.2.0.tgz#7d6ad4fa0546dc3049f882fd6446df78fd26505c"
@@ -7566,22 +7443,6 @@ validate-npm-package-name@^5.0.0:
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz#a316573e9b49f3ccd90dbb6eb52b3f06c6d604e8"
   integrity sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==
 
-vfile-message@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.npmmirror.com/vfile-message/-/vfile-message-4.0.2.tgz#c883c9f677c72c166362fd635f21fc165a7d1181"
-  integrity sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-stringify-position "^4.0.0"
-
-vfile@^6.0.0:
-  version "6.0.3"
-  resolved "https://registry.npmmirror.com/vfile/-/vfile-6.0.3.tgz#3652ab1c496531852bf55a6bac57af981ebc38ab"
-  integrity sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    vfile-message "^4.0.0"
-
 vite-plugin-static-copy@^0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-0.17.1.tgz#0de35c4a4c760d5f344b5559d0a8d7d417a52093"