commit

src/onlineSelling/components/RaiseCard/index.js

@@ -56,7 +56,7 @@ export default function RaiseCard(props) {
         <View onClick={props.handleCard}>
           {!props.type && <View className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
           {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className='badge'>{mineLocked ? '已锁给我' : '　'}</View>}
-          {(props.type == 'raiseProfile' || props.type == 'raiseMoney') && <View style={props.type == 'raiseMoney' ? 'color:#BB9C79;font-size:30rpx' : 'color:#BB9C79;font-size:30rpx;margin-top:-20rpx'}>{apartmentName || '　'}</View>}
+          {(props.type == 'raiseProfile' || props.type == 'raiseMoney') && <View style={props.type == 'raiseMoney' ? 'color:#BB9C79;font-size:30rpx' : 'color:#BB9C79;font-size:30rpx;margin-top:-20rpx'}>{apartmentName || ''}</View>}
           {props.type == 'raiseMoney' && <View className="red-price">现价{Number(price) + 0}万</View>}
           {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 12rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
           <View className="title">{title}</View>

src/onlineSelling/pages/protocol/index.js

@@ -11,25 +11,20 @@ export default class Protocol extends Component {
   }
 
   state = {
-    content: `
-      <p>New Year in china is an important festival. Nearly everyone thinks highly of it. No matter where people go and no matter how far they go， they will try their best to go home enjoying family time. And no matter what difficulty or trouble they are experiencing， they will put aside for the period of time. In every house， the main atmosphere is happiness. What do people usually do during the New Year time？ They will prepare a big meal together on New Year’s Eve. In the following days， they will visit their relatives. their relatives also will pay a return visit.</p>
-      <p>One of the most important things that they will not forget to do is to worship their ancestors. This is Chinese New Year New Year in china is an important festival. Nearly everyone thinks highly of it.</p>
-      <p>No matter where people go and no matter how far they go， they will try their best to go home enjoying family time. And no matter what difficulty or trouble they are experiencing， they will put aside for the period of time. In every house， the main atmosphere is happiness. </p>
-      <p>What do people usually do during the New Year time？ They will prepare a big meal together on New Year’s Eve. In the following days， they will visit their relatives. their relatives also will pay a return visit. One of the most important things that they will not forget to do is to worship their ancestors.</p>
-    `,
-    buildingId: '9f021a59b2a714822894c23ccca8c2db', // must change this
+
   }
 
   render() {
-    const { content, buildingId } = this.state
+
+    const { agreement, buildingId } = this.$router.params
 
     return (
       <View className="protocal-box">
         <View className="content">
-          <RichText nodes={content}/>
+          <RichText nodes={agreement} />
         </View>
         <View className="contact">
-          <ContactConsultant text="如有问题，请联系置业顾问" buildingId={buildingId}/>
+          <ContactConsultant text="如有问题，请联系置业顾问" buildingId={buildingId} />
         </View>
         <Statement />
       </View>

src/onlineSelling/pages/raiseProfile/index.js

@@ -73,10 +73,9 @@ export default class Raise extends Component {
               <Text>查看全部（{houseList.length}）</Text>
               <Text className='at-icon at-icon-chevron-right'></Text>
             </View>}
-
           </View>
         </View>
-        <RaiseCard summary={houseList[0]} type="raiseProfile" style="height:280rpx" />
+        <RaiseCard summary={houseList[0]} type="raiseProfile" style="height:auto" />
       </Block>
     )
   }
@@ -168,9 +167,15 @@ export default class Raise extends Component {
     num = num.replace(reg, '$1');
     num = this.toDecimal2(num)
     return num
-  };
+  }
+  toAgreement(agreement, buildingId) {
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/protocol/index?agreement=${agreement}&buildingId=${buildingId}`
+    })
+  }
+
   render() {
-    const { buildingId, raiseDeatil, orderDetail, refundOrder } = this.state;
+    const { buildingId, raiseDeatil, orderDetail, refundOrder, raiseOrder } = this.state;
 
 
     // 认筹信息
@@ -183,7 +188,7 @@ export default class Raise extends Component {
     // 缴费信息
     const payInfo = [
       { head: '缴费方式', body: `${raiseDeatil.payType == 'onLine' ? '线上缴费' : '线下缴费'}` },
-      { head: '实际支付费用', body: this.regFenToYuan(orderDetail.totalFee)+'元' },
+      { head: '实际支付费用', body: this.regFenToYuan(orderDetail.totalFee) + '元' },
       { head: '缴费成功时间', body: dayjs(orderDetail.payTime).format('YYYY/MM/DD HH:mm:ss') },
     ]
 
@@ -192,7 +197,7 @@ export default class Raise extends Component {
       { 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: this.regFenToYuan(refundOrder.totalFee) + '元' },
       { head: '退费到账时间', body: dayjs(refundOrder.payTime).format('YYYY/MM/DD HH:mm:ss') },
       { head: '退费原因', desc: raiseDeatil.refundReason },
     ]
@@ -213,6 +218,10 @@ export default class Raise extends Component {
           <View className="tip">{raiseDeatil.payDescription || ''}</View>
           {raiseDeatil.status == '0' && this.renderCancelReason()}
           {raiseDeatil.payStatus == 'unpaid' && this.renderUnpayNotice()}
+          <View className="raise-flex">
+            <View className="date">认筹提交时间 </View>
+            <View className="agreement" onClick={() => this.toAgreement(raiseOrder.payProtocol, raiseOrder.buildingId)}>线上选房协议<Text className="right-icon"></Text></View>
+          </View>
           <View>
             <CellBlock dataset={raiseInfo} />
             {raiseDeatil.consultantInfo && <ConsultantItem

src/onlineSelling/pages/raiseProfile/index.scss

@@ -128,3 +128,26 @@
     }
   }
 }
+.raise-flex{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .date{
+    font-size: 28px;
+    color: #666;
+  }
+  .agreement{
+    color: #BB9C79;
+    font-size: 32px;
+    display: flex;
+    align-items: center;
+     .right-icon{
+      width:20px;
+      height:20px;
+      border-top: 2px solid #999;
+      border-right: 2px solid #999;
+      transform:rotate(45deg);
+      display: inline-block;
+    }
+  }
+}