Merge branch 'master' into feature/zhujian/0726/qwLiving

src/common/js/wechatApi.js

@@ -36,24 +36,27 @@ export default class WechatApi {
               url: params.url,
               url: params.url,
             }).then((result2) => {
             }).then((result2) => {
               const res2 = result2.result;
               const res2 = result2.result;
-              this.agentConfig({
-                corpid: res2.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致
-                agentid: res2.agentid, // 必填，企业微信的应用id （e.g. 1000247）
-                timestamp: res2.timestamp, // 必填，生成签名的时间戳
-                nonceStr: res2.nonceStr, // 必填，生成签名的随机串
-                signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
-                jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat'],
-                success: (res) => {
-                  console.log(res, 'res-agentconfig');
-                  console.info('window.WWOpenData', window.WWOpenData);
-                  resolve(res);
-                },
-                fail: (err) => {
-                  console.log(1213545344545)
-                  console.log(err, 'err-agentconfig');
-                  reject(err);
-                },
-              });
+              setTimeout(() => {
+                this.agentConfig({
+                  corpid: res2.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致
+                  agentid: res2.agentid, // 必填，企业微信的应用id （e.g. 1000247）
+                  timestamp: res2.timestamp, // 必填，生成签名的时间戳
+                  nonceStr: res2.nonceStr, // 必填，生成签名的随机串
+                  signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
+                  jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving', 'replayLiving'],
+                  success: (res) => {
+                    console.log(res, 'res-agentconfig');
+                    console.info('window.WWOpenData', window.WWOpenData);
+                    resolve(res);
+                  },
+                  fail: (err) => {
+                    console.log(1213545344545)
+                    console.log(err, 'err-agentconfig');
+                    reject(err);
+                  },
+                });
+              }, 500)
+
             });
             });
 
 
           })
           })
@@ -93,7 +96,7 @@ export default class WechatApi {
         });
         });
       }
       }
     }
     }
-    
+
   }
   }
 
 
   static async config(config) {
   static async config(config) {
@@ -150,13 +153,13 @@ export default class WechatApi {
       wx.ready(() => {
       wx.ready(() => {
         wx.invoke('startLiving', {
         wx.invoke('startLiving', {
           "livingId": id,
           "livingId": id,
-        }, function(res) {
+        }, function (res) {
           if (res.err_msg === "startLiving:ok") {
           if (res.err_msg === "startLiving:ok") {
             resolve(true)
             resolve(true)
           } else {
           } else {
             reject(res.err_msg); //错误处理
             reject(res.err_msg); //错误处理
           }
           }
-      });
+        });
       });
       });
     })
     })
   }
   }
@@ -165,7 +168,7 @@ export default class WechatApi {
       wx.ready(() => {
       wx.ready(() => {
         wx.invoke('replayLiving', {
         wx.invoke('replayLiving', {
           "livingId": id,
           "livingId": id,
-        }, function(res) {
+        }, function (res) {
           if (res.err_msg === "replayLiving:ok") {
           if (res.err_msg === "replayLiving:ok") {
             resolve(true)
             resolve(true)
           } else {
           } else {
@@ -189,7 +192,7 @@ export default class WechatApi {
             }
             }
             reject(err); //错误处理
             reject(err); //错误处理
           }
           }
-      });
+        });
       });
       });
     })
     })
   }
   }

src/domains/basic-domain/constants.ts

 /*
 /*
  * @Author: 陈剑宇
  * @Author: 陈剑宇
  * @Date: 2020-05-07 14:43:01
  * @Date: 2020-05-07 14:43:01
- * @LastEditTime: 2021-06-22 16:49:06
+ * @LastEditTime: 2021-08-11 22:52:04
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
  * @Description:
  * @Description:
  * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
  * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts

src/domains/course-domain/constants.ts

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-08-20 09:21:40
  * @Date: 2020-08-20 09:21:40
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-11 15:17:56
+ * @LastEditTime: 2021-08-11 22:50:48
  * @Description: 
  * @Description: 
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
  */