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

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"https://xlj.newlandsh.com"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"https://xlj.newlandsh.com"',
     // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxe44244d1a5ea3364",
+	"appid": "wxc96058d57e77f373",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,
@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": false,
+		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/pages/index/activityDetail/index.scss

@@ -224,7 +224,7 @@
           }
           > .Top {
             width: 100%;
-            padding-bottom: 56%;
+            padding-bottom: 56.25%;
             position: relative;
             overflow: hidden;
             background: #eee;

src/pages/index/buildingDetail/components/BasicInfo/index.jsx

@@ -169,7 +169,7 @@ export default function BasicInfo (props) {
 
       {/* 围观 */}
       <view className='Views flex-h'>
-        <text>{Info.pvNum || 0}人围观</text>
+        <text>{299 + (Info.pvNum || 0)}人围观</text>
         <view className='flex-item'>
           {
             (Info?.uvList?.records || []).slice(0, 8).map((item, index) => (

src/pages/index/buildingDetail/components/PropertyConsultant/index.jsx

@@ -64,7 +64,7 @@ export default function PropertyConsultant (props) {
           List.map((item, index) => (
             <view key={`PersonItem-${index}`} className='flex-h'>
               <view className='Icon' onClick={() => gotoDetail(item)}>
-                <Image mode='aspectFill' src={item.photo || item.avatar}></Image>
+                <Image mode='aspectFill' src={item.photo || item.avatarurl || item.avatar || item.picture}></Image>
               </view>
               <view className='flex-item' onClick={() => gotoDetail(item)}>
                 <text>{item.userName}</text>

src/pages/index/buildingDetail/index.scss

@@ -69,5 +69,6 @@
     position: relative;
     overflow: hidden;
     box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
+    padding-bottom: 10px;
   }
 }

src/pages/mine/components/MyCustomerListItem/index.jsx

@@ -17,14 +17,16 @@ export default function MyCustomerListItem (props) {
   const expStr = expirationDate && customerStatus === '1' ? `${addDays(createDate, expirationDate)} 回收` : ''
 
   const gotoDetail = () => {
-    if (!data.customerId) {
-      Taro.showToast({
-        title: '该用户尚未到访',
-        icon: 'none',
-      })
-    } else {
-      const url = `/pages/mine/myCustomerDetail/index?id=${data.customerId}`
-      Taro.navigateTo({ url })
+    if (data.status - 0 !== 3) {
+      if (!data.customerId) {
+        Taro.showToast({
+          title: '该用户尚未到访',
+          icon: 'none',
+        })
+      } else {
+        const url = `/pages/mine/myCustomerDetail/index?id=${data.customerId}`
+        Taro.navigateTo({ url })
+      }
     }
   }
 
@@ -40,7 +42,14 @@ export default function MyCustomerListItem (props) {
         </view>
         <view className='Time flex-h'>
           <text className='flex-item'>{data.phone}</text>
-          <text>{BIZ_STATUS[customerStatus]||'报备'}</text>
+          {
+            data.status - 0 === 3 &&
+            <text>无效</text>
+          }
+          {
+            data.status - 0 !== 3 &&
+            <text>{BIZ_STATUS[customerStatus] || '报备'}</text>
+          }
         </view>
       </view>
     </view>

src/pages/mine/myRecommendCode/index.jsx

@@ -16,7 +16,7 @@ export default withLayout((props) => {
   useEffect(() => {
     const payload = {
       scene: `id=${person?.personId}&from=${page.type}_share&recommender=${person?.personId}`,
-      page: `pages/mine/myRecommendCode/index`
+      page: `pages/consultant/myHomepage/index`
     }
     fetch({ url: API_QRCODE, payload, method: 'post' }).then((res) => {
       setQrCodeUrl(res)

src/pages/mine/tabData.js

@@ -41,7 +41,7 @@ const MineMenuList = {
   Adviser: [ // 置业顾问
     [
       { name: '添加客户', icon: require('@/assets/mine-icon7.png'), router: '/pages/mine/addCustomer/index?type=consultant' },
-      { name: '成为驻场管理', icon: require('@/assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
+      // { name: '成为驻场管理', icon: require('@/assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
       { name: '我的主页', icon: require('@/assets/mine-icon15.png'), router: '/subpackages/pages/consultant/myHomepage/index' },
       { name: '我的推广码', icon: require('@/assets/mine-icon14.png'), router: '/pages/mine/myRecommendCode/index' },
       { name: '客户分析', icon: require('@/assets/mine-icon5.png'), router: '/subpackages/pages/consultant/customerAnalyse/index' },

src/subpackages/pages/consultant/customerAnalyse/index.jsx

@@ -35,6 +35,7 @@ export default withLayout((props) => {
   useEffect(() => {
     setChartList([])
     GetSexInfo()
+    GetChartInfo()
   }, [CurrentMenuId])
 
   useEffect(() => {

src/subpackages/pages/consultant/myHomepage/index.jsx

@@ -44,7 +44,10 @@ export default withLayout((props) => {
 
   useEffect(() => {
     if (PersonId) {
-      GetUserInfo()
+      // GetUserInfo()
+      fetch({ url: `${API_CARDS_LIST}/${PersonId}`, method: 'get' }).then((res) => {
+        setUserInfo(res)
+      })
     }
   }, [PersonId])
 
@@ -88,7 +91,7 @@ export default withLayout((props) => {
           <view className='Card UserInfo'>
             <view className='flex-h Top'>
               <view className='Icon'>
-                <Image mode='aspectFill' src={getImgURL(UserInfo.avatarurl || UserInfo.picture)}></Image>
+                <Image mode='aspectFill' src={getImgURL(UserInfo.avatarurl || UserInfo.avatar || UserInfo.picture)}></Image>
               </view>
               <view className='flex-item'>
                 <view className='flex-h'>