@titaui/pc 1.10.83-beta.7 → 1.10.83-beta.8

package/lib/components/wechat-btn/index.js

@@ -111,57 +111,45 @@ var WeChatBtn = function WeChatBtn(props) {
 
   var isWx = navigator.userAgent.match(/wxwork/);
   var isMac = navigator.userAgent.match(/Mac/);
-  /** 
+  /**
    * 点击企业微信图标这块稍许复杂 注释说明一下
-   * 先判断有没有群 没群就新建群 
+   * 先判断有没有群 没群就新建群
    * 有群就先调用加人的接口 人本身不在群的情况 成功加人就打开进入群聊
    * 人在群的情况 加人接口返回报错信息updateEnterpriseChat:fail_unsupported chat 则调用打开群接口
    * 群解散的情况 则弹窗提示 联系负责人手动加群
    * mac 不支持加人接口
-  */
+   */
 
   var handleClickWechatBtn = function handleClickWechatBtn() {
     if (isWx) {
       //有群了，判断没在群就先进群再打开群
       if (chatId !== null && chatId !== 'chatId') {
-        wx.invoke('updateEnterpriseChat', {
-          chatId: chatId,
-          userIdsToAdd: "".concat(loginUserOpenId)
+        wx.invoke('openExistedChatWithMsg', {
+          chatId: chatId
         }, function (res) {
-          if (res.err_msg === 'updateEnterpriseChat:ok') {
-            wx.invoke('openExistedChatWithMsg', {
-              chatId: chatId
-            }, function (res) {
-              if (res.err_msg === 'openExistedChatWithMsg:ok') {
-                console.log('打开群成功');
-              }
-            });
-          } else if (res.err_msg === 'updateEnterpriseChat:fail_unsupported chat') {
-            wx.invoke('openExistedChatWithMsg', {
-              chatId: chatId
-            }, function (res) {
-              if (res.err_msg === 'openExistedChatWithMsg:ok') {
-                console.log('打开群成功');
-              }
-            });
-          } else if (res.err_msg === 'updateEnterpriseChat:permission denied') {
+          if (res.err_msg === 'openExistedChatWithMsg:ok') {
+            console.log('打开群成功');
+          } else {
             if (isMac) {
-              wx.invoke('openExistedChatWithMsg', {
-                chatId: chatId
+              setMacWarnModalVisible(true);
+            } else {
+              wx.invoke('updateEnterpriseChat', {
+                chatId: chatId,
+                userIdsToAdd: loginUserOpenId
               }, function (res) {
-                if (res.err_msg === 'openExistedChatWithMsg:ok') {
+                console.log(chatId);
+
+                if (res.err_msg == 'updateEnterpriseChat:ok') {
                   console.log('打开群成功');
                 } else {
-                  setMacWarnModalVisible(true);
+                  if (loginUserOpenId === principalUser.userId) {
+                    setPrincipalUserModalVisible(true);
+                  } else {
+                    setMemberVisible(true);
+                  }
                 }
               });
             }
-          } else {
-            if (loginUserOpenId === principalUser.userId) {
-              setPrincipalUserModalVisible(true);
-            } else {
-              setMemberVisible(true);
-            }
           }
         });
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.83-beta.7",
+  "version": "1.10.83-beta.8",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",