bug fix

config/dev.js

@@ -5,14 +5,14 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST: '"https://dev.pawoma.cn"',//测试
-    WSS_HOST: '"wss://dev.pawoma.cn"',
+    // HOST: '"https://dev.pawoma.cn"',//测试
+    // WSS_HOST: '"wss://dev.pawoma.cn"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://127.0.0.1:8080"',
-    // WSS_HOST: '"ws://127.0.0.1:8080"',
+    HOST: '"http://192.168.2.52:8080"',
+    WSS_HOST: '"ws://192.168.2.52:8080"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
     Version: 'V3.5.12'

src/constants/api.js

@@ -59,6 +59,7 @@ export const API_INDEX_ICONS = resolvePath('taMiniappOrgIcon')
 
 export const API_HOUSE_LIST = resolvePath('listHousingResources')
 export const API_PRESELECTION_RECORD = resolvePath('listPreselectionRecord')
+export const API_RAISE_CHECK = resolvePath('check/raise')
 export const API_RAISE_PROFILE = resolvePath('taRaise')
 export const API_SAVE_RAISE_RECORD = resolvePath('taRaiseRecord')
 export const API_RATSE_RECORD = resolvePath('taRaiseRecord/list')

src/onlineSelling/pages/detail/index.js

@@ -12,6 +12,7 @@ import * as noticeType from '@/constants/common.js'
 import Statement from '../../components/Statement'
 import { View } from '@tarojs/components'
 import * as houseActions from '@/actions/house'
+import { checkRaise } from '@/services/house'
 
 @connect(
   ({ user, house }) => ({ ...user, house }),
@@ -148,9 +149,10 @@ export default class Index extends Component {
       return;
     }
 
-
-    this.props.dispatchAddCart(detail)
-    Taro.navigateTo({ url: `/onlineSelling/pages/raiseMoney/index?houseId=${detail.houseId}&salesBatchId=${detail.salesBatchId}` })
+    checkRaise([detail.houseId]).then(() => {
+      this.props.dispatchAddCart(detail)
+      Taro.navigateTo({ url: `/onlineSelling/pages/raiseMoney/index?houseId=${detail.houseId}&salesBatchId=${detail.salesBatchId}` })
+    })
   }
 
 

src/onlineSelling/pages/raiseMoney/index.js

@@ -13,6 +13,7 @@ import { fetch, apis } from '@/utils/request'
 import Captcha from './Captcha'
 import { raiseOrder, cancelOrder, queryPreselectionRecord } from '@/services/project'
 import { getCodeMessage, checkCaptcha } from '@/services/getCode'
+import { checkRaise } from '@/services/house'
 import { checkIDCard, isEmpty } from '@/utils/tools'
 import ContactConsultant from '../../components/ContactConsultant'
 import RadioList from './RadioList'
@@ -218,8 +219,8 @@ export default class raiseMoney extends Component {
   }
   renderHouse() {
     const { house: { raiseCart } } = this.props
-    const { raiseProfile = {} } = this.state
-    const disabled = raiseProfile.houseLockingType === 'auto'
+    const { raiseProfile = {}, record } = this.state
+    const disabled = raiseProfile.houseLockingType === 'auto' || !!record.raiseRecordId
 
     return (
       <ScrollView scrollY className="container">
@@ -451,8 +452,8 @@ export default class raiseMoney extends Component {
     )
   }
 
-  checkRaise = () => {
-    const { record, raiseProfile, preselectList } = this.state
+  validRaise = () => {
+    // const { record, raiseProfile, preselectList } = this.state
     const { house } = this.props
 
     // 当前选中房源
@@ -463,36 +464,40 @@ export default class raiseMoney extends Component {
       return Promise.reject()
     }
 
-    // 如果要求预选, 预先房源跟当前列表必须一致
-    if (raiseProfile.needPreselection) {
-      for (let i in houseList) {
-        const exists = preselectList.filter(x => x.houseId === houseList[i].houseId)[0]
-        if (!exists) {
-          Taro.showToast({ title: '需要先预选才能认筹', icon: 'none' })
-          return Promise.reject()
-        }
-      }
-    }
-
-    if (record.raiseRecordId) {
-      // 如果认筹单跟预选的房源不一致, 说明是新的认筹
-      let found = true
-      for (let inx in houseList) {
-        const has = (record.taHousingResourcesList || []).filter(x => x.houseId == houseList[inx].houseId)[0]
-
-        if (!has) {
-          found = false;
-          break;
-        }
-      }
-
-      if (!found) {
-        const defaultRecord = this.initRecord()
-        this.setState({ record: defaultRecord })
-      }
-    }
+    return new Promise((resolve, reject) => {
+      checkRaise(houseList).then(resolve).catch(reject)
+    })
 
-    return Promise.resolve()
+    // // 如果要求预选, 预先房源跟当前列表必须一致
+    // if (raiseProfile.needPreselection) {
+    //   for (let i in houseList) {
+    //     const exists = preselectList.filter(x => x.houseId === houseList[i].houseId)[0]
+    //     if (!exists) {
+    //       Taro.showToast({ title: '需要先预选才能认筹', icon: 'none' })
+    //       return Promise.reject()
+    //     }
+    //   }
+    // }
+
+    // if (record.raiseRecordId) {
+    //   // 如果认筹单跟预选的房源不一致, 说明是新的认筹
+    //   let found = true
+    //   for (let inx in houseList) {
+    //     const has = (record.taHousingResourcesList || []).filter(x => x.houseId == houseList[inx].houseId)[0]
+
+    //     if (!has) {
+    //       found = false;
+    //       break;
+    //     }
+    //   }
+
+    //   if (!found) {
+    //     const defaultRecord = this.initRecord()
+    //     this.setState({ record: defaultRecord })
+    //   }
+    // }
+
+    // return Promise.resolve()
   }
 
   makeRaiseRecord = () => {
@@ -615,8 +620,6 @@ export default class raiseMoney extends Component {
             resolve()
           },
           fail(err) {
-            console.log(err, "errrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr")
-
             cancelOrder(params).then(res => { })
 
             // 然后
@@ -683,56 +686,58 @@ export default class raiseMoney extends Component {
   }
 
   nextStep(current) {
-    switch (current) {
-      // 确认房源
-      case 0:
-        this.checkRaise().then(() => {
-          this.setState({
-            current: current + 1
-          })
-        })
-        return;
-
-      // 认筹确认
-      case 2:
-        this.makeRaiseRecord().then((res) => {
-          const { userInfo: { miniApp: { tpls } } } = this.props
-          const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
-          const that = this
-          wx.requestSubscribeMessage({
-            tmplIds: [tplId],
-            success(res) {
-            },
-            fail(res) {
-
-            },
-            complete() {
-              that.setState({
-                current: current + 1
-              })
-            }
-          })
-        })
-        return;
-
+    // 缴费的下一步
+    if (current > 3) {
+      this.setState({
+        current: current + 1
+      })
 
+      return;
+    }
 
-      // 缴费
-      case 3:
-        this.makePay().then(() => {
+    this.validRaise().then(() => {
+
+      switch (current) {
+        // 认筹确认
+        case 2:
+          this.makeRaiseRecord().then((res) => {
+            const { userInfo: { miniApp: { tpls } } } = this.props
+            const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
+            const that = this
+            wx.requestSubscribeMessage({
+              tmplIds: [tplId],
+              success(res) {
+              },
+              fail(res) {
+  
+              },
+              complete() {
+                that.setState({
+                  current: current + 1
+                })
+              }
+            })
+          })
+          return;
+
+        // 缴费
+        case 3:
+          this.makePay().then(() => {
+            this.setState({
+              current: current + 1
+            })
+          })
+          return;
+  
+        //
+        default:
           this.setState({
             current: current + 1
           })
-        })
-        return;
+      }
 
-      //
-      default:
-        this.setState({
-          current: current + 1
-        })
+    })
 
-    }
   }
 
   upStep(current) {

src/services/house.js

@@ -0,0 +1,3 @@
+import { fetch, apis } from '@/utils/request'
+
+export const checkRaise = houseIdList => fetch({ url: `${apis.API_RAISE_CHECK}?houseIds=${houseIdList.join(',')}`, method: 'GET' })