hhdoctor-wmp-sdk 3.8.34 → 3.8.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -37,6 +37,14 @@ let isAcceptCall = false, uploadCount = 0, _calledInfo = null
37
37
 
38
38
  /** 鹅民健康视频中邀请家人:改拉起成都和缓小程序(wx65749e9321b23f6c),落到 navi 分享引导页 */
39
39
  const INVITE_SHARE_NAVI_APPID = 'wx65749e9321b23f6c'
40
+ /**
41
+ * 鹅民健康专属 navi 分享引导页资源(navi 页面按入口 from=tx 套用绿色主题)
42
+ * 医生视频与专家视频两套:页面背景图 + 邀请卡片图(分享消息 imageUrl)
43
+ */
44
+ const INVITE_SHARE_TX_BG_IMG = 'https://imgs.hh-medic.com/icon/wmp/navi-share-tx.png'
45
+ const INVITE_SHARE_TX_CARD_IMG = 'https://imgs.hh-medic.com/icon/wmp/share-image-tx.png'
46
+ const INVITE_SHARE_TX_EXP_BG_IMG = 'https://imgs.hh-medic.com/icon/wmp/navi-share-tx-exp.png'
47
+ const INVITE_SHARE_TX_EXP_CARD_IMG = 'https://imgs.hh-medic.com/icon/wmp/share-image-tx-exp.png'
40
48
 
41
49
  Component({
42
50
  /**
@@ -1411,13 +1419,35 @@ Component({
1411
1419
  }
1412
1420
  this.triggerEvent('invite', e.detail)
1413
1421
  },
1414
- /** 鹅民健康视频中邀请家人:组装 navi 跳转参数,拉起 wx65749e9321b23f6c 显示分享引导页 */
1422
+ /**
1423
+ * 鹅民健康视频中邀请家人:组装 navi 跳转参数,拉起 wx65749e9321b23f6c 显示分享引导页
1424
+ * navi 通过 from=tx 识别鹅民健康并套用绿色按钮主题;页面背景图、邀请卡片图与分享标题由本组件按视频类型下发。
1425
+ * 设计稿要求 content 为空(页面无说明文案),故不传 content。
1426
+ */
1415
1427
  async inviteToShareNavi(e) {
1416
1428
  try {
1417
- let shareInfo = await hhDoctor.processShare(e)
1429
+ let detail = (e && e.detail) || {}
1430
+ // 专家视频(zhuanke)与医生视频使用不同的分享标题、页面背景图与邀请卡片图
1431
+ let isExpert = 'zhuanke' == (detail.serviceTypeStatus || this.data.doctor && this.data.doctor.serviceTypeStatus)
1432
+ // 专家视频分享标题带预约时间(order.provideTime,与专家等待页口径一致);取不到时沿用 processShare 默认文案
1433
+ let cardTitle = ''
1434
+ if (isExpert) {
1435
+ let provideTime = this.data.order && this.data.order.provideTime
1436
+ if (provideTime) cardTitle = i18n.t('share.inviteExpertVideoTitle', {
1437
+ name: hhDoctor.getUserName(),
1438
+ time: dateUtil.format(new Date(provideTime), i18n.t('im.dateFormat'))
1439
+ })
1440
+ }
1441
+ let shareInfo = await hhDoctor.processShare({
1442
+ detail: Object.assign({}, detail, {
1443
+ cardTitle,
1444
+ cardImage: isExpert ? INVITE_SHARE_TX_EXP_CARD_IMG : INVITE_SHARE_TX_CARD_IMG
1445
+ })
1446
+ })
1418
1447
  if (!shareInfo || !shareInfo.sharePath) throw new Error(i18n.t('common.systemError'))
1419
- let sharePath = `/pages/index/index${shareInfo.sharePath}`,
1420
- path = `/pages/navi/navi?shareTitle=${encodeURIComponent(shareInfo.cardTitle)}&sharePath=${encodeURIComponent(sharePath)}&shareImage=${encodeURIComponent(shareInfo.cardImage)}&content=${encodeURIComponent(i18n.t('room.inviteFamilyVideo'))}&buttonText=${encodeURIComponent(i18n.t('room.inviteNow'))}`
1448
+ let bgImage = isExpert ? INVITE_SHARE_TX_EXP_BG_IMG : INVITE_SHARE_TX_BG_IMG,
1449
+ sharePath = `/pages/index/index${shareInfo.sharePath}`,
1450
+ path = `/pages/navi/navi?from=tx&bgImage=${encodeURIComponent(bgImage)}&shareTitle=${encodeURIComponent(shareInfo.cardTitle)}&sharePath=${encodeURIComponent(sharePath)}&shareImage=${encodeURIComponent(shareInfo.cardImage)}&buttonText=${encodeURIComponent(i18n.t('room.inviteNow'))}`
1421
1451
  this.requestRtcLog('1', '鹅民健康视频中邀请家人,拉起 navi 分享引导页', this.data.order && this.data.order.orderid || '')
1422
1452
  wx.navigateToMiniProgram({
1423
1453
  appId: INVITE_SHARE_NAVI_APPID,
@@ -4,7 +4,7 @@ const TIM = require('./hh-rtc/lib/tim-wx');
4
4
  const cStyle = require('./utils/consoleStyle')
5
5
  const SDKAppID = 1400073238;
6
6
  const SdkVersion = '6.8.16'
7
- const SdkSubVersion = '.261023.1036'
7
+ const SdkSubVersion = '.261027.1023'
8
8
  const {
9
9
  isHhWmp
10
10
  } = require('./utils/commonUtil');
@@ -1287,7 +1287,7 @@ function regInviteUser({
1287
1287
  gender,
1288
1288
  birthday,
1289
1289
  loginname: openId
1290
- }, inviter)
1290
+ }, inviter, sdkProductId)
1291
1291
  } else {
1292
1292
  //普通问诊/专家问诊,视频中拉人,注册独立的体验账号
1293
1293
  let user = {
@@ -35,15 +35,61 @@ function sdkOptions() {
35
35
  return getGlobalData()._hhSdkOptions
36
36
  }
37
37
 
38
- /** RTC/wmp 域公共 query(不含前导 ?):sdkProductId + userToken */
38
+ /** JWT(accessToken) 内的 sdkProductId 缓存:按 token 记忆,避免每次请求重复解码 */
39
+ let cachedJwtProductId = { token: '', sdkProductId: null }
40
+
41
+ /**
42
+ * sdkProductId 兜底:SDK 选项 → 登录用户 appId → accessToken(JWT)
43
+ *
44
+ * 分享卡片邀请注册等冷启动会话不走 hhDoctor.login(),SDK 选项里没有产品上下文,
45
+ * 而 RS 的 Query sdkProductId 多为必填,缺失会在反序列化阶段直接 400。
46
+ */
47
+ function resolveSdkProductId() {
48
+ const options = sdkOptions() || {}
49
+ const fromOptions = toSdkProductId(options._sdkProductId)
50
+ if (null !== fromOptions) return fromOptions
51
+ const loginUser = getGlobalData().loginUser
52
+ const fromLoginUser = toSdkProductId(loginUser && loginUser.appId)
53
+ if (null !== fromLoginUser) return fromLoginUser
54
+ return getJwtSdkProductId()
55
+ }
56
+
57
+ /** 从 accessToken(JWT) payload 取 sdkProductId;解析失败返回 null */
58
+ function getJwtSdkProductId() {
59
+ const token = wx.getStorageSync('_hh_access_token') || wx.getStorageSync('_hh_access_token2')
60
+ if (!token || 'string' != typeof token) return null
61
+ if (cachedJwtProductId.token === token) return cachedJwtProductId.sdkProductId
62
+ let sdkProductId = null
63
+ try {
64
+ const segment = (token.split('.')[1] || '').replace(/-/g, '+').replace(/_/g, '/')
65
+ const padding = '='.repeat((4 - segment.length % 4) % 4)
66
+ const bytes = new Uint8Array(wx.base64ToArrayBuffer(segment + padding))
67
+ let payload = ''
68
+ for (let i = 0; i < bytes.length; i++) payload += String.fromCharCode(bytes[i])
69
+ // payload 是 UTF-8,中文会按字节拆开,但 ASCII 字段仍可被正则命中,这里只取数字型 sdkProductId
70
+ const matched = /"sdkProductId"\s*:\s*"?(\d+)"?/.exec(payload)
71
+ sdkProductId = matched ? toSdkProductId(matched[1]) : null
72
+ } catch (e) {
73
+ sdkProductId = null
74
+ }
75
+ cachedJwtProductId = { token, sdkProductId }
76
+ return sdkProductId
77
+ }
78
+
79
+ /** RTC/wmp 域公共 query(不含前导 ?):sdkProductId + userToken,空值不拼 */
39
80
  function pubQueryRaw() {
40
- const options = sdkOptions()
41
- return `sdkProductId=${options._sdkProductId}&userToken=${options._userToken}`
81
+ const options = sdkOptions() || {}
82
+ const params = []
83
+ const sdkProductId = resolveSdkProductId()
84
+ if (null !== sdkProductId) params.push('sdkProductId=' + sdkProductId)
85
+ if (options._userToken) params.push('userToken=' + options._userToken)
86
+ return params.join('&')
42
87
  }
43
88
 
44
89
  /** RTC/wmp 域公共 query(含前导 ?),extra 为业务参数串 */
45
90
  function pubQuery(extra) {
46
- return '?' + pubQueryRaw() + (extra ? '&' + extra : '')
91
+ const query = [pubQueryRaw(), extra].filter(Boolean).join('&')
92
+ return query ? '?' + query : ''
47
93
  }
48
94
 
49
95
  /** 启动参数里的环境名(App 未就绪时的兜底取值) */
@@ -279,7 +325,7 @@ function doRequest(url, method, data) {
279
325
  }
280
326
 
281
327
  function addPubVars(url) {
282
- url = addParam(url, 'sdkProductId', sdkOptions()._sdkProductId);
328
+ url = addParam(url, 'sdkProductId', resolveSdkProductId());
283
329
  url = addParam(url, 'userToken', sdkOptions()._userToken);
284
330
  url = addParam(url, 'openId', sdkOptions()._openId);
285
331
  url = addParam(url, 'hhDoctorSdkVersion', (wx.getStorageSync('SdkVersion') || ''));
@@ -314,7 +360,7 @@ function addPubData(data) {
314
360
  const options = sdkOptions();
315
361
  // sdkProductId 后端按整型反序列化(如 family-user 的 i32),SDK 选项里是字符串,直接下发会参数错误:
316
362
  // 调用方已显式传入时按其值归一,未传入时用 SDK 选项补齐;无法归一为整数时保持原样(交由后端校验报错)
317
- const sdkProductId = toSdkProductId(undefined === data.sdkProductId ? options._sdkProductId : data.sdkProductId);
363
+ const sdkProductId = toSdkProductId(undefined === data.sdkProductId ? resolveSdkProductId() : data.sdkProductId);
318
364
  if (null !== sdkProductId) data.sdkProductId = sdkProductId;
319
365
  if (!Object.prototype.hasOwnProperty.call(data, 'userToken')) data.userToken = options._userToken;
320
366
  // 原 api.js 的 request() 会把 hhDoctorSdkVersion 一并放进 Body,这里保持同等语义
@@ -425,7 +471,9 @@ function parseShareCode(mpAppId, shareCode) {
425
471
  function uploadFile(filePath, fileType) {
426
472
  return new Promise((resolve, reject) => {
427
473
  let accessToken = wx.getStorageSync('_hh_access_token') || wx.getStorageSync('_hh_access_token2')
428
- let url = `${urls.uploadFile}?sdkProductId=${sdkOptions()._sdkProductId}&userToken=${sdkOptions()._userToken}`
474
+ const options = sdkOptions() || {}
475
+ const productId = resolveSdkProductId()
476
+ let url = `${urls.uploadFile}?userToken=${options._userToken || ''}${null === productId ? '' : '&sdkProductId=' + productId}`
429
477
  uploadTask = wx.uploadFile({
430
478
  filePath,
431
479
  name: 'file',
@@ -761,8 +809,11 @@ function openInformationFlowCard(informationId) {
761
809
  * 获取呼叫前签名页地址(RS `/family-user/web/v1/user/getCallSignUrl`,Query,无 Body)
762
810
  * @returns data.url(必有,用它打开签字页)、data.signFlowId?(不可用于判断成功)
763
811
  */
764
- function getCallSignUrl() {
765
- return doRequest(urls.getCallSignUrl, '', {})
812
+ function getCallSignUrl(memberUserToken) {
813
+ const options = sdkOptions() || {}
814
+ // 后端 Query 为 BaseRequestVo:userToken / realUserToken / sdkProductId 均必填
815
+ const targetToken = memberUserToken || options._userToken || ''
816
+ return doRequest(urls.getCallSignUrl + pubQuery(`realUserToken=${targetToken}`), '', {})
766
817
  }
767
818
 
768
819
  /**
@@ -1156,13 +1207,17 @@ function normalizeSex(sex) {
1156
1207
  /**
1157
1208
  * 添加家庭成员(Rust `/web/v1/user/addMember`)
1158
1209
  * member 为老结构,敏感字段按操作人 token 加密;loginname 有值即视为独立子账号
1210
+ *
1211
+ * 服务端 Query 的 sdkProductId 为必填(HhBaseQuery),分享卡片邀请注册等无登录态场景
1212
+ * 全局 SDK 选项里可能没有值,因此调用方应显式传入上下文中的 sdkProductId,不再只依赖全局值
1159
1213
  */
1160
- function addEhrMember(member, masterUserToken) {
1214
+ function addEhrMember(member, masterUserToken, sdkProductId) {
1161
1215
  const options = sdkOptions()
1162
1216
  const masterToken = masterUserToken || options._userToken
1217
+ const productId = toSdkProductId(sdkProductId) ?? resolveSdkProductId()
1163
1218
  const loginname = member.loginname || ''
1164
1219
  const body = omitEmptyValues({
1165
- sdkProductId: options._sdkProductId,
1220
+ sdkProductId: null === productId ? '' : productId,
1166
1221
  userToken: masterToken,
1167
1222
  accountId: loginname,
1168
1223
  name: member.name,
@@ -1175,7 +1230,9 @@ function addEhrMember(member, masterUserToken) {
1175
1230
  isAccount: !!loginname
1176
1231
  })
1177
1232
  encryptWebAesFields(body, masterToken)
1178
- return doRequest(urls.userAddMember, '', body)
1233
+ // 显式拼 Query:addPubVars 仅在全局值非空时补参,缺省会直接被服务端反序列化拒绝
1234
+ const url = null === productId ? urls.userAddMember : `${urls.userAddMember}?sdkProductId=${productId}`
1235
+ return doRequest(url, '', body)
1179
1236
  }
1180
1237
 
1181
1238
  /**
@@ -1236,7 +1293,12 @@ function updateMemberAccount(params) {
1236
1293
  if ('undefined' == typeof body.relation && 'undefined' == typeof body.isAccount && !body.loginPhone) {
1237
1294
  return Promise.reject({ message: '没有需要更新的成员账号信息' })
1238
1295
  }
1239
- return doRequest(urls.updateMemberAccount, 'POST', body)
1296
+ // 后端 Query 的 sdkProductId 必填(HhBaseQuery),不依赖全局值
1297
+ const sdkProductId = resolveSdkProductId()
1298
+ const url = null === sdkProductId ? urls.updateMemberAccount : `${urls.updateMemberAccount}?sdkProductId=${sdkProductId}`
1299
+ // 后端 loginPhone 要求 HhWebAes 密文(密钥由操作人 userToken 派生),传明文会在服务端解密失败被拒
1300
+ encryptWebAesFields(body, body.userToken, ['loginPhone'])
1301
+ return doRequest(url, 'POST', body)
1240
1302
  }
1241
1303
 
1242
1304
  /**
@@ -1176,6 +1176,8 @@ module.exports = {
1176
1176
  // Share card share
1177
1177
  'share.inviteVideoTitle': '{{name}} invites you to a video consultation',
1178
1178
  'share.inviteExpertTitle': '{{name}} invites you to an expert video consultation',
1179
+ // Expert video invite (Emin Health): share title carries the appointment time
1180
+ 'share.inviteExpertVideoTitle': '{{name}} invites you to an expert video consultation at {{time}}',
1179
1181
  'share.inviteParamError': 'Invalid invite parameters',
1180
1182
  'share.noOpenFromGroup': 'This card cannot be opened from a WeChat group',
1181
1183
  'share.cardUserError': 'Invalid user info in the card',
@@ -1176,6 +1176,8 @@ module.exports = {
1176
1176
  // 分享卡 share
1177
1177
  'share.inviteVideoTitle': '{{name}}邀请你一起视频问诊',
1178
1178
  'share.inviteExpertTitle': '{{name}}邀请你与专家视频问诊',
1179
+ // 专家视频中邀请家人(鹅民健康):分享标题带预约时间
1180
+ 'share.inviteExpertVideoTitle': '{{name}}邀请你在{{time}}与专家视频问诊',
1179
1181
  'share.inviteParamError': '邀请参数异常',
1180
1182
  'share.noOpenFromGroup': '不支持打开微信群内分享的卡片',
1181
1183
  'share.cardUserError': '卡片携带用户信息错误',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hhdoctor-wmp-sdk",
3
- "version": "3.8.34",
3
+ "version": "3.8.35",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
@@ -35,4 +35,13 @@
35
35
 
36
36
  ## 6. 发布
37
37
  - 未执行任何 npm 登录 / 发布命令
38
- - 如需发布:确认版本号后执行 `npm publish --registry https://registry.npmjs.org/ --proxy=false --https-proxy=false`
38
+ - 如需发布:确认版本号后执行 `npm publish --registry https://registry.npmjs.org/ --proxy=false --https-proxy=false`
39
+ ## 7. 发布结果(npm 官方源)
40
+ - 发布命令:`npm publish --registry https://registry.npmjs.org/ --proxy=false --https-proxy=false`
41
+ - 结果:成功 `+ hhdoctor-wmp-sdk@3.8.34`(exit 0)
42
+ - 版本校验:`npm view hhdoctor-wmp-sdk@3.8.34 version` → 3.8.34
43
+ - dist-tags:`{ latest: '3.8.34' }`
44
+ - tarball:https://registry.npmjs.org/hhdoctor-wmp-sdk/-/hhdoctor-wmp-sdk-3.8.34.tgz
45
+ - 包信息:612 个文件,unpackedSize 7,863,193 字节,shasum bcec7a35dd82e223977dcb6fd551cbaa68df8da3
46
+ - 发布账号:mayonglei
47
+ - token 有效期:Jan 8, 2027(校验通过)
@@ -37,6 +37,14 @@ let isAcceptCall = false, uploadCount = 0, _calledInfo = null
37
37
 
38
38
  /** 鹅民健康视频中邀请家人:改拉起成都和缓小程序(wx65749e9321b23f6c),落到 navi 分享引导页 */
39
39
  const INVITE_SHARE_NAVI_APPID = 'wx65749e9321b23f6c'
40
+ /**
41
+ * 鹅民健康专属 navi 分享引导页资源(navi 页面按入口 from=tx 套用绿色主题)
42
+ * 医生视频与专家视频两套:页面背景图 + 邀请卡片图(分享消息 imageUrl)
43
+ */
44
+ const INVITE_SHARE_TX_BG_IMG = 'https://imgs.hh-medic.com/icon/wmp/navi-share-tx.png'
45
+ const INVITE_SHARE_TX_CARD_IMG = 'https://imgs.hh-medic.com/icon/wmp/share-image-tx.png'
46
+ const INVITE_SHARE_TX_EXP_BG_IMG = 'https://imgs.hh-medic.com/icon/wmp/navi-share-tx-exp.png'
47
+ const INVITE_SHARE_TX_EXP_CARD_IMG = 'https://imgs.hh-medic.com/icon/wmp/share-image-tx-exp.png'
40
48
 
41
49
  Component({
42
50
  /**
@@ -1411,13 +1419,35 @@ Component({
1411
1419
  }
1412
1420
  this.triggerEvent('invite', e.detail)
1413
1421
  },
1414
- /** 鹅民健康视频中邀请家人:组装 navi 跳转参数,拉起 wx65749e9321b23f6c 显示分享引导页 */
1422
+ /**
1423
+ * 鹅民健康视频中邀请家人:组装 navi 跳转参数,拉起 wx65749e9321b23f6c 显示分享引导页
1424
+ * navi 通过 from=tx 识别鹅民健康并套用绿色按钮主题;页面背景图、邀请卡片图与分享标题由本组件按视频类型下发。
1425
+ * 设计稿要求 content 为空(页面无说明文案),故不传 content。
1426
+ */
1415
1427
  async inviteToShareNavi(e) {
1416
1428
  try {
1417
- let shareInfo = await hhDoctor.processShare(e)
1429
+ let detail = (e && e.detail) || {}
1430
+ // 专家视频(zhuanke)与医生视频使用不同的分享标题、页面背景图与邀请卡片图
1431
+ let isExpert = 'zhuanke' == (detail.serviceTypeStatus || this.data.doctor && this.data.doctor.serviceTypeStatus)
1432
+ // 专家视频分享标题带预约时间(order.provideTime,与专家等待页口径一致);取不到时沿用 processShare 默认文案
1433
+ let cardTitle = ''
1434
+ if (isExpert) {
1435
+ let provideTime = this.data.order && this.data.order.provideTime
1436
+ if (provideTime) cardTitle = i18n.t('share.inviteExpertVideoTitle', {
1437
+ name: hhDoctor.getUserName(),
1438
+ time: dateUtil.format(new Date(provideTime), i18n.t('im.dateFormat'))
1439
+ })
1440
+ }
1441
+ let shareInfo = await hhDoctor.processShare({
1442
+ detail: Object.assign({}, detail, {
1443
+ cardTitle,
1444
+ cardImage: isExpert ? INVITE_SHARE_TX_EXP_CARD_IMG : INVITE_SHARE_TX_CARD_IMG
1445
+ })
1446
+ })
1418
1447
  if (!shareInfo || !shareInfo.sharePath) throw new Error(i18n.t('common.systemError'))
1419
- let sharePath = `/pages/index/index${shareInfo.sharePath}`,
1420
- path = `/pages/navi/navi?shareTitle=${encodeURIComponent(shareInfo.cardTitle)}&sharePath=${encodeURIComponent(sharePath)}&shareImage=${encodeURIComponent(shareInfo.cardImage)}&content=${encodeURIComponent(i18n.t('room.inviteFamilyVideo'))}&buttonText=${encodeURIComponent(i18n.t('room.inviteNow'))}`
1448
+ let bgImage = isExpert ? INVITE_SHARE_TX_EXP_BG_IMG : INVITE_SHARE_TX_BG_IMG,
1449
+ sharePath = `/pages/index/index${shareInfo.sharePath}`,
1450
+ path = `/pages/navi/navi?from=tx&bgImage=${encodeURIComponent(bgImage)}&shareTitle=${encodeURIComponent(shareInfo.cardTitle)}&sharePath=${encodeURIComponent(sharePath)}&shareImage=${encodeURIComponent(shareInfo.cardImage)}&buttonText=${encodeURIComponent(i18n.t('room.inviteNow'))}`
1421
1451
  this.requestRtcLog('1', '鹅民健康视频中邀请家人,拉起 navi 分享引导页', this.data.order && this.data.order.orderid || '')
1422
1452
  wx.navigateToMiniProgram({
1423
1453
  appId: INVITE_SHARE_NAVI_APPID,
package/src/hhDoctor.js CHANGED
@@ -4,7 +4,7 @@ const TIM = require('./hh-rtc/lib/tim-wx');
4
4
  const cStyle = require('./utils/consoleStyle')
5
5
  const SDKAppID = 1400073238;
6
6
  const SdkVersion = '6.8.16'
7
- const SdkSubVersion = '.261023.1036'
7
+ const SdkSubVersion = '.261027.1023'
8
8
  const {
9
9
  isHhWmp
10
10
  } = require('./utils/commonUtil');
@@ -1287,7 +1287,7 @@ function regInviteUser({
1287
1287
  gender,
1288
1288
  birthday,
1289
1289
  loginname: openId
1290
- }, inviter)
1290
+ }, inviter, sdkProductId)
1291
1291
  } else {
1292
1292
  //普通问诊/专家问诊,视频中拉人,注册独立的体验账号
1293
1293
  let user = {
@@ -35,15 +35,61 @@ function sdkOptions() {
35
35
  return getGlobalData()._hhSdkOptions
36
36
  }
37
37
 
38
- /** RTC/wmp 域公共 query(不含前导 ?):sdkProductId + userToken */
38
+ /** JWT(accessToken) 内的 sdkProductId 缓存:按 token 记忆,避免每次请求重复解码 */
39
+ let cachedJwtProductId = { token: '', sdkProductId: null }
40
+
41
+ /**
42
+ * sdkProductId 兜底:SDK 选项 → 登录用户 appId → accessToken(JWT)
43
+ *
44
+ * 分享卡片邀请注册等冷启动会话不走 hhDoctor.login(),SDK 选项里没有产品上下文,
45
+ * 而 RS 的 Query sdkProductId 多为必填,缺失会在反序列化阶段直接 400。
46
+ */
47
+ function resolveSdkProductId() {
48
+ const options = sdkOptions() || {}
49
+ const fromOptions = toSdkProductId(options._sdkProductId)
50
+ if (null !== fromOptions) return fromOptions
51
+ const loginUser = getGlobalData().loginUser
52
+ const fromLoginUser = toSdkProductId(loginUser && loginUser.appId)
53
+ if (null !== fromLoginUser) return fromLoginUser
54
+ return getJwtSdkProductId()
55
+ }
56
+
57
+ /** 从 accessToken(JWT) payload 取 sdkProductId;解析失败返回 null */
58
+ function getJwtSdkProductId() {
59
+ const token = wx.getStorageSync('_hh_access_token') || wx.getStorageSync('_hh_access_token2')
60
+ if (!token || 'string' != typeof token) return null
61
+ if (cachedJwtProductId.token === token) return cachedJwtProductId.sdkProductId
62
+ let sdkProductId = null
63
+ try {
64
+ const segment = (token.split('.')[1] || '').replace(/-/g, '+').replace(/_/g, '/')
65
+ const padding = '='.repeat((4 - segment.length % 4) % 4)
66
+ const bytes = new Uint8Array(wx.base64ToArrayBuffer(segment + padding))
67
+ let payload = ''
68
+ for (let i = 0; i < bytes.length; i++) payload += String.fromCharCode(bytes[i])
69
+ // payload 是 UTF-8,中文会按字节拆开,但 ASCII 字段仍可被正则命中,这里只取数字型 sdkProductId
70
+ const matched = /"sdkProductId"\s*:\s*"?(\d+)"?/.exec(payload)
71
+ sdkProductId = matched ? toSdkProductId(matched[1]) : null
72
+ } catch (e) {
73
+ sdkProductId = null
74
+ }
75
+ cachedJwtProductId = { token, sdkProductId }
76
+ return sdkProductId
77
+ }
78
+
79
+ /** RTC/wmp 域公共 query(不含前导 ?):sdkProductId + userToken,空值不拼 */
39
80
  function pubQueryRaw() {
40
- const options = sdkOptions()
41
- return `sdkProductId=${options._sdkProductId}&userToken=${options._userToken}`
81
+ const options = sdkOptions() || {}
82
+ const params = []
83
+ const sdkProductId = resolveSdkProductId()
84
+ if (null !== sdkProductId) params.push('sdkProductId=' + sdkProductId)
85
+ if (options._userToken) params.push('userToken=' + options._userToken)
86
+ return params.join('&')
42
87
  }
43
88
 
44
89
  /** RTC/wmp 域公共 query(含前导 ?),extra 为业务参数串 */
45
90
  function pubQuery(extra) {
46
- return '?' + pubQueryRaw() + (extra ? '&' + extra : '')
91
+ const query = [pubQueryRaw(), extra].filter(Boolean).join('&')
92
+ return query ? '?' + query : ''
47
93
  }
48
94
 
49
95
  /** 启动参数里的环境名(App 未就绪时的兜底取值) */
@@ -279,7 +325,7 @@ function doRequest(url, method, data) {
279
325
  }
280
326
 
281
327
  function addPubVars(url) {
282
- url = addParam(url, 'sdkProductId', sdkOptions()._sdkProductId);
328
+ url = addParam(url, 'sdkProductId', resolveSdkProductId());
283
329
  url = addParam(url, 'userToken', sdkOptions()._userToken);
284
330
  url = addParam(url, 'openId', sdkOptions()._openId);
285
331
  url = addParam(url, 'hhDoctorSdkVersion', (wx.getStorageSync('SdkVersion') || ''));
@@ -314,7 +360,7 @@ function addPubData(data) {
314
360
  const options = sdkOptions();
315
361
  // sdkProductId 后端按整型反序列化(如 family-user 的 i32),SDK 选项里是字符串,直接下发会参数错误:
316
362
  // 调用方已显式传入时按其值归一,未传入时用 SDK 选项补齐;无法归一为整数时保持原样(交由后端校验报错)
317
- const sdkProductId = toSdkProductId(undefined === data.sdkProductId ? options._sdkProductId : data.sdkProductId);
363
+ const sdkProductId = toSdkProductId(undefined === data.sdkProductId ? resolveSdkProductId() : data.sdkProductId);
318
364
  if (null !== sdkProductId) data.sdkProductId = sdkProductId;
319
365
  if (!Object.prototype.hasOwnProperty.call(data, 'userToken')) data.userToken = options._userToken;
320
366
  // 原 api.js 的 request() 会把 hhDoctorSdkVersion 一并放进 Body,这里保持同等语义
@@ -425,7 +471,9 @@ function parseShareCode(mpAppId, shareCode) {
425
471
  function uploadFile(filePath, fileType) {
426
472
  return new Promise((resolve, reject) => {
427
473
  let accessToken = wx.getStorageSync('_hh_access_token') || wx.getStorageSync('_hh_access_token2')
428
- let url = `${urls.uploadFile}?sdkProductId=${sdkOptions()._sdkProductId}&userToken=${sdkOptions()._userToken}`
474
+ const options = sdkOptions() || {}
475
+ const productId = resolveSdkProductId()
476
+ let url = `${urls.uploadFile}?userToken=${options._userToken || ''}${null === productId ? '' : '&sdkProductId=' + productId}`
429
477
  uploadTask = wx.uploadFile({
430
478
  filePath,
431
479
  name: 'file',
@@ -761,8 +809,11 @@ function openInformationFlowCard(informationId) {
761
809
  * 获取呼叫前签名页地址(RS `/family-user/web/v1/user/getCallSignUrl`,Query,无 Body)
762
810
  * @returns data.url(必有,用它打开签字页)、data.signFlowId?(不可用于判断成功)
763
811
  */
764
- function getCallSignUrl() {
765
- return doRequest(urls.getCallSignUrl, '', {})
812
+ function getCallSignUrl(memberUserToken) {
813
+ const options = sdkOptions() || {}
814
+ // 后端 Query 为 BaseRequestVo:userToken / realUserToken / sdkProductId 均必填
815
+ const targetToken = memberUserToken || options._userToken || ''
816
+ return doRequest(urls.getCallSignUrl + pubQuery(`realUserToken=${targetToken}`), '', {})
766
817
  }
767
818
 
768
819
  /**
@@ -1156,13 +1207,17 @@ function normalizeSex(sex) {
1156
1207
  /**
1157
1208
  * 添加家庭成员(Rust `/web/v1/user/addMember`)
1158
1209
  * member 为老结构,敏感字段按操作人 token 加密;loginname 有值即视为独立子账号
1210
+ *
1211
+ * 服务端 Query 的 sdkProductId 为必填(HhBaseQuery),分享卡片邀请注册等无登录态场景
1212
+ * 全局 SDK 选项里可能没有值,因此调用方应显式传入上下文中的 sdkProductId,不再只依赖全局值
1159
1213
  */
1160
- function addEhrMember(member, masterUserToken) {
1214
+ function addEhrMember(member, masterUserToken, sdkProductId) {
1161
1215
  const options = sdkOptions()
1162
1216
  const masterToken = masterUserToken || options._userToken
1217
+ const productId = toSdkProductId(sdkProductId) ?? resolveSdkProductId()
1163
1218
  const loginname = member.loginname || ''
1164
1219
  const body = omitEmptyValues({
1165
- sdkProductId: options._sdkProductId,
1220
+ sdkProductId: null === productId ? '' : productId,
1166
1221
  userToken: masterToken,
1167
1222
  accountId: loginname,
1168
1223
  name: member.name,
@@ -1175,7 +1230,9 @@ function addEhrMember(member, masterUserToken) {
1175
1230
  isAccount: !!loginname
1176
1231
  })
1177
1232
  encryptWebAesFields(body, masterToken)
1178
- return doRequest(urls.userAddMember, '', body)
1233
+ // 显式拼 Query:addPubVars 仅在全局值非空时补参,缺省会直接被服务端反序列化拒绝
1234
+ const url = null === productId ? urls.userAddMember : `${urls.userAddMember}?sdkProductId=${productId}`
1235
+ return doRequest(url, '', body)
1179
1236
  }
1180
1237
 
1181
1238
  /**
@@ -1236,7 +1293,12 @@ function updateMemberAccount(params) {
1236
1293
  if ('undefined' == typeof body.relation && 'undefined' == typeof body.isAccount && !body.loginPhone) {
1237
1294
  return Promise.reject({ message: '没有需要更新的成员账号信息' })
1238
1295
  }
1239
- return doRequest(urls.updateMemberAccount, 'POST', body)
1296
+ // 后端 Query 的 sdkProductId 必填(HhBaseQuery),不依赖全局值
1297
+ const sdkProductId = resolveSdkProductId()
1298
+ const url = null === sdkProductId ? urls.updateMemberAccount : `${urls.updateMemberAccount}?sdkProductId=${sdkProductId}`
1299
+ // 后端 loginPhone 要求 HhWebAes 密文(密钥由操作人 userToken 派生),传明文会在服务端解密失败被拒
1300
+ encryptWebAesFields(body, body.userToken, ['loginPhone'])
1301
+ return doRequest(url, 'POST', body)
1240
1302
  }
1241
1303
 
1242
1304
  /**
@@ -1176,6 +1176,8 @@ module.exports = {
1176
1176
  // Share card share
1177
1177
  'share.inviteVideoTitle': '{{name}} invites you to a video consultation',
1178
1178
  'share.inviteExpertTitle': '{{name}} invites you to an expert video consultation',
1179
+ // Expert video invite (Emin Health): share title carries the appointment time
1180
+ 'share.inviteExpertVideoTitle': '{{name}} invites you to an expert video consultation at {{time}}',
1179
1181
  'share.inviteParamError': 'Invalid invite parameters',
1180
1182
  'share.noOpenFromGroup': 'This card cannot be opened from a WeChat group',
1181
1183
  'share.cardUserError': 'Invalid user info in the card',
@@ -1176,6 +1176,8 @@ module.exports = {
1176
1176
  // 分享卡 share
1177
1177
  'share.inviteVideoTitle': '{{name}}邀请你一起视频问诊',
1178
1178
  'share.inviteExpertTitle': '{{name}}邀请你与专家视频问诊',
1179
+ // 专家视频中邀请家人(鹅民健康):分享标题带预约时间
1180
+ 'share.inviteExpertVideoTitle': '{{name}}邀请你在{{time}}与专家视频问诊',
1179
1181
  'share.inviteParamError': '邀请参数异常',
1180
1182
  'share.noOpenFromGroup': '不支持打开微信群内分享的卡片',
1181
1183
  'share.cardUserError': '卡片携带用户信息错误',