Merge branch '3.0' of http://git.ycjcjy.com/shigongli/miniapp-v2 into 3.0

src/pages/MineUserAll/MyTravel/index.jsx

@@ -1,8 +1,8 @@
 import Taro, { useDidShow } from '@tarojs/taro'
-import { Image, Button, View } from '@tarojs/components'
+import { Image, View } from '@tarojs/components'
 import formatTime from '@/utils/formatTime'
 import withLayout from '@/layouts'
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import SlideView from '@/components/SlideView';
 import editImg from '@/assets/icons/Travel/editimg.png'
 import CustomNav from '@/components/CustomNav'
@@ -25,8 +25,6 @@ export default withLayout((props) => {
               duration: 1000
             })
           })
-        } else if (res.cancel) {
-          getList()
         }
       }
     })
@@ -41,41 +39,38 @@ export default withLayout((props) => {
       setTravelMine(e.records)
     })
   }
+  //页面切换回来时查询列表   两种情况第一是从个人中心进入  第二是从行程编辑页面返回时重新查询列表
   useDidShow(() => getList())
-
-  useEffect(() => {
-    getList()
-  }, [])
   return (
     <View className='page-index box-content'>
       <View className='index-navbar'>
         <CustomNav title='我的行程' />
       </View>
       <View className='index-container'>
-          <scroll-view
-            scrollY
-            style='height: 100%;'
-          >
-            <View className='View-box'>
-              {
-                travelMine.map((item, index) =>
-                  <SlideView key={index} del onDelete={() => handelDelete(item)} className='myTravel'>
-                    <View className='View-box-Card' onClick={() => handelEdit(item)}>
-                      <View className='bottom'>
-                        <View className='travelName'>{item.title}</View>
-                        <Image src={editImg} className='edit'></Image>
-                      </View>
-                      <View className='bottom'>
-                        <View className='travelDay'>行程时间：{item.dayNum}天</View>
-                        <View className='travelDate'>创建时间：{formatTime(item.createDate, "yyyy/MM/dd")}</View>
-                      </View>
+        <scroll-view
+          scrollY
+          style='height: 100%;'
+        >
+          <View className='View-box'>
+            {
+              travelMine.map((item, index) =>
+                <SlideView key={index} del onDelete={() => handelDelete(item)} className='myTravel'>
+                  <View className='View-box-Card' onClick={() => handelEdit(item)}>
+                    <View className='bottom'>
+                      <View className='travelName'>{item.title}</View>
+                      <Image src={editImg} className='edit'></Image>
+                    </View>
+                    <View className='bottom'>
+                      <View className='travelDay'>行程时间：{item.dayNum}天</View>
+                      <View className='travelDate'>创建时间：{formatTime(item.createDate, "yyyy/MM/dd")}</View>
                     </View>
-                  </SlideView>
-                )
-              }
-              <View className='foot'>这是我的底线</View>
-            </View>
-          </scroll-view>
+                  </View>
+                </SlideView>
+              )
+            }
+            <View className='foot'>这是我的底线</View>
+          </View>
+        </scroll-view>
       </View>
     </View >
   )

src/pages/Travel/Edit/index.jsx

@@ -2,7 +2,7 @@ import Taro from '@tarojs/taro'
 import { Image, Button, View, Text, Input } from '@tarojs/components'
 import SpinBox from "@/components/Spin/SpinBox";
 import CustomCard from '@/components/foodCards/CustomCard/index'
-import { useState, useEffect, useRef } from "react";
+import { useState, useEffect } from "react";
 import BottomMoadl from '@/components/BottomMoadl/index'
 import Travel from '@/assets/icons/Travel/travel.png'
 import ChangeNext from '@/assets/icons/Travel/ChangeNext.png'
@@ -19,12 +19,17 @@ export default withLayout((props) => {
   const { id, dayNum } = router.params
 
   const [loading, setLoading] = useState(false)
+  //判断一天行程还是多天行程的标识位  一天就不用显示上一天下一天按钮
   const [bottomDayNum, setBottomDayNum] = useState(true)
 
+  //获取当前行程详情不包括标题
   const [showCutover, setShowCutover] = useState([])
+  //获取行程列表包括标题
   const [travelCustom, setTravelCustom] = useState()
 
+  //文本框弹窗
   const [showDialog, setShowDialog] = useState(false);
+  //行程标题获取弹窗的文本框的值
   const [inputChangle, setInputChangle] = useState();
 
   const handleDelete = (res) => {
@@ -94,9 +99,11 @@ export default withLayout((props) => {
   }, [id, dayNumber])
 
 
-
+  //删除行程
   const onDelete = (e) => {
+    //这个删除是需要两个id的前一个id是整个行程的id需要根据这个id找到这条行程的全部信息  后面那个itemId是行程数组travelItemList里面的一条当前点击的需要删除的信息的id
     const itemId = e
+    console.log(e)
     Taro.showModal({
       title: '提示',
       content: '确定要删除吗',
@@ -110,7 +117,6 @@ export default withLayout((props) => {
             })
             handleDelete()
           })
-        } else if (res.cancel) {
         }
       }
     })
@@ -122,7 +128,6 @@ export default withLayout((props) => {
     setShowFrame(!showFrame)
   }
   //修改行程名字
-
   const handelInput = (e) => {
     setInputChangle(e.detail.value)
   }
@@ -150,34 +155,33 @@ export default withLayout((props) => {
   }
 
   return (
-    <view className='page-index'>
-      <Popup show={showDialog} maskClosable={false}>
-
-        <view className='travel-box-info-ROOM'>
-          <view className='travel-bi-name-ROOM' >
-            <view className='travel-bin-title-ROOM'>修改行程名称：</view>
-            <Input className='travel-bint-nameInfo-ROOM' value={inputChangle} onInput={handelInput} />
-          </view>
-        </view>
-
-        <view className='travel-button-box' >
-          <button className='travelButton-Cancel' onClick={ButtonCancel} >取消</button>
-          <button className='travelButton-OK' onClick={ButtonOK} >确定</button>
-        </view>
-      </Popup>
-      {/* 
-      frameTitle 标题
-      flag 弹窗显示 true false
-      ico 底部图标
-      textNext 底部文字
+    <View className='page-index box-content'>
+      <View style={{ flex: 'none' }}>
+        <Popup show={showDialog} maskClosable={false}>
+          <View className='travel-box-info-ROOM'>
+            <View className='travel-bi-name-ROOM' >
+              <View className='travel-bin-title-ROOM'>修改行程名称：</View>
+              <Input className='travel-bint-nameInfo-ROOM' value={inputChangle} onInput={handelInput} />
+            </View>
+          </View>
+          <View className='travel-button-box' >
+            <Button className='travelButton-Cancel' onClick={ButtonCancel} >取消</Button>
+            <Button className='travelButton-OK' onClick={ButtonOK} >确定</Button>
+          </View>
+        </Popup>
+        {/* 
+        frameTitle 标题
+        flag 弹窗显示 true false
+        ico 底部图标
+        textNext 底部文字
       */}
-      <BottomMoadl frameTitle='行程推荐' dayNumber={dayNumber} travelId={id} flag={showFrame} handelAddTravel={handelAddTravel} onRecommend={setRecommend} ico={ChangeNext} textNext='换一批' location={location} />
-
-      <View className='box-content'>
-        <View className='index-navbar'>
-          <CustomNav title='定制行程' />
-        </View>
-        <scroll-view scrollY style='height: calc(100% - 75px);margin-bottom: 40px;' >
+        <BottomMoadl frameTitle='行程推荐' dayNumber={dayNumber} travelId={id} flag={showFrame} handelAddTravel={handelAddTravel} onRecommend={setRecommend} ico={ChangeNext} textNext='换一批' location={location} />
+      </View>
+      <View className='index-navbar'>
+        <CustomNav title='定制行程' />
+      </View>
+      <View className='index-container'>
+        <scroll-view scrollY style='height:100%;' >
           <View className='TravelTitle'>
             {travelCustom?.title}<Image src={editImg} className='edit' onClick={handleModale} ></Image>
           </View>
@@ -208,7 +212,7 @@ export default withLayout((props) => {
             </View>
           }
         </scroll-view>
-      </View >
-    </view>
+      </View>
+    </View>
   )
 })

src/pages/Travel/Edit/style.less

@@ -55,7 +55,8 @@
     font-weight: bold;
     color: #333;
     line-height: 44px;
-    margin: 63px 30px 15px;
+    margin: 0 30px 15px;
+    padding-top: 63px;
     display: flex;
     .edit {
       width: 40px;