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://127.0.0.1:8080"',
-    WSS_HOST: '"ws://127.0.0.1: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,8 +3,8 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    // HOST: '"http://192.168.2.54:8080"',
-    // WSS_HOST: '"ws://192.168.2.54:8080"',
+    // 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"',

src/constants/api.js

@@ -64,6 +64,7 @@ export const API_SAVE_RAISE_RECORD = resolvePath('taRaiseRecord')
 export const API_RATSE_RECORD = resolvePath('taRaiseRecord/list')
 export const API_RATSE_DETAIL = resolvePath('taRaiseRecord')
 export const API_RATSE_ORDER = resolvePath('unifiedOrder')
+export const API_CANCEL_ORDER = resolvePath('cancel')
 export const API_HOUSE_DETAIL = resolvePath('getHousingDetailById')
 export const API_ADD_PRESELECTION = resolvePath('taPreselectionRecord')
 export const API_CANCEL_PRESELECTION = resolvePath('taPreselectionRecordCancel')

src/onlineSelling/components/RaiseCard/index.js

@@ -1,34 +1,31 @@
 import { View, Image, Text } from "@tarojs/components";
 import { transferImage } from '@/utils/tools'
 import dayjs from 'dayjs'
-import emptyImg from '@/assets/empty.png'
 import copyImg from '../../assets/copy.png'
 import closeImg from '../../assets/close.png'
 
 import './index.scss'
 
-export default function HouseCard(props) {
+export default function RaiseCard(props) {
   const {
     buildingName,
-    termname,
+    termName,
     blockName,
     unitName,
     roomName,
     price,
-    housingStatus,
-    saleBatchStatus,
+    houseLockingStatus,
     apartmentName,
-    houseId,
+    mineLocked,
     createDate,
-    status = 1,
-    area1,
-    area2,
+    buildingArea,
+    insideArea,
     payStatus,
     code,
     buildingImgList = [],
   } = props.summary || {}
 
-  const title = `${buildingName} ${termname || ''} ${blockName} ${unitName} ${roomName}`
+  const title = `${buildingName || ''} ${termName || ''} ${blockName || ''} ${unitName || ''} ${roomName || '　'}`
   const thumb = (buildingImgList || []).length
   const showDT = dayjs(createDate).format('YYYY/MM/DD')
   const wanY = Number(price)
@@ -58,16 +55,15 @@ export default function HouseCard(props) {
         {props.type == 'raiseMoney' && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
         <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={status == '1' ? 'raised badge' : status == '2' ? 'unraise badge' : 'badge'}>{status == '1' ? '已锁给我' : '未缴费'}</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 == 'houseResource') && houseLockingStatus == 'locked' && <View style="color:#FF3C3C" className='raised 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 == 'raiseMoney' && <View className="red-price">现价{Number(price) + 0}万</View>}
-          {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 26rpx 0">未锁定/已锁定</View>}
+          {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 26rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
           <View className="title">{title}</View>
           {!props.type && <View className="meta">{showDT}</View>}
           {props.type == 'raiseProfile' && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
-
-          {props.type == 'raiseProfile' || props.type == 'raiseMoney' && <View className="area">建筑面积约<Text className="red">{area1}m²</Text></View>}
-          {props.type == 'raiseProfile' || props.type == 'raiseMoney' && <View className="area">使用面积约<Text className="red">{area2}m²</Text></View>}
+          {props.type == 'raiseProfile' || props.type == 'raiseMoney' && buildingArea && <View className="area">建筑面积约<Text className="red">{buildingArea}m²</Text></View>}
+          {props.type == 'raiseProfile' || props.type == 'raiseMoney' && insideArea && <View className="area">使用面积约<Text className="red">{insideArea}m²</Text></View>}
         </View>
         {props.type == 'houseResource' && <View className="house-code" style="margin-top:26rpx">房源编号：{code}
           <Image src={copyImg} className="copy-img" onClick={copyData}></Image>

src/onlineSelling/pages/raiseMoney/index.js

@@ -10,15 +10,15 @@ import * as houseActions from '@/actions/house'
 import NextStep from './NextStep'
 import { fetch, apis } from '@/utils/request'
 import Captcha from './Captcha'
-import { raiseOrder } from '@/services/project'
+import { raiseOrder, cancelOrder } from '@/services/project'
 import { getCodeMessage } from '@/services/getCode'
 import { checkIDCard, isEmpty } from '@/utils/tools'
 
-const getRaiseProfile = ({raiseId, salesBatchId, personId}) => {
+const getRaiseProfile = ({ raiseId, salesBatchId, personId }) => {
   const queryString = [
-    `${raiseId ? 'raiseId='+raiseId : ''}`,
-    `${salesBatchId ? 'salesBatchId='+salesBatchId : ''}`,
-    `${personId ? 'personId='+personId : ''}`,
+    `${raiseId ? 'raiseId=' + raiseId : ''}`,
+    `${salesBatchId ? 'salesBatchId=' + salesBatchId : ''}`,
+    `${personId ? 'personId=' + personId : ''}`,
   ].filter(Boolean).join('&')
 
   return fetch({ url: `${apis.API_RAISE_PROFILE}?${queryString}` })
@@ -51,7 +51,7 @@ export default class raiseMoney extends Component {
   captchaLock = false
 
   // 此页面不支持分享，以及二维码
-  componentWillMount(){
+  componentWillMount() {
     ready.queue(() => {
       const {
         salesBatchId,   // 批次, 备用
@@ -74,7 +74,7 @@ export default class raiseMoney extends Component {
         })
         return;
       }
-      
+
       if (this.$router.params.type == 'pay') {
         this.setState({ current: 3 })
       }
@@ -151,10 +151,10 @@ export default class raiseMoney extends Component {
       <ScrollView scrollY className="container">
         {
           raiseCart.map(item => (
-              <View key={item.houseId} >
-                <RaiseCard type="raiseMoney" summary={item} onCancel={this.handleCancel}/>
-              </View>
-            )
+            <View key={item.houseId} >
+              <RaiseCard type="raiseMoney" summary={item} onCancel={this.handleCancel} />
+            </View>
+          )
           )
         }
         <View className="addhouse">从<Text style="color:#BB9C79">预选记录</Text>中添加其他房源</View>
@@ -387,19 +387,20 @@ export default class raiseMoney extends Component {
 
   makePay = () => {
     const params = {
-      targetId: this.$router.params.id,
+      targetId: this.$router.params.raiseRecordId,
       targetType: 'house'
     }
-    
+
     return new Promise((resolve, reject) => {
       raiseOrder(params).then(res => {
+
         Taro.requestPayment({
-          timeStamp: res.timeStamp,
-          nonceStr: res.noncestr,
-          package: `prepay_id=${res.prepayid}`,
-          signType: 'MD5',
+          timeStamp: String(res.timeStamp),
+          nonceStr: res.nonceStr,
+          package: res.package,
+          signType: res.signType,
           paySign: res.sign,
-  
+
           success(res) {
             // TODO 缴费成功
 
@@ -457,7 +458,7 @@ export default class raiseMoney extends Component {
     return (
       <View className="bottom-btn">
         {current == 1 && <View style="font-size:24rpx;color:#999;line-height:70rpx">请仔细阅读选房协议直到结尾才能进入下一步</View>}
-        {current != 4 && 
+        {current != 4 &&
           <NextStep
             countdown={current == 1 ? 2 : 0}
             onClick={() => this.nextStep(current)}

src/onlineSelling/pages/raiseProfile/index.js

@@ -97,7 +97,7 @@ export default class extends Component {
   toPay = () => {
     const { raiseDeatil: { raiseRecordId } } = this.state
     Taro.navigateTo({
-      url: `/onlineSelling/pages/raiseMoney/index?type=pay&id=${raiseRecordId}`
+      url: `/onlineSelling/pages/raiseMoney/index?type=pay&raiseRecordId=${raiseRecordId}`
     })
   }
   // 未交费提示

src/onlineSelling/pages/records/index.js

@@ -122,7 +122,7 @@ export default class Records extends Component {
         <ScrollView scrollY className="container">
           <CheckboxGroup onChange={this.CheckboxChange}>
             {
-              noRecord ? <Blank style="margin:14vh 0 32vh 0" tips="暂无预选记录" /> :
+              noRecord ? <Blank style="margin:10vh 0 22vh 0" tips="暂无预选记录" /> :
                 <View>
                   {
                     recordList.map((item) => {
@@ -160,12 +160,12 @@ export default class Records extends Component {
       <Block>
 
         {
-          noRaiseRecord ? <Blank style="margin:14vh 0 32vh 0" tips="暂无认筹记录" /> :
+          noRaiseRecord ? <Blank style="margin:10vh 0 22vh 0" tips="暂无认筹记录" /> :
             <ScrollView scrollY>
               {
                 raiseList.map(item => (
                   <View key={item.raiseRecordId} >
-                    <RaiseCard handleCard={this.toRaiseProfile(item.raiseRecordId)} summary={item} />
+                    <RaiseCard handleCard={()=>this.toRaiseProfile(item.raiseRecordId)} summary={item} />
                   </View>
                 )
                 )

src/services/project.js

@@ -11,7 +11,8 @@ import {
   API_NOTICE_INFO,
   API_SALES_BATCH,
   API_RATSE_DETAIL,
-  API_RATSE_ORDER
+  API_RATSE_ORDER,
+  API_CANCEL_ORDER
 
 } from '@/constants/api'
 
@@ -79,6 +80,11 @@ export const queryApartmentType = payload => fetch({ url: API_APARTMENT_TYPE, pa
  * @param {*} payload
  */
 export const raiseOrder = payload => fetch({ url: API_RATSE_ORDER, payload, method: 'POST' })
+/**
+ *认筹单取消支付接口
+ * @param {*} payload
+ */
+export const cancelOrder = payload => fetch({ url: API_CANCEL_ORDER, payload, method: 'POST' })