Baozhangchao 3 年前
父节点
当前提交
260f9cdd25

+ 1
- 2
src/components/CompoentsOrder/complete/style.less 查看文件

8
 }
8
 }
9
 
9
 
10
 .complete-boxs {
10
 .complete-boxs {
11
-  margin: 20px auto;
12
-  padding: 0 30px;
11
+  padding: 20px 30px;
13
   .foot {
12
   .foot {
14
     font-size: 28px;
13
     font-size: 28px;
15
     color: #c0c8d3;
14
     color: #c0c8d3;

+ 2
- 71
src/components/foodCards/ShopNoteCard/index.jsx 查看文件

6
 import { compressImage } from '@/utils'
6
 import { compressImage } from '@/utils'
7
 import SaveIcon from '@/components/SaveIcon'
7
 import SaveIcon from '@/components/SaveIcon'
8
 import Location from '@/components/Location'
8
 import Location from '@/components/Location'
9
-
10
 import grassOFF from '@/assets/icons/housemantj/grassOFF.png'
9
 import grassOFF from '@/assets/icons/housemantj/grassOFF.png'
11
 import grassNO from '@/assets/icons/housemantj/grassNO.png'
10
 import grassNO from '@/assets/icons/housemantj/grassNO.png'
12
 import Popup from '@/components/Popup'
11
 import Popup from '@/components/Popup'
13
 import { saveTravel, newTravelMine } from '@/services/travel'
12
 import { saveTravel, newTravelMine } from '@/services/travel'
14
-
15
 import './style.less'
13
 import './style.less'
16
 
14
 
17
 
15
 
21
 //套餐卡片
19
 //套餐卡片
22
 export default (props) => {
20
 export default (props) => {
23
   const { item, st, editable, setScroll, goshop, travelMine, resourceList, det, handelNoteList } = props
21
   const { item, st, editable, setScroll, goshop, travelMine, resourceList, det, handelNoteList } = props
24
-  // const travelId = travelMineContent?.records[0]?.travelId
25
   const targetId = props.item?.targetId
22
   const targetId = props.item?.targetId
26
   const targetType = props.item?.targetType
23
   const targetType = props.item?.targetType
27
-
28
   const goFood = () => {
24
   const goFood = () => {
29
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${targetId}` })
25
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${targetId}` })
30
-
31
   }
26
   }
32
   const [showCutover, setShowCutover] = useState(false)
27
   const [showCutover, setShowCutover] = useState(false)
33
   const [valueList, setValueList] = useState([])
28
   const [valueList, setValueList] = useState([])
34
-
35
-  const [traveCoumun, setTraveCoumun] = useState()
29
+  const [traveCoumun, setTraveCoumun] = useState()  //第几天
36
 
30
 
37
   useEffect(() => {
31
   useEffect(() => {
38
-
39
     setValueList(travelMine?.records)
32
     setValueList(travelMine?.records)
40
     setTraveCoumun(travelMine?.records[0].dayNum)
33
     setTraveCoumun(travelMine?.records[0].dayNum)
41
-
42
   }, [travelMine?.records, item])
34
   }, [travelMine?.records, item])
43
 
35
 
44
   const onClose = () => {
36
   const onClose = () => {
48
     setScroll(true)
40
     setScroll(true)
49
   }
41
   }
50
 
42
 
51
-  //列改变
52
-
53
 
43
 
54
   const numberTrave = (new Array(traveCoumun).fill()).map((_, index) => ({ id: index + 1, title: `第 ${index + 1} 天` }))
44
   const numberTrave = (new Array(traveCoumun).fill()).map((_, index) => ({ id: index + 1, title: `第 ${index + 1} 天` }))
55
 
45
 
57
 
47
 
58
 
48
 
59
   const handleColumn = e => {
49
   const handleColumn = e => {
60
-    console.log("🚀 ~ file: index.jsx ~ line 63 ~ e", e)
61
-    // console.log(e.detail.column);
62
     const { column, value } = e.detail
50
     const { column, value } = e.detail
63
-
64
     if (column == 0) {
51
     if (column == 0) {
65
-
66
       const firstValue = valueList[value] || ''
52
       const firstValue = valueList[value] || ''
67
       setTraveCoumun(firstValue.dayNum)
53
       setTraveCoumun(firstValue.dayNum)
68
-
69
     }
54
     }
70
-
71
-
72
-
73
   }
55
   }
74
 
56
 
75
-
76
   const day = new Date();
57
   const day = new Date();
77
   const y = day.getFullYear();
58
   const y = day.getFullYear();
78
   const m = day.getMonth() + 1;
59
   const m = day.getMonth() + 1;
79
   const d = day.getDate();
60
   const d = day.getDate();
80
-  let number = 0
81
-
82
   const hanleChange = (e) => {
61
   const hanleChange = (e) => {
83
-    console.log("🚀 ~ file: index.jsx ~ line 63 ~ e", e)
84
-
85
-    if (travelMine?.records == '') {
86
-
87
-
88
-      // newTravelMine({ title: `我的行程 ${y}-${m}-${d}` }).then(res => {
89
-      //   handelNoteList()
90
-      //   // 首先创建一个行程,然后才能拿到下面的这些数据
91
-
92
-      //   const [firstInx, secondInx] = e.detail?.value
93
-
94
-      //   const firstValue = valueList[firstInx] || ''
95
-
96
-      //   const secondValue = numberTrave[secondInx] || ''
97
-
98
-      //   const { travelId } = firstValue
99
-
100
-      //   //行程内容
101
-      //   const { id } = secondValue//天数
102
-      //   // saveTravel({})
103
-      //   saveTravel(res.travelId, { dayOrder: id, targetId: targetId, targetType: targetType }).then((val) => {
104
-      //     Taro.showToast({
105
-      //       title: '添加成功',
106
-      //       icon: 'none',
107
-      //       duration: 1000
108
-      //     })
109
-      //     resourceList(travelId)
110
-      //   })
111
-      // })
112
-
113
-      return;
114
-    } else {
62
+    if (travelMine?.records != '') {
115
       const [firstInx, secondInx] = e.detail.value
63
       const [firstInx, secondInx] = e.detail.value
116
-
117
       const firstValue = valueList[firstInx]
64
       const firstValue = valueList[firstInx]
118
-
119
       const secondValue = numberTrave[secondInx]
65
       const secondValue = numberTrave[secondInx]
120
-
121
       const { travelId } = firstValue
66
       const { travelId } = firstValue
122
-
123
-
124
       //行程内容
67
       //行程内容
125
       const { id } = secondValue//天数
68
       const { id } = secondValue//天数
126
-
127
       saveTravel(travelId, { dayOrder: id, targetId: targetId, targetType: targetType }).then((res) => {
69
       saveTravel(travelId, { dayOrder: id, targetId: targetId, targetType: targetType }).then((res) => {
128
         Taro.showToast({
70
         Taro.showToast({
129
           title: '添加成功',
71
           title: '添加成功',
130
           icon: 'none',
72
           icon: 'none',
131
-
132
           duration: 1000
73
           duration: 1000
133
         })
74
         })
134
         resourceList(travelId)
75
         resourceList(travelId)
135
-
136
-        // setGrowGrass(grassNO)
137
-
138
       })
76
       })
139
     }
77
     }
140
   }
78
   }
141
 
79
 
142
-
143
   const handlePayClick = () => {
80
   const handlePayClick = () => {
144
     if (travelMine?.records == '') {
81
     if (travelMine?.records == '') {
145
       Taro.showToast({
82
       Taro.showToast({
152
         handelNoteList()
89
         handelNoteList()
153
         // 首先创建一个行程,然后才能拿到下面的这些数据
90
         // 首先创建一个行程,然后才能拿到下面的这些数据
154
       })
91
       })
155
-
156
     }
92
     }
157
-    // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
158
-
159
   }
93
   }
160
   const PayAction = travelMine?.total >= 1 ?
94
   const PayAction = travelMine?.total >= 1 ?
161
     <View className='view-picker'>
95
     <View className='view-picker'>
167
         onColumnChange={handleColumn}
101
         onColumnChange={handleColumn}
168
         onChange={hanleChange}
102
         onChange={hanleChange}
169
         scrollType='link'
103
         scrollType='link'
170
-      // value={}
171
       >
104
       >
172
         <Action.Icon icon={item.isVisited < 1 ? grassOFF : grassNO} text={item.isVisited < 1 ? '种草' : '已种草'} onClick={handlePayClick} />
105
         <Action.Icon icon={item.isVisited < 1 ? grassOFF : grassNO} text={item.isVisited < 1 ? '种草' : '已种草'} onClick={handlePayClick} />
173
       </Picker>
106
       </Picker>
175
     :
108
     :
176
     <Action.Icon icon={item.isVisited < 1 ? grassOFF : grassNO} text={item.isVisited < 1 ? '种草' : '已种草'} onClick={handlePayClick} />
109
     <Action.Icon icon={item.isVisited < 1 ? grassOFF : grassNO} text={item.isVisited < 1 ? '种草' : '已种草'} onClick={handlePayClick} />
177
 
110
 
178
-
179
   return (
111
   return (
180
     <View style={{ margin: '15px 5px' }} >
112
     <View style={{ margin: '15px 5px' }} >
181
       <View className='packageDetail' style={{ display: goshop ? '' : 'none' }}>
113
       <View className='packageDetail' style={{ display: goshop ? '' : 'none' }}>
202
               </View>
134
               </View>
203
               <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
135
               <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
204
                 <Text className='cpn-card-text_mn'>¥{`${(item.averagePrice == '' ? 0 / 100 : item.averagePrice / 100).toFixed(2)}元`}</Text>
136
                 <Text className='cpn-card-text_mn'>¥{`${(item.averagePrice == '' ? 0 / 100 : item.averagePrice / 100).toFixed(2)}元`}</Text>
205
-                {/* <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text> */}
206
               </View>
137
               </View>
207
               <View className='cpn-md-act'>
138
               <View className='cpn-md-act'>
208
                 <Location {...det} />
139
                 <Location {...det} />

+ 1
- 23
src/pages/MineUserAll/MyTravel/index.jsx 查看文件

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 查看文件

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;

+ 1
- 1
src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx 查看文件

139
               </view>
139
               </view>
140
             </view>
140
             </view>
141
             {/* 商品信息结束 */}
141
             {/* 商品信息结束 */}
142
-            <view>
142
+            <view style={{padding:'0 3px'}}>
143
               {(list || []).map((item) => {
143
               {(list || []).map((item) => {
144
                 return (
144
                 return (
145
                   <OrderCard item={item} key={item.orderId} kkp='1' />
145
                   <OrderCard item={item} key={item.orderId} kkp='1' />

+ 2
- 2
src/pages/Travel/Edit/index.jsx 查看文件

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',