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

config/dev.js

@@ -5,6 +5,8 @@ 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.pawoma.cn"',//测试
     // WSS_HOST: '"wss://dev.pawoma.cn"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
@@ -15,7 +17,7 @@ module.exports = {
     WSS_HOST: '"ws://127.0.0.1:8080"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.15'
+    Version: 'V3.5.19'
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -5,13 +5,17 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.2.52:8080"',
     // WSS_HOST: '"ws://192.168.2.52:8080"',
-    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.fangdeal.cn"',//测试
+    WSS_HOST: '"wss://dev.fangdeal.cn"',
+    // HOST: '"https://wx.fangdeal.cn"',//正式
+    // WSS_HOST: '"wss://wx.fangdeal.cn"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.15'
+    Version: 'V3.5.19'
   },
   weapp: {},
   h5: {}

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行联调",
-	"appid": "wxd9ee3a9480a4e544",
+	"description": "大营销云测试",
+	"appid": "wxda1f84b79b3edeb3",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.js

@@ -51,6 +51,7 @@ class App extends Component {
       "wx74767bf0b684f7d3",
       "wx6fa58869f7b65e7f",
       "wxc4f812079fc9ff0d",
+      "wx60d176f873ca2d67",
     ],
     pages: [
       'pages/project/index',
@@ -129,6 +130,8 @@ class App extends Component {
         pages: [
           'pages/houseList/index',
           'pages/raiseMoney/index',
+          'pages/raiseMoney/signResult',
+          'pages/raiseMoney/Certification',
           'pages/live/index',
           'pages/help/index',
           'pages/records/index',

src/constants/api.js

@@ -77,6 +77,12 @@ export const API_ADDLIVE_NUM = resolvePath('addVisitNum')
 export const API_LIVE_DEATIL = resolvePath('taLiveActivity')
 // /wx/location/city?location=lon,lat
 
+//sign
+export const API_CONTRACT_USER = resolvePath('contract/user/add')
+export const API_CONTRACT_GET = resolvePath('contract/user/get')
+export const API_CONTRACT_AUTO = resolvePath('contract/auto')
+export const API_CONTRACT_MANUAL = resolvePath('contract/manual')
+export const API_CONTRACT_CHECK = resolvePath('contract/check')
 
 // shop
 export const API_GOODS_LIST = resolvePath('goods')

src/onlineSelling/pages/detail/index.js

@@ -46,7 +46,7 @@ export default class Index extends Component {
       queryHouseDetail(params).then(res => {
         this.setState({
           houseDetail: !res ? {} : res,
-          buildingImgList: res.buildingImgList || []
+          buildingImgList: (res && res.buildingImgList) || []
         })
       })
 

src/onlineSelling/pages/protocol/index.js

@@ -31,7 +31,7 @@ export default class Protocol extends Component {
     const { buildingId } = this.$router.params
     const { house } = this.props
     const { raiseDeatil } = this.state
-    const payProtocol = house.onlineProtocol.replace(/\${name}/ig, raiseDeatil.name || '').replace(/\${idcard}/ig, raiseDeatil.idcard || '').replace(/\${phone}/ig, raiseDeatil.tel || '').replace(/\${date}/ig, dayjs(raiseDeatil.createDate).format('YYYY/MM/DD') || '') || ''
+    const payProtocol = house.onlineProtocol.replace(/\${name}/ig, raiseDeatil.name || '').replace(/0.096rem/g, '').replace(/\${idcard}/ig, raiseDeatil.idcard || '').replace(/\${phone}/ig, raiseDeatil.tel || '').replace(/\${date}/ig, dayjs(raiseDeatil.createDate).format('YYYY/MM/DD') || '') || ''
 
     return (
       <View className="protocal-box">

src/onlineSelling/pages/protocol/index.scss

@@ -5,6 +5,7 @@
     margin-top: 48px;
     width: 100%;
     padding: 0 40px;
+    font-size: initial;
   }
 
   .contact {

src/onlineSelling/pages/raiseMoney/Certification.js

@@ -0,0 +1,152 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Block } from '@tarojs/components'
+import './index.scss'
+import ready from '@/utils/ready'
+import { connect } from '@tarojs/redux'
+import * as noticeType from '@/constants/common.js'
+import { contractUser, contractGet, contractAuto, contractManual } from '@/services/project'
+import ContactConsultant from '../../components/ContactConsultant'
+
+@connect(({ user, house }) => ({ user, house }))
+
+export default class Certification extends Component {
+  config = {
+    navigationBarTitleText: '正在实名认证'
+  }
+  state = {
+    signDetail: null,
+    autoErr: null,
+    userErr: null,
+  }
+
+  componentWillMount() {
+    ready.queue(() => {
+      const { id: raiseRecordId, raiseId, consultantName, consultantId } = this.$router.params
+      contractUser({ raiseRecordId, }).then(res => {
+        this.setState({
+          signDetail: res || {}
+        }, () => {
+          const { signDetail } = this.state
+          if (signDetail.status == 2 && signDetail.authStatus == 'autoSign') {
+            // 自动签署
+            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'
+                    })
+                  }
+                })
+              } else {
+                Taro.navigateTo({
+                  url: `/onlineSelling/pages/raiseMoney/signResult?status=${res.status}&id=${raiseRecordId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
+                })
+              }
+
+
+
+            }).catch(err => {
+              this.setState({
+                autoErr: err.message || ''
+              })
+            })
+          }
+        })
+      }).catch(error => {
+        this.setState({
+          userErr: error.message || ''
+        })
+      })
+
+    })
+  }
+
+  handleChatClick() {
+
+    const { consultantName, consultantId } = this.$router.params
+    const { user: { userInfo: { miniApp: { tpls }, person: { personId, nickname, name } } } } = this.props
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true)[0] || {}).tplId
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success(res) {
+      },
+      fail(res) {
+
+      },
+      complete() {
+        Taro.navigateTo({
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultantId}&receiverName=${encodeURIComponent(consultantName)}`
+        })
+      }
+    })
+  }
+  handleBtnClick() {
+    contractGet().then(res => {
+    })
+  }
+  renderLoading() {
+    return (
+      <Block>
+        <Image style=" width:60px;height:60px;margin-bottom:10px" src={require('../../assets/loading.gif')}></Image>
+        <View className="status" >请稍等，正在准备实名认证</View>
+      </Block>
+    )
+  }
+
+
+  render() {
+    const { signDetail, autoErr, userErr } = this.state
+    const status = signDetail ? signDetail.status : ''
+    const showIcon = status == 2 ? require('../../assets/success2.png') : (status == 0 || status == 1) ? require('../../assets/fail2.png') : status == 2 ? require('../../assets/fail2.png') : require('../../assets/going.png')
+
+    const showTitle = (status == 0 || status == 1) ? '未激活/未认证' : status == 2 ? '审核通过' : status == 3 ? '待审核' : status == 4 ? '未通过' : '注册/获取失败'
+    return (
+      <View className="result" style="height:100vh">
+
+        {!signDetail && !userErr && this.renderLoading()}
+        {
+          signDetail &&
+          <Block>
+            <Image className="result-img" src={showIcon}></Image>
+            <View className="status" >实名认证<Text style={status == 3 ? 'color:#2CD7AA' : status == 2 ? 'color:#118EE9' : 'color:#F4333B'}>{showTitle}</Text></View>
+
+            {status == 4 && <View className="tip" style="margin-top:14rpx">不通过原因：XXXXXX</View>}
+
+            {status == 2 && <Block>
+              {!autoErr && <View className="tip" style="margin-top:14rpx">正在准备合同，请不要退出···</View>}
+              {autoErr && <Block>
+                <View className="tip" style="margin-top:14rpx;color:#F4333B">自动签署失败</View>
+                <View className="tip" style="margin-top:14rpx;color:#333">原因：{autoErr}</View>
+                {/* <ContactConsultant contactClick={() => this.handleChatClick()} text="请联系专属置业顾问" style=" position: absolute;bottom: 9vh;" /> */}
+              </Block>}
+            </Block>
+            }
+            {userErr && <View className="tip" style="margin-top:14rpx;color:#333">原因：{userErr}</View>}
+            {(autoErr || userErr) && <Block>
+              <View className="tip" style="margin-top:24rpx">请联系专属置业顾问解决</View>
+              <ContactConsultant contactClick={() => this.handleChatClick()} text="请联系专属置业顾问" style=" position: absolute;bottom: 9vh;" />
+            </Block>
+            }
+
+            {(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()}>实名信息需要法大大审核，请刷新状态
+            <Image style="width:18px;height:18px;margin-left:8rpx" src={require('../../assets/refresh.png')} />
+            </View>}
+
+            {status == 4 && <View class="certification-btn" onClick={() => this.handleBtnClick()}>查询不通过原因</View>}
+
+            {status == 3 && <View class="certification-btn" onClick={() => this.handleBtnClick()}>更新我的实名认证信息</View>}
+          </Block>
+        }
+      </View>
+    )
+  }
+}

src/onlineSelling/pages/raiseMoney/index.js

@@ -11,14 +11,15 @@ import * as houseActions from '@/actions/house'
 import NextStep from './NextStep'
 import { fetch, apis } from '@/utils/request'
 import Captcha from './Captcha'
-import { raiseOrder, cancelOrder, queryPreselectionRecord, raiseOffline } from '@/services/project'
+import { raiseOrder, cancelOrder, queryPreselectionRecord, raiseOffline, contractUser, queryRaiseDetail } from '@/services/project'
 import { getCodeMessage, checkCaptcha } from '@/services/getCode'
 import { checkRaise } from '@/services/house'
-import { checkIDCard, isEmpty } from '@/utils/tools'
+import { checkIDCard, isEmpty, transferImage } from '@/utils/tools'
 import ContactConsultant from '../../components/ContactConsultant'
 import RadioList from './RadioList'
 import * as noticeType from '@/constants/common.js'
 import { UPDATE_USER_INFO } from '@/constants/user'
+import BackHomeBtn from '@/components/BackHomeBtn'
 
 const getRaiseProfile = ({ salesBatchId, raiseRecordId }) => {
   const queryString = [
@@ -61,6 +62,8 @@ export default class raiseMoney extends Component {
       { label: '线上缴费', value: 'onLine' },
       { label: '线下缴费', value: 'offLine' },
     ],
+    signDetail: {},
+    raiseDeatil: {},
   }
 
   captchaLock = false
@@ -104,7 +107,10 @@ export default class raiseMoney extends Component {
         payType = payTypeSettings[0]
       }
 
-      this.setState({ raiseProfile: res, payType, record: res.record || defaultRecord })
+      this.setState({
+        raiseProfile: res, payType,
+        record: res.record || defaultRecord
+      })
 
       // 销售批次已被取消发布
       if (res.status != 1) {
@@ -162,7 +168,26 @@ export default class raiseMoney extends Component {
       })
     })
   }
+  // 获取认筹单详情
+  getRaiseDetail(raiseRecordId) {
+    queryRaiseDetail(raiseRecordId).then(res => {
+      this.setState({
 
+        raiseDeatil: res.taRaiseRecord || {},
+
+        // contractDetail: res.taContract || null,
+      }, () => {
+        const { raiseDeatil: { showContract } } = this.state
+        if (showContract == 1) {
+          contractUser({ raiseRecordId, }).then(res => {
+            this.setState({
+              signDetail: res || null
+            })
+          })
+        }
+      })
+    })
+  }
   initRecord = () => {
     const { userInfo } = this.props
     const { personId, name, idcard, tel, phone } = userInfo.person
@@ -254,7 +279,7 @@ export default class raiseMoney extends Component {
   }
   renderAgreement() {
     const { raiseProfile = {} } = this.state
-    const payProtocol = raiseProfile.payProtocol.replace(/\${name}/ig, '').replace(/\${idcard}/ig, '').replace(/\${phone}/ig, '').replace(/\${date}/ig, '') || ''
+    const payProtocol = raiseProfile.payProtocol.replace(/\${name}/ig, '').replace(/\${idcard}/ig, '').replace(/\${phone}/ig, '').replace(/\${date}/ig, '').replace(/0.096rem/g, '') || ''
     return (
       <ScrollView scrollY className="container3">
         <View className="agent-box">
@@ -288,7 +313,7 @@ export default class raiseMoney extends Component {
 
     if (this.captchaLock) {
       Taro.showToast({
-        title: '发送中, 请稍后',
+        title: '发送中, 请稍候',
         icon: 'none'
       })
       return false;
@@ -621,6 +646,7 @@ export default class raiseMoney extends Component {
       const paramsId = this.$router.params.raiseRecordId || record.raiseRecordId
       return new Promise((resolve, reject) => {
         raiseOffline(paramsId).then(res => {
+          this.getRaiseDetail(this.$router.params.raiseRecordId || record.raiseRecordId)
           resolve()
         }).catch(err => {
           reject()
@@ -644,6 +670,7 @@ export default class raiseMoney extends Component {
           paySign: res.sign,
 
           success(res) {
+            this.getRaiseDetail(this.$router.params.raiseRecordId || record.raiseRecordId)
             // 最后
             resolve()
           },
@@ -696,8 +723,73 @@ export default class raiseMoney extends Component {
       }
     })
   }
+  toBuilding(buildingId) {
+    Taro.navigateTo({
+      url: `/pages/project/detail/index?id=${buildingId}`
+    })
+  }
+  toHouseList(id) {
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/houseList/index?id=${id}`
+    })
+  }
+  toSign = () => {
+    const { signDetail } = this.state
+    const status = signDetail ? signDetail.status : ''
+    const consultant = this.getConsultant()
+    if (status == 0 || status == 1) {
+      if (signDetail.certifiedAddress) {
+        Taro.navigateTo({
+          url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&from=raiseProfile&consultantInfo=${consultant}`
+        })
+      } else {
+        Taro.showToast({
+          title: '无可跳转的认证地址',
+          icon: 'none'
+        })
+      }
+    } else {
+      const { record = {} } = this.state
+      const { id: raiseRecordId } = this.$router.params
+      Taro.navigateTo({
+        url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId || record.raiseRecordId}&consultantInfo=${consultant}`
+      })
+    }
+  }
+  renderBtn() {
+    const { raiseProfile = {}, record = {}, signDetail, raiseDeatil = {} } = this.state
+    return (
+      <View className="bottombar">
+        <View className="bt-nav__left">
+          <Button class='bt-nav__item' onClick={() => this.toBuilding(raiseProfile.buildingId)}>
+            <Image src={transferImage(require('@/assets/news/property.png'))} style="width:42rpx;height:42rpx"></Image>
+            <Text className="text">查看项目</Text>
+          </Button>
+          <Button className='bt-nav__item' onClick={() => this.toHouseList(raiseProfile.salesBatchId)}>
+            <Image src={transferImage(require('../../assets/list.png'))} style="width:40rpx;height:40rpx" ></Image>
+            <Text className="text">房源列表</Text>
+          </Button>
+          <Button className='bt-nav__item' onClick={() => this.handleChatClick()}>
+            <Image src={transferImage(require('../../assets/consult.png'))} style="width:36rpx;height:40rpx"></Image>
+            <Text className="text">置业顾问</Text>
+          </Button>
+          {
+            raiseDeatil.showContract == 1 && signDetail &&
+            <Button className='bt-nav__item' >
+              <Image src={transferImage(require('../../assets/sign.png'))} style="width:42rpx;height:40rpx"></Image>
+              <Text className="text" style="color:#E4A938" onClick={this.toSign}>签署合同</Text>
+            </Button>
+          }
+
+        </View>
+        <Button className="btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>
+          认筹单
+        </Button>
+      </View>
+    )
+  }
   renderResult() {
-    const { raiseProfile = {}, record = {}, failInfo, payType } = this.state
+    const { failInfo, payType, record = {}, signDetail, raiseDeatil = {} } = this.state
     const isOk = !failInfo
     const showIcon = isOk ? require('../../assets/success2.png') : require('../../assets/fail2.png')
     const showTitle = isOk ? '提交成功' : failInfo.title
@@ -706,16 +798,19 @@ export default class raiseMoney extends Component {
       <View className="result">
         <Image className="result-img" src={showIcon}></Image>
 
-        <View className="status">{showTitle}</View>
+        <View className="status" style={failInfo ? 'color:#F4333B' : 'color:#118EE9'}>{showTitle}</View>
 
         {
           isOk &&
           (
             <Block>
-              <View className="tip" style="margin-bottom:10rpx">详情请查看认筹单</View>
+              <View className="tip" style="margin:16rpx 0">详情请查看认筹单</View>
               {payType === 'onLine' && <Block>
                 <View className="tip">支付结果请留意微信支付通知</View>
-              </Block>}
+                {raiseDeatil.showContract == 1 && signDetail &&
+                  <View style="font-size: 30rpx;color: #E4A938;line-height:2">为保障您的权益，请签署认筹合同！</View>}
+              </Block>
+              }
               {payType === 'offLine' && <Block>
                 <View className="tip" style="margin-bottom:10rpx">后台已收到认筹申请，您尚未付款！</View>
                 <View className="tip">请尽快联系您的专属置业顾问缴纳定金</View>
@@ -727,12 +822,13 @@ export default class raiseMoney extends Component {
         {
           !isOk && (<View className="tip">{(failInfo || {}).desc}</View>)
         }
-
-        <ContactConsultant buildingId={raiseProfile.buildingId} contactClick={() => this.handleChatClick()} text="联系专属置业顾问" style=" position: absolute;bottom: 11vh;" />
-        {
+        {/* <ContactConsultant buildingId={raiseProfile.buildingId} contactClick={() => this.handleChatClick()} text="联系专属置业顾问" style=" position: absolute;bottom: 11vh;" /> */}
+        {/* {
           record.raiseRecordId &&
           (<View className="look-btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>查看认筹单</View>)
-        }
+        } */}
+        {this.renderBtn()}
+        <BackHomeBtn style={{ right: '3%', bottom: '190rpx' }}></BackHomeBtn>
       </View>
 
     );
@@ -780,6 +876,7 @@ export default class raiseMoney extends Component {
           this.paying = true
 
           this.makePay().then(() => {
+            this.loadInfo(salesBatchId, raiseRecordId)
             this.setState({
               current: current + 1
             })

src/onlineSelling/pages/raiseMoney/index.scss

@@ -162,45 +162,118 @@
         margin-top: 36px;
     }
   }
-  .result{
-    background-color: #fff;
-    height: 88vh;
-    width: 100vw;
-    position: relative;
-    text-align: center;
-    padding-top: 19vh;
-    font-weight: 300;
-    .result-img{
-      width:168px;
-      height:168px;
-    }
-    .status{
-      font-size: 34px;
-      color: #333;
-      line-height: 1.8;
-    }
-    .tip{
-      font-size: 30px;
-      color: #999;
-      padding: 0 100px;
+}
+.result{
+  background-color: #fff;
+  height: 88vh;
+  width: 100vw;
+  position: relative;
+  text-align: center;
+  padding-top: 19vh;
+  font-weight: 400;
+  .result-img{
+    width:168px;
+    height:168px;
+  }
+  .status{
+    font-size: 34px;
+    color: #333;
+    line-height: 1.8;
+  }
+  .tip{
+    font-size: 30px;
+    color: #999;
+    padding: 0 80px;
+  }
+  .last-tip{
+    color: #BB9C79;
+    font-size: 32px;
+    margin-top: 50px;
+    padding: 0 100px;
+  }
+ .look-btn{
+   width: 690px;
+   height:94px;
+   background:rgba(187,156,121,1);
+   border-radius:10px;
+   color: #fff;
+   font-size: 36px;
+   line-height: 94px;
+   position: absolute;
+   bottom: 1vh;
+   left: 30px;
+ }
+}
+.bottombar {
+  height: 164px;
+  box-shadow:0px 16px 48px 0px rgba(0, 0, 0, 0.12);
+  width: 100%;
+  padding: 0 35px;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  position: fixed;
+  bottom: 0;
+  background-color: #fff;
+
+  .btn {
+    height: 88px;
+    flex: none;
+    border-radius: 10px;
+    line-height: 88px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #BB9C79;
+    color: #fff;
+    width: 24%;
+    margin-left: 4%;
+    font-size: 26px;
+  }
+  .bt-nav {
+  
+    &__item {
+      margin: 0;
+      padding: 0;
+      line-height: 1;
+      width: 25%;
+      box-sizing: border-box;
+      background: transparent;
+      border-radius: none;
+      height: 80px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      .text {
+        margin-top: 12px;
+        text-align: center;
+        font-size: 24px;
+        color: #a1a1a1;
+      }
     }
-    .last-tip{
-      color: #BB9C79;
-      font-size: 32px;
-      margin-top: 50px;
-      padding: 0 100px;
+  
+    &__left {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      // justify-content: space-between;
+      padding: 20px 0;
     }
-   .look-btn{
-     width: 690px;
-     height:94px;
-     background:rgba(187,156,121,1);
-     border-radius:10px;
-     color: #fff;
-     font-size: 36px;
-     line-height: 94px;
-     position: absolute;
-     bottom: 1vh;
-     left: 30px;
-   }
+    
   }
+
+}
+.certification-btn{
+  width: 690px;
+  line-height:90px;
+  background:rgba(187,156,121,1);
+  border-radius:10px;
+  font-size: 32px;
+  color: #fff;
+  text-align: center;
+  position: absolute;
+  bottom: 7vh;
+  left: 30px;
+
 }

src/onlineSelling/pages/raiseMoney/signResult.js

@@ -0,0 +1,167 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Block } from '@tarojs/components'
+import './index.scss'
+import ready from '@/utils/ready'
+import { connect, getStore } from '@tarojs/redux'
+import * as houseActions from '@/actions/house'
+import * as noticeType from '@/constants/common.js'
+import BackHomeBtn from '@/components/BackHomeBtn'
+import { contractCheck } from '@/services/project'
+import { transferImage } from '@/utils/tools'
+
+@connect(({ user, house }) => ({ ...user, house }), { ...houseActions })
+export default class signResult extends Component {
+  config = {
+    navigationBarTitleText: '签署结果'
+  }
+  state = {
+    result: {}
+  }
+
+
+  componentWillMount() {
+    ready.queue(() => {
+      const { id: raiseRecordId, } = this.$router.params
+      contractCheck(({ raiseRecordId, showToast: false })).then(res => {
+        this.setState({
+          result: res
+        })
+      })
+
+    })
+  }
+
+
+  toRaiseProfile(id) {
+    const { userInfo: { miniApp: { tpls } } } = this.props
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
+
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success(res) {
+      },
+      fail(res) {
+
+      },
+      complete() {
+        Taro.navigateTo({
+          url: `/onlineSelling/pages/raiseProfile/index?id=${id}`
+        })
+      }
+    })
+  }
+
+  handleChatClick() {
+    const { userInfo: { miniApp: { tpls }, person: { personId, nickname, name } } } = this.props
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true)[0] || {}).tplId
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success(res) {
+      },
+      fail(res) {
+
+      },
+      complete() {
+        Taro.navigateTo({
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultant.id}&receiverName=${encodeURIComponent(consultant.name || consultant.nickname || consultant.userName)}`
+        })
+      }
+    })
+  }
+  toBuilding(buildingId) {
+    Taro.navigateTo({
+      url: `/pages/project/detail/index?id=${buildingId}`
+    })
+  }
+  toHouseList(id) {
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/houseList/index?id=${id}`
+    })
+  }
+  toSeeContract(url) {
+    Taro.navigateTo({
+      url: `/pages/project/panorama/index?url=${encodeURIComponent(url)}`
+    })
+  }
+  toDownloadContract(url) {
+    Taro.downloadFile({
+      url,
+      success: function (param) {
+        if (param.statusCode === 200) {
+          Taro.showToast({
+            title: '下载合同成功',
+            icon: 'none'
+          })
+        }
+      },
+      fail: function (res) {
+        console.log('下载合同失败');
+      }
+    })
+
+  }
+  renderBtn() {
+    const { result = {} } = this.state
+    const { status } = this.$router.params
+
+    return (
+      <View className="bottombar">
+        <View className="bt-nav__left">
+          <Button class='bt-nav__item' onClick={() => this.toBuilding(result.buildingId)}>
+            <Image src={transferImage(require('@/assets/news/property.png'))} style="width:42rpx;height:42rpx"></Image>
+            <Text className="text">查看项目</Text>
+          </Button>
+          <Button className='bt-nav__item' onClick={() => this.toHouseList(result.salesBatchId)}>
+            <Image src={transferImage(require('../../assets/list.png'))} style="width:40rpx;height:40rpx" ></Image>
+            <Text className="text">房源列表</Text>
+          </Button>
+          {status != 1 && <Button className='bt-nav__item' onClick={() => this.handleChatClick()}>
+            <Image src={transferImage(require('../../assets/consult.png'))} style="width:36rpx;height:40rpx"></Image>
+            <Text className="text">置业顾问</Text>
+          </Button>}
+          {status == 1 && <Button className='bt-nav__item' onClick={() => this.toSeeContract(result.contractViewUrl)} >
+            <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)} >
+            <Image src={transferImage(require('../../assets/download.png'))} style="width:42rpx;height:40rpx"></Image>
+            <Text className="text" style="color:#E4A938" >下载合同</Text>
+          </Button>}
+
+        </View>
+        <Button className="btn" onClick={() => this.toRaiseProfile(result.invoiceTargetId)}>
+          认筹单
+        </Button>
+      </View>
+    )
+  }
+
+  render() {
+    const { status } = this.$router.params
+    const { result = {} } = this.state
+    const failInfo = { title: '合同签署失败', desc: '签署失败描述' }
+    const showIcon = status == 1 ? require('../../assets/success2.png') : require('../../assets/fail2.png')
+    const showTitle = status == 1 ? '恭喜已成功签署合同' : failInfo.title
+
+    return (
+      <View className="result">
+        <Image className="result-img" src={showIcon}></Image>
+
+        <View className="status" style={status != 1 ? 'color:#F4333B' : 'color:#118EE9'}>{showTitle}</View>
+        {
+          status != 1 && (
+            <Block>
+              <View className="tip" style="margin-top:10rpx">{result.reason || ''}</View>
+              <View className="tip" style="margin-top:10rpx">请到认筹单中尝试重新签署合同</View>
+              <View className="tip" style="margin-top:10rpx">或联系您的专属置业顾问</View>
+            </Block>
+          )
+        }
+        {this.renderBtn()}
+        <BackHomeBtn style={{ right: '3%', bottom: '190rpx' }}></BackHomeBtn>
+      </View>
+
+    )
+  }
+
+}

src/onlineSelling/pages/raiseProfile/index.js

@@ -5,9 +5,8 @@ import CellBlock from './CellBlock'
 import Statement from '../../components/Statement'
 import ContactConsultant from '../../components/ContactConsultant'
 import ConsultantItem from '../../components/ConsultantItem/index'
-import NamedIcon from '../../components/NamedIcon'
 import RaiseCard from '../../components/RaiseCard'
-import { queryRaiseDetail } from '@/services/project'
+import { queryRaiseDetail, contractUser } from '@/services/project'
 import { connect } from '@tarojs/redux'
 import * as noticeType from '@/constants/common.js'
 import './index.scss'
@@ -28,6 +27,8 @@ export default class Raise extends Component {
     orderDetail: {},
     refundOrder: {},
     payDisable: true,
+    signDetail: null,
+    contractDetail: null,
   }
 
   componentWillMount() {
@@ -40,6 +41,16 @@ export default class Raise extends Component {
         raiseOrder: res.taRaise || {},
         orderDetail: res.taOrder || {},
         refundOrder: res.refundOrder || {},
+        contractDetail: res.taContract || null,
+      }, () => {
+        const { raiseDeatil: { showContract } } = this.state
+        if (showContract == 1) {
+          contractUser({ raiseRecordId, }).then(res => {
+            this.setState({
+              signDetail: res || null
+            })
+          })
+        }
       })
     })
   }
@@ -200,9 +211,53 @@ export default class Raise extends Component {
       url: `/onlineSelling/pages/protocol/index?buildingId=${buildingId}&id=${raiseRecordId}`
     })
   }
+  toSign = () => {
+    const { signDetail, raiseOrder: { raiseId }, raiseDeatil: { consultantInfo: { name, userName, personId, consultantPersonId } } } = this.state
+    const { id: raiseRecordId } = this.$router.params
+    const status = signDetail ? signDetail.status : ''
+    if (status == 0 || status == 1) {
+      if (signDetail.certifiedAddress) {
+        Taro.navigateTo({
+          url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&raiseId=${raiseId}&from=raiseProfile&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}&id=${raiseRecordId}`
+        })
+      } else {
+        Taro.showToast({
+          title: '无可跳转的认证地址',
+          icon: 'none'
+        })
+      }
+    } else {
+      const { id: raiseRecordId } = this.$router.params
+      Taro.navigateTo({
+        url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&raiseId=${raiseId}&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}`
+      })
+    }
+  }
+  toSeeContract(url) {
+    Taro.navigateTo({
+      url: `/pages/project/panorama/index?url=${encodeURIComponent(url)}`
+    })
+  }
+  toDownloadContract(url) {
+    Taro.downloadFile({
+      url,
+      success: function (param) {
+        if (param.statusCode === 200) {
+          Taro.showToast({
+            title: '下载合同成功',
+            icon: 'none'
+          })
+        }
+      },
+      fail: function (res) {
+        console.log('下载合同失败');
+      }
+    })
+
+  }
 
   render() {
-    const { buildingId, raiseDeatil, orderDetail, refundOrder, raiseOrder } = this.state;
+    const { buildingId, raiseDeatil, orderDetail, refundOrder, raiseOrder, signDetail, contractDetail } = this.state;
 
 
     // 认筹信息
@@ -251,12 +306,25 @@ export default class Raise extends Component {
             <View className="date">认筹提交时间  {dayjs(raiseDeatil.createDate).format('YYYY/MM/DD HH:mm:ss')}</View>
             <View className="agreement" onClick={this.toAgreement}>在线选房协议<Text className="right-icon"></Text></View>
           </View>
+          {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>
+              <View className="agreement" onClick={() => this.toSeeContract(contractDetail.contractViewUrl)}>查看合同<Text className="right-icon"></Text></View>
+            </View>}
+
+          {
+            raiseDeatil.showContract == 1 && signDetail &&
+            <View className="sign" onClick={this.toSign}>
+              为保障您的权益，请签署认筹合同<Text className="right-icon" style="opacity:0.3"></Text><Text className="right-icon" style="opacity:0.6"></Text><Text className="right-icon"></Text>
+            </View>
+          }
           <View>
             <CellBlock dataset={raiseInfo} />
             {raiseDeatil.consultantInfo && <ConsultantItem
               data={raiseDeatil.consultantInfo}
               type="raiseProfile"
-              style="height:140rpx;margin-bottom:0rpx;width:690rpx"
+              style="height:140rpx;margin-bottom:0rpx;width:690rpx;padding:1px 0"
               contactClick={() => this.handleChatClick(raiseDeatil.consultantInfo)}
             />}
             <View className="hr" />

src/onlineSelling/pages/raiseProfile/index.scss

@@ -138,6 +138,13 @@
   .date{
     font-size: 28px;
     color: #666;
+    display: flex;
+    align-items: center;
+  }
+  .download{
+    width:44px;
+    height:38px;
+    margin-left: 6px;
   }
   .agreement{
     color: #BB9C79;
@@ -153,4 +160,21 @@
       display: inline-block;
     }
   }
+}
+.sign{
+  display: flex;
+  align-items: center;
+  color: #E4A938;
+  text-align: right;
+  justify-content: flex-end;
+  margin: 40px 0 15px 0;
+  .right-icon{
+    width:18px;
+    height:18px;
+    border-top: 2px solid #E4A938;
+    border-right: 2px solid #E4A938;
+    transform:rotate(45deg);
+    display: inline-block;
+    margin-left: -3px;
+  }
 }

src/pages/project/NavIcons/icons.js

@@ -108,4 +108,52 @@ export default [
     iconName: '意见反馈',
     page: '/useless/pages/person/feedback/index',
   },
+  {
+    iconCode: 'NewsDetail',
+    iconName: '资讯详情',
+    page: '/pages/news/detail/index',
+  },
+  {
+    iconCode: 'BuildingDetail',
+    iconName: '项目详情',
+    page: '/pages/project/detail/index',
+  },
+  {
+    iconCode: 'ActivityDetail',
+    iconName: '报名活动详情',
+    page: '/pages/activity/detail/index',
+  },
+  {
+    iconCode: 'LiveDetail',
+    iconName: '直播活动详情',
+    page: '/onlineSelling/pages/live/index',
+  },
+  {
+    iconCode: 'AssistanceDetail',
+    iconName: '助力活动详情',
+    page: '/pages/activity/detail/assistance',
+  },
+  {
+    iconCode: 'AssembleDetail',
+    iconName: '拼团活动详情',
+    page: '/pages/activity/detail/assemble',
+  },
+  {
+    iconCode: 'HouseListDetail',
+    iconName: '房源列表详情',
+    page: '/onlineSelling/pages/houseList/index',
+  },
+  {
+    iconCode: 'H5Detail',
+    iconName: 'H5活动详情',
+    page: '/pages/project/h5Page',
+  },
+  {
+    iconCode: 'H5WebView',
+    iconName: 'H5',
+    page: ({ navIcon }) => {
+      return `/pages/project/panorama/index?url=${encodeURIComponent(navIcon.params)}`
+    },
+  },
 ]
+

src/pages/project/NavIcons/index.js

@@ -21,7 +21,7 @@ export default function (props) {
     if (isEmpty(navIcon.page) && isEmpty(navIcon.tab)) return false;
 
     if (isFunction(navIcon.page)) {
-      const pg = navIcon.page(props)
+      const pg = navIcon.page({ ...props, navIcon: navIcon })
       if (!pg) return false;
 
       return { ...navIcon, page: pg }
@@ -31,12 +31,15 @@ export default function (props) {
   }).filter(Boolean)
 
   const naviTo = (icon) => {
-    const { page, tab } = icon || {}
+
+
+    const { page, tab, params } = icon || {}
+    const urlParams = params && params.indexOf('?') === -1 ? '?' + params : '&' + params
 
     if (tab) {
       Taro.switchTab({ url: tab })
     } else {
-      Taro.navigateTo({ url: page })
+      Taro.navigateTo({ url: params ? page + urlParams : page })
     }
   }
 

src/pages/project/index.scss

@@ -495,8 +495,8 @@
   height:94px;
   font-size: 34px;
   line-height: 94px;
-  background-color: #f8f8f8;
-  color: #bb9c79;
+  background-color: #bb9c79;
+  color: #fff;
   text-align: center;
   border-radius: 10px;
   margin: 40px 30px;

src/pages/project/panorama/index.js

@@ -1,12 +1,63 @@
 import Taro, { Component } from '@tarojs/taro'
 import { WebView } from '@tarojs/components'
+import { contractUser, contractCheck } from '@/services/project'
 
 export default class Panorama extends Component {
   state = {}
+  tk = undefined
+  tk2 = undefined
+  componentWillMount() {
+    const { from = '', id: raiseRecordId, consultantName, consultantId } = this.$router.params
+    if (from == 'raiseProfile') {
+      console.log('！！！！')
+      this.tk = setInterval(() => {
+        contractUser().then(res => {
+          console.log(res, res.status, '每5秒请求一次！！！！')
+          if (res.status != 0 && res.status != 1) {
+            const { id } = this.$router.params
+            clearInterval(this.tk)
+            Taro.navigateTo({
+              url: `/onlineSelling/pages/raiseMoney/Certification?id=${res.raiseRecordId || id}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
+            })
+          }
+        })
+      }, 5000)
+    }
+    if (from == 'contractManual') {
+      console.log('contractManual！！！！')
+      this.tk2 = setInterval(() => {
+        contractCheck({ raiseRecordId, showToast: false }).then(res => {
+          console.log(res, res.status, 'contractManual每5秒请求一次！！！')
+          if (res.status != 0) {
+            clearInterval(this.tk2)
+            Taro.navigateTo({
+              url: `/onlineSelling/pages/raiseMoney/signResult?status=${res.status}&id=${raiseRecordId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
+            })
+          }
+        })
+      }, 5000)
+    } else {
+      console.log(this.$router.params, "this.$router.paramsthis.$router.paramsthis.$router.paramsthis.$router.params")
+    }
+  }
+  componentDidHide() {
+    if (this.tk) {
+      clearInterval(this.tk)
+    }
+    if (this.tk2) {
+      clearInterval(this.tk2)
+    }
+  }
+  componentWillUnmount() {
+    if (this.tk) {
+      clearInterval(this.tk)
+    }
+    if (this.tk2) {
+      clearInterval(this.tk2)
+    }
+  }
 
-  componentWillMount() {}
-
-  render () {
+  render() {
     const url = decodeURIComponent(this.$router.params.url)
 
     return (

src/services/project.js

@@ -12,7 +12,12 @@ import {
   API_SALES_BATCH,
   API_RATSE_DETAIL,
   API_RATSE_ORDER,
-  API_CANCEL_ORDER
+  API_CANCEL_ORDER,
+  API_CONTRACT_USER,
+  API_CONTRACT_GET,
+  API_CONTRACT_AUTO,
+  API_CONTRACT_MANUAL,
+  API_CONTRACT_CHECK
 
 } from '@/constants/api'
 
@@ -90,6 +95,31 @@ export const raiseOrder = payload => fetch({ url: API_RATSE_ORDER, payload, meth
  * @param {*} payload
  */
 export const cancelOrder = payload => fetch({ url: API_CANCEL_ORDER, payload, method: 'POST' })
+/**
+ *获取签约信息
+ * @param {*} payload
+ */
+export const contractUser = payload => fetch({ url: API_CONTRACT_USER, payload, method: 'POST' })
+/**
+ *获取签约信息
+ * @param {*} payload
+ */
+export const contractGet = payload => fetch({ url: API_CONTRACT_GET, payload })
+/**
+ *自动签署
+ * @param {*} payload
+ */
+export const contractAuto = payload => fetch({ url: API_CONTRACT_AUTO, payload, method: 'POST' })
+/**
+ *手动签署
+ * @param {*} payload
+ */
+export const contractManual = payload => fetch({ url: API_CONTRACT_MANUAL, payload, method: 'POST' })
+/**
+ *手动签署结果
+ * @param {*} payload
+ */
+export const contractCheck = payload => fetch({ url: API_CONTRACT_CHECK, payload, method: 'POST' })
 
 
 

src/useless/pages/agent/client/index.js

@@ -6,6 +6,7 @@ import emptyImg from '@/assets/empty.png'
 import dayjs from 'dayjs'
 import { savePoint, updatePoint } from '@/services/common'
 import { connect } from '@tarojs/redux'
+import { transferImage } from '@/utils/tools'
 @connect(
   state => ({ ...state.project, ...state.city }))
 export default class Index extends Component {
@@ -21,7 +22,8 @@ export default class Index extends Component {
     verifyStatus: ['待审核', '审核同意', '未通过'],
     floorList: '',
     floor: '',
-    recordId: null
+    recordId: null,
+    noRecord: false,
   }
   componentWillMount() {
     savePoint({
@@ -67,8 +69,10 @@ export default class Index extends Component {
     }
     this.loadGetFloor()
     getClientList(params).then(res => {
+      const list = res.records
       that.setState({
-        list: res.records
+        list,
+        noRecord: (list || []).length ? false : true
       }, () => {
       })
     })
@@ -94,7 +98,7 @@ export default class Index extends Component {
     })
   }
   render() {
-    const { list, status, floorList } = this.state
+    const { list, status, floorList, noRecord } = this.state
     return (
       <View className='myClient'>
         {/* <View className='search__box'>
@@ -104,13 +108,13 @@ export default class Index extends Component {
         {/*<View className='client__status'>
              <Text>{status[item.status - 1]}</Text>
           </View>*/}
-        {!list.length &&
+        {noRecord &&
           <View className="empty">
             <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
             <View className="empty__text">暂无我的客户数据~</View>
           </View>
         }
-        {list.length &&
+        {!noRecord &&
           <View className='client__content'>
             <ScrollView
               scrollY
@@ -124,7 +128,7 @@ export default class Index extends Component {
                 list.map((item, index) => {
                   return (
                     <View className='client__list' key={index + 'client'} onClick={this.navigateTo.bind(this, item.customerId)}>
-                      <Image className='bg' src={item.verifyStatus == 2 ? require('@/assets/person/card1.png') : require('@/assets/person/card2.png')}></Image>
+                      <Image className='bg' src={item.verifyStatus == 2 ? transferImage(require('@/assets/person/card1.png')) : transferImage(require('@/assets/person/card2.png'))}></Image>
                       <View className='client'>
                         <View className='client__status2'>
                           {
@@ -157,7 +161,7 @@ export default class Index extends Component {
 
         {/* <View className='recommend' onClick={this.toRecomonedPage}>123</View> */}
         <View className="recommend" onClick={this.toRecomonedPage}  >
-          <Image src={require('@/assets/tuijiankehu.png')} className='home-img'></Image>
+          <Image src={transferImage(require('@/assets/tuijiankehu.png'))} className='home-img'></Image>
           <Text className="text">推荐</Text>
         </View>
       </View>

src/utils/request.js

@@ -97,7 +97,7 @@ export function optionBuilder(options) {
   ]
 }
 
-export function reqSuccess (res, opts) {
+export function reqSuccess(res, opts) {
   const [, settings] = opts || []
   const { showMessage, autoLogin = true } = settings || {}
 
@@ -110,7 +110,7 @@ export function reqSuccess (res, opts) {
     throw new Error('请检查网络')
   }
 
-  const { data, code, message } = res.data
+  const { data, code, message } = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
   if (code === CODE_SUCCESS) {
     return data
   } else {
@@ -143,7 +143,7 @@ export function reqSuccess (res, opts) {
   }
 }
 
-export function reqFail (err, opts) {
+export function reqFail(err, opts) {
   const [reqParams, settings] = opts || []
   const { showMessage } = settings || {}
 

src/utils/tools.js

@@ -367,7 +367,7 @@ export const downloadFile = (imgUrl, callback) => {
       }
     },
     fail: function (res) {
-      console.log('生成失败请稍后重试');
+      console.log('生成失败请稍候重试');
     }
   })
 }