帮我找房必选项

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxc96058d57e77f373",
+	"appid": "wxe44244d1a5ea3364",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,
@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/pages/index/addedValueService/index.jsx

@@ -4,6 +4,7 @@ import { Image, Slider, Textarea, ScrollView } from '@tarojs/components'
 import { fetch } from '@/utils/request'
 import { API_HELP_FIND_HOUSE_SUBMIT } from '@/constants/api'
 import { useSelector } from 'react-redux'
+import Taro from '@tarojs/taro'
 import './index.scss'
 import questions from './formData'
 import SubmitBuyHouseResult from '../helpToFindHouse/components/SubmitBuyHouseResult/index'
@@ -90,20 +91,34 @@ export default function AddedValueService () {
   }
 
   const NextStep = () => {
-    if (StepId < 4) {
-      setStepId(StepId + 1)
-    } else {
-      let Arr = [...FormData]
-      Arr.map((item) => {
-        if (item.type === 'checkboxs') {
-          item.options.map((subItem) => {
-            if (subItem.selected) {
-              item.result.push(subItem.name)
-            }
-          })
+    let Bool = true
+    let IndexArr = []
+    FormData.map((item, index) => {
+      if(index >= StepRange[0] && index < StepRange[1]) {
+        if(!!item.required && item.result === '') {
+          Bool = false
+          IndexArr.push(index)
         }
-      })
-      SubmitForm(Arr)
+      }
+    })
+    if(Bool) {
+      if (StepId < 4) {
+        setStepId(StepId + 1)
+      } else {
+        let Arr = [...FormData]
+        Arr.map((item) => {
+          if (item.type === 'checkboxs') {
+            item.options.map((subItem) => {
+              if (subItem.selected) {
+                item.result.push(subItem.name)
+              }
+            })
+          }
+        })
+        SubmitForm(Arr)
+      }
+    } else {
+      Taro.showToast({title: `请选择${FormData[IndexArr[0]].question}`, icon: 'none'})
     }
   }
 

src/pages/index/helpToFindHouse/components/BuyHouse/formData.js

@@ -3,9 +3,10 @@ const questions = [
     question: '你的购房预算是多少？',
     key: 'budget',
     type: 'range',
-    result: '300',
+    result: 300,
     resultId: null,
-    options: [100, 1000]
+    required: true,
+    options: [100, 2000]
   },
   {
     question: '你想购买的是新房还是二手房？',
@@ -13,6 +14,7 @@ const questions = [
     type: 'checkbox',
     result: '',
     resultId: null,
+    required: true,
     options: [
       { name: '新房', id: 1 },
       { name: '二手房', id: 2 },
@@ -50,6 +52,7 @@ const questions = [
     type: 'checkbox',
     result: '',
     resultId: null,
+    required: true,
     options: [
       { name: '刚需', id: 1 },
       { name: '结婚', id: 2 },
@@ -138,6 +141,7 @@ const questions = [
     type: 'checkbox',
     result: '',
     resultId: null,
+    required: true,
     options: [
       { name: '5年以内', id: 1 },
       { name: '10年以内', id: 2 },

src/pages/index/helpToFindHouse/components/BuyHouse/index.jsx

@@ -1,11 +1,12 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
 import { Image, Slider, Textarea } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import './index.scss'
 import questions from './formData'
 
 export default function BuyHouse (props) {
-  const { change = () => { }, toSubmit = () => { }, AreaInfo = {}, selectArea = () => {} } = props
+  const { change = () => { }, toSubmit = () => { }, AreaInfo = {}, selectArea = () => { } } = props
 
   const [FormData, setFormData] = useState(questions)
   const [StepId, setStepId] = useState(1)
@@ -52,10 +53,24 @@ export default function BuyHouse (props) {
   }
 
   const NextStep = () => {
-    if (StepId < 4) {
-      setStepId(StepId + 1)
+    let Bool = true
+    let IndexArr = []
+    FormData.map((item, index) => {
+      if (index >= StepRange[0] && index < StepRange[1]) {
+        if (!!item.required && item.result === '') {
+          Bool = false
+          IndexArr.push(index)
+        }
+      }
+    })
+    if (Bool) {
+      if (StepId < 4) {
+        setStepId(StepId + 1)
+      } else {
+        toSubmit(FormData)
+      }
     } else {
-      toSubmit(FormData)
+      Taro.showToast({ title: `请选择${FormData[IndexArr[0]].question}`, icon: 'none' })
     }
   }
 

src/pages/index/helpToFindHouse/components/HousePurchasing/formData.js

@@ -12,7 +12,7 @@ const questions = [
     type: 'range',
     result: '',
     resultId: null,
-    options: [100, 1000]
+    options: [100, 2000]
   },
   {
     question: '优先选择的房屋类型是？',

src/pages/index/helpToFindHouse/components/HousePurchasing/index.jsx

@@ -1,6 +1,7 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
 import { Image, Slider, Textarea } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import './index.scss'
 import questions from './formData'
 
@@ -47,10 +48,24 @@ export default function HousePurchasing (props) {
   }
 
   const NextStep = () => {
-    if (StepId < 1) {
-      setStepId(StepId + 1)
+    let Bool = true
+    let IndexArr = []
+    FormData.map((item, index) => {
+      if(index >= StepRange[0] && index < StepRange[1]) {
+        if(!!item.required && item.result === '') {
+          Bool = false
+          IndexArr.push(index)
+        }
+      }
+    })
+    if(Bool) {
+      if (StepId < 4) {
+        setStepId(StepId + 1)
+      } else {
+        toSubmit(FormData)
+      }
     } else {
-      toSubmit(FormData)
+      Taro.showToast({title: `请选择${FormData[IndexArr[0]].question}`, icon: 'none'})
     }
   }
 

src/pages/index/helpToFindHouse/components/RentingHouse/formData.js

@@ -5,7 +5,7 @@ const questions = [
     type: 'range',
     result: '',
     resultId: null,
-    options: [500, 4500]
+    options: [500, 20000]
   },
   {
     question: '你的租房偏好？',

src/pages/index/helpToFindHouse/components/RentingHouse/index.jsx

@@ -1,6 +1,7 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
 import { Image, Slider, Textarea } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import './index.scss'
 import questions from './formData'
 
@@ -57,20 +58,34 @@ export default function RentingHouse (props) {
   }
 
   const NextStep = () => {
-    if (StepId < 2) {
-      setStepId(StepId + 1)
-    } else {
-      let Arr = [...FormData]
-      Arr.map((item) => {
-        if (item.type === 'checkbox') {
-          item.options.map((subItem) => {
-            if (subItem.selected) {
-              item.result.push(subItem.name)
-            }
-          })
+    let Bool = true
+    let IndexArr = []
+    FormData.map((item, index) => {
+      if(index >= StepRange[0] && index < StepRange[1]) {
+        if(!!item.required && item.result === '') {
+          Bool = false
+          IndexArr.push(index)
         }
-      })
-      toSubmit(Arr)
+      }
+    })
+    if(Bool) {
+      if (StepId < 2) {
+        setStepId(StepId + 1)
+      } else {
+        let Arr = [...FormData]
+        Arr.map((item) => {
+          if (item.type === 'checkbox') {
+            item.options.map((subItem) => {
+              if (subItem.selected) {
+                item.result.push(subItem.name)
+              }
+            })
+          }
+        })
+        toSubmit(Arr)
+      }
+    } else {
+      Taro.showToast({title: `请选择${FormData[IndexArr[0]].question}`, icon: 'none'})
     }
   }