李志伟 3 years ago
parent
commit
2fa7f51ff4

+ 1
- 23
src/pages/MineUserAll/MyTravel/index.jsx View File

1
 import Taro, { useDidShow } from '@tarojs/taro'
1
 import Taro, { useDidShow } from '@tarojs/taro'
2
 import { Image, Button, View } from '@tarojs/components'
2
 import { Image, Button, View } from '@tarojs/components'
3
-import SpinBox from "@/components/Spin/SpinBox";
4
 import formatTime from '@/utils/formatTime'
3
 import formatTime from '@/utils/formatTime'
5
 import withLayout from '@/layouts'
4
 import withLayout from '@/layouts'
6
-
7
 import { useState, useEffect } from "react";
5
 import { useState, useEffect } from "react";
8
 import SlideView from '@/components/SlideView';
6
 import SlideView from '@/components/SlideView';
9
 import editImg from '@/assets/icons/Travel/editimg.png'
7
 import editImg from '@/assets/icons/Travel/editimg.png'
10
 import CustomNav from '@/components/CustomNav'
8
 import CustomNav from '@/components/CustomNav'
11
 import { getTravelMine, deleteTravel } from '@/services/travel'
9
 import { getTravelMine, deleteTravel } from '@/services/travel'
12
-
13
 import './style.less'
10
 import './style.less'
14
 
11
 
15
 export default withLayout((props) => {
12
 export default withLayout((props) => {
16
-
17
-  const [loading, setLoading] = useState(false)
18
-
19
   //删除
13
   //删除
20
   const handelDelete = (e) => {
14
   const handelDelete = (e) => {
21
     Taro.showModal({
15
     Taro.showModal({
23
       content: '确定要删除吗',
17
       content: '确定要删除吗',
24
       success: function (res) {
18
       success: function (res) {
25
         if (res.confirm) {
19
         if (res.confirm) {
26
-
27
           deleteTravel(e.travelId).then(r => {
20
           deleteTravel(e.travelId).then(r => {
28
             getList()
21
             getList()
29
-
30
             Taro.showToast({
22
             Taro.showToast({
31
               title: '删除成功',
23
               title: '删除成功',
32
               icon: 'none',
24
               icon: 'none',
33
               duration: 1000
25
               duration: 1000
34
             })
26
             })
35
-
36
           })
27
           })
37
-
38
         } else if (res.cancel) {
28
         } else if (res.cancel) {
39
           getList()
29
           getList()
40
-
41
-
42
         }
30
         }
43
       }
31
       }
44
     })
32
     })
45
-
46
   }
33
   }
47
   const handelEdit = (item) => {
34
   const handelEdit = (item) => {
48
-
49
-    Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${item.travelId}&dayNum=${item.dayNum}&travelId=${item.travelId}` })
35
+    Taro.navigateTo({ url: `/pages/Travel/Edit/index?id=${item.travelId}&dayNum=${item.dayNum}` })
50
   }
36
   }
51
 
37
 
52
   const [travelMine, setTravelMine] = useState([])
38
   const [travelMine, setTravelMine] = useState([])
53
   const getList = () => {
39
   const getList = () => {
54
     getTravelMine({ pageNum: 1, pageSize: 99, }).then(e => {
40
     getTravelMine({ pageNum: 1, pageSize: 99, }).then(e => {
55
       setTravelMine(e.records)
41
       setTravelMine(e.records)
56
-
57
-
58
     })
42
     })
59
   }
43
   }
60
   useDidShow(() => getList())
44
   useDidShow(() => getList())
61
 
45
 
62
   useEffect(() => {
46
   useEffect(() => {
63
     getList()
47
     getList()
64
-
65
   }, [])
48
   }, [])
66
   return (
49
   return (
67
     <View className='page-index box-content'>
50
     <View className='page-index box-content'>
69
         <CustomNav title='我的行程' />
52
         <CustomNav title='我的行程' />
70
       </View>
53
       </View>
71
       <View className='index-container'>
54
       <View className='index-container'>
72
-        <SpinBox loading={loading}>
73
           <scroll-view
55
           <scroll-view
74
             scrollY
56
             scrollY
75
             style='height: 100%;'
57
             style='height: 100%;'
77
             <View className='View-box'>
59
             <View className='View-box'>
78
               {
60
               {
79
                 travelMine.map((item, index) =>
61
                 travelMine.map((item, index) =>
80
-
81
                   <SlideView key={index} del onDelete={() => handelDelete(item)} className='myTravel'>
62
                   <SlideView key={index} del onDelete={() => handelDelete(item)} className='myTravel'>
82
                     <View className='View-box-Card' onClick={() => handelEdit(item)}>
63
                     <View className='View-box-Card' onClick={() => handelEdit(item)}>
83
                       <View className='bottom'>
64
                       <View className='bottom'>
90
                       </View>
71
                       </View>
91
                     </View>
72
                     </View>
92
                   </SlideView>
73
                   </SlideView>
93
-
94
                 )
74
                 )
95
               }
75
               }
96
-
97
               <View className='foot'>这是我的底线</View>
76
               <View className='foot'>这是我的底线</View>
98
             </View>
77
             </View>
99
           </scroll-view>
78
           </scroll-view>
100
-        </SpinBox>
101
       </View>
79
       </View>
102
     </View >
80
     </View >
103
   )
81
   )

+ 2
- 1
src/pages/MineUserAll/MyTravel/style.less View File

2
   background-color: #F8F8F8;
2
   background-color: #F8F8F8;
3
   height: 100vh;
3
   height: 100vh;
4
   .View-box {
4
   .View-box {
5
-    margin: 30px 20px 0 20px;
5
+    margin:0 20px;
6
+    padding-top:30px;
6
     .myTravel{
7
     .myTravel{
7
       .slideview-content{
8
       .slideview-content{
8
         margin:7.5px 0;
9
         margin:7.5px 0;

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

16
 
16
 
17
 export default withLayout((props) => {
17
 export default withLayout((props) => {
18
   const { router, location } = props
18
   const { router, location } = props
19
-  const { id, dayNum, travelId } = router.params
19
+  const { id, dayNum} = router.params
20
 
20
 
21
   const [loading, setLoading] = useState(false)
21
   const [loading, setLoading] = useState(false)
22
   const [bottomDayNum, setBottomDayNum] = useState(true)
22
   const [bottomDayNum, setBottomDayNum] = useState(true)
133
   }
133
   }
134
   //确认
134
   //确认
135
   const ButtonOK = () => {
135
   const ButtonOK = () => {
136
-    seaveTravelID(id, { title: inputChangle, travelId: travelId }).then(val => {
136
+    seaveTravelID(id, { title: inputChangle}).then(val => {
137
       Taro.showToast({
137
       Taro.showToast({
138
         title: '修改成功',
138
         title: '修改成功',
139
         icon: 'none',
139
         icon: 'none',