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

src/pages/details/foodDetails/foodDetails.jsx

@@ -129,8 +129,8 @@ export default withLayout((props) => {
       getShopPackage(id, { pageSize: 500 }).then((res) => {
         setPackage(res.records || []);
         setNewpgNum(res.records.length);
-        setAllpgNum(res.total);
       });
+      setAllpgNum(res.total);
       getExtendContent("shop", id, { pageSize: 500 }).then((res) => {
         setExtend(res.records || []);
         setAllextNum(res.total);
@@ -246,14 +246,14 @@ export default withLayout((props) => {
                   {(spackage || []).map((item) => (
                     <Cards key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
                   ))}
-                  <view
+                  {/* <view
                     className='showMore'
                     style={{ display: newpgNum == AllpgNum ? "none" : "" }}
                     onClick={pgMore}
                   >
                     <view>查看更多</view>
                     <image src={showMore} className='moreTip' />
-                  </view>
+                  </view> */}
                 </view>
                 <view
                   style={{

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -159,7 +159,7 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={titlejd} />景点介绍
             </view>
-              {(extend || []).map((item) => <Extend item={item} />)}
+            {(extend || []).map((item) => <Extend item={item} />)}
 
           </view>
           <view style={{ position: 'relative', marginTop: '6em', display: recommend == '' ? 'none' : '' }}>