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

src/components/foodCards/ShopNoteCard/index.jsx

@@ -60,6 +60,7 @@ export default (props) => {
 
 
   const handleColumn = e => {
+    console.log("🚀 ~ file: index.jsx ~ line 63 ~ e", e)
     // console.log(e.detail.column);
 
     const { column, value } = e.detail
@@ -77,36 +78,38 @@ export default (props) => {
   const d = day.getDate();
   let number = 0
   const onChange = (e) => {
-
+    console.log("🚀 ~ file: index.jsx ~ line 63 ~ e", e)
 
     if (travelMine?.records == '') {
 
 
-      console.log('没有行程');
-      newTravelMine({ title: `我的行程 ${y}-${m}-${d}` }).then(res => {
-        handelNoteList()
-        // 首先创建一个行程，然后才能拿到下面的这些数据
+      // console.log('没有行程');
+      // newTravelMine({ title: `我的行程 ${y}-${m}-${d}` }).then(res => {
+      //   handelNoteList()
+      //   // 首先创建一个行程，然后才能拿到下面的这些数据
 
-        const [firstInx, secondInx] = e.detail?.value
+      //   const [firstInx, secondInx] = e.detail?.value
 
-        const firstValue = valueList[firstInx] || ''
+      //   const firstValue = valueList[firstInx] || ''
 
-        const secondValue = numberTrave[secondInx] || ''
+      //   const secondValue = numberTrave[secondInx] || ''
 
-        const { travelId } = firstValue
+      //   const { travelId } = firstValue
 
-        //行程内容
-        const { i } = secondValue//天数
-        // saveTravel({})
-        saveTravel(res.travelId, { dayOrder: i, targetId: targetId, targetType: targetType }).then((val) => {
-          Taro.showToast({
-            title: '添加成功',
-            icon: 'none',
-            duration: 1000
-          })
-          resourceList(travelId)
-        })
-      })
+      //   //行程内容
+      //   const { id } = secondValue//天数
+      //   // saveTravel({})
+      //   saveTravel(res.travelId, { dayOrder: id, targetId: targetId, targetType: targetType }).then((val) => {
+      //     Taro.showToast({
+      //       title: '添加成功',
+      //       icon: 'none',
+      //       duration: 1000
+      //     })
+      //     resourceList(travelId)
+      //   })
+      // })
+
+      return;
     } else {
       console.log('有行程', e);
       const [firstInx, secondInx] = e.detail.value
@@ -117,10 +120,12 @@ export default (props) => {
 
       const { travelId } = firstValue
 
+
       //行程内容
-      const { i } = secondValue//天数
+      const { id } = secondValue//天数
+      console.log("🚀 ~ file: index.jsx ~ line 102 ~ newTravelMine ~ secondValue", secondValue)
 
-      saveTravel(travelId, { dayOrder: i, targetId: targetId, targetType: targetType }).then((res) => {
+      saveTravel(travelId, { dayOrder: id, targetId: targetId, targetType: targetType }).then((res) => {
         Taro.showToast({
           title: '添加成功',
           icon: 'none',
@@ -154,7 +159,6 @@ export default (props) => {
     }
 
 
-
     // Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}&scene=${scene || ''}&subOrderId=${subOrderId}&id=${id}` })
 
   }

src/pages/MineUserAll/MyTravel/index.jsx

@@ -25,16 +25,18 @@ export default withLayout((props) => {
         if (res.confirm) {
 
           deleteTravel(e.travelId).then(r => {
+            getList()
+
             Taro.showToast({
               title: '删除成功',
               icon: 'none',
               duration: 1000
             })
-            getList()
 
           })
 
         } else if (res.cancel) {
+          getList()
 
 
         }