bug fix

config/dev.js

@@ -5,16 +5,16 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST: '"https://dev.fangdeal.cn"',//测试
-    WSS_HOST: '"wss://dev.fangdeal.cn"',
+    // HOST: '"https://dev.fangdeal.cn"',//测试
+    // WSS_HOST: '"wss://dev.fangdeal.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.19'

src/onlineSelling/pages/houseList/index.js

@@ -143,7 +143,15 @@ export default class HouseList extends Component {
 
     }).catch(err => {
       Taro.hideToast()
-      Taro.showToast({ title: '未找到房源批次', icon: 'none', duration: 2000 })
+      if (err.message) {
+        Taro.showToast({
+          title: err.message,
+          icon: 'none'
+        })
+      } else {
+        Taro.showToast({ title: '未找到房源批次', icon: 'none', duration: 2000 })
+      }
+
     })
   }
   anotherInfo(id) {
@@ -583,10 +591,10 @@ export default class HouseList extends Component {
         <View className="screen-top">
           筛选房源
             {conditionList.map(item => (
-            <View key={item.value} onClick={() => this.handleCondition(item.value)} className={current == item.value ? 'top-item active' : 'top-item'}>
-              {item.title}
-            </View>
-          ))}
+          <View key={item.value} onClick={() => this.handleCondition(item.value)} className={current == item.value ? 'top-item active' : 'top-item'}>
+            {item.title}
+          </View>
+        ))}
         </View>
         {current == 0 && this.renderApartment()}
         {current == 1 && displayHousePrice && this.renderPrice()}

src/onlineSelling/pages/raiseMoney/Certification.js

@@ -31,19 +31,19 @@ export default class Certification extends Component {
             // 自动签署
             contractAuto({ raiseRecordId, showToast: false }).then(res => {
               // if (res.status == 0) {
-                // 自动签署成功后调手动签署
-                contractManual({ ...res, showToast: false }).then(res => {
-                  if (res) {
-                    Taro.navigateTo({
-                      url: `/pages/project/panorama/index?url=${encodeURIComponent(res)}&from=contractManual&raiseId=${raiseId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}&id=${raiseRecordId}`
-                    })
-                  } else {
-                    Taro.showToast({
-                      title: '无可跳转的认证地址',
-                      icon: 'none'
-                    })
-                  }
-                })
+              // 自动签署成功后调手动签署
+              contractManual({ ...res, showToast: false }).then(res => {
+                if (res) {
+                  Taro.navigateTo({
+                    url: `/pages/project/panorama/index?url=${encodeURIComponent(res)}&from=contractManual&raiseId=${raiseId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}&id=${raiseRecordId}`
+                  })
+                } else {
+                  Taro.showToast({
+                    title: '无可跳转的认证地址',
+                    icon: 'none'
+                  })
+                }
+              })
               // } else {
               //   Taro.navigateTo({
               //     url: `/onlineSelling/pages/raiseMoney/signResult?id=${raiseRecordId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
@@ -134,7 +134,7 @@ export default class Certification extends Component {
 
             {(status == 0 || status == 1 || status == 4) && <View className="tip" style="margin-top:14rpx">请返回重新发起认证</View>}
 
-            {status == 3 && <View className="tip" style="margin-top:14rpx; display: flex;align-items: center;" onClick={() => this.handleBtnClick()}>实名信息需要法大大审核，请刷新状态
+            {status == 3 && <View className="tip" style="margin-top:14rpx; display: flex;align-items: center;justify-content: center;" onClick={() => this.handleBtnClick()}>实名信息需要法大大审核，请刷新状态
             <Image style="width:18px;height:18px;margin-left:8rpx" src={require('../../assets/refresh.png')} />
             </View>}
 

src/onlineSelling/pages/raiseMoney/signResult.js

@@ -123,10 +123,10 @@ export default class signResult extends Component {
             <Image src={transferImage(require('../../assets/see.png'))} style="width:42rpx;height:40rpx"></Image>
             <Text className="text" style="color:#E4A938" >查看合同</Text>
           </Button>}
-          {status == 1 && <Button className='bt-nav__item' onClick={() => this.toDownloadContract(result.contractDownloadUrl)} >
+          {/* {status == 1 && <Button className='bt-nav__item' onClick={() => this.toDownloadContract(result.contractDownloadUrl)} >
             <Image src={transferImage(require('../../assets/download.png'))} style="width:42rpx;height:40rpx"></Image>
             <Text className="text" style="color:#E4A938" >下载合同</Text>
-          </Button>}
+          </Button>} */}
 
         </View>
         <Button className="btn" onClick={() => this.toRaiseProfile(result.invoiceTargetId)}>

src/onlineSelling/pages/raiseProfile/index.js

@@ -30,8 +30,12 @@ export default class Raise extends Component {
     signDetail: null,
     contractDetail: null,
   }
-
-  componentWillMount() {
+  componentDidShow() {
+    // componentWillMount() {
+    Taro.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    })
     const { id: raiseRecordId } = this.$router.params
     queryRaiseDetail(raiseRecordId).then(res => {
       this.setState({
@@ -48,8 +52,14 @@ export default class Raise extends Component {
           contractUser({ raiseRecordId, }).then(res => {
             this.setState({
               signDetail: res || null
+            }, () => {
+              Taro.hideToast()
             })
+          }).catch(err => {
+            Taro.hideToast()
           })
+        } else {
+          Taro.hideToast()
         }
       })
     })
@@ -320,7 +330,8 @@ export default class Raise extends Component {
           {contractDetail &&
             <View className="raise-flex">
               <View className="date">合同签署时间  {dayjs(raiseDeatil.createDate).format('YYYY/MM/DD HH:mm:ss')}
-                <Image className="download" onClick={() => this.toDownloadContract(contractDetail.contractDownloadUrl)} src={require('../../assets/download.png')} /></View>
+                {/* <Image className="download" onClick={() => this.toDownloadContract(contractDetail.contractDownloadUrl)} src={require('../../assets/download.png')} /> */}
+              </View>
               <View className="agreement" onClick={() => this.toSeeContract(contractDetail.contractViewUrl)}>查看合同<Text className="right-icon"></Text></View>
             </View>}