@titaui/pc 1.10.82-beta.9 → 1.10.83-beta.3
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,30 +116,46 @@ 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: "".concat(loginUserOpenId)
|
|
121
122
|
}, function (res) {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
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));
|
|
124
|
+
|
|
125
|
+
if (res.err_msg === 'updateEnterpriseChat:ok') {
|
|
126
|
+
wx.invoke('openExistedChatWithMsg', {
|
|
127
|
+
chatId: chatId
|
|
128
|
+
}, function (res) {
|
|
129
|
+
if (res.err_msg === 'openExistedChatWithMsg:ok') {
|
|
130
|
+
console.log('打开群成功');
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
} else if (res.err_msg === 'updateEnterpriseChat:fail_unsupported chat') {
|
|
134
|
+
wx.invoke('openExistedChatWithMsg', {
|
|
135
|
+
chatId: chatId
|
|
136
|
+
}, function (res) {
|
|
137
|
+
if (res.err_msg === 'openExistedChatWithMsg:ok') {
|
|
138
|
+
console.log('打开群成功');
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
} else if (res.err_msg === 'updateEnterpriseChat:permission denied') {
|
|
125
142
|
if (isMac) {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
wx.invoke('updateEnterpriseChat', {
|
|
129
|
-
chatId: chatId,
|
|
130
|
-
userIdsToAdd: loginUserOpenId
|
|
143
|
+
wx.invoke('openExistedChatWithMsg', {
|
|
144
|
+
chatId: chatId
|
|
131
145
|
}, function (res) {
|
|
132
|
-
if (res.err_msg
|
|
133
|
-
console.log('
|
|
146
|
+
if (res.err_msg === 'openExistedChatWithMsg:ok') {
|
|
147
|
+
console.log('打开群成功');
|
|
134
148
|
} else {
|
|
135
|
-
|
|
136
|
-
setPrincipalUserModalVisible(true);
|
|
137
|
-
} else {
|
|
138
|
-
setMemberVisible(true);
|
|
139
|
-
}
|
|
149
|
+
setMacWarnModalVisible(true);
|
|
140
150
|
}
|
|
141
151
|
});
|
|
142
152
|
}
|
|
153
|
+
} else {
|
|
154
|
+
if (loginUserOpenId === principalUser.userId) {
|
|
155
|
+
setPrincipalUserModalVisible(true);
|
|
156
|
+
} else {
|
|
157
|
+
setMemberVisible(true);
|
|
158
|
+
}
|
|
143
159
|
}
|
|
144
160
|
});
|
|
145
161
|
} else {
|
|
@@ -213,6 +229,7 @@ var WeChatBtn = function WeChatBtn(props) {
|
|
|
213
229
|
}
|
|
214
230
|
|
|
215
231
|
if (isWx) {
|
|
232
|
+
console.log(res.Data.obj);
|
|
216
233
|
setChatId(res.Data.obj);
|
|
217
234
|
(0, _request.rpost)('v1')('chat/users', {
|
|
218
235
|
objId: id,
|