浏览代码

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

Your Name 3 年前
父节点
当前提交
a5cbb8ffc9
共有 30 个文件被更改,包括 94 次插入53 次删除
  1. 1
    1
      src/components/BottomMoadl/index.jsx
  2. 2
    2
      src/components/BottomMoadl/style.css
  3. 1
    1
      src/components/foodCards/CustomCard/index.jsx
  4. 1
    2
      src/components/foodCards/NoteCard/index.jsx
  5. 1
    1
      src/components/foodCards/RecommendedCard/index.jsx
  6. 1
    1
      src/components/foodCards/ShareCard/index.jsx
  7. 2
    2
      src/pages/MineUserAll/MyTravel/index.jsx
  8. 1
    1
      src/pages/RandomItinerary/ResultOver/index.jsx
  9. 5
    1
      src/pages/RandomItinerary/components/ConstellationCard/style.less
  10. 3
    1
      src/pages/RandomItinerary/components/FiveSenses/style.less
  11. 5
    2
      src/pages/RandomItinerary/components/GirlFriend/style.less
  12. 3
    1
      src/pages/RandomItinerary/components/Hand/style.less
  13. 3
    1
      src/pages/RandomItinerary/components/UFO/style.less
  14. 32
    12
      src/pages/Travel/Edit/index.jsx
  15. 0
    1
      src/pages/Travel/Edit/style.less
  16. 2
    0
      src/pages/Travel/customizedTravel/components/CustomDay/index.jsx
  17. 1
    0
      src/pages/Travel/customizedTravel/components/ThreeModel/index.jsx
  18. 1
    0
      src/pages/Travel/customizedTravel/components/TipModel/index.jsx
  19. 1
    0
      src/pages/Travel/customizedTravel/components/TwoModel/index.jsx
  20. 1
    1
      src/pages/details/NoteDetails/index.jsx
  21. 6
    6
      src/pages/index/components/Customized/style.less
  22. 1
    1
      src/pages/index/components/NoteCard/index.jsx
  23. 1
    1
      src/pages/index/tabbar.js
  24. 4
    1
      src/pages/index/tabs/Guide.jsx
  25. 9
    2
      src/pages/index/tabs/GuideCss/style.less
  26. 1
    1
      src/pages/index/tabs/Mine.jsx
  27. 0
    5
      src/pages/index/tabs/Recommend.jsx
  28. 3
    3
      src/pages/search/search.jsx
  29. 1
    1
      src/pages/searchResult/searchResult.jsx
  30. 1
    1
      src/store/models/person.js

+ 1
- 1
src/components/BottomMoadl/index.jsx 查看文件

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

+ 2
- 2
src/components/BottomMoadl/style.css 查看文件

@@ -1,5 +1,5 @@
1 1
 .wrapAnimate {
2
-  animation: wrapAnimate 0.5s ease-in-out forwards;
2
+  animation: wrapAnimate 0.2s ease forwards;
3 3
 }
4 4
 @keyframes wrapAnimate {
5 5
   0% {
@@ -9,7 +9,7 @@
9 9
   }
10 10
 }
11 11
 .wrapAnimateOut {
12
-  animation: wrapAnimateOut 0.4s ease-in-out forwards;
12
+  animation: wrapAnimateOut 0.4s ease forwards;
13 13
 }
14 14
 @keyframes wrapAnimateOut {
15 15
   0% {

+ 1
- 1
src/components/foodCards/CustomCard/index.jsx 查看文件

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

+ 1
- 2
src/components/foodCards/NoteCard/index.jsx 查看文件

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

+ 1
- 1
src/components/foodCards/RecommendedCard/index.jsx 查看文件

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

+ 1
- 1
src/components/foodCards/ShareCard/index.jsx 查看文件

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

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

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

+ 1
- 1
src/pages/RandomItinerary/ResultOver/index.jsx 查看文件

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

+ 5
- 1
src/pages/RandomItinerary/components/ConstellationCard/style.less 查看文件

@@ -18,9 +18,13 @@
18 18
     .RC-box-image {
19 19
       width: 160px;
20 20
       height: 190px;
21
-      filter: grayscale(100%);
21
+
22
+      filter: grayscale(95%);
23
+      opacity: 0.6;
22 24
     }
23 25
     .imageLess {
26
+      opacity: 1;
27
+      opacity: 1;
24 28
       filter: grayscale(0%);
25 29
     }
26 30
   }

+ 3
- 1
src/pages/RandomItinerary/components/FiveSenses/style.less 查看文件

@@ -19,9 +19,11 @@
19 19
       height: 190px;
20 20
       padding-left: 10px;
21 21
 
22
-      filter: grayscale(100%);
22
+      filter: grayscale(95%);
23
+      opacity: 0.6;
23 24
     }
24 25
     .Five-imageLess {
26
+      opacity: 1;
25 27
       filter: grayscale(0%);
26 28
     }
27 29
   }

+ 5
- 2
src/pages/RandomItinerary/components/GirlFriend/style.less 查看文件

@@ -21,7 +21,8 @@
21 21
       position: relative;
22 22
       bottom: -22px;
23 23
       left: 90px;
24
-      filter: grayscale(100%);
24
+      filter: grayscale(95%);
25
+      opacity: 0.6;
25 26
     }
26 27
     .imageTwo {
27 28
       height: 420px;
@@ -29,10 +30,12 @@
29 30
       position: relative;
30 31
       left: 0em;
31 32
       bottom: 45px;
32
-      filter: grayscale(100%);
33
+      filter: grayscale(95%);
34
+      opacity: 0.6;
33 35
     }
34 36
 
35 37
     .Girl-imageLess {
38
+      opacity: 1;
36 39
       filter: grayscale(0%);
37 40
     }
38 41
   }

+ 3
- 1
src/pages/RandomItinerary/components/Hand/style.less 查看文件

@@ -21,9 +21,11 @@
21 21
       position: relative;
22 22
       bottom: -10px;
23 23
       left: 90px;
24
-      filter: grayscale(100%);
24
+      filter: grayscale(95%);
25
+      opacity: 0.6;
25 26
     }
26 27
     .Hand-imageLess {
28
+      opacity: 1;
27 29
       filter: grayscale(0%);
28 30
     }
29 31
   }

+ 3
- 1
src/pages/RandomItinerary/components/UFO/style.less 查看文件

@@ -18,9 +18,11 @@
18 18
       width: 160px;
19 19
       height: 190px;
20 20
       padding-left: 10px;
21
-      filter: grayscale(100%);
21
+      filter: grayscale(95%);
22
+      opacity: 0.6;
22 23
     }
23 24
     .UFO-imageLess {
25
+      opacity: 1;
24 26
       filter: grayscale(0%);
25 27
     }
26 28
   }

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

@@ -22,7 +22,9 @@ export default withLayout((props) => {
22 22
   const { id, dayNum } = router.params
23 23
 
24 24
 
25
+
25 26
   const [loading, setLoading] = useState(false)
27
+  const [bottomDayNum, setBottomDayNum] = useState(true)
26 28
 
27 29
 
28 30
 
@@ -48,14 +50,14 @@ export default withLayout((props) => {
48 50
 
49 51
   const [dayNumber, setDayNumber] = useState(1)
50 52
   const sum = dayNum - dayNumber
53
+  const [state, setstate] = useState(true)
51 54
 
52 55
 
53 56
   const addTextSum = () => {
54 57
     setDayNumber(dayNumber + 1)
55
-    if (dayNumber > dayNum) {
56 58
 
57
-    } else {
58
-      console.log('98888888');
59
+    if (dayNumber == 1) {
60
+      setstate(false)
59 61
     }
60 62
 
61 63
 
@@ -63,6 +65,10 @@ export default withLayout((props) => {
63 65
   }
64 66
   const minusTextSum = () => {
65 67
     setDayNumber(dayNumber - 1)
68
+    if (dayNumber == 2) {
69
+      setstate(true)
70
+
71
+    }
66 72
 
67 73
 
68 74
   }
@@ -97,6 +103,12 @@ export default withLayout((props) => {
97 103
   }
98 104
 
99 105
   useEffect(() => {
106
+    if (dayNum == 1) {
107
+      setBottomDayNum(false)
108
+    } else {
109
+      setBottomDayNum(true)
110
+
111
+    }
100 112
 
101 113
     setLoading(true)
102 114
 
@@ -191,7 +203,7 @@ export default withLayout((props) => {
191 203
                 {
192 204
                   showCutover.map((item, index) =>
193 205
 
194
-                    <CustomCard key={index} item={item} det={item} travelId={item.travelId} onDelete={onDelete} />
206
+                    <CustomCard key={index} item={item} det={item} editable='1' travelId={item.travelId} onDelete={onDelete} />
195 207
 
196 208
                   )
197 209
                 }
@@ -204,15 +216,23 @@ export default withLayout((props) => {
204 216
             <Image src={Travel}></Image>
205 217
             <Text>查看行程推荐</Text>
206 218
           </View>
207
-          <View className='bottom'>
208
-            {
209
-              dayNumber >= dayNum && <Button className='bottom-btn bottom-btn-cancel' onClick={minusTextSum} >上一天</Button>
210
-            }
211
-            {
212
-              sum >= 1 && <Button className='bottom-btn bottom-btn-ok' onClick={addTextSum}>下一天</Button>
213
-            }
214 219
 
215
-          </View>
220
+
221
+          {
222
+            bottomDayNum &&
223
+            <View className='bottom'>
224
+              {
225
+
226
+                // dayNumber >= dayNum && <Button className='bottom-btn bottom-btn-cancel' onClick={minusTextSum} >上一天</Button>
227
+                state === false && <Button className='bottom-btn bottom-btn-cancel' onClick={minusTextSum} >上一天</Button>
228
+              }
229
+              {
230
+                sum >= 1 && <Button className='bottom-btn bottom-btn-ok' onClick={addTextSum}>下一天</Button>
231
+              }
232
+
233
+            </View>
234
+          }
235
+
216 236
 
217 237
         </scroll-view>
218 238
       </View >

+ 0
- 1
src/pages/Travel/Edit/style.less 查看文件

@@ -49,7 +49,6 @@
49 49
 
50 50
       &:nth-child(2) {
51 51
         margin-left: 4em;
52
-        margin-bottom: 2em;
53 52
       }
54 53
     }
55 54
 

+ 2
- 0
src/pages/Travel/customizedTravel/components/CustomDay/index.jsx 查看文件

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

+ 1
- 0
src/pages/Travel/customizedTravel/components/ThreeModel/index.jsx 查看文件

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

+ 1
- 0
src/pages/Travel/customizedTravel/components/TipModel/index.jsx 查看文件

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

+ 1
- 0
src/pages/Travel/customizedTravel/components/TwoModel/index.jsx 查看文件

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

+ 1
- 1
src/pages/details/NoteDetails/index.jsx 查看文件

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

+ 6
- 6
src/pages/index/components/Customized/style.less 查看文件

@@ -3,7 +3,7 @@
3 3
   height: 440px;
4 4
   position: relative;
5 5
   left: 0;
6
-  animation: CustomizedEntrance 2s ease-in infinite;
6
+  animation: CustomizedEntrance 3s ease infinite;
7 7
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
8 8
   background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/CustomizedEntrance.png")
9 9
     no-repeat;
@@ -17,7 +17,7 @@
17 17
 
18 18
   height: 100px;
19 19
   position: relative;
20
-  animation: MiniYellow 1.2s ease-in infinite;
20
+  animation: MiniYellow 2.2s ease infinite;
21 21
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
22 22
   // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniYellow.png")
23 23
   //   no-repeat;
@@ -33,7 +33,7 @@
33 33
   height: 250px;
34 34
   position: relative;
35 35
   left: 54px;
36
-  animation: BigPink 1.4s ease-in infinite;
36
+  animation: BigPink 2.4s ease infinite;
37 37
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
38 38
   // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigPink.png")
39 39
   //   no-repeat;
@@ -53,7 +53,7 @@
53 53
   position: relative;
54 54
   left: 0;
55 55
   top: -40px;
56
-  animation: LtineraryEntrance 3.5s ease-in-out infinite;
56
+  animation: LtineraryEntrance 3.5s ease-out infinite;
57 57
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
58 58
 
59 59
   background-size: 100% 100%;
@@ -66,7 +66,7 @@
66 66
   position: relative;
67 67
   left: 20px;
68 68
   z-index: -1;
69
-  animation: BigYellow 1.4s ease-in infinite;
69
+  animation: BigYellow 2.4s ease infinite;
70 70
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
71 71
   background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/BigYellow.png")
72 72
     no-repeat;
@@ -81,7 +81,7 @@
81 81
   position: relative;
82 82
   left: 0px;
83 83
   bottom: 20px;
84
-  animation: MiniPink 1.4s ease-in infinite;
84
+  animation: MiniPink 2.4s ease infinite;
85 85
   animation-iteration-count: infinite; /*动作循环的次数:infinite 无限循环*/
86 86
   // background: url("https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/GuideCheck/MiniPink.png")
87 87
   //   no-repeat;

+ 1
- 1
src/pages/index/components/NoteCard/index.jsx 查看文件

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

+ 1
- 1
src/pages/index/tabbar.js 查看文件

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

+ 4
- 1
src/pages/index/tabs/Guide.jsx 查看文件

@@ -210,7 +210,10 @@ export default (props) => {
210 210
         <view className='Guide-Content-box'>
211 211
           <Customized />
212 212
         </view>
213
-        <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} />
213
+        <view className='Guide-bottom-box'>
214
+          <Image mode='widthFix' style={{ width: '100%' }} src='http://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/hotel_guide_help.png' onClick={goIndex} />
215
+
216
+        </view>
214 217
       </view>
215 218
 
216 219
     </scroll-view>

+ 9
- 2
src/pages/index/tabs/GuideCss/style.less 查看文件

@@ -3,7 +3,8 @@
3 3
 .Guide-Home-box {
4 4
   width: 94%;
5 5
   margin: auto;
6
-
6
+  height: 95%;
7
+  position: relative;
7 8
   .room-box-info-ROOM {
8 9
     display: flex;
9 10
     padding: 10px;
@@ -306,7 +307,13 @@
306 307
       }
307 308
     }
308 309
   }
309
-    
310
+  .Guide-bottom-box {
311
+    width: 100%;
312
+    height: auto;
313
+    position: absolute;
314
+    bottom: 0px;
315
+  }
316
+
310 317
   //攻略卡片.
311 318
   .Raiders-box-one {
312 319
     margin-bottom: 60px;

+ 1
- 1
src/pages/index/tabs/Mine.jsx 查看文件

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

+ 0
- 5
src/pages/index/tabs/Recommend.jsx 查看文件

@@ -118,11 +118,6 @@ export default (props) => {
118 118
             :
119 119
             <RecommendNote />
120 120
 
121
-
122
-
123
-
124
-
125
-
126 121
         }
127 122
 
128 123
       </view>

+ 3
- 3
src/pages/search/search.jsx 查看文件

@@ -51,18 +51,18 @@ export default withLayout((props) => {
51 51
           </View>
52 52
         </Picker>
53 53
         <View className='selector-box'>
54
-          <SearchBar placeholder='搜索景点/店铺' onBlur={onSearch} />
54
+          <SearchBar placeholder='搜索笔记' onBlur={onSearch} />
55 55
         </View>
56 56
 
57 57
       </View>
58
-      <View className='content'>
58
+      {/* <View className='content'>
59 59
         <View className='hotSearch'>热门搜索</View>
60 60
         <View className='hotSearchtip'>
61 61
           {
62 62
             (hotList || []).map((item) => <View onClick={() => hotSearch(item.word)}>{item.word}</View>)
63 63
           }
64 64
         </View>
65
-      </View>
65
+      </View> */}
66 66
     </View>
67 67
   )
68 68
 })

+ 1
- 1
src/pages/searchResult/searchResult.jsx 查看文件

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

+ 1
- 1
src/store/models/person.js 查看文件

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