李志伟 3 years ago
parent
commit
4ccc1524d1

+ 0
- 38
src/pages/details/foodDetails/foodDetails.jsx View File

@@ -20,7 +20,6 @@ import dw from "@/assets/icons/housemantj/loc-o.png";
20 20
 import phoneImg from "@/assets/icons/housemantj/phone-o.png";
21 21
 import zhuandao from "@/assets/icons/housemantj/backTop.png";
22 22
 import titlezs from "@/assets/icons/housemantj/titleTip.png";
23
-import showMore from "@/assets/icons/housemantj/setMore.png";
24 23
 import share from "@/assets/icons/housemantj/touristShare.png";
25 24
 import good from "@/assets/icons/housemantj/touristGood.png";
26 25
 import baozan from "@/assets/icons/housemantj/bgood.png";
@@ -65,29 +64,9 @@ export default withLayout((props) => {
65 64
   const [isSaved, toggleSave] = useSave(detail.isSaved, "shop", id);
66 65
   const [isLike, toggleLike] = useLike(detail.isLike, "shop", id);
67 66
 
68
-  //当前套餐总数
69
-  const [newpgNum, setNewpgNum] = useState(0);
70
-  //全部套餐个数
71
-  const [AllpgNum, setAllpgNum] = useState(0);
72
-  //套餐当前页数
73
-  const [page, setpage] = useState(2);
74
-  const pgMore = () => {
75
-    setpage(page + 1);
76
-    getShopPackage(id, { pageNum: page }).then((res) => {
77
-      setPackage([...spackage, ...res.records]);
78
-      setNewpgNum(newpgNum + res.records.length);
79
-    });
80
-  };
81 67
   //本店指南
82 68
   const [extend, setExtend] = useState([]);
83 69
 
84
-  //当前指南总数
85
-  const [newextNum, setNewextNum] = useState(0);
86
-  //全部指南个数
87
-  const [AllextNum, setAllextNum] = useState(0);
88
-  //指南当前页数
89
-  const [epage, setepage] = useState(2);
90
-
91 70
   const openMap = () => {
92 71
     Taro.openLocation({
93 72
       longitude: log.current - 0,
@@ -107,10 +86,8 @@ export default withLayout((props) => {
107 86
         title: '暂无商家联系方式',
108 87
         icon: 'none',
109 88
       })
110
-
111 89
       return;
112 90
     }
113
-
114 91
     Taro.makePhoneCall({
115 92
       phoneNumber: detail.phone
116 93
     })
@@ -128,13 +105,9 @@ export default withLayout((props) => {
128 105
       }).catch(() => setLoading(false));
129 106
       getShopPackage(id, { pageSize: 500 }).then((res) => {
130 107
         setPackage(res.records || []);
131
-        setNewpgNum(res.records.length);
132 108
       });
133
-      setAllpgNum(res.total);
134 109
       getExtendContent("shop", id, { pageSize: 500 }).then((res) => {
135 110
         setExtend(res.records || []);
136
-        setAllextNum(res.total);
137
-        setNewextNum(res.records.length);
138 111
       });
139 112
     }
140 113
   }, [id]);
@@ -182,7 +155,6 @@ export default withLayout((props) => {
182 155
                 </text>
183 156
               </view>
184 157
             </View>
185
-
186 158
             <view className='storeJs'>
187 159
               <view style={{ overflow: "hidden" }}>
188 160
                 <view className='storeName'>{detail.shopName}</view>
@@ -246,14 +218,6 @@ export default withLayout((props) => {
246 218
                   {(spackage || []).map((item) => (
247 219
                     <Cards key={item.packageId} editable='1' st={star} goshop='1' item={item} det={detail} />
248 220
                   ))}
249
-                  {/* <view
250
-                    className='showMore'
251
-                    style={{ display: newpgNum == AllpgNum ? "none" : "" }}
252
-                    onClick={pgMore}
253
-                  >
254
-                    <view>查看更多</view>
255
-                    <image src={showMore} className='moreTip' />
256
-                  </view> */}
257 221
                 </view>
258 222
                 <view
259 223
                   style={{
@@ -269,11 +233,9 @@ export default withLayout((props) => {
269 233
                   {(extend || []).map((item) => (
270 234
                     <Extend key={item.extId} item={item} />
271 235
                   ))}
272
-
273 236
                 </view>
274 237
                 <view
275 238
                   className='botton'
276
-                  style={{ display: newextNum == AllextNum ? "" : "none" }}
277 239
                 >
278 240
                   这是我的底线
279 241
                 </view>

+ 0
- 18
src/pages/details/mjDetails/sceneryDetails.jsx View File

@@ -3,7 +3,6 @@ import ax from '@/assets/icons/housemantj/onlove.png'
3 3
 import dw from '@/assets/icons/housemantj/loc-o.png'
4 4
 import titlejd from '@/assets/icons/housemantj/goodTourist.png'
5 5
 import titlems from '@/assets/icons/housemantj/goodFood.png'
6
-import showMore from '@/assets/icons/housemantj/setMore.png'
7 6
 import share from '@/assets/icons/housemantj/touristShare.png'
8 7
 import good from '@/assets/icons/housemantj/touristGood.png'
9 8
 import baozan from '@/assets/icons/housemantj/bgood.png'
@@ -39,21 +38,6 @@ export default withLayout((props) => {
39 38
 
40 39
   //本店指南
41 40
   const [extend, setExtend] = useState([])
42
-  //当前指南总数
43
-  const [newextNum, setNewextNum] = useState(0)
44
-  //全部指南个数
45
-  const [AllextNum, setAllextNum] = useState(0)
46
-  //指南当前页数
47
-  const [epage, setepage] = useState(2)
48
-  const extendMore = () => {
49
-    setepage(epage + 1)
50
-    getExtendContent('tourist', id, { pageNum: epage }).then((res) => {
51
-      setExtend([...extend, ...res.records])
52
-      setNewextNum(newextNum + res.records.length)
53
-      setLoading(false)
54
-    })
55
-  }
56
-
57 41
   // 推荐套餐列表
58 42
   const [recommend, setRecommend] = useState([])
59 43
 
@@ -82,7 +66,6 @@ export default withLayout((props) => {
82 66
       getExtendContent('tourist', id, { pageSize: 500 }).then((res) => {
83 67
         setExtend(res.records || [])
84 68
         setAllextNum(res.total)
85
-        setNewextNum(res.records.length)
86 69
         setLoading(false)
87 70
 
88 71
       })
@@ -160,7 +143,6 @@ export default withLayout((props) => {
160 143
               <image src={titlejd} />景点介绍
161 144
             </view>
162 145
             {(extend || []).map((item) => <Extend item={item} />)}
163
-
164 146
           </view>
165 147
           <view style={{ position: 'relative', marginTop: '6em', display: recommend == '' ? 'none' : '' }}>
166 148
             <view className='title'>

+ 0
- 3
src/pages/index/tabs/Guide.jsx View File

@@ -12,7 +12,6 @@ import { getRecommendList, getExtendContent } from '@/services/home'
12 12
 import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
13 13
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
14 14
 import useTrackClick from '@/utils/hooks/useTrackClick'
15
-import showMore from '@/assets/icons/housemantj/setMore.png'
16 15
 import { useModel } from "@/store";
17 16
 import './GuideCss/style.less'
18 17
 
@@ -197,10 +196,8 @@ export default (props) => {
197 196
                         </view>
198 197
                       </view>
199 198
                     </view>
200
-
201 199
                 }
202 200
 
203
-
204 201
                 {/* --------停车场-------- */}
205 202
                 {
206 203
                   !parkingGps ? <view></view>