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

src/constants/user.js

@@ -14,5 +14,6 @@ export const ROLE_CODE = {
   ESTATE_AGENT: 'estate agent', // 独立经纪人
   CHANNEL_AGENT: 'channel agent', // 渠道经纪人
   DRIFT: 'drift', // 游客
-  CUSTOMER: 'customer' // 客户
+  CUSTOMER: 'customer', // 客户
+  MARKETING: 'marketing', //
 }

src/pages/mine/addCustomer/index.jsx

@@ -60,7 +60,7 @@ export default withLayout((props) => {
       if (type === ROLE_CODE.CONSULTANT) {
         params = { name: FormData.name, phone: FormData.phone, sex: SexId }
       } else {
-        params = { ...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId }
+        params = { ...FormData, sex: SexId, buildingId: BuildingId, realtyConsultant: CardId }
       }
       if (type === ROLE_CODE.CHANNEL_AGENT) {
         params.channelCustomerId = PersonId

src/pages/video/liveDetail/index.jsx

@@ -60,7 +60,7 @@ export default withLayout((props) => {
     Taro.navigateToMiniProgram({
       // 固定跳转到微信企业直播
       appId: 'wx7424030d69bde86e',
-      path: `pages/watch/index?living_code=${livingCodeRef.current}`,
+      path: `pages/watch/index?living_code=${encodeURIComponent(livingCodeRef.current)}`,
     })
   }
 

src/services/activity.js

@@ -112,4 +112,4 @@ export const getGroupDetail = (id, recordId, payload, header) => fetch({ url: `$
 export const createGroupActivity = payload => fetch({ url: API_GROUP_CREATE, method: 'POST', payload })
 export const joinGroupBuy = payload => fetch({ url: API_GROUP_JOIN, method: 'POST', payload })
 
-export const getLivingCode = livingid => fetch({ url: `${API_LIVING_CODE}?livingid=${livingid}` })
+export const getLivingCode = livingid => fetch({ url: `${API_LIVING_CODE}?livingid=${encodeURIComponent(livingid)}` })