Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/ShopUsed/index.jsx

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro'
-import {  setGetVerifiedOrder } from '@/services/shopBoss'
-import { View,  Text, Image } from '@tarojs/components'
+import { setGetVerifiedOrder } from '@/services/shopBoss'
+import { View, Text, Image } from '@tarojs/components'
 import { useState } from 'react'
 import formatTimes from '@/utils/formatTime'
 import './style.less'
@@ -13,6 +13,8 @@ export default (props) => {
   const [buttonStyle, setButtonStyle] = useState('')
 
 
+
+
   const confirmOrder = () => {
     setGetVerifiedOrder(verifyNo).then((e) => {
       Taro.showToast({

src/pages/details/foodDetails/foodDetails.jsx

@@ -113,7 +113,6 @@ export default withLayout((props) => {
   useEffect(() => {
     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];
@@ -141,7 +140,7 @@ export default withLayout((props) => {
   useShareAppMessage(() => {
     return {
       title: detail.shopName,
-      path: `/pages/details/foodDetails/foodDetails?id=${id}`,
+      path: `/pages/details/foodDetails/foodDetails?id=${id}&subOrderId=${subOrderId}`,
       imageUrl: detail.poster,
     };
   });

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -26,7 +26,6 @@ export default withLayout((props) => {
   const [detail, setDetail] = useState({})
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
-  const [distance, setDistance] = useState()
   //banner图集数组
   const [imglist, setimglist] = useState([])
   const [index, setIndex] = useState(0)
@@ -54,7 +53,7 @@ export default withLayout((props) => {
   const [recommend, setRecommend] = useState([])
 
   const openMap = () => {
-    const [lng, lat] = detail.location.split(',')
+    const [lng, lat] = detail.locaton.split(',')
 
     Taro.openLocation({
       longitude: lng - 0,
@@ -132,7 +131,7 @@ export default withLayout((props) => {
               <view className='wz'>{detail.address}</view>
               <view className='dpPosition' onClick={openMap}>
                 <image src={dw} className='dwTip' />
-                <view className='distance'>{distance}公里<image src={zhuandao} className="zhuandao" /></view>
+                <view className='distance'>{(detail.distance / 1000).toFixed(2)}公里<image src={zhuandao} className="zhuandao" /></view>
               </view>
             </view>
           </view>