feats

project.config.json

@@ -48,9 +48,9 @@
 			"list": [
 				{
 					"id": -1,
-					"name": "pages/help/index",
-					"pathName": "onlineSelling/pages/help/index",
-					"query": "",
+					"name": "pages/houseList/index",
+					"pathName": "onlineSelling/pages/houseList/index",
+					"query": "id=6&buildingId=7a46e04f15c324fa9cf44ce27f9573c5",
 					"scene": null
 				},
 				{

src/components/Poster/index.js

@@ -75,6 +75,7 @@ export default class Poster extends Component {
 
   onCreateSuccess = (inx) => {
     return (result) => {
+      debugger
       const { tempFilePath, errMsg } = result;
       if (errMsg === 'canvasToTempFilePath:ok') {
         this.tmpImgs[inx] = tempFilePath

src/onlineSelling/components/HouseGrid/Room.js

@@ -12,12 +12,14 @@ export default function Room(props) {
     }
   }
 
+  const wanY = Number(price / 10000).toFixed(0)
+
   return (
     <HotBlock number={heat + realHeat + 0}>
       <View className="room" onClick={handleClick}>
         <View className="warn">{roomName}</View>
         <View className="warn">{personNum}</View>
-        <View className="info">{price || '0'}万</View>
+        <View className="info">{wanY}万</View>
         <View className="info">{apartmentName || 'A户型'}</View>
       </View>
     </HotBlock>

src/onlineSelling/pages/houseList/index.js

@@ -7,7 +7,8 @@ import Blank from '../../components/Blank'
 import ActSheet from '../../components/ActSheet'
 import ShareButtons from '../../components/ShareButtons'
 import GrantProfile from '../../components/GrantProfile'
-import Poster from './poster'
+// import Poster from './poster'
+import Poster from '@/components/Poster'
 import { connect } from '@tarojs/redux'
 import ready from '@/utils/ready'
 import { queryHouseList, queryNoticeInfo, queryApartmentType, querySalesInfo } from '@/services/project'
@@ -17,12 +18,12 @@ import { share as shareSavePoint } from '@/utils/shareSavePoint'
 import { ROLE_CODE } from '@/constants/user'
 import { report as reportCustomer } from '@/utils/customer'
 import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
+import { getCanvasConfig } from '@/utils/tools'
 // import Consultant from '@/components/consultant'
 
 import './index.scss'
 
 @connect(s => s.user)
-@withDetail()
 export default class HouseList extends Component {
   config = {
     navigationBarTitleText: '房源',
@@ -45,8 +46,8 @@ export default class HouseList extends Component {
     posterShow: false,
     posterData: {},
     shareContents: [],
-    buildingId: null
-
+    buildingId: null,
+    posterConfig: [],
   }
 
   componentWillMount() {
@@ -59,6 +60,13 @@ export default class HouseList extends Component {
   componentWillReceiveProps() {
     this.reportClientFn()
   }
+  
+  transTPLs2Configs(tpls, params) {
+    return tpls.map((tpl) => {
+      const conf = getCanvasConfig(tpl.configs, params)
+      return { ...conf }
+    })
+  }
 
   // 报备客户
   reportClientFn() {
@@ -115,17 +123,18 @@ export default class HouseList extends Component {
       })
     })
     querySalesInfo(id).then(res => {
+      const { templates = [], posterImg = '' } = (res.posters || [])[0]
+
       this.setState({
         buildingId: res.buildingId,
-        posterData: res.posters || [],
+        posterData: { poster: posterImg },
         shareContents: res.shareContents || [],
       }, () => {
-        const { posterData } = this.state
-        if (posterData && posterData.length && posterData[0].posterImg) {
-          this.setState({
-            posterShow: true
-          })
-        }
+        debugger
+        this.getPosterData().then(posterData => {
+          const posterConfig = this.transTPLs2Configs(templates, posterData)
+          this.setState({ posterConfig, posterData })
+        })
       })
     })
     queryApartmentType({ salesBatchId: id }).then(res => {
@@ -183,7 +192,6 @@ export default class HouseList extends Component {
       if (!found) {
         list.push({ ...unit, unitList: [unit] })
       }
-      console.log(list, "listlistlistlistlistlistlistlistlistlistlistlistlist")
 
       return list
     }, [])
@@ -302,10 +310,10 @@ export default class HouseList extends Component {
       const payload = { page, scene }
 
       getMiniQrcode(payload).then(qrcode => {
-        const { posterData } = this.state
+        const { posterData = {} } = this.state
         let data = {
           qrcode,//小程序二维码
-          poster:posterData[0].posterImg
+          ...posterData,
         }
         resolve(data)
       })
@@ -520,9 +528,11 @@ export default class HouseList extends Component {
   }
 
   render() {
-    const { showShareMenu, showPoster, showGrantProfile, houseList, conditionVisible, posterData, posterShow } = this.state
+    const { showShareMenu, showPoster, houseList, conditionVisible, posterData, posterShow, posterConfig } = this.state
     const { userInfo: { person } } = this.props
 
+    const showCircleBtn = posterData && posterData.qrcode
+console.log('==============>', posterData, showPoster, posterConfig)
     return (
       <Block>
         {conditionVisible && this.renderCondition()}
@@ -530,7 +540,7 @@ export default class HouseList extends Component {
         <GrantProfile both person={person} />
 
         {/* 生成海报 */}
-        {showPoster && <Poster data={posterData} toggle={this.togglePosterStatus}></Poster>}
+        {showPoster && <Poster data={posterData} configs={posterConfig} onCancel={this.togglePosterStatus} onFinish={this.togglePosterStatus} ></Poster>}
         {!conditionVisible && <Block>
           <View className="houselist">
             {this.renderBar()}
@@ -540,7 +550,7 @@ export default class HouseList extends Component {
           {/* 分享按钮 */}
           <ActSheet show={showShareMenu}>
             <ShareButtons
-              circleBtn={posterShow}
+              circleBtn={showCircleBtn}
               onShareFrineds={this.handleShareFrineds}
               onSharingCircleOfFriends={() => this.togglePosterStatus(true)}
             // onSharingCircleOfFriends={this.handleSharingCircleOfFriends}

src/pages/temp/index.js

@@ -0,0 +1,17 @@
+import Taro, { Component } from '@tarojs/taro'
+import { Navigator } from "@tarojs/components";
+
+export default class extends Component {
+  render() {
+    return (
+      <Navigator
+        target="miniProgram"
+        path="pages/roomend/main.html?roomId=1358593484"
+        appId="wxb825ab501296672e"
+        style="width: 100vw; height: 100vh"
+      >
+        <Image style="width: 100vw; height: 100vh" src="https://njcj.oss-cn-shanghai.aliyuncs.com/20200213105513.png" />
+      </Navigator>
+    )
+  }
+}