张延森 3 年之前
父節點
當前提交
643606e6b3

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

10
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
10
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
11
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
11
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
12
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
12
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
13
-    Version: '"V0.0.62-20210824"'
13
+    Version: '"V0.0.65-20210827"'
14
   },
14
   },
15
   mini: {},
15
   mini: {},
16
   h5: {
16
   h5: {

+ 1
- 1
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,

+ 32
- 27
src/pages/chat/chatDetail/index.jsx 查看文件

77
   }
77
   }
78
 
78
 
79
   const getChatHistory = (params) => {
79
   const getChatHistory = (params) => {
80
-    Taro.showLoading()
81
-    queryChatHistory({
82
-      chatWith: friend,
83
-      pageSize: 20,
84
-      ...params || {},
85
-    }).then((res) => {
86
-      const { records } = res;
87
-      Taro.hideLoading()
88
-
89
-      const lst = (records || []).reverse()
90
-
91
-      // 如果聊天对象是有身份的
92
-      if (receiver.personType !== ROLE_CODE.DRIFT && receiver.personType !== ROLE_CODE.CUSTOMER) {
93
-        const mockMessage = {
94
-          chatId: Math.random().toString(36).substring(2),
95
-          message: '',
96
-          messageType: im.MESSAGETYPE.CARD,
97
-          receivePerson: person.personId,
98
-          sendPerson: friend,
99
-          createDate: new Date(),
100
-        }
101
-        lst.push(mockMessage)
102
-      }
103
-
104
-      setPageList(lst)
105
-      scroll()
80
+    return new Promise((resovle, reject) => {
81
+      Taro.showLoading()
82
+      queryChatHistory({
83
+        chatWith: friend,
84
+        pageSize: 20,
85
+        ...params || {},
86
+      }).then((res) => {
87
+        const { records } = res;
88
+        Taro.hideLoading()
89
+  
90
+        const lst = (records || []).reverse()  
91
+        resovle(lst)
92
+      }).catch(() => {
93
+        Taro.hideLoading()
94
+      })
106
     })
95
     })
107
   }
96
   }
108
 
97
 
117
       im.bindReceiver(friend)
106
       im.bindReceiver(friend)
118
       fetch({ url: `${API_QUERY_USERINFO_BYID}/${friend}`, spin: true }).then((res) => {
107
       fetch({ url: `${API_QUERY_USERINFO_BYID}/${friend}`, spin: true }).then((res) => {
119
         setReceiver(res)
108
         setReceiver(res)
120
-        getChatHistory({ pageNumber: 1 })
109
+        getChatHistory({ pageNumber: 1 }).then((lst) => {
110
+          // 如果聊天对象是有身份的
111
+          if (res.personType !== ROLE_CODE.DRIFT && res.personType !== ROLE_CODE.CUSTOMER) {
112
+            const mockMessage = {
113
+              chatId: Math.random().toString(36).substring(2),
114
+              message: '',
115
+              messageType: im.MESSAGETYPE.CARD,
116
+              receivePerson: person.personId,
117
+              sendPerson: friend,
118
+              createDate: new Date(),
119
+            }
120
+            lst.push(mockMessage)
121
+          }
122
+
123
+          setPageList(lst)
124
+          scroll()
125
+        })
121
       })
126
       })
122
     } else {
127
     } else {
123
       Taro.showToast({
128
       Taro.showToast({

+ 1
- 1
src/subpackages/pages/consultant/components/StatCustomerListItem/index.jsx 查看文件

9
 
9
 
10
   const handleChat = () => {
10
   const handleChat = () => {
11
     Taro.navigateTo({
11
     Taro.navigateTo({
12
-      url: `/pages/chat/chatDetail/index?friend=${data.id}`
12
+      url: `/pages/chat/chatDetail/index?friend=${data.personId}`
13
     })
13
     })
14
   }
14
   }
15
 
15