Baozhangchao преди 3 години
родител
ревизия
a84ed68b9d

BIN
src/assets/icons/housemantj/VideoStart.png Целия файл


src/components/foodCards/NoteCard/index.jsx → src/components/foodCards/ShopNoteCard/index.jsx Целия файл

@@ -9,6 +9,7 @@ import Location from '@/components/Location'
9 9
 
10 10
 import grassOFF from '@/assets/icons/housemantj/grassOFF.png'
11 11
 import grassNO from '@/assets/icons/housemantj/grassNO.png'
12
+import VideoStart from '@/assets/icons/housemantj/VideoStart.png'
12 13
 import Popup from '@/components/Popup'
13 14
 import { saveTravel, newTravelMine, getTravelMine } from '@/services/travel'
14 15
 

src/components/foodCards/NoteCard/style.less → src/components/foodCards/ShopNoteCard/style.less Целия файл


+ 15
- 3
src/pages/RandomItinerary/index.jsx Целия файл

@@ -29,12 +29,24 @@ export default withLayout((props) => {
29 29
 
30 30
   const handleGoTo = () => {
31 31
     if (show >= 5) {
32
+      if (i === false) {
33
+        Taro.showToast({
34
+          title: '请选择一项噢',
35
+          icon: 'none',
36
+          duration: 2000
37
+        })
32 38
 
33
-      seaveTravelDestiny().then(e => {
39
+      } else {
40
+        setI(false)
41
+        seaveTravelDestiny().then(e => {
42
+
43
+          Taro.navigateTo({ url: `/pages/RandomItinerary/ResultOver/index` })
44
+
45
+        })
46
+
47
+      }
34 48
 
35
-        Taro.navigateTo({ url: `/pages/RandomItinerary/ResultOver/index` })
36 49
 
37
-      })
38 50
 
39 51
 
40 52
     } else {

+ 2
- 2
src/pages/details/NoteDetails/index.jsx Целия файл

@@ -21,7 +21,7 @@ import logo from "@/assets/icons/UserCenter/laba.png"
21 21
 import { Swiper, SwiperItem, Button, View, Ad, Video } from '@tarojs/components';
22 22
 import useSave from "@/utils/hooks/useSave"
23 23
 import useLike from "@/utils/hooks/useLike"
24
-import NoteCards from '@/components/foodCards/NoteCard/index'
24
+import ShopNoteCard from '@/components/foodCards/ShopNoteCard/index'
25 25
 import Taro, { useShareAppMessage } from '@tarojs/taro'
26 26
 import Extend from '../components/Extend/extend'
27 27
 import ImageList from "../components/ImageList";
@@ -175,7 +175,7 @@ export default withLayout((props) => {
175 175
             <view className='title'>
176 176
               <image src={TextMentioned} />文中提及
177 177
             </view>
178
-            {(recommend || []).map((item) => <NoteCards resourceList={resourceList} editable='1' travelMine={travelMine} key={item} item={item} det={item} handelNoteList={handelNoteList} />)}
178
+            {(recommend || []).map((item) => <ShopNoteCard resourceList={resourceList} editable='1' travelMine={travelMine} key={item} item={item} det={item} handelNoteList={handelNoteList} />)}
179 179
           </view>
180 180
           <view className='botton'>这是我的底线</view>
181 181
         </scroll-view>

+ 3
- 1
src/pages/index/components/NoteCard/index.jsx Целия файл

@@ -8,6 +8,8 @@ import mjTip from '@/assets/icons/housemantj/mjtip.png'
8 8
 import location from '@/assets/icons/housemantj/location.png'
9 9
 import onlove from '@/assets/icons/housemantj/onlove.png'
10 10
 import love from '@/assets/icons/housemantj/bheart.png'
11
+import VideoStart from '@/assets/icons/housemantj/VideoStart.png'
12
+
11 13
 import './style.less'
12 14
 
13 15
 export default (props) => {
@@ -30,7 +32,7 @@ export default (props) => {
30 32
       <view className='contentCard' style={style}>
31 33
         <view className='cardTop'>
32 34
           <image mode='widthFix' onClick={Detail} src={compressImage(item.poster)} className='cCardimg' />
33
-          {/* <image className='lefttips' src={item.targetType === 'tourist' ? mjTip : msTip} /> */}
35
+          <image className='lefttips' src={item.noteType == 'video' ? VideoStart : ''} />
34 36
           <image onClick={toggleSave} src={isSaved > 0 ? onlove : love} className='loveharde'></image>
35 37
         </view>
36 38
         <view className='bContent' onClick={Detail}>

+ 5
- 4
src/pages/index/components/NoteCard/style.less Целия файл

@@ -16,11 +16,12 @@
16 16
       border-radius: 24px 24px 0px 0px;
17 17
     }
18 18
     .lefttips {
19
-      width: 99px;
20
-      height: 37px;
19
+      width: 60px;
20
+      height: 50px;
21
+
21 22
       position: absolute;
22
-      left: 0;
23
-      top: 0;
23
+      left: 40%;
24
+      top: 30%;
24 25
     }
25 26
     .loveharde {
26 27
       width: 28px;