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

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://192.168.2.52:8080"',
-    WSS_HOST: '"ws://192.168.2.52: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/onlineSelling/pages/addHouse/index.js

@@ -52,19 +52,26 @@ export default class extends Component {
   }
 
   handleSubmit = () => {
-    if (!this.state.chooseList.length) {
+    const { chooseList } = this.state
+    const { house } = this.props
+
+    if (!chooseList.length) {
       Taro.showModal({
         title: '提示',
         content: '您未选择房源, 确认离开?',
         success: (res) => {
           if (res.confirm) {
-            this.props.dispatchFlush2Cart([])
+            const leftHouses = house.raiseCart.filter(x => !(house.mySelectHouses || []).filter(it => it.houseId == x.houseId)[0])
+
+            this.props.dispatchFlush2Cart(leftHouses)
             Taro.navigateBack({ delta: 1 })
           }
         }
       })
     } else {
-      this.props.dispatchFlush2Cart(this.state.chooseList)
+      const notInPreSelect = house.raiseCart.filter(x => !chooseList.filter(it => it.houseId == x.houseId)[0])
+      
+      this.props.dispatchFlush2Cart(notInPreSelect.concat(chooseList))
       Taro.navigateBack({ delta: 1 })
     }
   }