|
@@ -1,9 +1,9 @@
|
|
|
-import AxiosInstanceFunc from '../Service/AxiosInstance'
|
|
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
|
// @ts-ignore
|
|
|
import wx from 'weixin-js-sdk'
|
|
|
import Config from '../config'
|
|
|
-import { IResponse } from '../Service/IResponse'
|
|
|
+import NewAxiosInstanceFunc from 'Service/NewAxiosInstance'
|
|
|
+import { INewResponse } from 'Service/INewResponse'
|
|
|
|
|
|
const baseTitle = `${Config.titleGenerateHz}${Config.titleGenerateYj}`
|
|
|
const baseImgUrl = 'https://hzstatic.hzinsights.com/cygx_web/ico/logo.png'
|
|
@@ -11,10 +11,12 @@ const baseImgUrl = 'https://hzstatic.hzinsights.com/cygx_web/ico/logo.png'
|
|
|
export const checkWechat = (): boolean => /MicroMessenger/i.test(window.navigator.userAgent)
|
|
|
|
|
|
export interface IJssign {
|
|
|
- url: string
|
|
|
- noncestr: string
|
|
|
- timestamp: number
|
|
|
- signature: string
|
|
|
+ AppId: string
|
|
|
+ NonceStr: string
|
|
|
+ Timestamp: number
|
|
|
+ Url: string
|
|
|
+ Signature: string
|
|
|
+ RawString: string
|
|
|
}
|
|
|
|
|
|
export interface IShareMsg {
|
|
@@ -24,12 +26,12 @@ export interface IShareMsg {
|
|
|
desc: string
|
|
|
}
|
|
|
|
|
|
-const getJssign = (url: string): IResponse<IJssign> =>
|
|
|
- AxiosInstanceFunc({
|
|
|
- url: `/auth/jssign`,
|
|
|
+const getJssign = (url: string): INewResponse<IJssign> =>
|
|
|
+ NewAxiosInstanceFunc({
|
|
|
+ url: `/wechat/getWxSign`,
|
|
|
method: 'get',
|
|
|
params: {
|
|
|
- url: url
|
|
|
+ Url: url
|
|
|
}
|
|
|
})
|
|
|
|
|
@@ -41,10 +43,10 @@ export const shareConfig = (shareMsg: IShareMsg): void => {
|
|
|
getJssign(shareMsg.url).then(result => {
|
|
|
wx.config({
|
|
|
debug: false,
|
|
|
- appId: 'wx2f85cdbe74585222',
|
|
|
- timestamp: result.data.data.timestamp,
|
|
|
- nonceStr: result.data.data.noncestr,
|
|
|
- signature: result.data.data.signature,
|
|
|
+ appId: result.data.Data.AppId || 'wx2f85cdbe74585222',
|
|
|
+ timestamp: result.data.Data.Timestamp,
|
|
|
+ nonceStr: result.data.Data.NonceStr,
|
|
|
+ signature: result.data.Data.Signature,
|
|
|
jsApiList: ['updateAppMessageShareData', 'updateTimelineShareData']
|
|
|
})
|
|
|
})
|
|
@@ -89,10 +91,10 @@ export const prepareForWechatTag = async () => {
|
|
|
const result = await getJssign(window.location.href.split('#')[0])
|
|
|
wx.config({
|
|
|
debug: true,
|
|
|
- appId: 'wx2f85cdbe74585222',
|
|
|
- timestamp: result.data.data.timestamp,
|
|
|
- nonceStr: result.data.data.noncestr,
|
|
|
- signature: result.data.data.signature,
|
|
|
+ appId: result.data.Data.AppId || 'wx2f85cdbe74585222',
|
|
|
+ timestamp: result.data.Data.Timestamp,
|
|
|
+ nonceStr: result.data.Data.NonceStr,
|
|
|
+ signature: result.data.Data.Signature,
|
|
|
jsApiList: ['updateAppMessageShareData', 'updateTimelineShareData'],
|
|
|
openTagList: ['wx-open-audio']
|
|
|
})
|