Baozhangchao пре 3 година
родитељ
комит
7222e6af15

+ 15
- 6
src/components/foodCards/NoteCard/index.jsx Прегледај датотеку

@@ -110,7 +110,7 @@ export default (props) => {
110 110
         })
111 111
       })
112 112
     } else {
113
-      console.log('有行程');
113
+      console.log('有行程', e);
114 114
       const [firstInx, secondInx] = e.detail.value
115 115
 
116 116
       const firstValue = valueList[firstInx]
@@ -141,18 +141,26 @@ export default (props) => {
141 141
 
142 142
 
143 143
   const handlePayClick = () => {
144
-    travelMine.records == '' ?
144
+    if (travelMine.records == '') {
145 145
       Taro.showToast({
146
-        title: '暂无行程,点击种草自动创建',
146
+        title: '暂无行程,自动创建',
147 147
         icon: 'none',
148 148
         duration: 3000
149 149
       })
150
-      : ''
150
+
151
+      newTravelMine({ title: `我的行程 ${y}-${m}-${d}` }).then(res => {
152
+        handelNoteList()
153
+        // 首先创建一个行程,然后才能拿到下面的这些数据
154
+      })
155
+
156
+    }
157
+
158
+
151 159
 
152 160
     // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
153 161
 
154 162
   }
155
-  const PayAction =
163
+  const PayAction = travelMine.total >= 1 ?
156 164
     <View className='view-picker'>
157 165
       <Picker
158 166
         className='picker-box'
@@ -167,7 +175,8 @@ export default (props) => {
167 175
         <Action.Icon icon={item.isVisited < 1 ? grassOFF : grassNO} text={item.isVisited < 1 ? '种草' : '已种草'} onClick={handlePayClick} />
168 176
       </Picker>
169 177
     </View>
170
-
178
+    :
179
+    <Action.Icon icon={item.isVisited < 1 ? grassOFF : grassNO} text={item.isVisited < 1 ? '种草' : '已种草'} onClick={handlePayClick} />
171 180
 
172 181
 
173 182
   return (

+ 8
- 12
src/components/foodCards/ShareCard/index.jsx Прегледај датотеку

@@ -1,19 +1,15 @@
1
-import { useState, useEffect, useRef } from 'react'
1
+import { useState } from 'react'
2 2
 
3 3
 import Taro from '@tarojs/taro'
4
-import { deleteTravel, deleteTravelItem } from '@/services/travel'
5 4
 
6
-import { View, Text, Image, ScrollView } from '@tarojs/components'
5
+import { View, Text } from '@tarojs/components'
7 6
 import CouponCard from '@/components/CouponCard'
8 7
 import { compressImage } from '@/utils'
9 8
 import SaveIcon from '@/components/SaveIcon'
10 9
 import Location from '@/components/Location'
10
+import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
11 11
 
12
-import grassOFF from '@/assets/icons/housemantj/grassOFF.png'
13
-import DeleteTravel from '@/assets/icons/Travel/delete.png'
14 12
 
15
-import grassNO from '@/assets/icons/housemantj/grassNO.png'
16
-import Popup from '@/components/Popup'
17 13
 
18 14
 import './style.less'
19 15
 
@@ -66,14 +62,14 @@ export default (props) => {
66 62
     // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
67 63
 
68 64
   }
69
-  const PayAction = <Action.Icon icon={DeleteTravel} text='删除' onClick={handlePayClick} />
65
+  const PayAction = <Action.Icon icon={SeeDetails} text='查看详情' onClick={item.targetType === 'tourist' ? goDetail : goFood} />
70 66
 
71 67
 
72 68
 
73 69
 
74 70
   return (
75 71
     <View style={{ margin: '15px 5px' }} >
76
-      <View className='packageDetail' style={{ display: goshop ? '' : 'none' }}>
72
+      {/* <View className='packageDetail' style={{ display: goshop ? '' : 'none' }}>
77 73
         <Popup show={showCutover} maskClosable={showCutover} onClose={onClose}>
78 74
           <ScrollView
79 75
             scrollY
@@ -82,9 +78,9 @@ export default (props) => {
82 78
             <Image mode='widthFix' src={item.details ? item.details : item.poster} />
83 79
           </ScrollView>
84 80
         </Popup >
85
-      </View>
86
-      <CouponCard action={PayAction}>
87
-        <CouponMedia onClick={item.targetType === 'tourist' ? goDetail : goFood}>
81
+      </View> */}
82
+      <CouponCard action={PayAction}  >
83
+        <CouponMedia >
88 84
           <CouponMedia.Header
89 85
             cashback={item.cashback}
90 86
             image={compressImage(item.poster)}

+ 1
- 1
src/pages/RandomItinerary/ResultOver/index.jsx Прегледај датотеку

@@ -65,7 +65,7 @@ export default withLayout((props) => {
65 65
             </View>
66 66
           </View>
67 67
           {
68
-            traveContent?.isHidden === false && shareList.map((item) => <ShareCard def={item} item={item} key={item.itemId} />
68
+            traveContent?.isHidden === false && shareList.map((item) => <ShareCard det={item} item={item} key={item.itemId} />
69 69
 
70 70
 
71 71
             )

+ 0
- 2
src/pages/RandomItinerary/index.jsx Прегледај датотеку

@@ -10,8 +10,6 @@ import FiveSenses from "./components/FiveSenses"//五官
10 10
 import GirlFriend from "./components/GirlFriend"//有没有女朋友
11 11
 import Hand from "./components/Hand"//左右手
12 12
 import UFO from "./components/UFO"//不明飞行物
13
-
14
-
15 13
 import './style.less'
16 14
 
17 15
 

+ 11
- 26
src/pages/index/components/Customized/style.less Прегледај датотеку

@@ -2,7 +2,7 @@
2 2
   width: 345px;
3 3
   height: 440px;
4 4
   position: relative;
5
-  left: 0;
5
+  top: 50px;
6 6
   animation: CustomizedEntrance 3s ease infinite;
7 7
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
8 8
   background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/CustomizedEntrance.png")
@@ -25,7 +25,7 @@
25 25
 
26 26
   animation-fill-mode: both; /*播放后的状态*/
27 27
   left: 201px;
28
-  bottom: 40px;
28
+  bottom: 20px;
29 29
 }
30 30
 
31 31
 .BigPink {
@@ -52,7 +52,7 @@
52 52
   height: 440px;
53 53
   position: relative;
54 54
   left: 0;
55
-  top: -40px;
55
+  top: -30px;
56 56
   animation: LtineraryEntrance 3.5s ease-out infinite;
57 57
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
58 58
 
@@ -64,7 +64,9 @@
64 64
   width: 267px;
65 65
   height: 190px;
66 66
   position: relative;
67
-  left: 20px;
67
+  left: 80px;
68
+  top: 50px;
69
+
68 70
   z-index: -1;
69 71
   animation: BigYellow 2.4s ease infinite;
70 72
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
@@ -80,7 +82,6 @@
80 82
 
81 83
   position: relative;
82 84
   left: 0px;
83
-  bottom: 20px;
84 85
   animation: MiniPink 2.4s ease infinite;
85 86
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
86 87
   // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniPink.png")
@@ -89,21 +90,6 @@
89 90
   animation-fill-mode: both; /*播放后的状态*/
90 91
 }
91 92
 
92
-// @keyframes CustomizedEntrance {
93
-//   0% {
94
-//     left: 0px;
95
-//   }
96
-//   25% {
97
-//     left: 15px;
98
-//   }
99
-//   50% {
100
-//     left: 30px;
101
-//   }
102
-//   100% {
103
-//     left: 0px;
104
-//   }
105
-// }
106
-
107 93
 @keyframes CustomizedEntrance {
108 94
   0% {
109 95
     transform: translateY(-3px);
@@ -160,16 +146,15 @@
160 146
 }
161 147
 @keyframes BigYellow {
162 148
   0% {
163
-    top: 0px;
164
-  }
165
-  25% {
166
-    top: 6px;
149
+    transform: translateX(-3px);
167 150
   }
151
+
168 152
   50% {
169
-    top: 16px;
153
+    transform: translateX(-30px);
170 154
   }
155
+
171 156
   100% {
172
-    top: 0px;
157
+    transform: translateX(-3px);
173 158
   }
174 159
 }
175 160
 @keyframes MiniPink {

+ 0
- 0
src/pages/index/components/MiniYellow/style.less Прегледај датотеку


+ 1
- 1
src/pages/index/tabs/Guide.jsx Прегледај датотеку

@@ -211,7 +211,7 @@ export default (props) => {
211 211
           <Customized />
212 212
         </view>
213 213
         <view className='Guide-bottom-box'>
214
-          <Image mode='widthFix' style={{ width: '100%', position: 'absolute', bottom: 'auto' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
214
+          <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
215 215
 
216 216
         </view>
217 217
       </view>

+ 4
- 5
src/pages/index/tabs/GuideCss/style.less Прегледај датотеку

@@ -3,7 +3,6 @@
3 3
 .Guide-Home-box {
4 4
   width: 94%;
5 5
   margin: auto;
6
-  height: 95%;
7 6
   position: relative;
8 7
   .room-box-info-ROOM {
9 8
     display: flex;
@@ -263,7 +262,6 @@
263 262
     }
264 263
   }
265 264
   .Guide-Content-box {
266
-    margin-top: 2em;
267 265
     .title-image {
268 266
       display: flex;
269 267
       // width: 270px;
@@ -309,9 +307,10 @@
309 307
   }
310 308
   .Guide-bottom-box {
311 309
     width: 100%;
312
-    height: auto;
313
-    position: absolute;
314
-    bottom: 0px;
310
+    position: fixed;
311
+    left: 0;
312
+    bottom: 17vw;
313
+    z-index: 9999;
315 314
   }
316 315
 
317 316
   //攻略卡片.