cancelorder

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'

config/prod.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   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: '"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://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',

src/onlineSelling/components/ConsultantItem/index.js

@@ -9,10 +9,10 @@ export default function CConsultantItem(props) {
   return (
     <View className="card-item" style={style}>
       <Image src={data.photo || data.avatar} className='avatar' ></Image>
-      <View className="name">{data.name}<Image src={require('@/assets/person/card.png')} className='card' ></Image>{type == 'raiseProfile' && <View className="tip">您的专属置业顾问</View>}</View>
+      <View className="name">{data.name || data.userName}<Image src={require('@/assets/person/card.png')} className='card' ></Image>{type == 'raiseProfile' && <View className="tip">您的专属置业顾问</View>}</View>
       <View className="phone">{data.phone}</View>
       {!type && <View className="home">主页</View>}
-      {type == 'raiseProfile' && <View className="contact">联系我<Text className="right-icon"></Text></View>}
+      {type == 'raiseProfile' && <View className="contact" onClick={props.contactClick}>联系我<Text className="right-icon"></Text></View>}
     </View >
   );
 }

src/onlineSelling/components/RaiseCard/index.js

@@ -46,7 +46,7 @@ export default function RaiseCard(props) {
   }
   return (
     <View className="housecard" style={props.style} >
-      <View className="head">
+      <View className="head" onClick={props.handleCard}>
         {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
           <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
         }

src/onlineSelling/pages/detail/resultPage.js

@@ -9,7 +9,7 @@ import ContactConsultant from '../../components/ContactConsultant'
   ({ user }) => ({ ...user })
 )
 
-export default class Index extends Component {
+export default class resultPage extends Component {
   config = {
     navigationBarTitleText: '',
   }
@@ -77,7 +77,7 @@ export default class Index extends Component {
         {type != 'add' && <View className="status">{status == 1 ? '取消成功' : status == 2 ? '正在处理' : '取消失败'}</View>}
         <View className="tip" style="margin-bottom:10rpx">{statusText}</View>
         {statusText2 && <View className="tip">{statusText2}</View>}
-        <ContactConsultant  buildingId={buildingId} style=" position: absolute;bottom: 8vh;" />
+        <ContactConsultant buildingId={buildingId} style=" position: absolute;bottom: 8vh;" />
       </View>
 
     );

src/onlineSelling/pages/raiseMoney/index.js

@@ -289,16 +289,13 @@ export default class raiseMoney extends Component {
           paySign: res.sign,
 
           success(res) {
-            // TODO 缴费成功
-
-            // 调用远程接口
-
-
             // 最后
             resolve()
           },
-          fail(res) {
-            // TODO 缴费失败
+          fail(err) {
+            console.log(err, "errrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr")
+
+            cancelOrder(params).then(res => { })
 
             // 然后
             reject()
@@ -322,7 +319,7 @@ export default class raiseMoney extends Component {
 
       // 缴费
       case 3:
-        this.makePay()
+        this.makePay().then()
         return;
 
       //

src/onlineSelling/pages/raiseProfile/index.js

@@ -8,12 +8,13 @@ import ConsultantItem from '../../components/ConsultantItem/index'
 import NamedIcon from '../../components/NamedIcon'
 import RaiseCard from '../../components/RaiseCard'
 import { queryRaiseDetail } from '@/services/project'
-
-
+import { connect } from '@tarojs/redux'
+import * as noticeType from '@/constants/common.js'
 import './index.scss'
-import consultant from 'dist/components/consultant'
 
-export default class extends Component {
+@connect(({ user }) => ({ user }))
+
+export default class Raise extends Component {
   config = {
     navigationBarTitleText: '认筹单',
   }
@@ -22,7 +23,9 @@ export default class extends Component {
     buildingId: '',
     raiseDeatil: {},
     houseList: [],
-    raiseOrder: {}
+    raiseOrder: {},
+    orderDetail: {},
+    refundOrder: {},
   }
 
   componentWillMount() {
@@ -33,6 +36,8 @@ export default class extends Component {
         raiseDeatil: res.taRaiseRecord || {},
         houseList: res.houseList || [],
         raiseOrder: res.taRaise || {},
+        orderDetail: res.taOrder || {},
+        refundOrder: res.refundOrder || {},
       })
     })
   }
@@ -77,6 +82,7 @@ export default class extends Component {
 
   // 取消认购原因
   renderCancelReason() {
+    const { raiseDeatil } = this.state;
     return (
       <Block>
         <View className="cancelReason flexSpace">
@@ -85,8 +91,7 @@ export default class extends Component {
           </View>
           <View className="flexSpace-item" style="margin-left: 20px">
             <View>认筹单作废原因：</View>
-            <View className="gray">认筹单作废原因作废原因原因认筹单作废原因作废原因原因
-              认筹单作废原因作废原因原因认筹单作废原因作废原因原因</View>
+            <View className="gray">{raiseDeatil.invalidReason}</View>
           </View>
         </View>
         <View className="hr"></View>
@@ -112,53 +117,93 @@ export default class extends Component {
           </View>
           <View className="flexSpace-fixed">
             <Text className="a-line">认筹金额</Text>
-            <Text className="a-line price">{raiseOrder.raisePrice}元</Text>
+            <Text className="a-line price">{this.regFenToYuan(raiseOrder.raisePrice)}元</Text>
           </View>
         </View>
         <View className="hr"></View>
       </Block>
     )
   }
-
+  handleChatClick(item) {
+
+    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=${item.consultantPersonId}&receiverName=${encodeURIComponent(item.name || item.nickname || item.userName)}`
+        })
+      }
+    })
+  }
+  toDecimal2 = (x) => {
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    return s;
+  }
+  regFenToYuan = (fen) => {
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    num = this.toDecimal2(num)
+    return num
+  };
   render() {
-    const { buildingId, raiseDeatil } = this.state;
+    const { buildingId, raiseDeatil, orderDetail, refundOrder } = this.state;
+
 
     // 认筹信息
     const raiseInfo = [
-      { head: '认筹人', body: `${raiseDeatil.name || ''}`, },
-      { head: '身份证号', body: `${raiseDeatil.idcard || ''}` },
-      { head: '手机号', body: `${raiseDeatil.tel || ''}` },
+      { head: '认筹人', body: raiseDeatil.name || '', },
+      { head: '身份证号', body: raiseDeatil.idcard || '' },
+      { head: '手机号', body: raiseDeatil.tel || '' },
     ]
 
     // 缴费信息
     const payInfo = [
       { head: '缴费方式', body: `${raiseDeatil.payType == 'onLine' ? '线上缴费' : '线下缴费'}` },
-      { head: '实际支付费用', body: '234元' },
-      { head: '缴费成功时间', body: dayjs('2020-2-28 17:12:48').format('YYYY/MM/DD HH:mm:ss') },
+      { head: '实际支付费用', body: this.regFenToYuan(orderDetail.totalFee) },
+      { head: '缴费成功时间', body: dayjs(orderDetail.payTime).format('YYYY/MM/DD HH:mm:ss') },
     ]
 
     // 退费信息
     const refundInfo = [
-      { head: '退费状态', body: '退费中/退费完成' },
-      { head: '退费结果', body: '成功/失败' },
-      { head: '退费发起时间', body: dayjs('2020-2-28 17:12:48').format('YYYY/MM/DD HH:mm:ss') },
-      { head: '实退费用', body: '234元' },
-      { head: '退费到账时间', body: dayjs('2020-2-28 17:12:48').format('YYYY/MM/DD HH:mm:ss') },
-      { head: '退费原因', desc: '无效原因无效原因无效原因无效原因无效原因无效原因无效原因无效原因无效原因无效原因' },
+      { head: '退费状态', body: refundOrder.payStatus == 'refunded' ? '退费完成' : '退费中' },
+      { head: '退费结果', body: refundOrder.payStatus == 'refunded' ? '成功' : '失败' },
+      { head: '退费发起时间', body: dayjs(refundOrder.createDate).format('YYYY/MM/DD HH:mm:ss') },
+      { head: '实退费用', body: this.regFenToYuan(refundOrder.totalFee) },
+      { head: '退费到账时间', body: dayjs(refundOrder.payTime).format('YYYY/MM/DD HH:mm:ss') },
+      { head: '退费原因', desc: raiseDeatil.refundReason },
     ]
 
     // 其他信息
     const otherInfo = [
       { head: '其他信息', body: '供核对数据使用' },
-      { head: '认筹单编号', body: `${raiseDeatil.raiseRecordId}`, action: true },
-      { head: '缴费单编号', body: '234567890-09876543456', action: true, hide: `${raiseDeatil.payStatus == 'paid' ? false : true}` },
-      { head: '退费单编号', body: '234567890-09876543423', action: true, hide: `${raiseDeatil.payStatus == 'refunded' ? false : true}` },
+      { head: '认筹单编号', body: raiseDeatil.raiseRecordId || '', action: true },
+      { head: '缴费单编号', body: orderDetail.tradeNo || '', action: true, hide: raiseDeatil.payStatus != 'paid' },
+      { head: '退费单编号', body: refundOrder.refundNo || '', action: true, hide: raiseDeatil.payStatus != 'refunded' },
     ]
-    const consultantInfo = {
-      name: '哈哈哈1',
-      phone: '138541369741',
-      avatar: 'http://img5.imgtn.bdimg.com/it/u=3299138037,391931528&fm=26&gp=0.jpg'
-    }
+
 
     return (
       <View className="raiseProfilePage">
@@ -169,12 +214,12 @@ export default class extends Component {
           {raiseDeatil.payStatus == 'unpaid' && this.renderUnpayNotice()}
           <View>
             <CellBlock dataset={raiseInfo} />
-            <ConsultantItem
-              data={consultantInfo}
+            {raiseDeatil.consultantInfo && <ConsultantItem
+              data={raiseDeatil.consultantInfo}
               type="raiseProfile"
               style="height:140rpx;margin-bottom:0rpx;width:690rpx"
-              onClick={this.handleItemClick}>
-            </ConsultantItem>
+              contactClick={() => this.handleChatClick(raiseDeatil.consultantInfo)}
+            />}
             <View className="hr" />
             {raiseDeatil.payStatus == 'paid' &&
               <Block>