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

src/components/BossCard/index.jsx

@@ -11,7 +11,7 @@ import starOff from '@/assets/icons/housemantj/景点爆赞.png'
 import food from '@/assets/icons/ProCard/food.png'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 
-import { getQueryString} from '@/utils/index'
+import { getQueryString } from '@/utils/index'
 //入住指引--老板推荐
 
 
@@ -19,21 +19,34 @@ import { getQueryString} from '@/utils/index'
 import './style.less'
 
 export default (props) => {
-  const { item, cardNavigateTo,taRoomContent,trackClick } = props
+  const { item, cardNavigateTo, taRoomContent, trackClick } = props
   const { shopId, packageId } = props.item
   const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.packageId)
   const [city, setCity] = useState({})
   const [detail, setDetail] = useState({})
 
-    
+  const [handelareaName, setHandelareaName] = useState()
+
+  const lareaName = () => {
+    if (city.areaPName == null) {
+      setHandelareaName(city.areaPName / city.areaName)
+    } else {
+      setHandelareaName(city.areaName)
+    }
+  }
+
+
+
+
 
-  
   const goFood = () => {
-     trackClick({ eventType: 'hotel_recommend_package', eventParams: getQueryString({ hotelId:taRoomContent.hotelId,shopId:shopId,packageId:packageId})  })
+    trackClick({ eventType: 'hotel_recommend_package', eventParams: getQueryString({ hotelId: taRoomContent.hotelId, shopId: shopId, packageId: packageId }) })
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
   }
 
   useEffect(() => {
+    lareaName()
+
     getShopDetail(item.shopId).then((res) => {
       setDetail(res)
       getShopcity(res.cityId).then((x) => {
@@ -66,7 +79,7 @@ export default (props) => {
             <text className='title-money' >￥{(item.actualPrice / 100)?.toFixed(2)}元<text className='title-money-2'>门市价{(item.standardPrice / 100)?.toFixed(2)}元</text></text>
             <view className='title-position-on'>
               <image className='title-position' src={position} />
-              <text className='title-position-image'>{city.areaPName}/{city.areaName}</text>
+              <text className='title-position-image'>{city.areaPName}/ {city.areaName}</text>
               <view style={{ display: 'inline-block' }} onClick={toggleSave}>
 
                 <image className='title-on' src={isSaved > 0 ? starOn : starOff} />

src/components/CollectList/MyCollect/index.jsx

@@ -27,7 +27,7 @@ export default (props) => {
   return (
     <View>
       {
-        targetType === "shop" && (
+        targetType === "shop_package" && (
           <view class='wrapper'>
             <view class='left-complete-one'   >
               <image className='left-image-1' src={ProCard_hot} style={{ display: item.targetType === 'shop_package' ? '' : 'none' }} ></image>
@@ -50,13 +50,18 @@ export default (props) => {
                 <text className='title-money' >￥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standardPrice)}元</text></text>
                 <view className='title-position-on'>
                   <image className='title-position' src={position} />
-                  <text className='title-position-image'>{item.areaPName}/{item.areaName}</text>
+                  <text className='title-position-image'>
+                    {
+                      targetType === "shop_package" && (
+                        item.areaPName == '' ? item.areaPName / item.areaName : item.areaName
+                      )
+                    }
+                  </text>
                 </view>
               </view>
             </view>
             <view class='right-complete-two'>
               <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` }); }}>
-                {/* <view className='right-number'>×1</view> */}
                 <image className='right-image' src={SeeDetails} />
                 <view className='right-title'>查看详情</view>
               </view>
@@ -66,7 +71,7 @@ export default (props) => {
       }
       <View>
         {
-          targetType !== "shop" && (
+          targetType !== "shop_package" && (
             <view class='wrapper-tourist'>
               <view class='left-complete-one'   >
                 <view className='title-image'>
@@ -84,7 +89,17 @@ export default (props) => {
                   </view>
                   <view className='title-position-on'>
                     <image className='title-position' src={position} />
-                    <text className='title-position-image'>{item.areaPName}/{item.areaName}</text>
+                    <text className='title-position-image'>
+                      {
+                        targetType === "tourist" && (
+                          item.areaPName == '' ? item.areaPName / item.areaName : item.areaName
+                        )
+                      }
+                      {
+                        targetType === "shop" && (
+                          item.areaPName === null ? item.areaName : item.areaPName / item.areaName
+                        )
+                      }</text>
                   </view>
                 </view>
               </view>
@@ -98,8 +113,8 @@ export default (props) => {
             </view>
           )
         }
-      </View>
 
+      </View>
     </View>
 
 

src/components/CollectList/MyCollect/style.less

@@ -74,14 +74,16 @@
     }
     //图片
     .title-image {
-      width: 145px;
+      height: 144px;
       margin-left: 20px;
       border-radius: 24px;
       overflow: hidden;
       position: relative;
+     
       .image-1 {
-        width: 100%;
-        height: 145px;
+        width: 144px;
+        height: 144px;
+        margin: 0 ;
       }
       .image-2 {
         width: 89px;
@@ -286,14 +288,24 @@
     }
     //图片
     .title-image {
-      width: 145px;
-      margin-left: 20px;
-      border-radius: 24px;
-      overflow: hidden;
-      position: relative;
+      // width: 145px;
+      // margin-left: 20px;
+      // overflow: hidden;
+      // position: relative;
+      height: 144px;
+ margin-left: 20px;
+ border-radius: 24px;
+ overflow: hidden;
+ position: relative;
       .image-1 {
-        width: 100%;
-        height: 145px;
+        // width: 100%;
+        // height: 145px;
+        // border-radius: 10px;
+
+
+ width: 144px;
+ height: 144px;
+ margin: 0;
       }
       .image-2 {
         width: 89px;

src/components/foodCards/foodCards.jsx

@@ -58,12 +58,12 @@ export default (props) => {
           <text className='storezf'>{star}</text>
         </view>
         <view>
-          <view className='contentImg'  onClick={() => { goFood() }}>
+          <view className='contentImg' onClick={() => { goFood() }}>
             <image src={item.poster} className='img1'></image>
             <image src={msTip} className='mstip'></image>
           </view>
           <view className='neirong'>
-            <view className='textword'  onClick={() => { goFood() }} >{(item.description).toString().length > 22 ? (item.description).substring(0, 22) + '...' : (item.description)}</view>
+            <view className='textword' onClick={() => { goFood() }} >{(item.description).toString().length > 22 ? (item.description).substring(0, 22) + '...' : (item.description)}</view>
             <view className='jiage' onClick={() => { goFood() }} >
               <text className='rmb' >￥</text>
               <text className='p1'><text className='price' >{(item.actualPrice / 100).toFixed(2)}</text>元&nbsp;&nbsp;</text>

src/pages/details/foodDetails/foodDetails.jsx

@@ -1,3 +1,4 @@
+import Taro, { useShareAppMessage } from "@tarojs/taro";
 import CustomNav from "@/components/CustomNav";
 import withLayout from "@/layouts";
 import {
@@ -20,7 +21,6 @@ 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 useSave from "@/utils/hooks/useSave";
 import useLike from "@/utils/hooks/useLike";
 import Extend from "../components/Extend/extend";
@@ -130,7 +130,7 @@ export default withLayout((props) => {
       });
     }
   }, [id]);
-  
+
   const star = parseFloat(
     (
       (detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1)
@@ -280,7 +280,7 @@ export default withLayout((props) => {
           分享
         </view>
         <view className="tab" onClick={toggleLike}>
-          <image className="good" style={{top:'1px'}} src={isLike > 0 ? baozan : weibaozan} />
+          <image className="good" style={{ top: '1px' }} src={isLike > 0 ? baozan : weibaozan} />
           {isLike > 0 ? "已爆赞" : "爆赞"}
         </view>
         <view className="tab" onClick={toggleSave}>

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -20,15 +20,16 @@ export default (props) => {
   const { tabJump } = params || {}
 
   const [activeTab, setActiveTab] = useState(0)
-  const [phone, setPhone] = useState()
-  // const [isVerified, setisVerified] = useState(0)
+  const [phonea, setPhone] = useState()
+  const [isVerifieda, setisVerified] = useState(0)
   // const [queryParams, setQueryParams] = useState({ isVerified: isVerified, pageNum: 1, pageSize: 10, shopId: shop?.shopId, phone: phone })
 
   const queryParams = useMemo(() => ({
     shopId: shop?.shopId,
-    isVerified: `${tabJump}` === '1' ? 1 : 0,
-    phone: phone || '',
-  }), [phone, shop?.shopId, tabJump])
+    isVerified: isVerifieda,
+    // `${tabJump}` === '1' ? 1 : 0,
+    phone: phonea || '',
+  }), [phonea, shop?.shopId, isVerifieda])
 
 
   // 获取资源表信息
@@ -63,6 +64,8 @@ export default (props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
+    setisVerified(index)
+
   }
   const tabs = [
     {