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

config/prod.js

@@ -5,10 +5,10 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.2.54:8080"',
     // WSS_HOST: '"ws://192.168.2.54:8080"',
-    // HOST: '"https://dev.pawoma.cn"',// 新测试
-    // WSS_HOST: '"wss://dev.pawoma.cn"',
-    HOST: '"https://lt.pawoma.cn"',
-    WSS_HOST: '"wss://lt.pawoma.cn"',
+    HOST: '"https://dev.pawoma.cn"',// 新测试
+    WSS_HOST: '"wss://dev.pawoma.cn"',
+    // HOST: '"https://lt.pawoma.cn"',
+    // WSS_HOST: '"wss://lt.pawoma.cn"',
     Version: 'V3.5.12'
   },
   weapp: {},

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行互动",
-	"appid": "wxd6f47a9bb3052175",
+	"description": "知与行联调",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.js

@@ -125,12 +125,12 @@ class App extends Component {
         root: "onlineSelling",
         pages: [
           'pages/houseList/index',
+          'pages/raiseMoney/index',
           'pages/live/index',
           'pages/help/index',
           'pages/records/index',
           'pages/detail/index',
           'pages/detail/resultPage',
-          'pages/selectionRecord/index',
           'pages/screenHouse/index',
         ],
       }

src/onlineSelling/components/HouseGrid/Unit.js

@@ -13,7 +13,7 @@ export default class Unit extends Component {
     } else {
       item.noshow = false
     }
-    this.setState({})
+    this.setState({})  // 强制页面刷新
   }
   render() {
     const { termName, blockName, unitName, noshow = false, floorList = [] } = this.props.dataset || {}

src/onlineSelling/components/RaiseHouse/index.js

@@ -0,0 +1,46 @@
+import { View, Image, Text } from "@tarojs/components";
+import { transferImage } from '@/utils/tools'
+import dayjs from 'dayjs'
+
+import './index.scss'
+
+export default function RaiseHouse(props) {
+  const {
+    buildingName,
+    termname,
+    blockName,
+    unitName,
+    roomName,
+    price,
+    createDate,
+    buildingImgList = [],
+  } = props.summary || {}
+
+  const title = `${buildingName} ${termname||''} ${blockName} ${unitName} ${roomName}`
+  const thumb = (buildingImgList || []).length
+  const showDT = dayjs(createDate).format('YYYY/MM/DD')
+  const wanY = Number(price)
+
+  return (
+    <View className="raisehouse">
+      <View className="head">
+        {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
+          <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
+        }
+      </View>
+      <View className="body">
+        <View className="apartment">A户型</View>
+        <View className="price">现价234万</View>
+        <View className="title">XX嘉苑 1号楼 2单元 3楼 303号</View>
+        <View className="subtitle">
+          <Text>建筑面积约</Text>
+          <Text className="red">{wanY + 'm²' || '待定'}</Text>
+        </View>
+        <View className="subtitle">
+          <Text>使用面积约</Text>
+          <Text className="red">{wanY + 'm²' || '待定'}</Text>
+        </View>
+      </View>
+    </View>
+  )
+}

src/onlineSelling/components/RaiseHouse/index.scss

@@ -0,0 +1,65 @@
+.raisehouse {
+  width: 690px;
+  height: 250px;
+  background:#fff;
+  border-radius: 8px;
+  display: flex;
+  margin: 16px 30px;
+  box-shadow: 0 4px 15px 1px rgba(0, 0, 0, 0.12);
+  font-weight: 400;
+
+  .head {
+    width: 250px;
+    flex: none;
+    border-right: 2px solid rgba(0, 0, 0, 0.04);
+    padding: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .thumb {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .body {
+    width: 438px;
+    flex: none;
+    position: relative;
+    line-height: 40px;
+    padding: 20px 16px;
+
+    .apartment {
+      font-size: 26px;
+      color: #FE1C1C;
+      font-weight: 700;
+    }
+
+    .price {
+      font-size: 24px;
+      font-weight: 700;
+      color: #FE1C1C;
+      line-height: 1.8;
+    }
+    .title {
+      font-size: 26px;
+      font-weight: bold;
+      color: #333;
+      line-height: 1.8;
+    }
+
+    .subtitle {
+      font-size: 28px;
+      color:#333;
+      line-height: 1.6;
+
+    }
+  }
+
+  .red {
+    color: #FF3C3C;
+    margin: 0 6px;
+  }
+
+}

src/onlineSelling/pages/detail/index.js

@@ -136,7 +136,9 @@ export default class Index extends Component {
     }
 
   }
-
+  toRaiseMoney(){
+    Taro.navigateTo({ url: `/onlineSelling/pages/raiseMoney/index` })
+  }
 
 
   render() {
@@ -213,17 +215,12 @@ export default class Index extends Component {
                     取消预选
                   </View>
                 }
-                <View className="close-btn">
-                  认筹功能未开放
+                <View className="close-btn" onClick={() => this.toRaiseMoney()}>
+                  认筹此房源
               </View>
               </View>
-
-
             </View>
           </ScrollView>
-
-
-
         </View>
 
       </Block >

src/onlineSelling/pages/raiseMoney/index.js

@@ -0,0 +1,32 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View } from '@tarojs/components'
+import './index.scss'
+
+export default class raiseMoney extends Component {
+  config = {
+    navigationBarTitleText: '认筹确认'
+  }
+
+  render() {
+
+    return (
+      <View className="raiseMoney">
+        <View className="top-con">
+          <View>确认房源</View>
+          <View className="right-icon1" ></View>
+          <View>阅读协议</View>
+          <View className="right-icon1" ></View>
+          <View>填写资料</View>
+          <View className="right-icon1" ></View>
+          <View>缴纳定金</View>
+          <View className="right-icon1" ></View>
+          <View>认筹结果</View>
+          
+       
+        </View>
+
+      </View>
+    )
+  }
+
+}

src/onlineSelling/pages/raiseMoney/index.scss

@@ -0,0 +1,35 @@
+.raiseMoney{
+  .top-con{
+    display: flex;
+    align-items: center;
+    padding: 30px;
+    .right-icon1{
+      width:11px;
+      height:11px;
+      border-top: 1px solid rgba(0,0,0,0.4);
+      border-right: 1px solid rgba(0,0,0,0.4);
+      transform:rotate(45deg);
+      display: inline-block;
+    }
+    .right-icon2{
+      width:14px;
+      height:14px;
+      border-top: 1px solid rgba(0,0,0,0.7);
+      border-right: 1px solid rgba(0,0,0,0.4);
+      transform:rotate(45deg);
+      display: inline-block;
+      margin-left: -2px;
+    }
+    .right-icon3{
+      width:17px;
+      height:17px;
+      border-top: 1px solid rgba(0,0,0,7);
+      border-right: 1px solid rgba(0,0,0,1);
+      transform:rotate(45deg);
+      display: inline-block;
+      margin-left: -2px;
+    }
+    
+  }
+  
+}

src/onlineSelling/pages/selectionRecord/index.js

@@ -1,105 +0,0 @@
-import Taro, { Component } from '@tarojs/taro';
-import './index.scss'
-import HouseCard from '../../components/HouseCard'
-import Blank from '../../components/Blank'
-import { AtTabs, AtTabsPane } from 'taro-ui'
-import "taro-ui/dist/style/components/tabs.scss"
-import { connect } from '@tarojs/redux'
-
-
-@connect(({ user, city }) => ({ user, city }))
-export default class selectionRecord extends Component {
-
-  config = {
-    navigationBarTitleText: '选房记录'
-  }
-
-  state = {
-    current: 0,
-    recordId: undefined, // 埋点ID
-    testData: [
-      {
-        preselectionRecordId: 1,
-        buildingName: '艾菲国际二期',
-        blockName: '6栋',
-        unitName: '一单元',
-        roomName: '1502',
-        aerialViewImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1573738541467-25667811-b020-4c1f-b57d-e65a410d6fbd3103856559286073565.jpg',
-        price: '234万',
-        createDate: '2020-02-8',
-        status: 1
-      },
-      {
-        preselectionRecordId: 2,
-        buildingName: '艾菲国际二期',
-        blockName: '6栋',
-        unitName: '一单元',
-        roomName: '1502',
-        aerialViewImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1573738541467-25667811-b020-4c1f-b57d-e65a410d6fbd3103856559286073565.jpg',
-        price: '234万',
-        createDate: '2020-02-9',
-        status: 0
-      },
-      {
-        preselectionRecordId: 3,
-        buildingName: '艾菲国际二期',
-        blockName: '6栋',
-        unitName: '二单元',
-        roomName: '1503',
-        aerialViewImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1573738541467-25667811-b020-4c1f-b57d-e65a410d6fbd3103856559286073565.jpg',
-        price: '234万',
-        createDate: '2020-02-10',
-        status: 1
-      },
-      {
-        preselectionRecordId: 4,
-        buildingName: '艾菲国际二期',
-        blockName: '6栋',
-        unitName: '二单元',
-        roomName: '1504',
-        aerialViewImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1573738541467-25667811-b020-4c1f-b57d-e65a410d6fbd3103856559286073565.jpg',
-        price: '234万',
-        createDate: '2020-02-11',
-        status: 0
-      },
-    ]
-  }
-
-  componentWillMount() {
-
-  }
-
-
-  handleClick(value) {
-    this.setState({
-      current: value
-    })
-  }
-
-
-  render() {
-    const { testData } = this.state
-    return (
-      <View style="height:100vh">
-        <AtTabs className="selectionRecord" scroll current={this.state.current} tabList={[{ title: '预选记录' }, { title: '认筹记录' }]} onClick={this.handleClick.bind(this)}>
-          <AtTabsPane current={this.state.current} index={0} >
-            {
-              testData.map((item) => {
-                return (
-                  <View className="carditem" key={item.preselectionRecordId}>
-                    <HouseCard summary={item} />
-                  </View>
-                )
-              })
-            }
-          </AtTabsPane>
-          <AtTabsPane current={this.state.current} index={1}>
-            <View>
-              <Blank tips="暂无认筹记录" />
-            </View>
-          </AtTabsPane>
-        </AtTabs>
-      </View>
-    )
-  }
-}

src/onlineSelling/pages/selectionRecord/index.scss

@@ -1,28 +0,0 @@
-@import "@/styles/mixins.scss";
-@import "@/styles/theme.scss";
-.selectionRecord{
-    .at-tabs__header{
-      width: 86%;
-      background-color: #fff;
-      box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
-      margin: 20px auto 10px auto;
-      border-radius: 44px;
-    }
-    .at-tabs__item{
-      width:50%;
-      flex: none;
-      color: #333;
-      font-size: 28px;
-    }
-    .at-tabs__item--active{
-      color: $primary-color;
-      background-color: #f4f4f4;
-    }
-    .at-tabs__item-underline{
-      height: 0;
-    }
-    .at-tabs__underline{
-      display: none;
-    }
-  
-}