.

src/pages/RandomItinerary/components/ConstellationCard/index.jsx

@@ -1,18 +1,11 @@
 import Taro from "@tarojs/taro"
-import { Icon, View } from "@tarojs/components"
-import { useEffect, useState } from "react"
-import CustomNav from '@/components/CustomNav'
-import withLayout from '@/layouts'
-
-
+import { View,Text,Image } from "@tarojs/components"
+import React, { useState } from "react"
 import './style.less'
 
-
-
-
-
 export default (props) => {
   const { ico, textNext, onSelected, nextQuestio } = props
+  // nextQuestio进入下一题
   const [netxIma, setNetxIma] = useState(false)
 
   const Ari = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/ConstelPhoto/Ari.png'
@@ -42,35 +35,30 @@ export default (props) => {
         moon: '04.20-05.20',
         ico: Tau,
         active: false
-
       },
       {
         title: '双子座',
         moon: '05.21-06.21',
         ico: Gem,
         active: false
-
       },
       {
         title: '巨蟹座',
         moon: '06.22-07.22',
         ico: Cnc,
         active: false
-
       },
       {
         title: '狮子座',
         moon: '07.23-08.22',
         ico: Leo,
         active: false
-
       },
       {
         title: '处女座',
         moon: '08.23-09.22',
         ico: Vir,
         active: false
-
       },
     ]
   )
@@ -81,75 +69,55 @@ export default (props) => {
         moon: '09.23-10.23',
         ico: Lib,
         active: false
-
       },
       {
         title: '天蝎座',
         moon: '10.24-11.22',
         ico: Sco,
         active: false
-
       },
       {
         title: '射手座',
         moon: '11.23-12.21',
         ico: Sgr,
         active: false
-
       },
       {
         title: '摩羯座',
         moon: '12.22-01.19',
         ico: Cap,
         active: false
-
       },
       {
         title: '水瓶座',
         moon: '01.20-02.18',
         ico: Agr,
         active: false
-
       },
       {
         title: '双鱼座',
         moon: '02.19-03.20',
         ico: Psc,
         active: false
-
       },
     ]
   )
 
-
-
-  const handleTextNext = () => {
-    setNetxIma(!netxIma)
-  }
-
   //第一组
   const handleFilter = (e) => {
     onSelected()
     setTimeout(() => {
       nextQuestio()
-
     }, 500);
     const res = filterImage.map((item, inx) => {
       if (item.title == e.title) {
-
         item.active = true
-
       } else {
-
         item.active = false
       }
       return item
-
     })
     setFilterImage(res)
-
-
-
   }
 
   //第二组
@@ -157,7 +125,6 @@ export default (props) => {
     nextQuestio()
     setTimeout(() => {
       nextQuestio()
-
     }, 500);
 
     const res = twoImage.map((item, inx) => {
@@ -174,73 +141,50 @@ export default (props) => {
 
     })
     setTwoImage(res)
-
-
   }
 
-
-
-
-
-
-
-
-
-
-
-
   return (
     <View >
       <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;margin-bottom: 1em;'>
-        1<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>你是什么星座的？
+        1<Text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </Text>你是什么星座的？
       </View>
       {
         netxIma === false ? filterImage.map((item, index) =>
-          <view className='Random-Conste-box' key={index} onClick={() => handleFilter(item)} >
+          <View className='Random-Conste-box' key={index} onClick={() => handleFilter(item)} >
             <View className='RC-box-imageContent'>
-              <image className={`RC-box-image ${item.active && 'imageLess'}`} src={item.ico} />
+              <Image className={`RC-box-image ${item.active && 'imageLess'}`} src={item.ico} />
             </View>
-            <view className='RC-box-content' >
+            <View className='RC-box-content' >
               <View className='RC-box-C-title' >
                 {item.title}
               </View>
               <View className='RC-box-C-moon' >
                 {item.moon}
               </View>
-            </view>
-
-          </view>
-
+            </View>
+          </View>
         )
           :
           twoImage.map((item, index) =>
-            <view className='Random-Conste-box' key={index} onClick={() => handleTwoFilter(item)} >
+            <View className='Random-Conste-box' key={index} onClick={() => handleTwoFilter(item)} >
               <View className='RC-box-imageContent'>
-                <image className={`RC-box-image ${item.active && 'imageLess'}`} src={item.ico} />
-
+                <Image className={`RC-box-image ${item.active && 'imageLess'}`} src={item.ico} />
               </View>
-              <view className='RC-box-content' >
+              <View className='RC-box-content' >
                 <View className='RC-box-C-title' >
                   {item.title}
                 </View>
                 <View className='RC-box-C-moon' >
                   {item.moon}
                 </View>
-              </view>
-
-            </view>
-
+              </View>
+            </View>
           )
-
       }
-
-      <view className='bottom-text' onClick={handleTextNext}>
-        <image className='btn-image' src={ico} />
-        <text className='btn-text' >{textNext}</text>
-      </view>
-
+      <View className='bottom-text' onClick={()=>setNetxIma(!netxIma)}>
+        <Image className='btn-image' src={ico} />
+        <Text className='btn-text' >{textNext}</Text>
+      </View>
     </View>
-
-
   )
 }

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

@@ -54,7 +54,6 @@
 
 .bottom-text {
   margin-left: 40%;
-  margin-top: -2em;
   width: 100%;
   padding: 0.5em 0 2em 0;
   display: flex;

src/pages/RandomItinerary/components/FiveSenses/index.jsx

@@ -1,9 +1,6 @@
 import Taro from "@tarojs/taro"
-import { Icon, View } from "@tarojs/components"
-import { useEffect, useState } from "react"
-import CustomNav from '@/components/CustomNav'
-import withLayout from '@/layouts'
-
+import { View,Image,Text } from "@tarojs/components"
+import {  useState } from "react"
 import './style.less'
 
 const ear = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/ear.png'
@@ -15,8 +12,6 @@ const mouth = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomII
 export default (props) => {
   const { ico, textNext, onSelected, nextQuestio } = props
 
-
-  const [netxIma, setNetxIma] = useState(false)
   const [oneImage, setOneImage] = useState([
     {
       title: '眉毛',
@@ -43,12 +38,10 @@ export default (props) => {
       ico: ear,
       active: false
     },
-
   ])
 
   const handleTextNext = (e) => {
     onSelected()
-
     const res = oneImage.map((item, inx) => {
 
       if (item.title == e.title) {
@@ -67,47 +60,29 @@ export default (props) => {
       nextQuestio()
 
     }, 500);
-
   }
 
-
-
-
-
-
-
   return (
     <View >
       <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;;marginLeft:10px;'>
-        4<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>现在开始想你的一个五官，你想到的是？
+        4<Text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </Text>现在开始想你的一个五官，你想到的是？
       </View>
       {
         oneImage.map((item, index) =>
-          <view className='Five-Conste-box' key={index} onClick={() => handleTextNext(item)}>
+          <View className='Five-Conste-box' key={index} onClick={() => handleTextNext(item)}>
             <View className='Five-box-imageContent'>
-              <image className={`Five-box-image ${item.active && 'Five-imageLess'}`} src={item.ico} />
-
+              <Image className={`Five-box-image ${item.active && 'Five-imageLess'}`} src={item.ico} />
             </View>
-            <view className='Five-box-content' >
+            <View className='Five-box-content' >
               <View className='Five-box-C-title' >
                 {item.title}
               </View>
               <View className='Five-box-C-moon' >
               </View>
-            </view>
-
-          </view>
-
+            </View>
+          </View>
         )
-
-
-
-
       }
-
-
     </View>
-
-
   )
 }

src/pages/RandomItinerary/components/GirlFriend/index.jsx

@@ -1,8 +1,6 @@
 import Taro from "@tarojs/taro"
-import { Icon, View } from "@tarojs/components"
-import { useEffect, useState } from "react"
-import CustomNav from '@/components/CustomNav'
-import withLayout from '@/layouts'
+import { View,Image,Text } from "@tarojs/components"
+import { useState } from "react"
 
 
 import './style.less'
@@ -23,70 +21,49 @@ export default (props) => {
     onSelected()
     setTimeout(() => {
       nextQuestio()
-
     }, 500);
-
   }
 
-
   const handleNo = () => {
     setImageOne(false)
     setImageTow(true)
     onSelected()//未选择不给到下一题
     setTimeout(() => {
       nextQuestio()
-
     }, 500);
-
   }
 
-
-
-
-
   return (
     <View >
       <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;;'>
-        2<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>你是单身吗？
+        2<Text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </Text>你是单身吗？
       </View>
-
-
-      <view className='Girl-Conste-box' onClick={handleYES}  >
+      <View className='Girl-Conste-box' onClick={handleYES}  >
         <View className='Girl-box-imageContent'>
-          <image className={`Girl-box-image  imageTwo ${imageOne && 'Girl-imageLess'} `} src={YES} />
-
+          <Image className={`Girl-box-image  imageTwo ${imageOne && 'Girl-imageLess'} `} src={YES} />
         </View>
-        <view className='Girl-box-content' >
+        <View className='Girl-box-content' >
           <View className='Girl-box-C-title' >
             YES
           </View>
           <View className='Girl-box-C-moon' >
             是
           </View>
-        </view>
-
-      </view>
-
-      <view className='Girl-Conste-box' onClick={handleNo} >
+        </View>
+      </View>
+      <View className='Girl-Conste-box' onClick={handleNo} >
         <View className='Girl-box-imageContent'>
-          <image className={`Girl-box-image ${imageTow && 'Girl-imageLess'} `} src={No} />
+          <Image className={`Girl-box-image ${imageTow && 'Girl-imageLess'} `} src={No} />
         </View>
-        <view className='Girl-box-content' >
+        <View className='Girl-box-content' >
           <View className='Girl-box-C-title' >
             No
           </View>
           <View className='Girl-box-C-moon' >
             否
           </View>
-        </view>
-
-      </view>
-
-
-
-
+        </View>
+      </View>
     </View>
-
-
   )
 }

src/pages/RandomItinerary/components/Hand/index.jsx

@@ -1,11 +1,6 @@
 import Taro from "@tarojs/taro"
-import { Icon, View } from "@tarojs/components"
-import { useEffect, useState } from "react"
-import CustomNav from '@/components/CustomNav'
-import withLayout from '@/layouts'
-
-
-
+import { Image, View,Text } from "@tarojs/components"
+import {  useState } from "react"
 import './style.less'
 
 
@@ -23,66 +18,49 @@ export default (props) => {
     onSelected()
     setTimeout(() => {
       nextQuestio()
-
     }, 500);
   }
 
-
   const handleRightHand = () => {
     setImageOne(false)
     setImageTow(true)
     onSelected()
     setTimeout(() => {
       nextQuestio()
-
     }, 500);
   }
 
-
-
   return (
     <View >
       <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;;'>
-        3<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>双手交叉相握，你是拇指在上还是右手拇指在上？
+        3<Text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </Text>双手交叉相握，你是拇指在上还是右手拇指在上？
       </View>
-
-
-      <view className='Hand-Conste-box' onClick={handleLeftHand} >
+      <View className='Hand-Conste-box' onClick={handleLeftHand} >
         <View className='Hand-box-imageContent'>
-          <image className={`Hand-box-image  ${imageOne && 'Hand-imageLess'} `} src={LeftHand} />
+          <Image className={`Hand-box-image  ${imageOne && 'Hand-imageLess'} `} src={LeftHand} />
         </View>
-        <view className='Hand-box-content' >
+        <View className='Hand-box-content' >
           <View className='Hand-box-C-title' >
             Head
           </View>
           <View className='Hand-box-C-moon' >
             左手
           </View>
-        </view>
-
-      </view>
-
-      <view className='Hand-Conste-box' onClick={handleRightHand} >
+        </View>
+      </View>
+      <View className='Hand-Conste-box' onClick={handleRightHand} >
         <View className='Hand-box-imageContent'>
-          <image className={`Hand-box-image  ${imageTow && 'Hand-imageLess'} `} src={RightHand} />
-
+          <Image className={`Hand-box-image  ${imageTow && 'Hand-imageLess'} `} src={RightHand} />
         </View>
-        <view className='Hand-box-content' >
+        <View className='Hand-box-content' >
           <View className='Hand-box-C-title' >
             Right
           </View>
           <View className='Hand-box-C-moon' >
             右手
           </View>
-        </view>
-
-      </view>
-
-
-
-
+        </View>
+      </View>
     </View>
-
-
   )
 }

src/pages/RandomItinerary/components/ResultOver/index.jsx

@@ -1,38 +0,0 @@
-import Taro from "@tarojs/taro"
-import { Text, View } from "@tarojs/components"
-import { useEffect, useState } from "react"
-
-import './style.less'
-
-
-export default (props) => {
-  const { ico, textNext } = props
-  const ShowOver = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/ShowOver.png'
-
-
-
-
-  return (
-    <View className='Over-box'>
-
-      <View className='Over-index-box' >
-        <image className='OI-image' src={ShowOver} />
-        <View className='OI-text-box'>
-          <Text className='OI-text'>
-            整体运势或有起伏的情况，需要做好各方面的平衡避免有故此彼伏的情况。 你要学会自己衡量得失利弊，但时间不够用的时候就要面临个人的
-          </Text>
-          <Text className='OI-text'>
-            未必就是走的人多的路就是对，你可以保持自己的想法。
-          </Text>
-          <Text className='OI-text'>
-            南京对于你而言是梦想中的地方，你的命定行程适合阳光、梦幻的地方。结合你的回答你的命定行程如下：
-          </Text>
-          <View className='bottom-text'>》</View>
-        </View>
-
-      </View>
-      <View className='content'>分享并邀请好友点开查看完整命定行程</View>
-    </View>
-
-  )
-}

src/pages/RandomItinerary/components/UFO/index.jsx

@@ -1,19 +1,11 @@
 import Taro from "@tarojs/taro"
-import { Icon, View } from "@tarojs/components"
-import { useEffect, useState } from "react"
-import CustomNav from '@/components/CustomNav'
-import withLayout from '@/layouts'
-
-
-
-
+import {Image, Text, View } from "@tarojs/components"
+import {  useState } from "react"
 import './style.less'
 
 
 export default (props) => {
   const { ico, onSelected, handleGoTo } = props
-  const [netxIma, setNetxIma] = useState(false)
-
   const MaJiang = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/MaJiang.png'
   const hello = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/hello.png'
   const WeChat = 'https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/RandomIIcon/WeChat.png'
@@ -31,37 +23,27 @@ export default (props) => {
       title: '打招呼',
       ico: hello,
       active: false
-
     },
     {
       title: '加微信',
       ico: WeChat,
       active: false
-
     },
     {
       title: '报警',
       ico: police,
       active: false
-
     },
     {
       title: '逃跑',
       ico: RunAway,
       active: false
-
     },
-
-  ]
-
-  )
-
-
+  ])
 
   const handleTexUfo = (e) => {
     onSelected()
     const res = ufoImage.map((item, inx) => {
-
       if (item.title == e.title) {
 
         item.active = true
@@ -76,45 +58,31 @@ export default (props) => {
     setUfoImage(res)
     setTimeout(() => {
       handleGoTo()
-
     }, 500);
-
-
   }
 
 
   return (
     <View >
       <View style='font-size: 20px;font-weight: bold;color: #140F0F;marginLeft:10px;;marginLeft:10px;'>
-        5<text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </text>当你看到外星人是第一时间会做什么？
+        5<Text style='font-size: 13px;font-weight: bold;color: #140F0F;'> / 5 </Text>当你看到外星人是第一时间会做什么？
       </View>
       {
         ufoImage.map((item, index) =>
-          <view className='UFO-Conste-box' key={index} onClick={() => handleTexUfo(item)}>
+          <View className='UFO-Conste-box' key={index} onClick={() => handleTexUfo(item)}>
             <View className='UFO-box-imageContent'>
-              <image className={`UFO-box-image ${item.active && 'UFO-imageLess'}`} src={item.ico} />
-
+              <Image className={`UFO-box-image ${item.active && 'UFO-imageLess'}`} src={item.ico} />
             </View>
-            <view className='UFO-box-content' >
+            <View className='UFO-box-content' >
               <View className='UFO-box-C-title' >
                 {item.title}
               </View>
               <View className='UFO-box-C-moon' >
               </View>
-            </view>
-
-          </view>
-
+            </View>
+          </View>
         )
-
-
-
-
       }
-
-
     </View>
-
-
   )
 }

src/pages/RandomItinerary/index.jsx

@@ -12,8 +12,6 @@ import Hand from "./components/Hand"//左右手
 import UFO from "./components/UFO"//不明飞行物
 import './style.less'
 
-
-
 export default withLayout((props) => {
   const { router, person } = props
   const [show, setShow] = useState(1)
@@ -26,7 +24,6 @@ export default withLayout((props) => {
     setI(true)
   }
 
-
   const handleGoTo = () => {
     if (show >= 5) {
       if (i === false) {
@@ -35,20 +32,12 @@ export default withLayout((props) => {
           icon: 'none',
           duration: 2000
         })
-
       } else {
         setI(false)
         seaveTravelDestiny().then(e => {
-
           Taro.navigateTo({ url: `/pages/RandomItinerary/ResultOver/index` })
-
         })
-
       }
-
-
-
-
     } else {
       if (i === false) {
         Taro.showToast({
@@ -56,22 +45,15 @@ export default withLayout((props) => {
           icon: 'none',
           duration: 2000
         })
-
       } else {
         setShow(show + 1)
         setI(false)
-
       }
-
     }
-
   }
   //选择题目即下一题
   const nextQuestio = () => setShow(show + 1)
 
-
-
-
   return (
     <view className='page-index'>
       <view className='index-navbar'>