Baozhangchao 3 years ago
parent
commit
98ad3d305c

+ 1
- 1
config/prod.js View File

3
     NODE_ENV: '"production"'
3
     NODE_ENV: '"production"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"https://sgl-v2.njyunzhi.com"',
6
+    HOST: '"https://sgl-v2-test.njyunzhi.com"',
7
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
7
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
8
     VERSION: '"3.0.1_2021-11-10"',
8
     VERSION: '"3.0.1_2021-11-10"',
9
   },
9
   },

+ 1
- 0
src/components/BottomMoadl/index.jsx View File

54
 
54
 
55
   //换一批
55
   //换一批
56
   const handleTextNext = (e) => {
56
   const handleTextNext = (e) => {
57
+    console.log('换一批触发');
57
     // setLoading(true)
58
     // setLoading(true)
58
     setTextNext(textNextSum + 1)
59
     setTextNext(textNextSum + 1)
59
 
60
 

+ 3
- 3
src/components/BottomMoadl/style.css View File

9
   }
9
   }
10
 }
10
 }
11
 .wrapAnimateOut {
11
 .wrapAnimateOut {
12
-  animation: wrapAnimateOut 0.4s ease forwards;
12
+  animation: wrapAnimateOut 0.2s ease forwards;
13
 }
13
 }
14
 @keyframes wrapAnimateOut {
14
 @keyframes wrapAnimateOut {
15
   0% {
15
   0% {
21
   }
21
   }
22
 }
22
 }
23
 .frameAnimate {
23
 .frameAnimate {
24
-  animation: frameAnimate 0.5s ease forwards;
24
+  animation: frameAnimate 0.2s ease forwards;
25
 }
25
 }
26
 @keyframes frameAnimate {
26
 @keyframes frameAnimate {
27
   0% {
27
   0% {
32
   }
32
   }
33
 }
33
 }
34
 .frameAnimateOut {
34
 .frameAnimateOut {
35
-  animation: frameAnimateOut 0.5s ease forwards;
35
+  animation: frameAnimateOut 0.2s ease forwards;
36
 }
36
 }
37
 @keyframes frameAnimateOut {
37
 @keyframes frameAnimateOut {
38
   0% {
38
   0% {

+ 1
- 3
src/components/foodCards/ShopNoteCard/index.jsx View File

79
   const onChange = (e) => {
79
   const onChange = (e) => {
80
 
80
 
81
 
81
 
82
-
83
     if (travelMine?.records == '') {
82
     if (travelMine?.records == '') {
84
 
83
 
85
 
84
 
91
         const [firstInx, secondInx] = e.detail?.value
90
         const [firstInx, secondInx] = e.detail?.value
92
 
91
 
93
         const firstValue = valueList[firstInx] || ''
92
         const firstValue = valueList[firstInx] || ''
94
-        console.log("🚀 ~ file: index.jsx ~ line 89 ~ newTravelMine ~ e.detail", firstValue)
95
 
93
 
96
         const secondValue = numberTrave[secondInx] || ''
94
         const secondValue = numberTrave[secondInx] || ''
97
 
95
 
160
     // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
158
     // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
161
 
159
 
162
   }
160
   }
163
-  const PayAction = travelMine.total >= 1 ?
161
+  const PayAction = travelMine?.total >= 1 ?
164
     <View className='view-picker'>
162
     <View className='view-picker'>
165
       <Picker
163
       <Picker
166
         className='picker-box'
164
         className='picker-box'

+ 1
- 0
src/pages/Travel/Edit/index.jsx View File

165
 
165
 
166
   //行程推荐
166
   //行程推荐
167
   const setRecommend = () => {
167
   const setRecommend = () => {
168
+    console.log('弹窗触发了。');
168
 
169
 
169
 
170
 
170
     setShowFrame(!showFrame)
171
     setShowFrame(!showFrame)

+ 2
- 7
src/pages/index/components/NoteCard/index.jsx View File

3
 import Taro from '@tarojs/taro'
3
 import Taro from '@tarojs/taro'
4
 import useSave from "@/utils/hooks/useSave"
4
 import useSave from "@/utils/hooks/useSave"
5
 import { compressImage, random } from '@/utils'
5
 import { compressImage, random } from '@/utils'
6
-import msTip from '@/assets/icons/housemantj/foodtip.png'
7
-import mjTip from '@/assets/icons/housemantj/mjtip.png'
8
-import location from '@/assets/icons/housemantj/location.png'
9
 import onlove from '@/assets/icons/housemantj/onlove.png'
6
 import onlove from '@/assets/icons/housemantj/onlove.png'
10
 import love from '@/assets/icons/housemantj/bheart.png'
7
 import love from '@/assets/icons/housemantj/bheart.png'
11
 import VideoStart from '@/assets/icons/housemantj/VideoStart.png'
8
 import VideoStart from '@/assets/icons/housemantj/VideoStart.png'
22
 
19
 
23
   const [isSaved, toggleSave] = useSave(item.isSaved, 'note', item.noteId)
20
   const [isSaved, toggleSave] = useSave(item.isSaved, 'note', item.noteId)
24
   const Detail = () => {
21
   const Detail = () => {
25
-
26
     Taro.navigateTo({ url: `/pages/details/NoteDetails/index?id=${item.noteId}` });
22
     Taro.navigateTo({ url: `/pages/details/NoteDetails/index?id=${item.noteId}` });
27
 
23
 
28
-
29
   }
24
   }
30
   return (
25
   return (
26
+
31
     <view className={uqClass} style={{ overflow: 'hidden' }}>
27
     <view className={uqClass} style={{ overflow: 'hidden' }}>
32
       <view className='contentCard' style={style}>
28
       <view className='contentCard' style={style}>
33
         <view className='cardTop'>
29
         <view className='cardTop'>
34
-          <image mode='widthFix' onClick={Detail} src={compressImage(item.poster)} className='cCardimg' />
30
+          <image mode='widthFix' src={compressImage(item.poster)} className='cCardimg' />
35
           <image className='lefttips' src={item.noteType == 'video' ? VideoStart : ''} />
31
           <image className='lefttips' src={item.noteType == 'video' ? VideoStart : ''} />
36
           <image onClick={toggleSave} src={isSaved > 0 ? onlove : love} className='loveharde'></image>
32
           <image onClick={toggleSave} src={isSaved > 0 ? onlove : love} className='loveharde'></image>
37
         </view>
33
         </view>
41
       </view>
37
       </view>
42
     </view>
38
     </view>
43
   )
39
   )
44
-
45
 }
40
 }

+ 2
- 2
src/pages/index/components/NoteCard/style.less View File

16
       border-radius: 24px 24px 0px 0px;
16
       border-radius: 24px 24px 0px 0px;
17
     }
17
     }
18
     .lefttips {
18
     .lefttips {
19
-      width: 60px;
20
-      height: 50px;
19
+      width: 75px;
20
+      height: 72px;
21
 
21
 
22
       position: absolute;
22
       position: absolute;
23
       left: 40%;
23
       left: 40%;