fix:ghjkldduud

src/common/js/wechatApi.js

@@ -15,6 +15,7 @@ import Service from '@/common/js/service';
 export default class WechatApi {
 export default class WechatApi {
   static async initConfig(params = { isAgentConfig: false, url: '' }) {
   static async initConfig(params = { isAgentConfig: false, url: '' }) {
     if (Platform.isWorkWx()) {
     if (Platform.isWorkWx()) {
+<<<<<<< HEAD
 
 
       return new Promise(async (resolve, reject) => {
       return new Promise(async (resolve, reject) => {
         Service.Hades('anon/hades/getWxCorpJSAPISignature', {
         Service.Hades('anon/hades/getWxCorpJSAPISignature', {
@@ -54,6 +55,44 @@ export default class WechatApi {
                   reject(err);
                   reject(err);
                 },
                 },
               });
               });
+=======
+      return Service.Hades('anon/hades/getWxCorpJSAPISignature', {
+        storeId: User.getStoreId(),
+        url: params.url,
+      }).then((result) => {
+        const res = result.result;
+        this.config({
+          beta: true, // 必须这么写，否则wx.invoke调用形式的jsapi会有问题
+          debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+          appId: res.appId, // 必填，企业微信的corpID
+          timestamp: res.timestamp, // 必填，生成签名的时间戳
+          nonceStr: res.nonceStr, // 必填，生成签名的随机串
+          signature: res.signature, // 必填，签名，见 附录-JS-SDK使用权限签名算法
+          jsApiList: ['chooseImage', 'shareToExternalContact', 'selectExternalContact', 'selectEnterpriseContact'],
+        }).then(() => {
+          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(1213545344545)
+                console.log(err, 'err-agentconfig');
+                reject(err);
+              },
+>>>>>>> feature/zhangleyuan/20210719/personnel-organization
             });
             });
 
 
           })
           })
@@ -114,7 +153,11 @@ export default class WechatApi {
   }
   }
 
 
   static async agentConfig(config) {
   static async agentConfig(config) {
+<<<<<<< HEAD
     wx.agentConfig(config);
     wx.agentConfig(config);
+=======
+    wx.agentConfig({ ...config });
+>>>>>>> feature/zhangleyuan/20210719/personnel-organization
   }
   }
 
 
   static getCurExternalContact() {
   static getCurExternalContact() {

src/modules/root/CollegeManagePage.jsx

@@ -132,9 +132,10 @@ export default class CollegeManagePage extends React.Component {
       list: [],
       list: [],
       enterpriseId: User.getEnterpriseId(),
       enterpriseId: User.getEnterpriseId(),
       isAdmin: false,
       isAdmin: false,
-      createStoreList: [],
-      joinStoreList: [],
-      surplusDayTime: 365, //剩余天数
+      createStoreList:[],
+      joinStoreList:[],
+      initWechat:false,
+      surplusDayTime:365, //剩余天数
       endTime: 0, //有效截至时间
       endTime: 0, //有效截至时间
     };
     };
   }
   }
@@ -145,6 +146,13 @@ export default class CollegeManagePage extends React.Component {
     this.getVersion()
     this.getVersion()
   }
   }
 
 
+ initWechatConfig() {
+    WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] }).then(() => {
+     this.setState({initWechat:true})
+    })
+
+  }
+  
   getEnterpriseUser() {
   getEnterpriseUser() {
     const { enterpriseId } = this.state;
     const { enterpriseId } = this.state;
     const params = {
     const params = {
@@ -253,7 +261,8 @@ export default class CollegeManagePage extends React.Component {
       list,
       list,
       isAdmin,
       isAdmin,
       createStoreList,
       createStoreList,
-      joinStoreList
+      joinStoreList,
+      initWechat
     } = this.state;
     } = this.state;
     return (
     return (
       <div className="college-manage-page">
       <div className="college-manage-page">
@@ -266,7 +275,7 @@ export default class CollegeManagePage extends React.Component {
               <span className="name">
               <span className="name">
                 {name}
                 {name}
                 {
                 {
-                 <WWOpenDataCom type="userName" openid={name} />
+                  initWechat && <WWOpenDataCom type="userName" openid={name} />
                 }
                 }
 
 
               </span>
               </span>
@@ -295,7 +304,10 @@ export default class CollegeManagePage extends React.Component {
             <img className="image" src={avatar} />
             <img className="image" src={avatar} />
             <span className="name">
             <span className="name">
               {name}
               {name}
-              {/* <WWOpenDataCom type="userName" openid={name}/> */}
+              {
+                initWechat  &&   <WWOpenDataCom type="userName" openid={name}/>
+              }
+            
             </span>
             </span>
           </div>
           </div>
           <div>
           <div>