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

config/dev.js

@@ -4,7 +4,8 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"http://192.168.89.147:8080"',
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
+    HOST: '"https://sgl-v2.njyunzhi.com"',
+    OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},
   h5: {}

config/prod.js

@@ -4,6 +4,7 @@ module.exports = {
   },
   defineConstants: {
     HOST: '"https://sgl-v2.njyunzhi.com"',
+    OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},
   h5: {

src/pages/details/foodDetails/foodDetails.jsx

@@ -8,7 +8,7 @@ import {
 } from "@/services/home";
 import { getVerifyTargetList } from "@/services/payOrder";
 import { useState, useEffect, useRef } from "react";
-import { Button, Swiper, SwiperItem } from "@tarojs/components";
+import { Button, Swiper, SwiperItem, View } from "@tarojs/components";
 import Star from "@/components/Star/Star.jsx";
 import NoData from '@/components/NoData'
 import Cards from "@/components/foodCards/foodCards.jsx";
@@ -20,7 +20,6 @@ import dw from "@/assets/icons/housemantj/loc-o.png";
 import phoneImg from "@/assets/icons/housemantj/phone-o.png";
 import zhuandao from "@/assets/icons/housemantj/backTop.png";
 import titlezs from "@/assets/icons/housemantj/titleTip.png";
-import showMore from "@/assets/icons/housemantj/setMore.png";
 import share from "@/assets/icons/housemantj/touristShare.png";
 import good from "@/assets/icons/housemantj/touristGood.png";
 import baozan from "@/assets/icons/housemantj/bgood.png";
@@ -65,29 +64,9 @@ export default withLayout((props) => {
   const [isSaved, toggleSave] = useSave(detail.isSaved, "shop", id);
   const [isLike, toggleLike] = useLike(detail.isLike, "shop", id);
 
-  //当前套餐总数
-  const [newpgNum, setNewpgNum] = useState(0);
-  //全部套餐个数
-  const [AllpgNum, setAllpgNum] = useState(0);
-  //套餐当前页数
-  const [page, setpage] = useState(2);
-  const pgMore = () => {
-    setpage(page + 1);
-    getShopPackage(id, { pageNum: page }).then((res) => {
-      setPackage([...spackage, ...res.records]);
-      setNewpgNum(newpgNum + res.records.length);
-    });
-  };
   //本店指南
   const [extend, setExtend] = useState([]);
 
-  //当前指南总数
-  const [newextNum, setNewextNum] = useState(0);
-  //全部指南个数
-  const [AllextNum, setAllextNum] = useState(0);
-  //指南当前页数
-  const [epage, setepage] = useState(2);
-
   const openMap = () => {
     Taro.openLocation({
       longitude: log.current - 0,
@@ -107,10 +86,8 @@ export default withLayout((props) => {
         title: '暂无商家联系方式',
         icon: 'none',
       })
-
       return;
     }
-
     Taro.makePhoneCall({
       phoneNumber: detail.phone
     })
@@ -128,13 +105,9 @@ export default withLayout((props) => {
       }).catch(() => setLoading(false));
       getShopPackage(id, { pageSize: 500 }).then((res) => {
         setPackage(res.records || []);
-        setNewpgNum(res.records.length);
       });
-      setAllpgNum(res.total);
       getExtendContent("shop", id, { pageSize: 500 }).then((res) => {
         setExtend(res.records || []);
-        setAllextNum(res.total);
-        setNewextNum(res.records.length);
       });
     }
   }, [id]);
@@ -164,24 +137,24 @@ export default withLayout((props) => {
           style={{ height: '100%' }}
         >
           <view className='storeDetails'>
-            <Swiper
-              className='swiper'
-              circular
-              current={index}
-              onChange={handchange}
-            >
-              {imglist.map((item, inx) => (
-                <SwiperItem key={inx}>
-                  <image src={item.url} mode='aspectFit' className='storeImage'>
-                    <view className='tpPage'>
-                      <text>
-                        {index + 1}/{imglist.length}
-                      </text>
-                    </view>
-                  </image>
-                </SwiperItem>
-              ))}
-            </Swiper>
+            <View className='huadong'>
+              <Swiper
+                circular
+                className='swiper'
+                onChange={handchange}
+              >
+                {imglist.map((item, inx) => (
+                  <SwiperItem key={inx}>
+                    <image src={item.url} mode='aspectFit' className='storeImage' />
+                  </SwiperItem>
+                ))}
+              </Swiper>
+              <view className='tpPage'>
+                <text>
+                  {index + 1}/{imglist.length}
+                </text>
+              </view>
+            </View>
             <view className='storeJs'>
               <view style={{ overflow: "hidden" }}>
                 <view className='storeName'>{detail.shopName}</view>
@@ -245,14 +218,6 @@ export default withLayout((props) => {
                   {(spackage || []).map((item) => (
                     <Cards key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
                   ))}
-                  {/* <view
-                    className='showMore'
-                    style={{ display: newpgNum == AllpgNum ? "none" : "" }}
-                    onClick={pgMore}
-                  >
-                    <view>查看更多</view>
-                    <image src={showMore} className='moreTip' />
-                  </view> */}
                 </view>
                 <view
                   style={{
@@ -268,11 +233,9 @@ export default withLayout((props) => {
                   {(extend || []).map((item) => (
                     <Extend key={item.extId} item={item} />
                   ))}
-
                 </view>
                 <view
                   className='botton'
-                  style={{ display: newextNum == AllextNum ? "" : "none" }}
                 >
                   这是我的底线
                 </view>

src/pages/details/foodDetails/foodDetails.less

@@ -2,15 +2,16 @@
   background-color: #fff;
   border-radius: 12px;
   margin-bottom: 20px;
-
-  .swiper {
-    height: calc((100vw - 60px) * 0.6);
-  }
-  .storeImage {
+  .huadong{    
     position: relative;
-    border-radius: 22px;
-    width: 100%;
-    height: 100%;
+    .swiper {
+      height: calc((100vw - 60px) * 0.6);
+      .storeImage {
+        border-radius: 22px;
+        width: 100%;
+        height: 100%;
+      }
+    }
     .tpPage {
       position: absolute;
       right: 20px;
@@ -26,7 +27,7 @@
       text {
         opacity: 0.64;
       }
-    }
+    }  
   }
   .storeJs {
     padding: 20px;
@@ -117,12 +118,6 @@
 }
 .cs {
   height: 500px;
-  // background: rgb(240, 142, 142);
-  // background: radial-gradient(circle at top left, transparent 15px, rgb(240, 142, 142) 0) top left,
-  //           radial-gradient(circle at top right, transparent 15px, #58a 0) top right,
-  //           radial-gradient(circle at bottom left, transparent 15px, #58a 0) bottom left,
-  //           radial-gradient(circle at bottom right, transparent 15px, #58a 0) bottom right;
-
   background: radial-gradient(
         circle at 82% top,
         transparent 15px,
@@ -135,43 +130,9 @@
         rgb(230, 120, 120) 0
       )
       bottom;
-
   background-repeat: no-repeat;
   background-size: auto 50%;
 }
-
-.showMore {
-  width: 100%;
-  background: linear-gradient(
-    0deg,
-    rgba(248, 248, 248, 0.58) 42%,
-    rgba(248, 248, 248, 0) 100%
-  );
-  font-size: 28px;
-  font-weight: bold;
-  color: #202020;
-  text-align: center;
-  position: absolute;
-  bottom: -140px;
-  padding-top: 77px;
-  padding-bottom: 20px;
-  .moreTip {
-    width: 38px;
-    height: 19px;
-    margin-top: 14px;
-  }
-}
-.storezn {
-  font-size: 28px;
-  color: #202020;
-  line-height: 64px;
-  margin-bottom: 44px;
-}
-.storezn + image {
-  width: 100%;
-  margin-bottom: 40px;
-}
-
 .botton {
   font-size: 28px;
   color: #c0c8d3;

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -14,7 +14,7 @@ import SpinBox from "@/components/Spin/SpinBox";
 import TabIcon from '@/components/HorTabbar/TabIcon'
 import { useState, useEffect } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
-import { Swiper, SwiperItem, Button } from '@tarojs/components';
+import { Swiper, SwiperItem, Button,View } from '@tarojs/components';
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Cards from '@/components/foodCards/foodCards.jsx'
@@ -39,20 +39,6 @@ export default withLayout((props) => {
 
   //本店指南
   const [extend, setExtend] = useState([])
-  //当前指南总数
-  const [newextNum, setNewextNum] = useState(0)
-  //全部指南个数
-  const [AllextNum, setAllextNum] = useState(0)
-  //指南当前页数
-  const [epage, setepage] = useState(2)
-  const extendMore = () => {
-    setepage(epage + 1)
-    getExtendContent('tourist', id, { pageNum: epage }).then((res) => {
-      setExtend([...extend, ...res.records])
-      setNewextNum(newextNum + res.records.length)
-      setLoading(false)
-    })
-  }
 
   // 推荐套餐列表
   const [recommend, setRecommend] = useState([])
@@ -81,8 +67,6 @@ export default withLayout((props) => {
       })
       getExtendContent('tourist', id, { pageSize: 500 }).then((res) => {
         setExtend(res.records || [])
-        setAllextNum(res.total)
-        setNewextNum(res.records.length)
         setLoading(false)
 
       })
@@ -113,24 +97,25 @@ export default withLayout((props) => {
       <SpinBox loading={loading} style={{ overflow: 'hidden', padding: '0 30rpx', height: '100%', background: '#F8F8F8' }}>
         <scroll-view scrollY style={{ height: '100%' }}>
           <view className='storeDetails'>
+          <View className='huadong'>
             <Swiper
               className='swiper'
               circular
-              current={index}
               onChange={handchange}
             >
               {
-                imglist.map((item) =>
+                imglist.map((item) =>(
                   <SwiperItem>
-                    <image src={item.url} mode='aspectFit' className='storeImage' >
-                      <view className='tpPage'>
-                        <text>{index + 1}/{imglist.length}</text>
-                      </view>
-                    </image>
-                  </SwiperItem>
-                )
-              }
-            </Swiper>
+                    <image src={item.url} mode='aspectFit' className='storeImage' />
+                    </SwiperItem>
+                ))}
+              </Swiper>
+              <view className='tpPage'>
+                <text>
+                  {index + 1}/{imglist.length}
+                </text>
+              </view>
+            </View>
 
             <view className='storeJs'>
               <view className='introduce'>
@@ -167,7 +152,7 @@ export default withLayout((props) => {
             </view>
             {(recommend || []).map((item) => <Cards item={item} det={item} st={parseFloat(item.score.toFixed(1))} />)}
           </view>
-          <view className='bottom'>这是我的底线</view>
+          <view className='botton'>这是我的底线</view>
         </scroll-view>
       </SpinBox>
 

src/pages/details/mjDetails/sceneryDetails.less

@@ -2,14 +2,16 @@
   background-color: #fff;
   border-radius: 12px;
   margin-bottom: 20px;
-  .swiper {
-    height: calc((100vw - 60px) * 0.6);
-  }
-  .storeImage {
+  .huadong{    
     position: relative;
-    border-radius: 22px;
-    width: 100%;
-    height: 100%;
+    .swiper {
+      height: calc((100vw - 60px) * 0.6);
+      .storeImage {
+        border-radius: 22px;
+        width: 100%;
+        height: 100%;
+      }
+    }
     .tpPage {
       position: absolute;
       right: 20px;
@@ -25,7 +27,7 @@
       text {
         opacity: 0.64;
       }
-    }
+    }  
   }
   .storeJs {
     padding: 22px;
@@ -118,29 +120,8 @@
     margin-right: 10px;
   }
 }
-.showMore {
-  width: 100%;
-  background: linear-gradient(
-    0deg,
-    rgba(248, 248, 248, 0.58) 42%,
-    rgba(248, 248, 248, 0) 100%
-  );
-  font-size: 28px;
-  font-weight: bold;
-  color: #202020;
-  text-align: center;
-  position: absolute;
-  bottom: -130px;
-  padding-top: 77px;
-  padding-bottom: 20px;
-  .moreTip {
-    width: 38px;
-    height: 19px;
-    margin-top: 14px;
-  }
-}
 
-.bottom {
+.botton {
   font-size: 28px;
   color: #c0c8d3;
   line-height: 34px;

src/pages/index/components/Card/index.jsx

@@ -2,6 +2,7 @@
 import { useMemo } from 'react'
 import Taro from '@tarojs/taro'
 import useSave from "@/utils/hooks/useSave"
+import { compressImage } from '@/utils'
 import msTip from '@/assets/icons/housemantj/foodtip.png'
 import mjTip from '@/assets/icons/housemantj/mjtip.png'
 import location from '@/assets/icons/housemantj/location.png'
@@ -39,7 +40,7 @@ export default (props) => {
     <view className={uqClass} style={{ overflow: 'hidden' }}>
       <view className='contentCard' style={style}>
         <view className='cardTop'>
-          <image mode='widthFix' onClick={Detail} src={item.poster} className='cCardimg' onLoad={handleLoad} />
+          <image mode='widthFix' onClick={Detail} src={compressImage(item.poster)} className='cCardimg' onLoad={handleLoad} />
           <image className='lefttips' src={item.targetType === 'tourist' ? mjTip : msTip} />
           <image onClick={toggleSave} src={isSaved > 0 ? onlove : love} className='loveharde'></image>
         </view>

src/pages/index/tabs/Guide.jsx

@@ -12,7 +12,6 @@ import { getRecommendList, getExtendContent } from '@/services/home'
 import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
 import useTrackClick from '@/utils/hooks/useTrackClick'
-import showMore from '@/assets/icons/housemantj/setMore.png'
 import { useModel } from "@/store";
 import './GuideCss/style.less'
 

src/pages/index/tabs/Recommend.jsx

@@ -70,6 +70,9 @@ export default (props) => {
     Taro.navigateTo({ url: '/pages/search/search' });
   }
 
+  useDidShow(() => {
+    setQueryParams({ ...queryParams })
+  })
 
   return (
     // <view style={{ height: '100%', overflow: 'hidden',display:'flex',flexDirection:'column' }}>

src/utils/index.js

@@ -44,3 +44,22 @@ export function getQueryString(params) {
 
   return arr.filter(Boolean).join('&')
 }
+
+/**
+ * 压缩图片
+ * @param {*} url 
+ * @returns 
+ */
+export function compressImage(url) {
+  if (!url) return url;
+
+  // GIF 不压缩
+  if (url.indexOf('.gif') > -1) return url;
+
+  // eslint-disable-next-line no-undef
+  if (url.indexOf(OSS) > -1) {
+    return `${url}?x-oss-process=style/cmp80`
+  }
+
+  return url;
+}