flx

src/pages/TobeShop/index.jsx

@@ -1,8 +1,9 @@
+import Taro from "@tarojs/taro";
+import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
-
 import CustomNav from "@/components/CustomNav";
+import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
 import Popup from "@/components/Popup";
-import { useState, useEffect } from "react";
 import LocationBig from "@/assets/icons/UserCenter/LocationBig.png";
 import Perfection from "@/assets/icons/UserCenter/Perfection.png";
 import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
@@ -14,21 +15,31 @@ import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
 import { Button, Icon, Text, Textarea } from "@tarojs/components";
 import { getVerifyTargetList, putVerifyTarget } from "@/services/payOrder";
 import formatTime from '@/utils/formatTime'
+
 import "./style.less";
-import Taro from "@tarojs/taro";
 
 export default withLayout((props) => {
   const { router, person } = props;
+  console.log("🚀 ~ file: index.jsx ~ line 22 ~ withLayout ~ props", props)
   const { id, subOrderId } = props.router.params;
   const [showDialog, setShowDialog] = useState(false);
   //核销
   const [Consumption, setConsumption] = useState(false);
 
   const [checked, setChecked] = useState();
+  const [shopContent, setShopContent] = useState([])
 
+  const [list, setList] = useState([]);
+
+
+  const getShop = () => {
+    getShopDetail(id).then(e => {
+      setShopContent(e)
+
+    })
+  }
 
 
-  const [list, setList] = useState([]);
 
   const getList = (params) => {
     getVerifyTargetList({
@@ -51,6 +62,7 @@ export default withLayout((props) => {
 
   useEffect(() => {
     getList();
+    getShop();
   }, []);
 
   const ShowMoldeOn = () => {
@@ -123,7 +135,7 @@ export default withLayout((props) => {
         <view className="position-header">
           <image className="position-LocationBig" src={LocationBig} />
           <text cla="position-LocationBig-text">
-            当前所在店铺：SEOUL·创意韩国料理
+            当前所在店铺：{shopContent?.shopName || []}
           </text>
         </view>
         <view className="shop-image">

src/pages/TobeShop/style.less

@@ -89,7 +89,6 @@
       position: absolute;
       width: auto;
       height: 44.3px;
-      position: absolute;
       left: 200px;
       top: 28px;
       font-size: 20px;
@@ -109,6 +108,7 @@
 
     .left-complete-one {
       // padding-left: 64px;
+      width: 560px;
       padding-top: 87px;
       padding-bottom: 43px;
       position: relative;
@@ -141,7 +141,7 @@
         width: 145px;
         height: 44px;
         position: absolute;
-        margin-left: 75px;
+        margin-left: 88px;
         top: 22px;
       }
       .left-viewText {
@@ -162,6 +162,7 @@
         border-radius: 24px;
         overflow: hidden;
         position: relative;
+        flex: none;
         .image-1 {
           width: 100%;
           height: 145px;
@@ -260,7 +261,7 @@
     background-repeat: no-repeat;
     width: 129px;
     border-radius: 0 15px 15px 0;
-    position: relative;
+    // position: relative;
     //右面部分
     .right-content {
       // width: 100px;

src/pages/details/foodDetails/foodDetails.jsx

@@ -15,7 +15,7 @@ import share from '@/assets/icons/housemantj/景点分享.png'
 import good from '@/assets/icons/housemantj/景点爆赞.png'
 import baozan from '@/assets/icons/housemantj/爆赞.png'
 import weibaozan from '@/assets/icons/housemantj/未赞.png'
-import Taro,{ useShareAppMessage } from '@tarojs/taro'
+import Taro, { useShareAppMessage } from '@tarojs/taro'
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Extend from '../components/Extend/extend'
@@ -35,7 +35,6 @@ export default withLayout((props) => {
   }, [id, subOrderId])
   //商铺基础信息
   const [detail, setDetail] = useState({})
-  console.log("🚀 ~ file: foodDetails.jsx ~ line 38 ~ withLayout ~ setDetail", setDetail)
   //商铺套餐
   const [spackage, setPackage] = useState([])
   //banner图集数组
@@ -45,6 +44,8 @@ export default withLayout((props) => {
     setIndex(e.detail.current)
   }
 
+
+
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'shop', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'shop', id)
 
@@ -108,15 +109,15 @@ export default withLayout((props) => {
     })
   }, [])
   const star = parseFloat(((detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1));
-  
+
   // 分享
-  useShareAppMessage(()=>{
-      return {
-        title: detail.shopName,
-        path: `/pages/details/foodDetails/foodDetails?id=${id}`,
-        imageUrl: detail.poster,
-      }
-    
+  useShareAppMessage(() => {
+    return {
+      title: detail.shopName,
+      path: `/pages/details/foodDetails/foodDetails?id=${id}`,
+      imageUrl: detail.poster,
+    }
+
   })
 
   return (