Преглед на файлове

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

Your Name преди 3 години
родител
ревизия
206c0e8991

+ 2
- 2
config/dev.js Целия файл

3
     NODE_ENV: '"development"'
3
     NODE_ENV: '"development"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"https://xlk.njyz.tech"',
7
-    // HOST: '"https://xlj.newlandsh.com"',
6
+    // HOST: '"https://xlk.njyz.tech"',
7
+    HOST: '"https://xlj.newlandsh.com"',
8
     // HOST: '"http://127.0.0.1:8567"',
8
     // HOST: '"http://127.0.0.1:8567"',
9
     WSS_HOST: '"wss://xlk.njyz.tech"',
9
     WSS_HOST: '"wss://xlk.njyz.tech"',
10
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
10
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

+ 2
- 2
project.config.json Целия файл

2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "miniapp",
3
 	"projectname": "miniapp",
4
 	"description": "",
4
 	"description": "",
5
-	"appid": "wxe44244d1a5ea3364",
5
+	"appid": "wxc96058d57e77f373",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,
8
 		"es6": false,
8
 		"es6": false,
27
 			"outputPath": ""
27
 			"outputPath": ""
28
 		},
28
 		},
29
 		"useIsolateContext": true,
29
 		"useIsolateContext": true,
30
-		"useCompilerModule": false,
30
+		"useCompilerModule": true,
31
 		"userConfirmedUseCompilerModuleSwitch": false
31
 		"userConfirmedUseCompilerModuleSwitch": false
32
 	},
32
 	},
33
 	"compileType": "miniprogram",
33
 	"compileType": "miniprogram",

+ 1
- 1
src/pages/index/activityDetail/index.scss Целия файл

224
           }
224
           }
225
           > .Top {
225
           > .Top {
226
             width: 100%;
226
             width: 100%;
227
-            padding-bottom: 56%;
227
+            padding-bottom: 56.25%;
228
             position: relative;
228
             position: relative;
229
             overflow: hidden;
229
             overflow: hidden;
230
             background: #eee;
230
             background: #eee;

+ 1
- 1
src/pages/index/buildingDetail/components/BasicInfo/index.jsx Целия файл

169
 
169
 
170
       {/* 围观 */}
170
       {/* 围观 */}
171
       <view className='Views flex-h'>
171
       <view className='Views flex-h'>
172
-        <text>{Info.pvNum || 0}人围观</text>
172
+        <text>{299 + (Info.pvNum || 0)}人围观</text>
173
         <view className='flex-item'>
173
         <view className='flex-item'>
174
           {
174
           {
175
             (Info?.uvList?.records || []).slice(0, 8).map((item, index) => (
175
             (Info?.uvList?.records || []).slice(0, 8).map((item, index) => (

+ 1
- 1
src/pages/index/buildingDetail/components/PropertyConsultant/index.jsx Целия файл

64
           List.map((item, index) => (
64
           List.map((item, index) => (
65
             <view key={`PersonItem-${index}`} className='flex-h'>
65
             <view key={`PersonItem-${index}`} className='flex-h'>
66
               <view className='Icon' onClick={() => gotoDetail(item)}>
66
               <view className='Icon' onClick={() => gotoDetail(item)}>
67
-                <Image mode='aspectFill' src={item.photo || item.avatar}></Image>
67
+                <Image mode='aspectFill' src={item.photo || item.avatarurl || item.avatar || item.picture}></Image>
68
               </view>
68
               </view>
69
               <view className='flex-item' onClick={() => gotoDetail(item)}>
69
               <view className='flex-item' onClick={() => gotoDetail(item)}>
70
                 <text>{item.userName}</text>
70
                 <text>{item.userName}</text>

+ 1
- 0
src/pages/index/buildingDetail/index.scss Целия файл

69
     position: relative;
69
     position: relative;
70
     overflow: hidden;
70
     overflow: hidden;
71
     box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
71
     box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
72
+    padding-bottom: 10px;
72
   }
73
   }
73
 }
74
 }

+ 18
- 9
src/pages/mine/components/MyCustomerListItem/index.jsx Целия файл

17
   const expStr = expirationDate && customerStatus === '1' ? `${addDays(createDate, expirationDate)} 回收` : ''
17
   const expStr = expirationDate && customerStatus === '1' ? `${addDays(createDate, expirationDate)} 回收` : ''
18
 
18
 
19
   const gotoDetail = () => {
19
   const gotoDetail = () => {
20
-    if (!data.customerId) {
21
-      Taro.showToast({
22
-        title: '该用户尚未到访',
23
-        icon: 'none',
24
-      })
25
-    } else {
26
-      const url = `/pages/mine/myCustomerDetail/index?id=${data.customerId}`
27
-      Taro.navigateTo({ url })
20
+    if (data.status - 0 !== 3) {
21
+      if (!data.customerId) {
22
+        Taro.showToast({
23
+          title: '该用户尚未到访',
24
+          icon: 'none',
25
+        })
26
+      } else {
27
+        const url = `/pages/mine/myCustomerDetail/index?id=${data.customerId}`
28
+        Taro.navigateTo({ url })
29
+      }
28
     }
30
     }
29
   }
31
   }
30
 
32
 
40
         </view>
42
         </view>
41
         <view className='Time flex-h'>
43
         <view className='Time flex-h'>
42
           <text className='flex-item'>{data.phone}</text>
44
           <text className='flex-item'>{data.phone}</text>
43
-          <text>{BIZ_STATUS[customerStatus]||'报备'}</text>
45
+          {
46
+            data.status - 0 === 3 &&
47
+            <text>无效</text>
48
+          }
49
+          {
50
+            data.status - 0 !== 3 &&
51
+            <text>{BIZ_STATUS[customerStatus] || '报备'}</text>
52
+          }
44
         </view>
53
         </view>
45
       </view>
54
       </view>
46
     </view>
55
     </view>

+ 1
- 1
src/pages/mine/myRecommendCode/index.jsx Целия файл

16
   useEffect(() => {
16
   useEffect(() => {
17
     const payload = {
17
     const payload = {
18
       scene: `id=${person?.personId}&from=${page.type}_share&recommender=${person?.personId}`,
18
       scene: `id=${person?.personId}&from=${page.type}_share&recommender=${person?.personId}`,
19
-      page: `pages/mine/myRecommendCode/index`
19
+      page: `pages/consultant/myHomepage/index`
20
     }
20
     }
21
     fetch({ url: API_QRCODE, payload, method: 'post' }).then((res) => {
21
     fetch({ url: API_QRCODE, payload, method: 'post' }).then((res) => {
22
       setQrCodeUrl(res)
22
       setQrCodeUrl(res)

+ 1
- 1
src/pages/mine/tabData.js Целия файл

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

+ 1
- 0
src/subpackages/pages/consultant/customerAnalyse/index.jsx Целия файл

35
   useEffect(() => {
35
   useEffect(() => {
36
     setChartList([])
36
     setChartList([])
37
     GetSexInfo()
37
     GetSexInfo()
38
+    GetChartInfo()
38
   }, [CurrentMenuId])
39
   }, [CurrentMenuId])
39
 
40
 
40
   useEffect(() => {
41
   useEffect(() => {

+ 5
- 2
src/subpackages/pages/consultant/myHomepage/index.jsx Целия файл

44
 
44
 
45
   useEffect(() => {
45
   useEffect(() => {
46
     if (PersonId) {
46
     if (PersonId) {
47
-      GetUserInfo()
47
+      // GetUserInfo()
48
+      fetch({ url: `${API_CARDS_LIST}/${PersonId}`, method: 'get' }).then((res) => {
49
+        setUserInfo(res)
50
+      })
48
     }
51
     }
49
   }, [PersonId])
52
   }, [PersonId])
50
 
53
 
88
           <view className='Card UserInfo'>
91
           <view className='Card UserInfo'>
89
             <view className='flex-h Top'>
92
             <view className='flex-h Top'>
90
               <view className='Icon'>
93
               <view className='Icon'>
91
-                <Image mode='aspectFill' src={getImgURL(UserInfo.avatarurl || UserInfo.picture)}></Image>
94
+                <Image mode='aspectFill' src={getImgURL(UserInfo.avatarurl || UserInfo.avatar || UserInfo.picture)}></Image>
92
               </view>
95
               </view>
93
               <view className='flex-item'>
96
               <view className='flex-item'>
94
                 <view className='flex-h'>
97
                 <view className='flex-h'>