@titaui/pc 1.10.82-beta.9 → 1.10.83-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -116,31 +116,45 @@ var WeChatBtn = function WeChatBtn(props) {
|
|
|
116
116
|
if (isWx) {
|
|
117
117
|
//有群了，判断没在群就先进群再打开群
|
|
118
118
|
if (chatId !== null && chatId !== 'chatId') {
|
|
119
|
-
wx.invoke('
|
|
120
|
-
chatId: chatId
|
|
119
|
+
wx.invoke('updateEnterpriseChat', {
|
|
120
|
+
chatId: chatId,
|
|
121
|
+
userIdsToAdd: loginUserOpenId
|
|
121
122
|
}, function (res) {
|
|
122
|
-
if (res.err_msg === '
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
}
|
|
123
|
+
console.log("1.\u4EBA\u5728\u7FA4\uFF0C\u8C03\u7528\u52A0\u4EBA\u63A5\u53E3\u8FD4\u56DE\u4FE1\u606F\uFF1B2.\u4EBA\u4E0D\u5728\u7FA4\uFF0C\u8C03\u7528\u52A0\u4EBA\u63A5\u53E3\u8FD4\u56DE\u4FE1\u606F\uFF1B 3.\u7FA4\u89E3\u6563\u4E86\uFF0C\u8C03\u7528\u52A0\u4EBA\u63A5\u53E3\u8FD4\u56DE\u4FE1\u606F 4.mac\u8C03\u7528\u52A0\u4EBA\u63A5\u53E3\u8FD4\u56DE\u4FE1\u606F ".concat(res.err_msg)); // if (res.err_msg === 'updateEnterpriseChat:ok') {
|
|
124
|
+
// wx.invoke(
|
|
125
|
+
// 'openExistedChatWithMsg',
|
|
126
|
+
// {
|
|
127
|
+
// chatId: chatId,
|
|
128
|
+
// },
|
|
129
|
+
// function (res) {
|
|
130
|
+
// if (res.err_msg === 'openExistedChatWithMsg:ok') {
|
|
131
|
+
// console.log('打开群成功')
|
|
132
|
+
// }
|
|
133
|
+
// },
|
|
134
|
+
// )
|
|
135
|
+
// } else if(res.err_msg !== 'updateEnterpriseChat:permission denied') {
|
|
136
|
+
// wx.invoke(
|
|
137
|
+
// 'openExistedChatWithMsg',
|
|
138
|
+
// {
|
|
139
|
+
// chatId: chatId,
|
|
140
|
+
// },
|
|
141
|
+
// function (res) {
|
|
142
|
+
// if (res.err_msg === 'openExistedChatWithMsg:ok') {
|
|
143
|
+
// console.log('打开群成功')
|
|
144
|
+
// } else {
|
|
145
|
+
// if (loginUserOpenId === principalUser.userId) {
|
|
146
|
+
// setPrincipalUserModalVisible(true)
|
|
147
|
+
// } else {
|
|
148
|
+
// setMemberVisible(true)
|
|
149
|
+
// }
|
|
150
|
+
// }
|
|
151
|
+
// },
|
|
152
|
+
// )
|
|
153
|
+
// } else {
|
|
154
|
+
// if (isMac) {
|
|
155
|
+
// setMacWarnModalVisible(true)
|
|
156
|
+
// }
|
|
157
|
+
// }
|
|
144
158
|
});
|
|
145
159
|
} else {
|
|
146
160
|
setCreateWechatVisible(true);
|
|
@@ -213,6 +227,7 @@ var WeChatBtn = function WeChatBtn(props) {
|
|
|
213
227
|
}
|
|
214
228
|
|
|
215
229
|
if (isWx) {
|
|
230
|
+
console.log(res.Data.obj);
|
|
216
231
|
setChatId(res.Data.obj);
|
|
217
232
|
(0, _request.rpost)('v1')('chat/users', {
|
|
218
233
|
objId: id,
|