张延森 3 anos atrás
pai
commit
1f0d244bfd

+ 1
- 1
config/dev.js Ver arquivo

4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://192.168.89.147:8080"',
6
     // HOST: '"http://192.168.89.147:8080"',
7
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
7
+    HOST: '"https://sgl-v2.njyunzhi.com"',
8
   },
8
   },
9
   mini: {},
9
   mini: {},
10
   h5: {}
10
   h5: {}

+ 1
- 1
config/prod.js Ver arquivo

3
     NODE_ENV: '"production"'
3
     NODE_ENV: '"production"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
6
+    HOST: '"https://sgl-v2.njyunzhi.com"',
7
   },
7
   },
8
   mini: {},
8
   mini: {},
9
   h5: {
9
   h5: {

+ 1
- 1
project.config.json Ver arquivo

2
   "miniprogramRoot": "./dist",
2
   "miniprogramRoot": "./dist",
3
   "projectname": "miniapp",
3
   "projectname": "miniapp",
4
   "description": "十公里",
4
   "description": "十公里",
5
-  "appid": "wx835627a9b9b3932a",
5
+  "appid": "wx06a7372d48d56843",
6
   "setting": {
6
   "setting": {
7
     "urlCheck": true,
7
     "urlCheck": true,
8
     "es6": false,
8
     "es6": false,

+ 1
- 0
src/components/List/index.jsx Ver arquivo

81
   // 请求数据
81
   // 请求数据
82
   useEffect(() => {
82
   useEffect(() => {
83
     fetchRef.current(payload)
83
     fetchRef.current(payload)
84
+    console.log('------------list----------------', payload, request)
84
   }, [payload, request])
85
   }, [payload, request])
85
 
86
 
86
   useEffect(() => {
87
   useEffect(() => {

+ 1
- 1
src/components/MoreGuide/style.less Ver arquivo

6
     font-size: 28px;
6
     font-size: 28px;
7
     font-weight: 400;
7
     font-weight: 400;
8
     color: #202020;
8
     color: #202020;
9
-    line-height: 54px;
9
+    line-height: 64px;
10
     padding-bottom: 10px;
10
     padding-bottom: 10px;
11
   }
11
   }

+ 1
- 1
src/hotel/pages/components/Extend/style.less Ver arquivo

45
   }
45
   }
46
   .storezn{
46
   .storezn{
47
     color: #202020;
47
     color: #202020;
48
-    line-height: 54px;
48
+    line-height: 64px;
49
     margin-bottom: 60px;
49
     margin-bottom: 60px;
50
     text-align: justify;
50
     text-align: justify;
51
   }
51
   }

+ 4
- 1
src/pages/details/components/Extend/extend.less Ver arquivo

1
 .cardext{
1
 .cardext{
2
+  padding: 0 30px;
3
+  box-sizing: border-box;
4
+
2
   .storezn{
5
   .storezn{
3
     font-size: 28px;    
6
     font-size: 28px;    
4
     color: #202020;
7
     color: #202020;
5
-    line-height: 54px;
8
+    line-height: 64px;
6
     margin-bottom: 40px;
9
     margin-bottom: 40px;
7
     text-align: justify;
10
     text-align: justify;
8
   }
11
   }

+ 2
- 2
src/pages/details/foodDetails/foodDetails.jsx Ver arquivo

109
         setimglist(res.imageList || []);
109
         setimglist(res.imageList || []);
110
         setLoading(false)
110
         setLoading(false)
111
       }).catch(() => setLoading(false));
111
       }).catch(() => setLoading(false));
112
-      getShopPackage(id).then((res) => {
112
+      getShopPackage(id, { pageSize: 500 }).then((res) => {
113
         setPackage(res.records || []);
113
         setPackage(res.records || []);
114
         setNewpgNum(res.records.length);
114
         setNewpgNum(res.records.length);
115
         setAllpgNum(res.total);
115
         setAllpgNum(res.total);
116
       });
116
       });
117
-      getExtendContent("shop", id, { pageNum: 999 }).then((res) => {
117
+      getExtendContent("shop", id, { pageSize: 500 }).then((res) => {
118
         setExtend(res.records || []);
118
         setExtend(res.records || []);
119
         setAllextNum(res.total);
119
         setAllextNum(res.total);
120
         setNewextNum(res.records.length);
120
         setNewextNum(res.records.length);

+ 1
- 1
src/pages/details/foodDetails/foodDetails.less Ver arquivo

164
 .storezn {
164
 .storezn {
165
   font-size: 28px;
165
   font-size: 28px;
166
   color: #202020;
166
   color: #202020;
167
-  line-height: 54px;
167
+  line-height: 64px;
168
   margin-bottom: 44px;
168
   margin-bottom: 44px;
169
 }
169
 }
170
 .storezn + image {
170
 .storezn + image {

+ 2
- 2
src/pages/details/mjDetails/sceneryDetails.jsx Ver arquivo

79
           setRecommend(res2 || [])
79
           setRecommend(res2 || [])
80
         })
80
         })
81
       })
81
       })
82
-      getExtendContent('tourist', id, { pageNum: 99999 }).then((res) => {
82
+      getExtendContent('tourist', id, { pageSize: 500 }).then((res) => {
83
         setExtend(res.records || [])
83
         setExtend(res.records || [])
84
         setAllextNum(res.total)
84
         setAllextNum(res.total)
85
         setNewextNum(res.records.length)
85
         setNewextNum(res.records.length)
158
             <view className='title'>
158
             <view className='title'>
159
               <image src={titlejd} />景点介绍
159
               <image src={titlejd} />景点介绍
160
             </view>
160
             </view>
161
-            {(extend || []).map((item) => <Extend item={item} />)}
161
+              {(extend || []).map((item) => <Extend item={item} />)}
162
 
162
 
163
           </view>
163
           </view>
164
           <view style={{ position: 'relative', marginTop: '6em', display: recommend == '' ? 'none' : '' }}>
164
           <view style={{ position: 'relative', marginTop: '6em', display: recommend == '' ? 'none' : '' }}>

+ 7
- 10
src/pages/index/tabs/Guide.jsx Ver arquivo

67
 
67
 
68
   const geiZy = () => {
68
   const geiZy = () => {
69
     setLoading(true)
69
     setLoading(true)
70
-    getExtendContent('room', roomId, {
71
-
72
-    }).then((res) => {
70
+    getExtendContent('room', roomId, { pageSize: 500 }).then((res) => {
73
       // setExtend(res.records || [])
71
       // setExtend(res.records || [])
74
       setExtend(res.records)
72
       setExtend(res.records)
75
       setIfroomId('reality')
73
       setIfroomId('reality')
162
   }
160
   }
163
 
161
 
164
   return (
162
   return (
165
-    <scroll-view scrollY style='height:100%;'  >
166
-      <SpinBox loading={loading}>
167
-
163
+    <scroll-view scrollY style={{ height: '100%' }}  >
168
         <view className='Guide-Home-box'>
164
         <view className='Guide-Home-box'>
169
           {
165
           {
170
             ifroomId === 'havenot' && (
166
             ifroomId === 'havenot' && (
177
           {/* 有民宿的情况下 */}
173
           {/* 有民宿的情况下 */}
178
           {
174
           {
179
             ifroomId === 'reality' && (
175
             ifroomId === 'reality' && (
180
-              <view>
176
+              <SpinBox loading={loading}>
181
                 <view className='room-box-info-ROOM'>
177
                 <view className='room-box-info-ROOM'>
182
                   <view className='room-bi-name-ROOM' >
178
                   <view className='room-bi-name-ROOM' >
183
                     <view className='room-bin-title-ROOM'>房屋名称</view>
179
                     <view className='room-bin-title-ROOM'>房屋名称</view>
245
                     <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
241
                     <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
246
                     <text className='title-title-boss' >更多指引</text>
242
                     <text className='title-title-boss' >更多指引</text>
247
                   </view>
243
                   </view>
248
-                  {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
244
+                  <view style={{ padding: '0 30rpx', boxSizing: 'border-box' }}>
245
+                    {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
246
+                  </view>
249
                 </view>
247
                 </view>
250
-              </view>
248
+              </SpinBox>
251
             )
249
             )
252
           }
250
           }
253
           <view className='Guide-Content-box'>
251
           <view className='Guide-Content-box'>
261
           </view>
259
           </view>
262
 
260
 
263
         </view>
261
         </view>
264
-      </SpinBox>
265
     </scroll-view>
262
     </scroll-view>
266
   )
263
   )
267
 }
264
 }

+ 8
- 7
src/pages/index/tabs/Recommend.jsx Ver arquivo

11
 import Card from '../components/Card'
11
 import Card from '../components/Card'
12
 import './less/Recommend.less'
12
 import './less/Recommend.less'
13
 
13
 
14
+const listStyle = { height: 'calc(100% - 145px)' }
14
 
15
 
15
 export default (props) => {
16
 export default (props) => {
16
   const { router, person, location } = props
17
   const { router, person, location } = props
19
   const [typeList, setTypeList] = useState([])
20
   const [typeList, setTypeList] = useState([])
20
   const listRef = useRef()
21
   const listRef = useRef()
21
 
22
 
22
-  const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
23
+  const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, typeId: '' })
23
 
24
 
24
   // 获取资源表信息
25
   // 获取资源表信息
25
   const [alllist, setAllList] = useState([])
26
   const [alllist, setAllList] = useState([])
27
   const tabs = [{ title: '附近' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
28
   const tabs = [{ title: '附近' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
28
   //切换上面的标签
29
   //切换上面的标签
29
   const handleTabChange = (e) => {
30
   const handleTabChange = (e) => {
31
+    console.log('------------handleTabChange-------', queryParams)
30
     const { index } = e.detail
32
     const { index } = e.detail
31
     setActiveTab(index)
33
     setActiveTab(index)
32
-    const tab = tabs[index].typeId
34
+    const tab = tabs[index].typeId || ''
35
+
33
     setQueryParams({
36
     setQueryParams({
34
       ...queryParams,
37
       ...queryParams,
35
       typeId: tab
38
       typeId: tab
36
     })
39
     })
37
 
40
 
38
-    if (index == 0) {
39
-      setQueryParams({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
40
-    }
41
     //如果context有的话代表他滚动了   那么切换tab页就置顶
41
     //如果context有的话代表他滚动了   那么切换tab页就置顶
42
     if (listRef.current?.context) {
42
     if (listRef.current?.context) {
43
       listRef.current.context.scrollTo({ top: 0 })
43
       listRef.current.context.scrollTo({ top: 0 })
64
 
64
 
65
   }
65
   }
66
 
66
 
67
+  console.log('-------------------', queryParams)
68
+
67
 
69
 
68
   useDidShow(() => {
70
   useDidShow(() => {
69
     likeLook()
71
     likeLook()
102
       {/* <View style={{ flex:'auto' }}> */}
104
       {/* <View style={{ flex:'auto' }}> */}
103
         <List
105
         <List
104
           ref={listRef}
106
           ref={listRef}
105
-          style={{ height: 'calc(100% - 145px)' }}
106
-          // style={{ flex: 'auto', height: '100%' }}
107
+          style={listStyle}
107
           request={getResourceList}
108
           request={getResourceList}
108
           params={queryParams}
109
           params={queryParams}
109
           onDataChange={setAllList}
110
           onDataChange={setAllList}