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://127.0.0.1:8080"',
+    // WSS_HOST: '"ws://127.0.0.1:8080"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
     Version: 'V3.5.12'

src/app.scss

@@ -23,12 +23,12 @@
   border-radius: 0;
   border:none;
 }
-.at-tabs-pane--active{
-  height: 100vh!important;
-  overflow: scroll;
-  padding-bottom: 100px;
+// .at-tabs-pane--active{
+//   height: 100vh!important;
+//   overflow: scroll;
+//   padding-bottom: 100px;
 
-}
+// }
 @keyframes fadeBottomIn {
   0% {
     transform: translateY(10%);

src/onlineSelling/components/RaiseCard/index.js

@@ -23,6 +23,7 @@ export default function RaiseCard(props) {
     payStatus,
     houseId,
     taHousingResourcesList = [],
+    taRaise = {},
     buildingImgList = [],
   } = props.summary || {}
 
@@ -48,22 +49,22 @@ export default function RaiseCard(props) {
   }
   return (
     <View className="housecard" style={props.style} >
-      <View className="head" onClick={props.handleCard}>
+      <View className="head" onClick={() => (props.handleCard && props.handleCard())}>
         {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
           <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
         }
       </View>
       <View className="body">
-        {props.type == 'raiseMoney' && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
-        <View onClick={props.handleCard}>
+        {props.type == 'raiseMoney' && !props.disableCancel && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
+        <View onClick={() => (props.handleCard && 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 == 'raiseMoney' && <View className="red-price">现价{Number(price) + 0}万</View>}
+          {props.type == 'raiseMoney' && taRaise.displayHousePrice && <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>
           {!props.type && <View className="meta">{showDT}</View>}
-          {props.type == 'raiseProfile' && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
+          {props.type == 'raiseProfile' && taRaise.displayHousePrice && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
           {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
             <Block>
               {buildingArea ? <View className="area">建筑面积约 <Text className="red">{buildingArea}m²</Text>

src/onlineSelling/components/RaiseCard/index.scss

@@ -1,6 +1,6 @@
 .housecard {
   width: 690px;
-  height: 250px;
+  min-height: 250px;
   background:#fff;
   display: flex;
   font-weight: 400;

src/onlineSelling/components/ScrollMessage/index.js

@@ -54,7 +54,6 @@ export default class ScrollMessage extends Component {
       <View className="scrollmessage">
         <View className="head">
           <Image style="width:44rpx;height:44rpx;margin-top: 10rpx;" src={require('../../assets/notice.png')}></Image>
-          {/* <NamedIcon name="notice" size={44} /> */}
         </View>
         <View className="body">
           <Swiper vertical autoplay>

src/onlineSelling/components/ShareButtons/ShareBtn.js

@@ -9,7 +9,6 @@ export default function ShareBtn(props) {
   return (
     <Button className="sharebtn" onClick={handleClick} openType={props.openType}>
       <View>
-        {/* <NamedIcon name={props.name} size={props.size || 56} /> */}
         {props.name=='share-friends'&&<Image style="width:56rpx;height:56rpx" src={require('../../assets/share-friends.png')}></Image>}
         {props.name=='sharing-circleoffriends'&&<Image style="width:56rpx;height:56rpx" src={require('../../assets/sharing-circleoffriends.png')}></Image>}
       </View>

src/onlineSelling/pages/detail/index.js

@@ -97,7 +97,6 @@ export default class Index extends Component {
   }
 
   handlePanoramaClick(panoramaLink) {
-    console.log(panoramaLink, "panoramapanoramapanoramapanoramapanoramapanoramapanoramapanoramapanorama")
 
     if (!panoramaLink) return;
 
@@ -191,9 +190,10 @@ export default class Index extends Component {
               <View style="padding: 0 30rpx;">
                 <View className="name">{houseDetail.apartmentName || ''}</View>
                 <View className="btn" onClick={() => this.handleChat(houseDetail.buildingId)}>询问优惠</View>
-                <View className="price">
-                  现价：{houseDetail.price}万
-              </View>
+                {
+                  taRaise.displayHousePrice && <View className="price"> 现价：{houseDetail.price}万</View>
+                }
+
                 {houseDetail.apartmentName &&
                   <View className="area">
                     {houseDetail.buildingArea ? <Text>建筑面积约<Text style="color:#FE1C1C">{houseDetail.buildingArea}</Text>m² </Text> : '建筑面积待定'}

src/onlineSelling/pages/houseCart/index.scss

@@ -68,13 +68,14 @@
 
   .shoping-cart {
     position: absolute;
-    bottom: 135px;
+    bottom: 125px;
     font-size: 28px;
     line-height: 30px;
     color: #333;
     width: calc(100% - 70px);
     box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
     border-radius:44px 44px 0px 0px;
+    background-color: #fff;
 
     .title {
       text-align: center;

src/onlineSelling/pages/houseList/index.js

@@ -23,8 +23,9 @@ import { getCardDetail } from '@/services/card'
 import Consultant from '@/components/consultant'
 import './index.scss'
 import { Loading } from '@/components/Loading'
+import * as houseActions from '@/actions/house'
 
-@connect(s => s.user)
+@connect(s => s.user, { ...houseActions })
 @withDetail({
   track: {
     event: 'house_list',
@@ -70,6 +71,9 @@ export default class HouseList extends Component {
       this.setState({ showShareMenu: false })
       this.initPageData()
     })
+
+    // 清空认筹选择
+    this.props.dispatchFlush2Cart([])
   }
 
 
@@ -382,12 +386,10 @@ export default class HouseList extends Component {
         </View>
         <View className="action">
           <View onClick={this.handleExplainClick}>
-            {/* <NamedIcon name="explain" size={50} /> */}
             <Image style="width:50rpx;height:50rpx" src={transferImage(require('../../assets/explain.png'))}></Image>
           </View>
           <View onClick={this.handleSearchClick}>
             <Image style="width:50rpx;height:50rpx" src={transferImage(require('../../assets/screen.png'))}></Image>
-            {/* <NamedIcon name="screen" size={50} /> */}
           </View>
         </View>
       </View>
@@ -395,7 +397,7 @@ export default class HouseList extends Component {
   }
 
   renderHouses() {
-    const { houseList,dataType } = this.state
+    const { houseList, dataType } = this.state
 
     return (
       <ScrollView className="container" scrollY scrollWithAnimation>
@@ -418,12 +420,10 @@ export default class HouseList extends Component {
     return (
       <View className="bottombar">
         <Button className="btn record" onClick={this.handleRecordBtn}>
-          {/* <NamedIcon name="record" size="42" /> */}
           <Image style="width:42rpx;height:42rpx" src={transferImage(require('../../assets/record.png'))}></Image>
           <Text className="txt">选房记录</Text>
         </Button>
         <Button className="btn share" onClick={this.handleShareBtn}>
-          {/* <NamedIcon name="share" size="42" /> */}
           <Image style="width:42rpx;height:42rpx" src={transferImage(require('../../assets/share.png'))}></Image>
           <Text className="txt">分享</Text>
         </Button>
@@ -432,7 +432,8 @@ export default class HouseList extends Component {
   }
 
   handleCondition(value) {
-    if (value == 2) {
+    const { salesBatchDetail: { displayHousePrice } } = this.state
+    if ((!displayHousePrice && value == 1) || value == 2) {
       this.setState({
         apartmentId: '',
         startPrice: '',
@@ -563,27 +564,29 @@ export default class HouseList extends Component {
             </View>
           ))}
         </View>
-          : <Blank tips="暂无户型图，请按价格筛选"></Blank>
+          : <Blank tips="暂无户型"></Blank>
         }
       </Block>
     )
   }
 
   renderCondition() {
-    const { current } = this.state
+    const { current, salesBatchDetail: { displayHousePrice } } = this.state
     const condition = [{ title: '按户型', value: 0 }, { title: '按价格', value: 1 }, { title: '不限条件', value: 2 }]
+    const condition2 = [{ title: '按户型', value: 0 }, { title: '不限条件', value: 2 }]
+    const conditionList = displayHousePrice ? condition : condition2
     return (
       <View className="screen-page">
         <View className="screen-top">
           筛选房源
-            {condition.map(item => (
+            {conditionList.map(item => (
             <View key={item.value} onClick={() => this.handleCondition(item.value)} className={current == item.value ? 'top-item active' : 'top-item'}>
               {item.title}
             </View>
           ))}
         </View>
         {current == 0 && this.renderApartment()}
-        {current == 1 && this.renderPrice()}
+        {current == 1 && displayHousePrice && this.renderPrice()}
 
 
       </View>
@@ -652,7 +655,7 @@ export default class HouseList extends Component {
                     </View>
                   ))}
                 </View>
-                
+
                 {houseList.length ? this.renderHouses() : this.renderBlank()}
                 {this.renderBottom()}
               </View>

src/onlineSelling/pages/raiseMoney/NextStep/index.scss

@@ -9,5 +9,6 @@
 
   &.disable {
     background: #000;
+    opacity:0.6;
   }
 }

src/onlineSelling/pages/raiseMoney/RadioList/index.js

@@ -0,0 +1,32 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Label, Radio } from "@tarojs/components";
+import './index.scss'
+
+export default class extends Component {
+
+  render() {
+    const { value, color, size, dataset = [], onChange } = this.props
+
+    return (
+      <RadioGroup onChange={onChange}>
+        {
+          dataset.map((item) => {
+            const checked = item.value === value
+            const checkedColor = color && checked ? `border-color: ${color}` : ''
+            const btnSize = size ? `width: ${size}; height: ${size}` : ''
+            const btnStyle = `${checkedColor};${btnSize}`
+
+            return (
+              <Label key={item.value} className="radio-btn">
+                <Radio hidden value={item.value} checked={checked}></Radio>
+                <View className={`icon ${checked ? 'checked' : ''}`} style={btnStyle}></View>
+                <View className="label">{item.label}</View>
+              </Label>
+            )
+          })
+        }
+      </RadioGroup>
+    )
+  }
+
+}

src/onlineSelling/pages/raiseMoney/RadioList/index.scss

@@ -0,0 +1,28 @@
+.radio-btn {
+  display: inline-block;
+
+  .icon {
+    width: 20px;
+    height: 20px;
+    display: inline-block;
+    border:2px solid #999;
+    border-radius:50%;
+    position: relative;
+    margin-right: 10px;
+    vertical-align: middle;
+
+    &.checked {
+      border-width: 6px;
+      border-style: solid;
+      border-color: #f00;
+    }
+  }
+
+  .label {
+    display: inline-block;
+  }
+
+  & + .radio-btn {
+    margin-left: 40px;
+  }
+}

src/onlineSelling/pages/raiseMoney/index.js

@@ -10,10 +10,11 @@ import * as houseActions from '@/actions/house'
 import NextStep from './NextStep'
 import { fetch, apis } from '@/utils/request'
 import Captcha from './Captcha'
-import { raiseOrder, cancelOrder } from '@/services/project'
+import { raiseOrder, cancelOrder, queryPreselectionRecord } from '@/services/project'
 import { getCodeMessage } from '@/services/getCode'
 import { checkIDCard, isEmpty } from '@/utils/tools'
 import ContactConsultant from '../../components/ContactConsultant'
+import RadioList from './RadioList'
 
 const getRaiseProfile = ({ salesBatchId, raiseRecordId, personId }) => {
   const queryString = [
@@ -46,11 +47,17 @@ export default class raiseMoney extends Component {
   state = {
     current: 0,
     inputName: '',
-    raiseProfile: undefined,
-    record: {},
-    protocolCountdown: 10, // 单位 s
-    captchaCountdown: 60, // 单位 s
-    raiseIdRecord:'',
+    raiseProfile: undefined,  // 认筹主记录
+    record: {},               // 认筹单
+    preselectList: [],        // 我的预选 - 当前批次
+    protocolCountdown: 10,    // 单位 s
+    captchaCountdown: 60,     // 单位 s
+    payType: '',              // 缴费方式
+    failInfo: undefined,      // 操作失败 - 对象 { title, desc }
+    payTypeList: [
+      { label: '线上缴费', value: 'onLine' },
+      { label: '线下缴费', value: 'offLine' },
+    ],
   }
 
   captchaLock = false
@@ -87,7 +94,13 @@ export default class raiseMoney extends Component {
 
     // 请求认筹信息
     getRaiseProfile({ salesBatchId, raiseRecordId, personId }).then(res => {
-      this.setState({ raiseProfile: res, record: res.record || defaultRecord })
+      let payType = ''
+      const payTypeSettings = (res.payType || '').split(',')
+      if (payTypeSettings.length === 1) {
+        payType = payTypeSettings[0]
+      }
+
+      this.setState({ raiseProfile: res, payType, record: res.record || defaultRecord })
 
       // 请求置业顾问列表
       if (!house.consultantList || !house.consultantList.length) {
@@ -97,6 +110,31 @@ export default class raiseMoney extends Component {
           pageNumber: 1,
         })
       }
+
+      this.getMyPreselection({
+        personId,
+        pageNumber: 1,
+        pageSize: 999,
+        salesBatchId: res.salesBatchId,
+      }).then((res2) => {
+        // 如果认筹必须预选
+        if (res.needPreselection && res2.length < 1) {
+          this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '请先预选房源' } })  
+        }
+      })
+    })
+  }
+
+  // 我的预选
+  getMyPreselection = (params) => {
+    return new Promise((resolve, reject) => {
+      queryPreselectionRecord(params).then((res) => {
+        this.setState({ preselectList: res.records })
+        resolve(res.records)        
+      }).catch(() => {
+        resolve([])
+        // reject()
+      })
     })
   }
 
@@ -160,17 +198,27 @@ export default class raiseMoney extends Component {
   }
   renderHouse() {
     const { house: { raiseCart } } = this.props
+    const { raiseProfile = {} } = this.state
+    const disabled = raiseProfile.houseLockingType === 'auto'
+
     return (
       <ScrollView scrollY className="container">
         {
           raiseCart.map(item => (
             <View key={item.houseId} >
-              <RaiseCard type="raiseMoney" summary={item} onCancel={this.handleCancel} />
+              <RaiseCard type="raiseMoney" style="height:auto" summary={item} onCancel={this.handleCancel} disableCancel={disabled} />
             </View>
           ))
         }
-        <View className="addhouse">从 <Text style="color:#F3B82E" onClick={this.gotoHouseSelect.bind(this, 'all')}>房源列表</Text> 中添加其他房源</View>
-        <View className="addhouse">从 <Text style="color:#BB9C79" onClick={this.gotoHouseSelect.bind(this, 'select')}>预选记录</Text> 中添加其他房源</View>
+        {
+          !disabled &&
+          (
+            <Block>
+              <View className="addhouse">从 <Text style="color:#F3B82E" onClick={this.gotoHouseSelect.bind(this, 'all')}>房源列表</Text> 中添加其他房源</View>
+              <View className="addhouse">从 <Text style="color:#BB9C79" onClick={this.gotoHouseSelect.bind(this, 'select')}>预选记录</Text> 中添加其他房源</View>
+            </Block>
+          )
+        }
         <Statement style="margin-top:80rpx" />
       </ScrollView>
     )
@@ -344,10 +392,19 @@ export default class raiseMoney extends Component {
     num = num.replace(reg, '$1');
     num = this.toDecimal2(num)
     return num
-  };
-  renderMoney() {
-    const { raiseProfile = {} } = this.state
+  }
 
+  handleChangeType = (e) => {
+    console.log('----------------->', e)
+    this.setState({ payType: e.detail.value })
+  }
+
+  renderMoney() {
+    const { raiseProfile = {}, payTypeList, payType } = this.state
+    const payTypeSettings = (raiseProfile.payType || '').split(',')
+    const showTypes = payTypeList.filter(x => (payTypeSettings.indexOf(x.value) > -1))
+    const showProtocal = payType === 'onLine' ? raiseProfile.payDescriptionOnline : raiseProfile.payDescriptionOffline
+    const payTip = payType === 'onLine' ? '线上缴费说明' : '线下缴费说明'
 
     return (
       <ScrollView scrollY className="container2" style="padding:0 30rpx">
@@ -355,8 +412,19 @@ export default class raiseMoney extends Component {
           <View className="title">认筹金额</View>
           <View className="price">{this.regFenToYuan(raiseProfile.raisePrice)}元</View>
         </View>
-        <View className="center-title">线上缴费说明</View>
-        <RichText nodes={raiseProfile.payDescriptionOnline || ''} />
+        {
+          (payTypeSettings.length > 1) &&
+          (
+            <View className="pay-type">
+              <View className="head">请选择缴费方式：</View>
+              <View className="body">
+                <RadioList dataset={showTypes} value={payType} onChange={this.handleChangeType} />
+              </View>
+            </View>
+          )
+        }
+        <View className="center-title">{payTip}</View>
+        <RichText nodes={showProtocal || ''} />
       </ScrollView >
     )
   }
@@ -417,8 +485,10 @@ export default class raiseMoney extends Component {
       return Promise.reject()
     }
 
+    debugger
+
     // 校验手机号
-    if (isEmpty(record.tel) || record.tel < 11) {
+    if (isEmpty(record.tel) || record.tel.length < 11) {
       Taro.showToast({
         title: '手机号格式不正确',
         icon: 'none',
@@ -458,8 +528,21 @@ export default class raiseMoney extends Component {
   }
 
   makePay = () => {
+    const { payType, record = {} } = this.state
+    if (!payType) {
+      Taro.showToast({
+        title: '请确定支付方式',
+        icon: 'none'
+      })
+      return Promise.reject()
+    }
+
+    if (payType === 'offLine') {
+      return Promise.resolve()
+    }
+
     const params = {
-      targetId: this.$router.params.raiseRecordId || this.state.raiseIdRecord,
+      targetId: this.$router.params.raiseRecordId || record.raiseRecordId,
       targetType: 'house'
     }
 
@@ -497,15 +580,31 @@ export default class raiseMoney extends Component {
     })
   }
   renderResult() {
-    const { raiseProfile = {} } = this.state
+    const { raiseProfile = {}, failInfo } = this.state
+    const isOk = !failInfo
+    const showIcon = isOk ? require('../../assets/success2.png') : require('../../assets/fail2.png')
+    const showTitle = isOk ? '提交成功' : failInfo.title
+
     return (
       <View className="result">
-        <Image className="result-img" src={require('../../assets/success2.png')}></Image>
+        <Image className="result-img" src={showIcon}></Image>
 
-        <View className="status">提交成功</View>
+        <View className="status">{showTitle}</View>
+
+        {
+          isOk &&
+          (
+            <Block>
+              <View className="tip" style="margin-bottom:10rpx">详情请查看认筹单</View>
+              <View className="tip">支付结果请留意微信支付通知</View>
+            </Block>
+          )
+        }
+
+        {
+          !isOk && (<View className="tip">{(failInfo || {}).desc}</View>)
+        }
 
-        <View className="tip" style="margin-bottom:10rpx">详情请查看认筹单</View>
-        <View className="tip">支付结果请留意微信支付通知</View>
         <ContactConsultant buildingId={raiseProfile.buildingId} style=" position: absolute;bottom: 11vh;" />
 
         <View className="look-btn" onClick={() => this.toRaiseProfile(raiseProfile.raiseId)}>查看认筹单</View>
@@ -530,9 +629,7 @@ export default class raiseMoney extends Component {
         this.makeRaiseRecord().then((res) => {
           console.log(res, "res")
           this.setState({
-            current: current + 1,
-            raiseIdRecord: res.raiseRecordId
-
+            current: current + 1
           })
         })
         return;

src/onlineSelling/pages/raiseMoney/index.scss

@@ -44,6 +44,26 @@
   }
   .container2 {
     height: calc(100vh - 382px);
+
+    .pay-type {
+      display: flex;
+      margin: 30px 0 40px;
+      font-size:28px;
+      color: #333;
+
+      .head {
+        width: 240px;
+        flex: none;
+      }
+
+      .body {
+        flex: auto;
+
+        .item {
+          display: inline-block;
+        }
+      }
+    }
   }
   .container3 {
     height: calc(100vh - 452px);

src/onlineSelling/pages/raiseProfile/Cell.js

@@ -15,7 +15,7 @@ export default function (props) {
             <View className="body">{props.body}</View>
             <View className="action" onClick={props.onActionClick}>
               {
-                props.action && (<NamedIcon name="copy" size={34} />)
+                props.action && (<Image src={require('../../assets/copy.png')} style="width:34rpx;height:34rpx"></Image>)
               }
             </View>
           </View>

src/onlineSelling/pages/raiseProfile/index.js

@@ -87,7 +87,7 @@ export default class Raise extends Component {
       <Block>
         <View className="cancelReason flexSpace">
           <View className="flexSpace-fixed">
-            <NamedIcon name="void" size={120} />
+            <Image src={require('../../assets/void.png')} style="width:120rpx;height:120rpx"></Image>
           </View>
           <View className="flexSpace-item" style="margin-left: 20px">
             <View>认筹单作废原因：</View>
@@ -100,10 +100,26 @@ export default class Raise extends Component {
   }
   // 跳转去交费
   toPay = () => {
-    const { raiseDeatil: { raiseRecordId } } = this.state
-    Taro.navigateTo({
-      url: `/onlineSelling/pages/raiseMoney/index?type=pay&raiseRecordId=${raiseRecordId}`
+    console.log(this.props, "this.propsthis.propsthis.props")
+    const { user: { userInfo: { miniApp: { tpls } } } } = 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() {
+        const { raiseDeatil: { raiseRecordId } } = this.state
+
+        Taro.navigateTo({
+          url: `/onlineSelling/pages/raiseMoney/index?type=pay&raiseRecordId=${raiseRecordId}`
+        })
+      }
     })
+
   }
   // 未交费提示
   renderUnpayNotice() {
@@ -112,7 +128,7 @@ export default class Raise extends Component {
       <Block>
         <View className="unpayNotice flexSpace" onClick={this.toPay}>
           <View className="flexSpace-fixed">
-            <NamedIcon name="pay" size={64} />
+            <Image src={require('../../assets/pay.png')} style="width:64rpx;height:64rpx"></Image>
             <View className="a-line txt">未缴费？点我缴费</View>
           </View>
           <View className="flexSpace-fixed">

src/onlineSelling/pages/raiseProfile/index.scss

@@ -71,6 +71,7 @@
 .flexSpace {
   display: flex;
   justify-content: space-between;
+  align-items: center;
 
   &-fixed {
     flex: none;
@@ -129,6 +130,7 @@
   }
 }
 .raise-flex{
+  margin-top: 40px;
   display: flex;
   align-items: center;
   justify-content: space-between;

src/onlineSelling/pages/records/index.js

@@ -12,8 +12,9 @@ import { transferImage } from '@/utils/tools'
 import PickerComponent from '../../components/Picker'
 import './index.scss'
 import * as houseActions from '@/actions/house'
+import * as noticeType from '@/constants/common.js'
 
-function noop(){}
+function noop() { }
 
 @connect(
   ({ user, city, house }) => ({ ...user, ...city, house }),
@@ -57,7 +58,7 @@ export default class Records extends Component {
   componentDidShow() {
     ready.queue(() => {
 
-      const { id: salesBatchId } = this.$router.params
+      const { id: salesBatchId = '' } = this.$router.params
       const { userInfo: { person: { personId } }, house } = this.props
       const params = {
         personId,
@@ -80,6 +81,9 @@ export default class Records extends Component {
       }
 
       this.setState({ salesBatchId })
+
+      // 清空认筹选择
+      this.props.dispatchFlush2Cart([])
     })
   }
   getPreselection(params) {
@@ -182,9 +186,24 @@ export default class Records extends Component {
     )
   }
   toRaiseProfile(id) {
-    Taro.navigateTo({
-      url: `/onlineSelling/pages/raiseProfile/index?raiseRecordId=${id}`
+    const { userInfo: { miniApp: { tpls } } } = 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: `/onlineSelling/pages/raiseProfile/index?raiseRecordId=${id}`
+        })
+      }
     })
+
+
   }
   renderRaise() {
     const { raiseList, noRaiseRecord } = this.state
@@ -197,7 +216,7 @@ export default class Records extends Component {
               {
                 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/pages/activity/index.js

@@ -134,6 +134,7 @@ export default class Index extends Component {
     return (
       <ListView
         className="wrap"
+        style="height: calc(100vh - 118rpx);"
         needInit
         isEmpty={isEmpty}
         emptyText="暂无活动~"

src/pages/activity/index.scss

@@ -31,3 +31,9 @@
   }
 
 }
+.at-tabs-pane--active{
+  height: 100vh!important;
+  overflow: scroll;
+  padding-bottom: 100px;
+
+}

src/pages/news/index.js

@@ -115,6 +115,7 @@ export default class Index extends Component {
     return (
       <ListView
         className="wrap"
+        style="height: calc(100vh - 118rpx);"
         needInit
         isEmpty={isEmpty}
         emptyText="暂无资讯~"

src/pages/person/spread/index.js

@@ -78,7 +78,7 @@ export default class Index extends Component {
       <Block>
         {/* 生成海报 */}
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
-        <View className='page'>
+        <View className='spread-page'>
           <View className='spread-code'>
             <View className='spread-code-head'>
               <Image src={avatarurl} className='spread-code-head_img'></Image>

src/pages/person/spread/index.scss

@@ -1,8 +1,8 @@
 @import "@/styles/theme.scss";
-.page {
+.spread-page {
   position: relative;
   width: 100%;
-  height: 100%;
+  height: 100vh;
   background: #f0f0f0;
 }
 .spread-code {

src/pages/shop/index.scss

@@ -156,7 +156,12 @@
     font-weight: bold;
   }
 }
+.at-tabs-pane--active{
+  height: 100vh!important;
+  overflow: scroll;
+  padding-bottom: 100px;
 
+}
 .list__wrap {
   margin-top: 20px;
   overflow: hidden;

src/useless/pages/person/customerAnalysis/followUpCustomer/index.js

@@ -284,6 +284,7 @@ export default class followUpCustomer extends Taro.Component {
         <View style="padding:0 10px 10px 10px">
           <ListView
             className="wrap"
+            style="height: calc(100vh - 234rpx)"
             needInit
             isEmpty={isEmpty}
             emptyText="暂无跟进客户~"

src/useless/pages/person/customerAnalysis/index.scss

@@ -3,7 +3,7 @@
 .wrap {
   background: white;
   position: relative;
-  height:100vh;
+  // height:100vh;
 }
 .my-customer{
   flex: 0 0 50%;
@@ -55,6 +55,9 @@
   
   }
 }
+.at-tabs{
+  height: 100vh;
+}
 .tab-box{
   .at-tabs__header{
     width: 86%;

src/useless/pages/person/customerAnalysis/transactionCustomer/index.js

@@ -115,6 +115,7 @@ export default class transactionCustomer extends Taro.Component {
       <View style="padding:0 10px 10px 10px">
         <ListView
           className="wrap"
+          style="height: calc(100vh - 78rpx)"
           needInit
           isEmpty={isEmpty}
           emptyText="暂无成交客户~"