Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/dev.js

@@ -6,8 +6,8 @@ module.exports = {
     HOST: '"https://xlk.njyz.tech"',
     // HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
-    OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
-    OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
+    OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
+    OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
     Version: '"V3.5.29-20201112"'
   },

src/app.jsx

@@ -10,6 +10,8 @@ import trackUserSource from '@/utils/tracking/userSource'
 import './app.scss'
 
 class App extends Component {
+  // 是否登录
+  logged;
   // 更新埋点
   updateTracking;
 
@@ -19,7 +21,9 @@ class App extends Component {
     // 保留初始场景
     Taro.setStorage({ key: 'scene', data: options.scene })
     // 埋点
-    trackUserSource(options).then((res) => (this.updateTracking = res))
+    if (this.logged) {
+      trackUserSource(options).then((res) => (this.updateTracking = res))
+    }
   }
 
   componentDidHide () {
@@ -72,8 +76,10 @@ class App extends Component {
           // 初始化 im
           im.init(personId)
 
-          // // 埋点
-          // trackUserSource(router.params).then(r => this.updateTrack = r)
+          this.logged = true
+
+          // 埋点
+          trackUserSource(options).then((x) => (this.updateTracking = x))
         })
       })
     })

src/constants/api.js

@@ -263,3 +263,9 @@ export const API_TEMPLATE_TYPE = resolvePath('template/of/')
 // 品牌商
 export const API_BRAND_LIST = resolvePath('brand')
 export const API_BRAND_INFO = resolvePath('brand')
+
+
+// 品牌商
+export const API_POLICYTYPE_LIST = resolvePath('taPolicyType')
+// export const API_BRAND_INFO = resolvePath('brand')
+// GET /api/{plat}/taPolicyType

src/layout/index.js

@@ -8,6 +8,7 @@ import AuthAvatar from '@/components/Auth/AuthAvatar'
 import AuthPhone from '@/components/Auth/AuthPhone'
 import Spin from '@/components/Spin/Spin2'
 import FixedConsultant from '@/components/FixedConsultant'
+import { report as reportCustomer } from '@/utils/customer'
 import { ROLE_CODE } from '@/constants/user'
 import useAuth from './useAuth'
 import { routes } from '../routes'
@@ -31,6 +32,11 @@ export default (ChildComponent) => (props) => {
   // 页面埋点
   const [trackData, setTrackData] = useState({})
 
+  // 报备客户
+  useEffect(() => {
+    reportCustomer(person, consultant, false).catch(() => {})
+  }, [person, consultant])
+
   // 请求埋点设置
   useEffect(() => {
     if (id) {

src/pages/index/buildingList/index.jsx

@@ -13,7 +13,9 @@ import FilterForHouseType from './components/FilterForHouseType/index'
 import FilterForMore from './components/FilterForMore/index'
 import FilterForHouseSort from './components/FilterForHouseSort/index'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { router } = props
+  const { isRecentOpening } = router.params
 
   const city = useSelector(state => state.city)
   const [PageList, setPageList] = useState([])
@@ -87,7 +89,7 @@ export default withLayout(() => {
         Data[key] = FilterData[key]
       }
     }
-    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, ...Data } }).then((res) => {
+    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, isRecentOpening, ...Data } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)

src/pages/index/encyDetail/index.jsx

@@ -1,52 +1,69 @@
-import React, { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import './index.scss'
-import { ScrollView } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-import { Image, RichText } from '@tarojs/components'
+import React, { useState, useEffect } from "react";
+import Taro from "@tarojs/taro";
+import withLayout from "@/layout";
+import "./index.scss";
+import { ScrollView } from "@tarojs/components";
+import "@/assets/css/iconfont.css";
+import { Image, RichText } from "@tarojs/components";
+import { queryPolicyDetail } from "@/services/policy";
+import getDateFormat from "@/utils/chatDate";
 
 export default withLayout((props) => {
+  const { router, shareContent, trackData, person, page } = props;
+  const { id } = router.params;
+  const [data, setData] = useState({});
 
-  // const [PageProps] = useState(props)
+  const getData = (params) => {
+    Taro.showLoading();
+    queryPolicyDetail(params).then((res) => {
+      setData(res);
+      Taro.hideLoading();
+    });
+  };
+  useEffect(() => {
+    if (id) {
+      getData(id);
+    }
+  }, [id]);
 
   return (
-    <view className='Page encyDetail flex-v'>
-      <view className='flex-item'>
+    <view className="Page encyDetail flex-v">
+      <view className="flex-item">
         <view>
-          <ScrollView scroll-y={true} refresher-enabled={false} refresher-background='#fff'>
-            <view className='PageContent'>
-
-              <view className='Info'>
+          <ScrollView
+            scroll-y={true}
+            refresher-enabled={false}
+            refresher-background="#fff"
+          >
+            <view className="PageContent">
+              <view className="Info">
                 <view>
-                  <text className='Title'>公积金又有新变化，附最新南京公积金贷款和提取方法。</text>
+                  <text className="Title">
+                    {data.title} {data.subtitle}
+                  </text>
                   <view>
-                    <text>阅读：28</text>
-                    <text>点赞15</text>
-                    <text>收藏22</text>
+                  <text>阅读：{data.pvNum}</text>
+                    <text className="Time">
+                      {getDateFormat(
+                        new Date(data.createDate).valueOf(),
+                        true,
+                        "yyyy-M-d"
+                      )}
+                    </text>
+                   
                   </view>
-                  <text className='Time'>时间：2019-10-20 10:00 </text>
-                  <text className='Share'>分享好友</text>
                 </view>
               </view>
 
-              <view className='Content'>
-                <RichText nodes={'<p>这是内容</p>'}></RichText>
+              <view className="Content">
+                <RichText nodes={data.body}></RichText>
               </view>
-
             </view>
           </ScrollView>
         </view>
       </view>
-      <view className='Bottom'>
-        <view>
-          <Image mode='heightFix' src={require('../../../assets/buildingDetail-icon3.png')}></Image>
-          <text>生成海报</text>
-        </view>
-        <view>
-          <text className='iconfont icon-shoucang'></text>
-          <text>收藏</text>
-        </view>
-      </view>
+    
+    
     </view>
-  )
-})
+  );
+});

src/pages/index/encyDetail/index.scss

@@ -54,7 +54,7 @@
                 display: block;
                 font-size: 28px;
                 color: #333;
-                margin-top: 20px;
+                float: right;
               }
               >.Share {
                 display: block;

src/pages/index/encyclopediasOfBuyHouse/index.jsx

@@ -1,56 +1,157 @@
-import React, { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import './index.scss'
-import { ScrollView, Image } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-import Taro from '@tarojs/taro'
+import React, { useState, useEffect } from "react";
+import withLayout from "@/layout";
+import "./index.scss";
+import { useSelector } from "react-redux";
+import { ScrollView, Image } from "@tarojs/components";
+import "@/assets/css/iconfont.css";
+import Taro from "@tarojs/taro";
+import { fetch } from "@/utils/request";
+import { queryPolicyTypeList, queryPolicyList } from "@/services/policy";
 
-export default withLayout((props) => {
+const EncyItem = (props) => {
+  const city = useSelector(state => state.city)
+
+  const { item, index } = props;
+  const [list, setList] = useState([]);
+
+  useEffect(() => {
+    if (item.policyTypeId) {
+      getPolicyListByType(item.policyTypeId);
+    }
+  }, [item,city]);
 
+  const getPolicyListByType = policyTypeId => {
+    queryPolicyList({ pageSize: 100,policyTypeId,cityId: city?.curCity?.id }).then((res) => {
+      setList(res.records);
+    });
+  };
+
+  return (
+    <view key={`ListItem-${index}`}>
+      <view className="Title">
+        <text>{index + 1 > 9 ? index + 1 : `0${index + 1}`}</text>
+        <text>/{item.policyTypeName}</text>
+        {/* <Image mode="heightFix" src={item.icon}></Image> */}
+      </view>
+      <view className="List">
+        {list.map((subItem, subIndex) => (
+          <view
+            key={`subItem-${subIndex}`}
+            onClick={() => {
+              Taro.navigateTo({
+                url: `/pages/index/encyDetail/index?id=${subItem.policyId}`,
+              });
+            }}
+          >
+            <text className="Name">{subItem.title}</text>
+            {subItem.isHot === 1 && (
+              <text className="Tips" style={{ background: "#FF0000" }}>
+                {/* {subItem.tips} */}
+                HOT
+              </text>
+            )}
+            {/* {subItem.icon !== "" && (
+              <Image mode="heightFix" src={subItem.icon}></Image>
+            )} */}
+          </view>
+        ))}
+      </view>
+    </view>
+  );
+};
+
+export default withLayout((props) => {
   // const [PageProps] = useState(props)
-  const [PageList] = useState([
-    {name: '准备买房', icon: require('@/assets/ency-icon3.png'), list: [{name: '买房资质查询', id: 1, tips: 'HOT', tipsColor: '#FF0000', icon: ''}, {name: '22个房产名词', id: 2, tips: 'NEW', tipsColor: '#30CFCF', icon: ''}]},
-    {name: '看房选房', icon: require('@/assets/ency-icon4.png'), list: [{name: '热门楼盘地图', id: 3, tips: '', icon: ''}, {name: '选户型攻略', id: 4, tips: '实用', tipsColor: '#62D547', icon: ''}, {name: '期房新房怎么选', id: 5, tips: '', icon: ''}]},
-    {name: '认筹签约', icon: require('@/assets/ency-icon5.png'), list: [{name: '买房签约流程', id: 6, tips: '哇！', tipsColor: '#FF396C', icon: require('@/assets/ency-icon2.png')}, {name: '契税征收标准', id: 7, tips: '', icon: ''}, {name: '公司名义买房', id: 8, tips: '', icon: ''}]},
-    {name: '贷款买房', icon: require('@/assets/ency-icon6.png'), list: [{name: '新房贷政策', id: 9, tips: '', icon: ''}, {name: '贷款查征信', id: 10, tips: '', icon: require('../../../assets/ency-icon1.png')}]}
-  ])
 
+  const [PageList, setPageList] = useState([
+    {
+      name: "准备买房",
+      icon: require("@/assets/ency-icon3.png"),
+      list: [
+        {
+          name: "买房资质查询",
+          id: 1,
+          tips: "HOT",
+          tipsColor: "#FF0000",
+          icon: "",
+        },
+        {
+          name: "22个房产名词",
+          id: 2,
+          tips: "NEW",
+          tipsColor: "#30CFCF",
+          icon: "",
+        },
+      ],
+    },
+    {
+      name: "看房选房",
+      icon: require("@/assets/ency-icon4.png"),
+      list: [
+        { name: "热门楼盘地图", id: 3, tips: "", icon: "" },
+        {
+          name: "选户型攻略",
+          id: 4,
+          tips: "实用",
+          tipsColor: "#62D547",
+          icon: "",
+        },
+        { name: "期房新房怎么选", id: 5, tips: "", icon: "" },
+      ],
+    },
+    {
+      name: "认筹签约",
+      icon: require("@/assets/ency-icon5.png"),
+      list: [
+        {
+          name: "买房签约流程",
+          id: 6,
+          tips: "哇！",
+          tipsColor: "#FF396C",
+          icon: require("@/assets/ency-icon2.png"),
+        },
+        { name: "契税征收标准", id: 7, tips: "", icon: "" },
+        { name: "公司名义买房", id: 8, tips: "", icon: "" },
+      ],
+    },
+    {
+      name: "贷款买房",
+      icon: require("@/assets/ency-icon6.png"),
+      list: [
+        { name: "新房贷政策", id: 9, tips: "", icon: "" },
+        {
+          name: "贷款查征信",
+          id: 10,
+          tips: "",
+          icon: require("../../../assets/ency-icon1.png"),
+        },
+      ],
+    },
+  ]);
+
+  const getPageList = () => {
+    queryPolicyTypeList({ pageSize: 100 }).then((res) => {
+      setPageList(res.records);
+    });
+  };
+  // GET /api/{plat}/taPolicyType
+
+  useEffect(() => {
+    getPageList();
+  }, []);
   return (
-    <view className='Page encyclopediasOfBuyHouse'>
-
-      <ScrollView scroll-y={true} refresher-enabled={false} refresher-background='#fff'>
-        <view className='PageContent'>
-          {
-            PageList.map((item, index) => (
-              <view key={`ListItem-${index}`}>
-                <view className='Title'>
-                  <text>{index + 1 > 9 ? index + 1 : `0${index + 1}`}</text>
-                  <text>/{item.name}</text>
-                  <Image mode='heightFix' src={item.icon}></Image>
-                </view>
-                <view className='List'>
-                  {
-                    item.list.map((subItem, subIndex) => (
-                      <view key={`subItem-${subIndex}`} onClick={() => { Taro.navigateTo({ url: `/pages/index/encyDetail/index?id=${subItem.id}` }) }}>
-                        <text className='Name'>{subItem.name}</text>
-                        {
-                          subItem.tips !== '' &&
-                          <text className='Tips' style={{background: subItem.tipsColor}}>{subItem.tips}</text>
-                        }
-                        {
-                          subItem.icon !== '' &&
-                          <Image mode='heightFix' src={subItem.icon}></Image>
-                        }
-                      </view>
-                    ))
-                  }
-                </view>
-              </view>
-            ))
-          }
+    <view className="Page encyclopediasOfBuyHouse">
+      <ScrollView
+        scroll-y={true}
+        refresher-enabled={false}
+        refresher-background="#fff"
+      >
+        <view className="PageContent">
+          {PageList.map((item, index) => (
+            <EncyItem item={item} key={index} index={index}></EncyItem>
+          ))}
         </view>
       </ScrollView>
-
     </view>
-  )
-})
+  );
+});

src/pages/index/encyclopediasOfBuyHouse/index.scss

@@ -63,6 +63,7 @@
               color: #333;
               position: relative;
               z-index: 1;
+              padding: 0 20px;
             }
             >.Tips {
               display: inline-block;

src/routes.js

@@ -44,6 +44,7 @@ const routes = [
     page: 'pages/chat/chatDetail/index',
     pkg: 'main',
     type: 'other',
+    auth: ['phone', 'avatar'],
   },
 
   // /********************************
@@ -131,6 +132,7 @@ const routes = [
     page: 'pages/index/buildingTakeLook/index',
     pkg: 'main',
     type: 'building',
+    auth: ['phone', 'avatar'],
   },
   {
     name: '项目动态',
@@ -173,6 +175,7 @@ const routes = [
     page: 'pages/index/activityDetail/index',
     pkg: 'main',
     type: 'activity',
+    auth: ['phone', 'avatar'],
   },
   {
     name: '特价房',

src/services/policy.js

@@ -1,8 +1,15 @@
 import { fetch } from '@/utils/request'
 import {
   API_POLICY_LIST,
+  API_POLICYTYPE_LIST
 } from '@/constants/api'
 
+/**
+ * 获取列表
+ * @param {*} payload
+ */
+ export const queryPolicyTypeList = payload => fetch({ url: API_POLICYTYPE_LIST, payload })
+
 
 /**
  * 获取列表

src/utils/customer.js

@@ -0,0 +1,42 @@
+
+import { reportClient } from '@/services/report'
+
+/**
+ * 报备客户
+ * @param {*} userInfo 
+ * @param {*} consultant 
+ * @param {*} showToast 
+ */
+function report(person, consultant, showToast) {
+  if (!person || !(person.tel || person.phone)) {
+    return Promise.reject('用户手机号不存在');
+  }
+
+  if (!consultant || !consultant.id) {
+    return Promise.reject('置业顾问信息不存在');
+  }
+
+  if (consultant.id == person.personId) {
+    return Promise.resolve();
+  }
+
+  const realPhone = person.tel || person.phone
+  const payload = {
+    realtyConsultant: consultant.id, //报备人 置业顾问
+    phone: realPhone,
+    showToast,
+  }
+
+  return new Promise((resolve, reject) => {
+    reportClient(payload).then(res => {
+      resolve()
+    }).catch(err => {
+      console.error(err)
+      reject(err.message || err)
+    })
+  })
+}
+
+export {
+  report,
+}

src/utils/login.js

@@ -58,6 +58,8 @@ export default (payload) => {
             })
           }
 
+          // 如果通过扫码进入
+
         }).catch(reject)
       }
     })

src/utils/qrcode.js

@@ -0,0 +1,34 @@
+
+import { getCodeScene  } from '@/services/common'
+import { parseQueryString } from './tools'
+
+/**
+ * 获取二维码参数
+ * 微信小程序  基础库 2.1.2 开始支持
+ * @param {*} scene 场景值
+ */
+export function getQrCodeParams(sceneID) {
+  if (!sceneID) {
+    console.error('未解析到二维码场景值')
+    return Promise.reject('未解析到二维码场景值')
+  }
+
+  console.log('解析到二维码场景 ID', sceneID)
+
+  return new Promise((resolve, reject) => {
+    getCodeScene(sceneID).then((res) => {
+      const data = typeof res === 'string' ? JSON.parse(res) : res
+      const params = parseQueryString(data.scene || '')
+
+      console.log('解析到二维码场景参数: ', params)
+
+      resolve({
+        ...params,
+        '__raw': data.scene,
+      })
+    }).catch(err => {
+      console.error('解析二维码场景参数失败', err)
+      reject('解析二维码场景参数失败')
+    })
+  })
+}

src/utils/request.js

@@ -89,12 +89,25 @@ export function optionBuilder(options) {
   const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
   const consultant = Taro.getStorageSync('consultantId') || ''
   const recommender = Taro.getStorageSync('recommender') || ''
+
+  // 去掉 null 跟 undefined 字段
+  const data = Object.keys(payload).reduce((acc, key) => {
+    const val = payload[key]
+    if (val === null || val === undefined) {
+      return acc;
+    }
+
+    return {
+      ...acc,
+      [key]: val,
+    }
+  }, {})
   
   return [
     {
       url,
       method,
-      data: payload,
+      data,
       header: {
         'content-type': 'application/json',
         'authorization': `Bearer ${Taro.getStorageSync('token')}`,