Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/onlineSelling/pages/addHouse/index.js

@@ -75,7 +75,7 @@ export default class extends Component {
     const { house } = this.props
 
     // 从预选记录中过滤出来, 状态正常且未锁定的房源
-    const houseList = (house.mySelectHouses || []).map(x => x.housingInfo).filter(x => x.status == 1 && x.houseLockingStatus != 'locked')
+    const houseList = (house.mySelectHouses || []).map(x => x.housingInfo).filter(x => x.status == 1)
 
     return houseList.length && (
       <Block>

src/onlineSelling/pages/detail/index.js

@@ -140,9 +140,9 @@ export default class Index extends Component {
   toRaiseMoney() {
     const detail = this.state.houseDetail || {}
 
-    if (detail.status != 1 || detail.houseLockingStatus == 'locked') {
+    if (detail.status != 1) {
       Taro.showToast({
-        url: '当前房源被锁定或未发布, 不能认筹',
+        url: '当前房源未发布, 不能认筹',
         icon: 'none',
       })
 

src/onlineSelling/pages/houseCart/index.js

@@ -132,11 +132,11 @@ export default class extends Component {
   // 添加到选择列表
   // 注意, 不是确认选择
   add2Cart = (room) => {
-    const locked = room.houseLockingStatus == 'locked'
-    if (locked) {
-      Taro.showToast({ title: '该房源已经被锁定', icon: 'none' })
-      return;
-    }
+    // const locked = room.houseLockingStatus == 'locked'
+    // if (locked) {
+    //   Taro.showToast({ title: '该房源已经被锁定', icon: 'none' })
+    //   return;
+    // }
 
     const { chooseList, multiSelect } = this.state
     const checked = (chooseList || []).filter(x => x.houseId == room.houseId)[0]

src/onlineSelling/pages/raiseMoney/index.js

@@ -642,6 +642,7 @@ export default class raiseMoney extends Component {
     })
 
   }
+  
   toRaiseProfile(id) {
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId