Merge branch 'feature/wufan/20210507/preview-address-list' into dev

src/common/js/wechatApi.js

@@ -2,7 +2,7 @@
  * @Author: wufan
  * @Author: wufan
  * @Date: 2021-05-11 10:21:37
  * @Date: 2021-05-11 10:21:37
  * @LastEditors: wufan
  * @LastEditors: wufan
- * @LastEditTime: 2021-06-02 11:47:22
+ * @LastEditTime: 2021-06-02 12:00:21
  * @Description: 企业微信api
  * @Description: 企业微信api
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -15,7 +15,7 @@ export default class WechatApi {
     return Service.Hades("anon/hades/getWxCorpJSAPISignature", {
     return Service.Hades("anon/hades/getWxCorpJSAPISignature", {
       storeId: User.getStoreId(),
       storeId: User.getStoreId(),
       url: params.url,
       url: params.url,
-    }).then((result) => {
+    }).then( await function(result) {
       const res = result.result;
       const res = result.result;
       if (/MicroMessenger/i.test(navigator.userAgent)) {
       if (/MicroMessenger/i.test(navigator.userAgent)) {
         this.config({
         this.config({
@@ -36,36 +36,34 @@ export default class WechatApi {
 
 
       if (params.isAgentConfig) {
       if (params.isAgentConfig) {
         return new Promise((resolve, reject) => {
         return new Promise((resolve, reject) => {
-          wx.ready(() => {
-            Service.Hades("anon/hades/getWxWorkJSAPISignature", {
-              storeId: User.getStoreId(),
-              url: params.url,
-            }).then((result2) => {
-              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(err, "err-agentconfig");
-                  reject(err);
-                },
-              });
+          Service.Hades("anon/hades/getWxWorkJSAPISignature", {
+            storeId: User.getStoreId(),
+            url: params.url,
+          }).then(await function(result2) {
+            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(err, "err-agentconfig");
+                reject(err);
+              },
             });
             });
           });
           });
         });
         });