noticetype

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/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;
 

src/onlineSelling/pages/houseList/index.js

@@ -386,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>
@@ -422,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>

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;

src/onlineSelling/pages/records/index.js

@@ -12,6 +12,7 @@ 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() { }
 
@@ -185,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