xujing il y a 5 ans
Parent
révision
2cc3cc3d0a

+ 4
- 4
config/dev.js Voir le fichier

@@ -5,12 +5,12 @@ module.exports = {
5 5
   defineConstants: {
6 6
     // HOST: '"http://47.101.36.130:8085"',//测试
7 7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
8
-    HOST: '"https://dev.jinchengjiaye.com"',//测试
9
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
8
+    // HOST: '"https://dev.jinchengjiaye.com"',//测试
9
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10 10
     // HOST: '"https://lt.pawoma.cn"',
11 11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    // HOST: '"http://192.168.2.51:8080"',
13
-    // WSS_HOST: '"ws://192.168.2.51:8080"',
12
+    HOST: '"http://192.168.2.51:8080"',
13
+    WSS_HOST: '"ws://192.168.2.51:8080"',
14 14
     Version: 'V3.5.5'
15 15
   },
16 16
   weapp: {},

+ 1
- 1
config/prod.js Voir le fichier

@@ -9,7 +9,7 @@ module.exports = {
9 9
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10 10
     // HOST: '"https://lt.pawoma.cn"',
11 11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    Version:'V3.5.5_2019-12-20'
12
+    Version:'V3.5.5_2019-12-23'
13 13
   },
14 14
   weapp: {},
15 15
   h5: {}

+ 1
- 1
src/components/consultant/index.js Voir le fichier

@@ -85,7 +85,7 @@ export default class Index extends Component {
85 85
                     <Image src={transferImage(data.picture || require('@assets/default-avatar.png'))} className='touxiang' onClick={this.handleConsuItemClick.bind(this, data)}></Image>
86 86
                     <View className="text" onClick={this.handleConsuItemClick.bind(this, data)}>
87 87
                         <View className="name">{data.name || ''}</View>
88
-                        <View className="company">{data.company || ''}</View>
88
+                        <View className="company">{data.buildingName || ''}</View>
89 89
                     </View>
90 90
                     <Image src={require('@assets/person/phone.png')} onClick={this.handleTelClick.bind(this, data)} className='phone-img'></Image>
91 91
                     <Image src={require('@assets/person/message.png')} onClick={this.handleChatClick.bind(this, data)} className='message-img'></Image>

+ 1
- 0
src/constants/api.js Voir le fichier

@@ -50,6 +50,7 @@ export const API_ITEMS_DETAIL = resolvePath('buildingSelectId')
50 50
 export const API_ITEMS_TYPE = resolvePath('tdBuildingType')
51 51
 export const API_ACTIVITY_GROUP = resolvePath('helpActivityAndGroup')
52 52
 export const API_LOCATION_CITYP = resolvePath('location/city')
53
+export const API_TACUSTOMIMG = resolvePath('taCustomImg')
53 54
 // /wx/location/city?location=lon,lat
54 55
 
55 56
 

+ 48
- 40
src/pages/project/index.js Voir le fichier

@@ -11,6 +11,7 @@ import ready from '@utils/ready'
11 11
 import { getLocationCity } from '@services/map'
12 12
 import { queryBanners, savePoint, updatePoint } from '@services/common'
13 13
 import { queryHelpGroup } from '@services/news'
14
+import { getIndexShare } from '@services/user'
14 15
 import { queryActivityList } from '@services/activity'
15 16
 import { dispatchCitySelected } from '@actions/city'
16 17
 import { ROLE_CODE, DECREASE_UNREADNUM } from '@constants/user'
@@ -25,42 +26,42 @@ import * as noticeType from '@constants/common.js'
25 26
 
26 27
 const { miniProgram: { appId } } = wx.getAccountInfoSync();
27 28
 
28
-// 分享图
29
-let shareImageOfApp;
30
-// banner 广告图
31
-let advImageOfApp;
32
-
33
-switch (appId) {
34
-  case 'wx755faa4b3ec76cd3':
35
-    // 尾房宝
36
-    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg';
37
-    advImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg';
38
-    break;
39
-
40
-  case 'wx1d981b76761246ce':
41
-    // 橙蕉嘉房
42
-    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E5%98%89%E6%88%BF.jpg';
43
-    break;
44
-
45
-  case 'wxa431cc21403b51bb':
46
-    // 橙蕉海房
47
-    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E6%B5%B7%E6%88%BF.jpg';
48
-    break;
49
-
50
-  case 'wx25c971cd14b0e11d':
51
-    // 橙蕉越房
52
-    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E8%B6%8A%E6%88%BF.jpg';
53
-    break;
54
-
55
-  case 'wx593a402c7c27beb9':
56
-    // 橙蕉金房
57
-    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E9%87%91%E6%88%BF.jpg';
58
-    break;
59
-
60
-  default:
61
-    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg';
62
-    break;
63
-}
29
+// // 分享图
30
+// let shareImageOfApp;
31
+// // banner 广告图
32
+// let advImageOfApp;
33
+
34
+// switch (appId) {
35
+//   case 'wx755faa4b3ec76cd3':
36
+//     // 尾房宝
37
+//     shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg';
38
+//     advImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg';
39
+//     break;
40
+
41
+//   case 'wx1d981b76761246ce':
42
+//     // 橙蕉嘉房
43
+//     shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E5%98%89%E6%88%BF.jpg';
44
+//     break;
45
+
46
+//   case 'wxa431cc21403b51bb':
47
+//     // 橙蕉海房
48
+//     shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E6%B5%B7%E6%88%BF.jpg';
49
+//     break;
50
+
51
+//   case 'wx25c971cd14b0e11d':
52
+//     // 橙蕉越房
53
+//     shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E8%B6%8A%E6%88%BF.jpg';
54
+//     break;
55
+
56
+//   case 'wx593a402c7c27beb9':
57
+//     // 橙蕉金房
58
+//     shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E9%87%91%E6%88%BF.jpg';
59
+//     break;
60
+
61
+//   default:
62
+//     shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg';
63
+//     break;
64
+// }
64 65
 
65 66
 @connect(
66 67
   state => ({ ...state.project, ...state.city, ...state.user }),
@@ -75,8 +76,9 @@ export default class Index extends Component {
75 76
     keywords: '',
76 77
     loaded: false,
77 78
     maskBanner: '',
78
-    shareImg: shareImageOfApp,
79
-    adImage: advImageOfApp,
79
+    shareImg: '',
80
+    imgDocument: '',
81
+    // adImage: advImageOfApp,
80 82
     bannerList: [],
81 83
     helpGroupList: [],
82 84
     activityList: [],
@@ -109,7 +111,6 @@ export default class Index extends Component {
109 111
         })
110 112
         console.log('进入首页')
111 113
       })
112
-
113 114
     })
114 115
   }
115 116
 
@@ -123,10 +124,17 @@ export default class Index extends Component {
123 124
   }
124 125
   componentDidShow() {
125 126
 
127
+    getIndexShare().then(res => {
128
+      this.setState({
129
+        shareImg: res.imgUrl || 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
130
+        imgDocument: res.imgDocument,
131
+      })
132
+    })
126 133
     if (this.props.curCity.id) {
127 134
       ready.queue(() => {
128 135
         // Taro.hideTabBar()
129 136
         this.loadData()
137
+
130 138
       })
131 139
     }
132 140
   }
@@ -323,7 +331,7 @@ export default class Index extends Component {
323 331
       console.log('首页分享')
324 332
     })
325 333
     return {
326
-      title: `${this.props.userInfo.miniApp.name || '橙蕉'} 精准获客平台`,//分享内容
334
+      title: this.state.imgDocument || `${this.props.userInfo.miniApp.name || '橙蕉'} 精准获客平台`,//分享内容
327 335
       path: `/pages/project/index?from=share&recommender=${personId}`,//分享地址
328 336
       imageUrl: this.state.shareImg
329 337
     }

+ 7
- 1
src/services/user.js Voir le fichier

@@ -6,7 +6,8 @@ import {
6 6
   API_QUERY_USER_INFO,
7 7
   API_QUERY_DOCUMENTVERIFY,
8 8
   API_QUERY_DOCUMENTVERIFY_list,
9
-  API_QUERY_TADRAINGE
9
+  API_QUERY_TADRAINGE,
10
+  API_TACUSTOMIMG
10 11
 } from '@constants/api'
11 12
 
12 13
 /**
@@ -66,4 +67,9 @@ export const doUserSignin = payload => fetch({ url: API_USER_SIGNIN, payload, me
66 67
  * @param {*} payload 
67 68
  */
68 69
 export const getHFiveDetail = payload => fetch({ url:`${API_QUERY_TADRAINGE}/${payload}`, payload  })
70
+/**
71
+ * 获取首页分享信息
72
+ * @param {*} payload
73
+ */
74
+export const getIndexShare = payload => fetch({ url:API_TACUSTOMIMG, payload  })
69 75