浏览代码

Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

许静 5 年前
父节点
当前提交
f8639de39f
共有 3 个文件被更改,包括 11 次插入7 次删除
  1. 4
    4
      config/prod.js
  2. 2
    2
      project.config.json
  3. 5
    1
      src/pages/card/index.js

+ 4
- 4
config/prod.js 查看文件

@@ -5,10 +5,10 @@ module.exports = {
5 5
   defineConstants: {
6 6
     // HOST: '"http://192.168.0.218:8080"',
7 7
     // WSS_HOST: '"ws://192.168.0.218:8080"',
8
-    HOST: '"https://dev.jinchengjiaye.com"',
9
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
-    //   HOST: '"https://lt.pawoma.cn"',
11
-    //   WSS_HOST: '"wss://lt.pawoma.cn"',
8
+    // HOST: '"https://dev.jinchengjiaye.com"',
9
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
+      HOST: '"https://lt.pawoma.cn"',
11
+      WSS_HOST: '"wss://lt.pawoma.cn"',
12 12
   },
13 13
   weapp: {},
14 14
   h5: {}

+ 2
- 2
project.config.json 查看文件

@@ -1,8 +1,8 @@
1 1
 {
2 2
 	"miniprogramRoot": "dist/",
3 3
 	"projectname": "mini-chengjiao",
4
-	"description": "知与行联调",
5
-	"appid": "wxd9ee3a9480a4e544",
4
+	"description": "知与行互动",
5
+	"appid": "wxd6f47a9bb3052175",
6 6
 	"setting": {
7 7
 		"urlCheck": false,
8 8
 		"es6": false,

+ 5
- 1
src/pages/card/index.js 查看文件

@@ -352,9 +352,13 @@ export default class Index extends Component {
352 352
   handleModalConfirm(phoneNumber) {
353 353
     const {
354 354
       cardInfo: { id, projects = [] },
355
-      userInfo: { person: { phone, tel, avatarurl } }
355
+      userInfo: { person: { phone, tel, personType, avatarurl } }
356 356
     } = this.props
357 357
 
358
+    if (personType === ROLE_CODE['CONSULTANT']) {
359
+      return
360
+    }
361
+
358 362
     const buildingId = projects[0]
359 363
     const realPhone = phoneNumber || phone || tel
360 364