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

src/components/BottomMoadl/index.jsx

@@ -87,7 +87,7 @@ export default (props) => {
 
 
 
-                  <RecommendedCard key={index} item={item} det={item} location={location} travelId={travelId} dayNumber={dayNumber} handelAddTravel={handelAddTravel} />
+                  <RecommendedCard key={index} item={item} det={item} editable='1' location={location} travelId={travelId} dayNumber={dayNumber} handelAddTravel={handelAddTravel} />
                 )
               }
               {props.children}

src/components/BottomMoadl/style.css

@@ -1,5 +1,5 @@
 .wrapAnimate {
-  animation: wrapAnimate 0.5s ease-in-out forwards;
+  animation: wrapAnimate 0.2s ease forwards;
 }
 @keyframes wrapAnimate {
   0% {
@@ -9,7 +9,7 @@
   }
 }
 .wrapAnimateOut {
-  animation: wrapAnimateOut 0.4s ease-in-out forwards;
+  animation: wrapAnimateOut 0.4s ease forwards;
 }
 @keyframes wrapAnimateOut {
   0% {

src/components/foodCards/CustomCard/index.jsx

@@ -101,7 +101,7 @@ export default (props) => {
               </View>
               <View className='cpn-md-act'>
                 <Location {...det} />
-                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.packageId} />
+                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.targetId} />
               </View>
             </View>
           </CouponMedia.Body>

src/components/foodCards/NoteCard/index.jsx

@@ -21,7 +21,6 @@ const Action = CouponCard.Action
 //套餐卡片
 export default (props) => {
   const { item, st, editable, setScroll, goshop, travelMine, resourceList, det, handelNoteList } = props
-  console.log("🚀 ~ file: index.jsx ~ line 24 ~ item", item.targetId)
   // const travelId = travelMineContent?.records[0]?.travelId
   const targetId = props.item?.targetId
   const targetType = props.item?.targetType
@@ -198,7 +197,7 @@ export default (props) => {
               </View>
               <View className='cpn-md-act'>
                 <Location {...det} />
-                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.packageId} />
+                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.targetId} />
               </View>
             </View>
           </CouponMedia.Body>

src/components/foodCards/RecommendedCard/index.jsx

@@ -98,7 +98,7 @@ export default (props) => {
               </View>
               <View className='cpn-md-act'>
                 <Location {...det} />
-                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.packageId} />
+                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.targetId} />
               </View>
             </View>
           </CouponMedia.Body>

src/components/foodCards/ShareCard/index.jsx

@@ -101,7 +101,7 @@ export default (props) => {
               </View>
               <View className='cpn-md-act'>
                 <Location {...det} />
-                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.packageId} />
+                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.targetId} />
               </View>
             </View>
           </CouponMedia.Body>

src/pages/MineUserAll/MyTravel/index.jsx

@@ -75,10 +75,10 @@ export default withLayout((props) => {
                 travelMine.map((item, index) =>
 
                   <SlideView key={index} del onDelete={() => handelDelete(item)} className='myTravel'>
-                    <View className='View-box-Card'>
+                    <View className='View-box-Card' onClick={() => handelEdit(item)}>
                       <View className='bottom'>
                         <View className='travelName'>{item.title}</View>
-                        <Image src={editImg} className='edit' onClick={() => handelEdit(item)}></Image>
+                        <Image src={editImg} className='edit'></Image>
                       </View>
                       <View className='bottom'>
                         <View className='travelDay'>行程时间：{item.dayNum}天</View>

src/pages/RandomItinerary/ResultOver/index.jsx

@@ -71,7 +71,7 @@ export default withLayout((props) => {
             )
           }
           {
-            traveContent?.isHidden === false &&
+            traveContent?.isHidden &&
             <Button openType='share' className='purebtn'><View className='shareImg'>分享并邀请好友点开查看完整命定行程</View></Button>
             // <View className='content' >分享并邀请好友点开查看完整命定行程</View>
 

src/pages/RandomItinerary/components/ConstellationCard/style.less

@@ -18,9 +18,13 @@
     .RC-box-image {
       width: 160px;
       height: 190px;
-      filter: grayscale(100%);
+
+      filter: grayscale(95%);
+      opacity: 0.6;
     }
     .imageLess {
+      opacity: 1;
+      opacity: 1;
       filter: grayscale(0%);
     }
   }

src/pages/RandomItinerary/components/FiveSenses/style.less

@@ -19,9 +19,11 @@
       height: 190px;
       padding-left: 10px;
 
-      filter: grayscale(100%);
+      filter: grayscale(95%);
+      opacity: 0.6;
     }
     .Five-imageLess {
+      opacity: 1;
       filter: grayscale(0%);
     }
   }

src/pages/RandomItinerary/components/GirlFriend/style.less

@@ -21,7 +21,8 @@
       position: relative;
       bottom: -22px;
       left: 90px;
-      filter: grayscale(100%);
+      filter: grayscale(95%);
+      opacity: 0.6;
     }
     .imageTwo {
       height: 420px;
@@ -29,10 +30,12 @@
       position: relative;
       left: 0em;
       bottom: 45px;
-      filter: grayscale(100%);
+      filter: grayscale(95%);
+      opacity: 0.6;
     }
 
     .Girl-imageLess {
+      opacity: 1;
       filter: grayscale(0%);
     }
   }

src/pages/RandomItinerary/components/Hand/style.less

@@ -21,9 +21,11 @@
       position: relative;
       bottom: -10px;
       left: 90px;
-      filter: grayscale(100%);
+      filter: grayscale(95%);
+      opacity: 0.6;
     }
     .Hand-imageLess {
+      opacity: 1;
       filter: grayscale(0%);
     }
   }

src/pages/RandomItinerary/components/UFO/style.less

@@ -18,9 +18,11 @@
       width: 160px;
       height: 190px;
       padding-left: 10px;
-      filter: grayscale(100%);
+      filter: grayscale(95%);
+      opacity: 0.6;
     }
     .UFO-imageLess {
+      opacity: 1;
       filter: grayscale(0%);
     }
   }

src/pages/Travel/Edit/index.jsx

@@ -22,7 +22,9 @@ export default withLayout((props) => {
   const { id, dayNum } = router.params
 
 
+
   const [loading, setLoading] = useState(false)
+  const [bottomDayNum, setBottomDayNum] = useState(true)
 
 
 
@@ -48,14 +50,14 @@ export default withLayout((props) => {
 
   const [dayNumber, setDayNumber] = useState(1)
   const sum = dayNum - dayNumber
+  const [state, setstate] = useState(true)
 
 
   const addTextSum = () => {
     setDayNumber(dayNumber + 1)
-    if (dayNumber > dayNum) {
 
-    } else {
-      console.log('98888888');
+    if (dayNumber == 1) {
+      setstate(false)
     }
 
 
@@ -63,6 +65,10 @@ export default withLayout((props) => {
   }
   const minusTextSum = () => {
     setDayNumber(dayNumber - 1)
+    if (dayNumber == 2) {
+      setstate(true)
+
+    }
 
 
   }
@@ -97,6 +103,12 @@ export default withLayout((props) => {
   }
 
   useEffect(() => {
+    if (dayNum == 1) {
+      setBottomDayNum(false)
+    } else {
+      setBottomDayNum(true)
+
+    }
 
     setLoading(true)
 
@@ -191,7 +203,7 @@ export default withLayout((props) => {
                 {
                   showCutover.map((item, index) =>
 
-                    <CustomCard key={index} item={item} det={item} travelId={item.travelId} onDelete={onDelete} />
+                    <CustomCard key={index} item={item} det={item} editable='1' travelId={item.travelId} onDelete={onDelete} />
 
                   )
                 }
@@ -204,15 +216,23 @@ export default withLayout((props) => {
             <Image src={Travel}></Image>
             <Text>查看行程推荐</Text>
           </View>
-          <View className='bottom'>
-            {
-              dayNumber >= dayNum && <Button className='bottom-btn bottom-btn-cancel' onClick={minusTextSum} >上一天</Button>
-            }
-            {
-              sum >= 1 && <Button className='bottom-btn bottom-btn-ok' onClick={addTextSum}>下一天</Button>
-            }
 
-          </View>
+
+          {
+            bottomDayNum &&
+            <View className='bottom'>
+              {
+
+                // dayNumber >= dayNum && <Button className='bottom-btn bottom-btn-cancel' onClick={minusTextSum} >上一天</Button>
+                state === false && <Button className='bottom-btn bottom-btn-cancel' onClick={minusTextSum} >上一天</Button>
+              }
+              {
+                sum >= 1 && <Button className='bottom-btn bottom-btn-ok' onClick={addTextSum}>下一天</Button>
+              }
+
+            </View>
+          }
+
 
         </scroll-view>
       </View >

src/pages/Travel/Edit/style.less

@@ -49,7 +49,6 @@
 
       &:nth-child(2) {
         margin-left: 4em;
-        margin-bottom: 2em;
       }
     }
 

src/pages/Travel/customizedTravel/components/CustomDay/index.jsx

@@ -19,6 +19,8 @@ export default (props) => {
   const d = day.getDate();
 
   const handelShare = (e) => {
+    onClose()
+
     newTravelMine({ title: `我的自定义行程 ${y}-${m}-${d}`, dayNum: datNum }).then(res => {
       Taro.showToast({
         title: '创建成功',

src/pages/Travel/customizedTravel/components/ThreeModel/index.jsx

@@ -15,6 +15,7 @@ export default (props) => {
   const m = day.getMonth() + 1;
   const d = day.getDate();
   const handelShare = () => {
+    onClose()
 
     newTravelMine({ title: `我的行程三日游 ${y}-${m}-${d}`, dayNum: 3 }).then(res => {
       Taro.showToast({

src/pages/Travel/customizedTravel/components/TipModel/index.jsx

@@ -17,6 +17,7 @@ export default (props) => {
   const handelShare = () => {
 
     newTravelMine({ title: `我的行程一日游 ${y}-${m}-${d}` }).then(res => {
+      onClose()
       Taro.showToast({
         title: '创建成功',
         icon: 'none',

src/pages/Travel/customizedTravel/components/TwoModel/index.jsx

@@ -15,6 +15,7 @@ export default (props) => {
   const m = day.getMonth() + 1;
   const d = day.getDate();
   const handelShare = () => {
+    onClose()
 
     newTravelMine({ title: `我的行程二日游 ${y}-${m}-${d}`, dayNum: 2 }).then(res => {
       Taro.showToast({

src/pages/details/NoteDetails/index.jsx

@@ -175,7 +175,7 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={TextMentioned} />文中提及
             </view>
-            {(recommend || []).map((item) => <NoteCards resourceList={resourceList} travelMine={travelMine} key={item} item={item} det={item} handelNoteList={handelNoteList} />)}
+            {(recommend || []).map((item) => <NoteCards resourceList={resourceList} editable='1' travelMine={travelMine} key={item} item={item} det={item} handelNoteList={handelNoteList} />)}
           </view>
           <view className='botton'>这是我的底线</view>
         </scroll-view>

src/pages/index/components/Customized/style.less

@@ -3,7 +3,7 @@
   height: 440px;
   position: relative;
   left: 0;
-  animation: CustomizedEntrance 2s ease-in infinite;
+  animation: CustomizedEntrance 3s ease infinite;
   animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
   background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/CustomizedEntrance.png")
     no-repeat;
@@ -17,7 +17,7 @@
 
   height: 100px;
   position: relative;
-  animation: MiniYellow 1.2s ease-in infinite;
+  animation: MiniYellow 2.2s ease infinite;
   animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
   // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniYellow.png")
   //   no-repeat;
@@ -33,7 +33,7 @@
   height: 250px;
   position: relative;
   left: 54px;
-  animation: BigPink 1.4s ease-in infinite;
+  animation: BigPink 2.4s ease infinite;
   animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
   // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigPink.png")
   //   no-repeat;
@@ -53,7 +53,7 @@
   position: relative;
   left: 0;
   top: -40px;
-  animation: LtineraryEntrance 3.5s ease-in-out infinite;
+  animation: LtineraryEntrance 3.5s ease-out infinite;
   animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
 
   background-size: 100% 100%;
@@ -66,7 +66,7 @@
   position: relative;
   left: 20px;
   z-index: -1;
-  animation: BigYellow 1.4s ease-in infinite;
+  animation: BigYellow 2.4s ease infinite;
   animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
   background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigYellow.png")
     no-repeat;
@@ -81,7 +81,7 @@
   position: relative;
   left: 0px;
   bottom: 20px;
-  animation: MiniPink 1.4s ease-in infinite;
+  animation: MiniPink 2.4s ease infinite;
   animation-iteration-count: infinite; /*动作循环的次数：infinite 无限循环*/
   // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniPink.png")
   //   no-repeat;

src/pages/index/components/NoteCard/index.jsx

@@ -18,7 +18,7 @@ export default (props) => {
 
   // const cls = useMemo(() => [className, 'contentCard', uqClass].filter(Boolean).join(' '), [className, uqClass])
 
-  const [isSaved, toggleSave] = useSave(item.isSaved, item.targetType, item.targetId)
+  const [isSaved, toggleSave] = useSave(item.isSaved, item.noteType, item.noteId)
   const Detail = () => {
 
     Taro.navigateTo({ url: `/pages/details/NoteDetails/index?id=${item.noteId}` });

src/pages/index/tabbar.js

@@ -6,7 +6,7 @@ const tabbar = [
     selectedIconPath: require('@/assets/icons/tabbar/recommend_active.png'),
   },
   {
-    text: '入住指引',
+    text: '我的指引',
     iconPath: require('@/assets/icons/tabbar/guide.png'),
     selectedIconPath: require('@/assets/icons/tabbar/guide_active.png'),
   },

src/pages/index/tabs/Guide.jsx

@@ -210,7 +210,10 @@ export default (props) => {
         <view className='Guide-Content-box'>
           <Customized />
         </view>
-        <Image mode='widthFix' style={{ width: '100%', position: 'relative', bottom: '-10vw' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
+        <view className='Guide-bottom-box'>
+          <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
+
+        </view>
       </view>
 
     </scroll-view>

src/pages/index/tabs/GuideCss/style.less

@@ -3,7 +3,8 @@
 .Guide-Home-box {
   width: 94%;
   margin: auto;
-
+  height: 95%;
+  position: relative;
   .room-box-info-ROOM {
     display: flex;
     padding: 10px;
@@ -306,7 +307,13 @@
       }
     }
   }
-    
+  .Guide-bottom-box {
+    width: 100%;
+    height: auto;
+    position: absolute;
+    bottom: 0px;
+  }
+
   //攻略卡片.
   .Raiders-box-one {
     margin-bottom: 60px;

src/pages/index/tabs/Mine.jsx

@@ -141,7 +141,7 @@ export default (props) => {
           <view className='Badge-box'>
             <view className='Badge-list' onClick={handleHomeLogo}>
               <image className='Badge-list-logo' src={HomeLogo} />
-              <text className='Badge-list-titme'> 入住指引</text>
+              <text className='Badge-list-titme'> 我的指引</text>
               <text className='Badge-list-gt'>&gt;</text>
             </view>
             <view className='Badge-list' onClick={handleTravel}>

src/pages/index/tabs/Recommend.jsx

@@ -118,11 +118,6 @@ export default (props) => {
             :
             <RecommendNote />
 
-
-
-
-
-
         }
 
       </view>

src/pages/search/search.jsx

@@ -51,18 +51,18 @@ export default withLayout((props) => {
           </View>
         </Picker>
         <View className='selector-box'>
-          <SearchBar placeholder='搜索景点/店铺' onBlur={onSearch} />
+          <SearchBar placeholder='搜索笔记' onBlur={onSearch} />
         </View>
 
       </View>
-      <View className='content'>
+      {/* <View className='content'>
         <View className='hotSearch'>热门搜索</View>
         <View className='hotSearchtip'>
           {
             (hotList || []).map((item) => <View onClick={() => hotSearch(item.word)}>{item.word}</View>)
           }
         </View>
-      </View>
+      </View> */}
     </View>
   )
 })

src/pages/searchResult/searchResult.jsx

@@ -58,7 +58,7 @@ export default withLayout((props) => {
       </view>
       <view className='index-container' style={{ display: 'flex', flexDirection: 'column' }}>
         <view className='search'>
-          <input className='searchInput' placeholder='搜索景点/店铺' disabled onClick={onSearch} />
+          <input className='searchInput' placeholder='搜索笔记' disabled onClick={onSearch} />
           <image className='searchicon' src={iconsearch} />
           <view className='lineSearch'></view>
         </view>

src/store/models/person.js

@@ -1,5 +1,5 @@
 import { useState } from "react"
-import Taro from '@tarojs/taro'
+import Taro, { stopDeviceMotionListening } from '@tarojs/taro'
 import { signIn, authPhone, authAvatar, toggleRole } from '@/services/person'
 
 export default () => {