feats

src/layouts/index.jsx

@@ -22,8 +22,8 @@ export default (Child) => (props) => {
   }
   useTrackPage(trackPageData)
 
-  // 确保人员信息到位
-  const loading = !person?.personRole;
+  // 确保人员信息到位, 确保二维码解析结束
+  const loading = !person?.personRole || (router.params.scene && !router.params.parseQRFinished);
 
   // 校验人员角色及页面是否对应
   const jumpPage = useMemo(() => {

src/pages/details/foodDetails/foodDetails.jsx

@@ -29,6 +29,7 @@ import "./foodDetails.less";
 export default withLayout((props) => {
   const { router, person } = props;
   const { id, subOrderId, scene } = props.router.params;
+
   useEffect(() => {
     if (id && subOrderId) {
       Taro.navigateTo({
@@ -109,24 +110,27 @@ export default withLayout((props) => {
   const lat = useRef("");
 
   useEffect(() => {
-    getShopDetail(id).then((res) => {
-      console.log(res)
-      setDetail(res);
-      log.current = res.locaton.toString().split(",")[0];
-      lat.current = res.locaton.toString().split(",")[1];
-      setimglist(res.imageList || []);
-    });
-    getShopPackage(id).then((res) => {
-      setPackage(res.records || []);
-      setNewpgNum(res.records.length);
-      setAllpgNum(res.total);
-    });
-    getExtendContent("shop", id).then((res) => {
-      setExtend(res.records || []);
-      setAllextNum(res.total);
-      setNewextNum(res.records.length);
-    });
-  }, []);
+    if (id) {
+      getShopDetail(id).then((res) => {
+        console.log(res)
+        setDetail(res);
+        log.current = res.locaton.toString().split(",")[0];
+        lat.current = res.locaton.toString().split(",")[1];
+        setimglist(res.imageList || []);
+      });
+      getShopPackage(id).then((res) => {
+        setPackage(res.records || []);
+        setNewpgNum(res.records.length);
+        setAllpgNum(res.total);
+      });
+      getExtendContent("shop", id).then((res) => {
+        setExtend(res.records || []);
+        setAllextNum(res.total);
+        setNewextNum(res.records.length);
+      });
+    }
+  }, [id]);
+  
   const star = parseFloat(
     (
       (detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1)

src/utils/hooks/useRouter.js

@@ -12,6 +12,7 @@ export default () => {
       router.params = {
         ...router.params || {},
         ...qrParams,
+        parseQRFinished: true, 
       }
     }
   }