hhdoctor-wmp-sdk 3.8.21 → 3.8.23
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.
- package/miniprogram_dist/hh-calling/hh-calling.js +3 -1
- package/miniprogram_dist/hh-im/cards.wxml +11 -13
- package/miniprogram_dist/hh-im/hh-im.js +3 -1
- package/miniprogram_dist/hh-im/hh-im.wxml +1 -2
- package/miniprogram_dist/hh-im/hh-im.wxss +49 -49
- package/miniprogram_dist/hh-my/hh-my.wxml +1 -1
- package/miniprogram_dist/hh-privacy/hh-privacy.js +5 -1
- package/miniprogram_dist/hh-privacy/hh-privacy.wxml +9 -5
- package/miniprogram_dist/hh-privacy/hh-privacy.wxss +32 -19
- package/miniprogram_dist/hh-rtc/hh-rtc.js +1 -0
- package/miniprogram_dist/hh-rtc/hh-rtc.wxml +1 -1
- package/miniprogram_dist/hh-rtc/phases/trtc-room/trtc-room.wxml +7 -7
- package/miniprogram_dist/hh-rtc/phases/trtc-room/trtc-room.wxss +15 -15
- package/miniprogram_dist/hhDoctor.js +2 -2
- package/miniprogram_dist/innerpages/ehr-addfiling/ehr-addfiling.wxml +1 -1
- package/miniprogram_dist/innerpages/ehr-addreport/ehr-addreport.wxml +1 -1
- package/miniprogram_dist/innerpages/invitationcode/invitationcode.wxml +1 -1
- package/miniprogram_dist/innerpages/medic-insurance/update-info.js +5 -2
- package/miniprogram_dist/innerpages/medic-insurance/update-info.wxml +1 -1
- package/miniprogram_dist/innerpages/medic-insurance/update-info.wxss +76 -76
- package/miniprogram_dist/innerpages/view/view.js +8 -6
- package/miniprogram_dist/utils/apiUtil.js +8 -18
- package/miniprogram_dist/utils/msgUtil.js +4 -4
- package/package.json +1 -1
- package/src/hh-calling/hh-calling.js +3 -1
- package/src/hh-im/cards.wxml +11 -13
- package/src/hh-im/hh-im.js +3 -1
- package/src/hh-im/hh-im.wxml +1 -2
- package/src/hh-im/hh-im.wxss +49 -49
- package/src/hh-my/hh-my.wxml +1 -1
- package/src/hh-privacy/hh-privacy.js +5 -1
- package/src/hh-privacy/hh-privacy.wxml +9 -5
- package/src/hh-privacy/hh-privacy.wxss +32 -19
- package/src/hh-rtc/hh-rtc.js +1 -0
- package/src/hh-rtc/hh-rtc.wxml +1 -1
- package/src/hh-rtc/phases/trtc-room/trtc-room.wxml +7 -7
- package/src/hh-rtc/phases/trtc-room/trtc-room.wxss +15 -15
- package/src/hhDoctor.js +2 -2
- package/src/innerpages/ehr-addfiling/ehr-addfiling.wxml +1 -1
- package/src/innerpages/ehr-addreport/ehr-addreport.wxml +1 -1
- package/src/innerpages/invitationcode/invitationcode.wxml +1 -1
- package/src/innerpages/medic-insurance/update-info.js +5 -2
- package/src/innerpages/medic-insurance/update-info.wxml +1 -1
- package/src/innerpages/medic-insurance/update-info.wxss +76 -76
- package/src/innerpages/view/view.js +8 -6
- package/src/utils/apiUtil.js +8 -18
- package/src/utils/msgUtil.js +4 -4
|
@@ -1100,10 +1100,12 @@ Component({
|
|
|
1100
1100
|
const _orderId = res?.data?.orderId
|
|
1101
1101
|
const _doctorId = res?.data?.doctorId
|
|
1102
1102
|
if (_orderId && _doctorId) wx.setStorageSync('preRegOrderInfo', { orderId: _orderId, doctorId: _doctorId })
|
|
1103
|
+
const _env = (hhDoctor.getOptions() || {}).profileName === 'test' ? 'trial' : 'release'
|
|
1104
|
+
hhDoctor.addLog('1', '跳转京城小程序挂号 appId=' + res.data.wmpAppId + ' path=' + res.data.jumpUrl + ' env=' + _env)
|
|
1103
1105
|
wx.openEmbeddedMiniProgram({
|
|
1104
1106
|
appId: res.data.wmpAppId,
|
|
1105
1107
|
path: res.data.jumpUrl,
|
|
1106
|
-
envVersion:
|
|
1108
|
+
envVersion: _env,
|
|
1107
1109
|
success: res => { },
|
|
1108
1110
|
fail: err => {
|
|
1109
1111
|
wx.showToast({ title: '正在取消挂号,请稍候', icon: 'none', duration: 5000 })
|
|
@@ -488,20 +488,18 @@
|
|
|
488
488
|
<view class='show-more column'>
|
|
489
489
|
<view wx:if="{{bodyContent.footButton}}"
|
|
490
490
|
class='show-more-btn {{bodyContent.footButton.isAllow?"":"disabled"}}'
|
|
491
|
-
catchtap="{{common.getRegFootAction(bodyContent.footButton)}}"
|
|
492
|
-
data-
|
|
493
|
-
data-
|
|
494
|
-
data-
|
|
491
|
+
catchtap="{{common.getRegFootAction(bodyContent.footButton)}}" data-doctor-id="{{bodyContent.doctorId||''}}"
|
|
492
|
+
data-order-id="{{bodyContent.footButton.orderId||''}}" data-call="{{true}}" data-service-type="quanke"
|
|
493
|
+
data-wmp-appid="{{bodyContent.footButton.wmpAppId||''}}"
|
|
494
|
+
data-jump-url="{{bodyContent.footButton.jumpUrl||''}}">
|
|
495
495
|
{{bodyContent.footButton.name}}
|
|
496
496
|
</view>
|
|
497
|
-
<view class="reg-tips" wx:if="{{bodyContent._tipsBefore || bodyContent._tipsAfter}}"
|
|
498
|
-
catch:longpress="_viewTest">
|
|
497
|
+
<view class="reg-tips" wx:if="{{bodyContent._tipsBefore || bodyContent._tipsAfter}}">
|
|
499
498
|
<text>{{bodyContent._tipsBefore}}</text>
|
|
500
499
|
<text class="reg-tips-seconds">{{bodyContent._tipsSeconds}}</text>
|
|
501
500
|
<text>{{bodyContent._tipsAfter}}</text>
|
|
502
501
|
</view>
|
|
503
|
-
<view class="reg-tips" wx:elif="{{bodyContent.tips}}"
|
|
504
|
-
catch:longpress="_viewTest">
|
|
502
|
+
<view class="reg-tips" wx:elif="{{bodyContent.tips}}">
|
|
505
503
|
<text>{{bodyContent.tips}}</text>
|
|
506
504
|
</view>
|
|
507
505
|
</view>
|
|
@@ -513,8 +511,8 @@
|
|
|
513
511
|
<hh-card id='msg{{time}}' msg="{{msg}}" request="{{request}}" default-title="{{bodyContent.title||'挂号成功'}}"
|
|
514
512
|
title-bg="{{bodyContent.backgroundImgUrl||''}}"
|
|
515
513
|
kv-list="{{[{key:'就诊人',value:bodyContent.patientName||''},{key:'就诊医院',value:bodyContent.hospitalName},{key:'就诊科室',value:bodyContent.deptName},{key:'就诊时间',value:bodyContent.orderRegTime}]}}"
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
</template>
|
|
514
|
+
default-card-foot="{{bodyContent.footButton}}" foot-text="{{bodyContent.footButton.name}}" foot-text-class="blue"
|
|
515
|
+
catchtapfoot="_tapRegSucc">
|
|
516
|
+
</hh-card>
|
|
517
|
+
</block>
|
|
518
|
+
</template>
|
|
@@ -553,6 +553,7 @@ Component({
|
|
|
553
553
|
&& msg.bodyContent.version == 3
|
|
554
554
|
&& msg.bodyContent.footButton
|
|
555
555
|
&& msg.bodyContent.footButton.isAllow == 1
|
|
556
|
+
&& msg.bodyContent.footButton.buttonCategory != 'hospitalInsureGoRefund'
|
|
556
557
|
})
|
|
557
558
|
this.setData({ callBtnDisabled: disabled })
|
|
558
559
|
} catch (error) {
|
|
@@ -1480,7 +1481,7 @@ Component({
|
|
|
1480
1481
|
this.uploadFileByQueue()
|
|
1481
1482
|
}
|
|
1482
1483
|
})
|
|
1483
|
-
.catch(err => {
|
|
1484
|
+
.catch(err => { uiUtil.toast(err?.message ?? '发送消息失败,请重试') })
|
|
1484
1485
|
},
|
|
1485
1486
|
/** 上传文件进度发生变化 */
|
|
1486
1487
|
onSendFileProgressUpdate(res) {
|
|
@@ -1955,6 +1956,7 @@ Component({
|
|
|
1955
1956
|
var data = this.getEventParams(e)
|
|
1956
1957
|
if (!data.wmpAppid || !data.jumpUrl) return
|
|
1957
1958
|
var env = "test" == this.data._request.profileName ? 'trial' : 'release'
|
|
1959
|
+
hhDoctor.addLog('1', '跳转京城小程序退费 appId=' + data.wmpAppid + ' path=' + data.jumpUrl + ' env=' + env)
|
|
1958
1960
|
wx.openEmbeddedMiniProgram({
|
|
1959
1961
|
appId: data.wmpAppid,
|
|
1960
1962
|
path: data.jumpUrl,
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
<hh-calling msgPanelTop='{{msgPanelTop}}' navigationBar='{{navigationBar}}' wxMbb='{{wxMbb}}' navStyle='{{navStyle}}' custom-style='{{customStyle}}' request='{{_request}}' basePath='{{basePath}}' disConnected='{{disConnected}}' demoStatusInit='{{demoStatusInit}}' bind:livePanelHeight='bindLivePanelHeight' sysInfo='{{sysInfo}}' call-btn-visible="{{callBtnVisible}}"
|
|
5
5
|
call-btn-disabled="{{callBtnDisabled}}" bind:onWsClose='bindOnWsClose' class='hhcalling' bind:memberList='getMemberList' manyVideo='{{manyVideo}}' product='{{product}}' loadcfg='{{loadcfg}}' isAuth='{{isAuth}}' bind:doRealName="_doRealName" bindcall="_naviToCall" bind:share="_share" catch:tapcalling="bindScrollView" bind:sizechange="callSizeChange"></hh-calling>
|
|
6
6
|
<view id="hhMultiUserCall" class="real-name-wrap" wx:if="{{multiUserCallInfo}}" style="top: {{(_request.callBtnVisible)?('custom'==navStyle?108+sysInfo.statusBarHeight:64):('custom'==navStyle?(wxMbb.bottom+5):0)}}px;">你有正在进行中的问诊。<text class="real-name-btn" catchtap="_doJoinRoom" data-room-info="{{multiUserCallInfo}}">点击进入视频</text></view>
|
|
7
|
-
|
|
8
7
|
<!-- 中部消息列表 -->
|
|
9
8
|
<scroll-view class='msg-panel-scroll' style='margin-top:{{msgPanelTop+livePanelHeight+authHeight}}px;height:{{msgPanelHeight-livePanelHeight-authHeight}}px;' scroll-y scroll-into-view='{{lastMsgId}}' scroll-anchoring="{{true}}" refresher-enabled="{{true}}" refresher-triggered="{{msgTrigger}}" catchtap='bindScrollView' bindscrolltoupper="" bindrefresherrefresh="showMoreMsg">
|
|
10
9
|
<block wx:for='{{msgList}}' wx:for-item='msg' wx:key='time'>
|
|
@@ -59,7 +58,7 @@
|
|
|
59
58
|
</view>
|
|
60
59
|
<hh-license show="{{showPopup}}" sdk-product-id="{{sdkProductId}}" user-token="{{userToken}}" base-path='{{basePath}}' reject-type="{{licenseConfig.rejectType}}" mode="{{licenseConfig.mode}}" type="{{licenseConfig.type}}" show-skip="{{licenseConfig.showSkip}}" cancel-text="{{licenseConfig.cancelText}}" confirm-text="{{licenseConfig.confirmText}}" hide-title="{{licenseConfig.hideTitle}}" title="{{licenseConfig.title}}" bindvisiblechange="licenseVisibleChange">
|
|
61
60
|
</hh-license>
|
|
62
|
-
|
|
61
|
+
<hh-privacy></hh-privacy>
|
|
63
62
|
<view class="pre-reg-query-mask" wx:if="{{showPreRegQuery}}">
|
|
64
63
|
<image class="pre-reg-query-bg" src="https://imgs.hh-medic.com/icon/wmp/bg-default-0717.png" mode="aspectFill"></image>
|
|
65
64
|
<view class="pre-reg-query-panel">
|
|
@@ -1719,52 +1719,52 @@ image {
|
|
|
1719
1719
|
text-align: center;
|
|
1720
1720
|
}
|
|
1721
1721
|
|
|
1722
|
-
.reg-tips-seconds {
|
|
1723
|
-
color: #FF0C19;
|
|
1724
|
-
margin: 0 5rpx;
|
|
1725
|
-
}
|
|
1726
|
-
|
|
1727
|
-
.pre-reg-query-mask {
|
|
1728
|
-
position: fixed;
|
|
1729
|
-
top: 0;
|
|
1730
|
-
left: 0;
|
|
1731
|
-
width: 100%;
|
|
1732
|
-
height: 100%;
|
|
1733
|
-
z-index: 99999;
|
|
1734
|
-
}
|
|
1735
|
-
.pre-reg-query-bg {
|
|
1736
|
-
position: absolute;
|
|
1737
|
-
top: 0;
|
|
1738
|
-
left: 0;
|
|
1739
|
-
width: 100%;
|
|
1740
|
-
height: 100%;
|
|
1741
|
-
}
|
|
1742
|
-
.pre-reg-query-panel {
|
|
1743
|
-
position: absolute;
|
|
1744
|
-
bottom: 0;
|
|
1745
|
-
width: 100%;
|
|
1746
|
-
height: 480rpx;
|
|
1747
|
-
background: #000;
|
|
1748
|
-
}
|
|
1749
|
-
.pre-reg-query-text {
|
|
1750
|
-
position: absolute;
|
|
1751
|
-
top: 84rpx;
|
|
1752
|
-
left: 0;
|
|
1753
|
-
width: 100%;
|
|
1754
|
-
text-align: center;
|
|
1755
|
-
font-size: 34rpx;
|
|
1756
|
-
line-height: 60rpx;
|
|
1757
|
-
font-weight: 500;
|
|
1758
|
-
color: #fff;
|
|
1759
|
-
}
|
|
1760
|
-
.pre-reg-query-dots {
|
|
1761
|
-
position: absolute;
|
|
1762
|
-
top: calc(84rpx + 60rpx);
|
|
1763
|
-
left: 0;
|
|
1764
|
-
width: 100%;
|
|
1765
|
-
text-align: center;
|
|
1766
|
-
font-size: 34rpx;
|
|
1767
|
-
line-height: 60rpx;
|
|
1768
|
-
font-weight: 500;
|
|
1769
|
-
color: #fff;
|
|
1770
|
-
}
|
|
1722
|
+
.reg-tips-seconds {
|
|
1723
|
+
color: #FF0C19;
|
|
1724
|
+
margin: 0 5rpx;
|
|
1725
|
+
}
|
|
1726
|
+
|
|
1727
|
+
.pre-reg-query-mask {
|
|
1728
|
+
position: fixed;
|
|
1729
|
+
top: 0;
|
|
1730
|
+
left: 0;
|
|
1731
|
+
width: 100%;
|
|
1732
|
+
height: 100%;
|
|
1733
|
+
z-index: 99999;
|
|
1734
|
+
}
|
|
1735
|
+
.pre-reg-query-bg {
|
|
1736
|
+
position: absolute;
|
|
1737
|
+
top: 0;
|
|
1738
|
+
left: 0;
|
|
1739
|
+
width: 100%;
|
|
1740
|
+
height: 100%;
|
|
1741
|
+
}
|
|
1742
|
+
.pre-reg-query-panel {
|
|
1743
|
+
position: absolute;
|
|
1744
|
+
bottom: 0;
|
|
1745
|
+
width: 100%;
|
|
1746
|
+
height: 480rpx;
|
|
1747
|
+
background: #000;
|
|
1748
|
+
}
|
|
1749
|
+
.pre-reg-query-text {
|
|
1750
|
+
position: absolute;
|
|
1751
|
+
top: 84rpx;
|
|
1752
|
+
left: 0;
|
|
1753
|
+
width: 100%;
|
|
1754
|
+
text-align: center;
|
|
1755
|
+
font-size: 34rpx;
|
|
1756
|
+
line-height: 60rpx;
|
|
1757
|
+
font-weight: 500;
|
|
1758
|
+
color: #fff;
|
|
1759
|
+
}
|
|
1760
|
+
.pre-reg-query-dots {
|
|
1761
|
+
position: absolute;
|
|
1762
|
+
top: calc(84rpx + 60rpx);
|
|
1763
|
+
left: 0;
|
|
1764
|
+
width: 100%;
|
|
1765
|
+
text-align: center;
|
|
1766
|
+
font-size: 34rpx;
|
|
1767
|
+
line-height: 60rpx;
|
|
1768
|
+
font-weight: 500;
|
|
1769
|
+
color: #fff;
|
|
1770
|
+
}
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
</view>
|
|
92
92
|
</view>
|
|
93
93
|
</view>
|
|
94
|
-
|
|
94
|
+
<hh-privacy></hh-privacy>
|
|
95
95
|
|
|
96
96
|
<page-container show="{{pageStatus}}" position="right" round="{{false}}" close-on-slideDown="{{true}}" z-index="999" style="display: flex;">
|
|
97
97
|
<view class="sub-menu-wrap">
|
|
@@ -9,10 +9,14 @@ Component({
|
|
|
9
9
|
},
|
|
10
10
|
data: {
|
|
11
11
|
visible: false,
|
|
12
|
-
event: ''
|
|
12
|
+
event: '',
|
|
13
|
+
agreeBtnBg: '#0592F5'
|
|
13
14
|
},
|
|
14
15
|
lifetimes: {
|
|
15
16
|
attached: function () {
|
|
17
|
+
let wxAppId = wx.getAccountInfoSync().miniProgram.appId || ''
|
|
18
|
+
let bgColor = wxAppId == 'wx362b09d1b81c08fe' ? '#80CF99' : '#0592F5'
|
|
19
|
+
this.setData({ agreeBtnBg: bgColor })
|
|
16
20
|
wx.onNeedPrivacyAuthorization && wx.onNeedPrivacyAuthorization(this.privacyauthorization)
|
|
17
21
|
self = this
|
|
18
22
|
},
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
<view class="mask" wx:if="{{visible}}">
|
|
2
2
|
<view class="wrap">
|
|
3
|
-
<view class="head"
|
|
4
|
-
<view class="body"
|
|
3
|
+
<view class="head">用户隐私保护提示</view>
|
|
4
|
+
<view class="body">
|
|
5
|
+
<view>在你使用本小程序服务之前,请仔细阅读</view>
|
|
6
|
+
<view catch:tap="viewPrivacy" class="policy-link">《小程序隐私保护指引》</view>
|
|
7
|
+
<view>如你同意该指引,请点击同意开始使用本小程序。</view>
|
|
8
|
+
</view>
|
|
5
9
|
<view class="foot">
|
|
6
|
-
<button class="btn" catch:tap="disagree">拒绝</button>
|
|
7
|
-
<button id="btn-agree" class="btn
|
|
10
|
+
<button class="btn refuse" catch:tap="disagree">拒绝</button>
|
|
11
|
+
<button id="btn-agree" class="btn agree" open-type="agreePrivacyAuthorization" bindagreeprivacyauthorization="agree" style="background-color: {{agreeBtnBg}}; border-color: {{agreeBtnBg}}">同意</button>
|
|
8
12
|
</view>
|
|
9
13
|
</view>
|
|
10
|
-
</view>
|
|
14
|
+
</view>
|
|
@@ -8,7 +8,7 @@ button {
|
|
|
8
8
|
height: 100%;
|
|
9
9
|
left: 0;
|
|
10
10
|
top: 0;
|
|
11
|
-
background-color: rgba(0, 0, 0, 0.
|
|
11
|
+
background-color: rgba(0, 0, 0, 0.5);
|
|
12
12
|
z-index: 9999;
|
|
13
13
|
}
|
|
14
14
|
|
|
@@ -21,6 +21,7 @@ button {
|
|
|
21
21
|
flex-flow: column nowrap;
|
|
22
22
|
box-sizing: border-box;
|
|
23
23
|
background-color: #ffffff;
|
|
24
|
+
height: 596rpx;
|
|
24
25
|
border-radius: 20rpx 20rpx 0 0;
|
|
25
26
|
font-size: 28rpx;
|
|
26
27
|
line-height: 40rpx;
|
|
@@ -28,43 +29,55 @@ button {
|
|
|
28
29
|
|
|
29
30
|
.head {
|
|
30
31
|
width: 100%;
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
font-weight:
|
|
32
|
+
font-size: 30rpx;
|
|
33
|
+
line-height: 42rpx;
|
|
34
|
+
font-weight: 500;
|
|
35
|
+
margin-top: 70rpx;
|
|
36
|
+
margin-left: 40rpx;
|
|
34
37
|
}
|
|
35
38
|
|
|
36
39
|
.body {
|
|
37
|
-
|
|
40
|
+
font-size: 28rpx;
|
|
41
|
+
line-height: 40rpx;
|
|
42
|
+
font-weight: 400;
|
|
43
|
+
color: #646464;
|
|
44
|
+
padding: 26rpx 30rpx 30rpx 40rpx;
|
|
38
45
|
}
|
|
39
46
|
|
|
40
47
|
.link {
|
|
41
|
-
color: #
|
|
48
|
+
color: #576382;
|
|
42
49
|
text-decoration: underline;
|
|
43
50
|
}
|
|
44
51
|
|
|
52
|
+
.policy-link {
|
|
53
|
+
color: #576382;
|
|
54
|
+
text-indent: -8rpx;
|
|
55
|
+
}
|
|
56
|
+
|
|
45
57
|
.foot {
|
|
46
58
|
width: 100%;
|
|
47
|
-
|
|
59
|
+
margin-top: 84rpx;
|
|
48
60
|
display: flex;
|
|
49
61
|
flex-flow: row nowrap;
|
|
62
|
+
gap: 30rpx;
|
|
50
63
|
align-items: center;
|
|
51
|
-
justify-content:
|
|
52
|
-
|
|
53
|
-
margin-bottom: 30px;
|
|
64
|
+
justify-content: center;
|
|
65
|
+
margin-bottom: 30rpx;
|
|
54
66
|
}
|
|
55
67
|
|
|
56
68
|
.btn {
|
|
57
|
-
width:
|
|
58
|
-
height:
|
|
69
|
+
width: 240rpx;
|
|
70
|
+
height: 84rpx;
|
|
71
|
+
margin: 0;
|
|
72
|
+
border-radius: 20rpx;
|
|
73
|
+
font-size: 32rpx;
|
|
59
74
|
text-align: center;
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
color: #
|
|
63
|
-
border: 1px solid #D2D2D2;
|
|
75
|
+
line-height: 84rpx;
|
|
76
|
+
background-color: #F3F3F3;
|
|
77
|
+
color: #323232;
|
|
64
78
|
}
|
|
65
79
|
|
|
66
|
-
.btn.
|
|
80
|
+
.btn.agree {
|
|
67
81
|
color: #ffffff;
|
|
68
82
|
background-color: #0592f5;
|
|
69
|
-
|
|
70
|
-
}
|
|
83
|
+
}
|
|
@@ -1442,6 +1442,7 @@ Component({
|
|
|
1442
1442
|
async getUserAddress(showMessage = false) {
|
|
1443
1443
|
//获取用户收获地址
|
|
1444
1444
|
let res = await this.getUserDeliveryAddress(this.data._request.sdkProductId, this.data._request.userToken, this.data.orderid)
|
|
1445
|
+
this.requestRtcLog('1', '获取用户收获地址:' + JSON.stringify(res?.data ?? {}), this.data.orderid || '');
|
|
1445
1446
|
this.parseUserDeliveryAddress(res?.data ?? {}, showMessage)
|
|
1446
1447
|
},
|
|
1447
1448
|
/** 解析用户收货地址 */
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
</view>
|
|
15
15
|
<trtc-modal title='{{modal.title}}' content='{{modal.content}}' isExitWx='{{modal.isExitWx}}' show-cancel="{{modal.showCancel}}" confirm-text="{{modal.confirmText}}" confirm-back="{{modal.confirmBack}}" wx:if='{{isShowModalTip}}' bind:trtcModalConfirm='bindTrtcModalConfirm' bind:cancel="bindTrtcModalCancel"></trtc-modal>
|
|
16
16
|
<web-view wx:if="{{whiteboardVisible}}" src="{{whiteboardUrl}}"></web-view>
|
|
17
|
-
|
|
17
|
+
<hh-privacy></hh-privacy>
|
|
18
18
|
<page-container show="{{calledVisible}}" overlay="{{calledInfo}}" position="bottom" round="{{true}}" close-on-slideDown="{{false}}" z-index="999" style="display: flex;" bind:afterleave="{{calledInfo?'callbackAction':''}}" wx:if="{{calledVisible}}">
|
|
19
19
|
<view class="called-wrap">
|
|
20
20
|
<view style="background-image:url('{{calledInfo.doctor.photourl}}')" class="called-doctor-avatar" mode="top"></view>
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
<scroll-view class="trtc-room {{translate?'flex-rows':''}} {{'default'==navibarStyle?'default-navbar':''}}" scroll-x="{{true}}" enable-flex="{{true}}">
|
|
2
2
|
<view wx:for="{{playerList}}" wx:key="streamID" wx:if="{{item.src && (item.hasVideo || item.hasAudio) && 'main' == item.streamType}}" class="view-container player-container {{translate?'row-item':''}}" style="{{translate?'':item.style}}">
|
|
3
3
|
<live-player class="player" id="{{item.id}}" data-userid="{{item.userID}}" picture-in-picture-mode="{{pipMode}}" data-streamid="{{item.streamID}}" data-streamtype="{{item.streamType}}" src="{{item.src}}" mode="{{item.mode}}" autoplay="{{item.autoplay}}" mute-audio="{{item.muteAudio}}" mute-video="{{item.muteVideo}}" orientation="{{item.orientation}}" object-fit="{{item.objectFit}}" background-mute="{{item.enableBackgroundMute}}" min-cache="{{item.minCache}}" max-cache="{{item.maxCache}}" sound-mode="{{item.soundMode}}" enable-recv-message="{{item.enableRecvMessage}}" auto-pause-if-navigate="{{item.autoPauseIfNavigate}}" auto-pause-if-open-native="{{item.autoPauseIfOpenNative}}" debug="{{debug}}" bindstatechange="_playerStateChange" bindfullscreenchange="_playerFullscreenChange" bindnetstatus="_playerNetStatus" bindaudiovolumenotify="_playerAudioVolumeNotify" />
|
|
4
|
-
<view class="player voicemode {{(!translate&&'200rpx'!=item.width)?'fullscreen':''}}" wx:if="{{voiceMode || !item.hasVideo}}">
|
|
5
|
-
<view class="voice-avatar" style="background-image:url('{{item.photoUrl}}');">
|
|
6
|
-
<view class="speech" wx:if="{{item.volume && item.volume>0}}"></view>
|
|
7
|
-
</view>
|
|
8
|
-
<view class="voice-name" wx:if="{{item.isDoctor}}">{{item.name}}</view>
|
|
9
|
-
</view>
|
|
4
|
+
<view class="player voicemode {{(!translate&&'200rpx'!=item.width)?'fullscreen':''}}" wx:if="{{voiceMode || !item.hasVideo}}">
|
|
5
|
+
<view class="voice-avatar" style="background-image:url('{{item.photoUrl}}');">
|
|
6
|
+
<view class="speech" wx:if="{{item.volume && item.volume>0}}"></view>
|
|
7
|
+
</view>
|
|
8
|
+
<view class="voice-name" wx:if="{{item.isDoctor}}">{{item.name}}</view>
|
|
9
|
+
</view>
|
|
10
10
|
</view>
|
|
11
11
|
|
|
12
12
|
<view class="pusher-container {{pusher.isVisible?'':'none'}} {{translate?'row-item':''}}" style="{{translate?'':pusher.style}}">
|
|
@@ -14,4 +14,4 @@
|
|
|
14
14
|
<view class="pusher voicemode" wx:if="{{voiceMode}}"></view>
|
|
15
15
|
<view class="speech" wx:if="{{voiceMode && pusher.volume && pusher.volume>0}}" style="z-index: 1200;"></view>
|
|
16
16
|
</view>
|
|
17
|
-
</scroll-view>
|
|
17
|
+
</scroll-view>
|
|
@@ -35,21 +35,21 @@
|
|
|
35
35
|
z-index: 100;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
.pusher-container {
|
|
39
|
-
position: fixed;
|
|
40
|
-
width: 200rpx;
|
|
41
|
-
height: 300rpx;
|
|
42
|
-
left: 540rpx;
|
|
43
|
-
z-index: 1000;
|
|
44
|
-
border-radius: 10rpx;
|
|
45
|
-
overflow: hidden;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
.player-container {
|
|
49
|
-
position: fixed;
|
|
50
|
-
border-radius: 10rpx;
|
|
51
|
-
overflow: hidden;
|
|
52
|
-
}
|
|
38
|
+
.pusher-container {
|
|
39
|
+
position: fixed;
|
|
40
|
+
width: 200rpx;
|
|
41
|
+
height: 300rpx;
|
|
42
|
+
left: 540rpx;
|
|
43
|
+
z-index: 1000;
|
|
44
|
+
border-radius: 10rpx;
|
|
45
|
+
overflow: hidden;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
.player-container {
|
|
49
|
+
position: fixed;
|
|
50
|
+
border-radius: 10rpx;
|
|
51
|
+
overflow: hidden;
|
|
52
|
+
}
|
|
53
53
|
|
|
54
54
|
.row-item {
|
|
55
55
|
position: relative;
|
|
@@ -3,8 +3,8 @@ const apis = require('./utils/api.js')
|
|
|
3
3
|
const TIM = require('./hh-rtc/lib/tim-wx');
|
|
4
4
|
const cStyle = require('./utils/consoleStyle')
|
|
5
5
|
const SDKAppID = 1400073238;
|
|
6
|
-
const SdkVersion = '6.8.
|
|
7
|
-
const SdkSubVersion = '.
|
|
6
|
+
const SdkVersion = '6.8.12'
|
|
7
|
+
const SdkSubVersion = '.260717.1748'
|
|
8
8
|
const { isHhWmp } = require('./utils/commonUtil');
|
|
9
9
|
const shareInfo = {}, inviteEnum = { zhuanke: 3, quanke: 1 }
|
|
10
10
|
const AESUtil = require('./utils/aesUtil');
|
|
@@ -164,7 +164,8 @@ Page({
|
|
|
164
164
|
wx.showLoading({ title: '上传中...' })
|
|
165
165
|
const uploadResults = await Promise.all(tempFiles.map(async file => {
|
|
166
166
|
const fileType = file.fileType || 'image'
|
|
167
|
-
const url = await apiUtil.uploadFile(file.tempFilePath, fileType)
|
|
167
|
+
const { fileUrl: url } = await apiUtil.uploadFile(file.tempFilePath, fileType)
|
|
168
|
+
console.error(url)
|
|
168
169
|
return { url, fileType }
|
|
169
170
|
}))
|
|
170
171
|
this.setData({ recordList: this.data.recordList.concat(uploadResults) })
|
|
@@ -312,10 +313,12 @@ Page({
|
|
|
312
313
|
if (_orderId && _doctorId) wx.setStorageSync('preRegOrderInfo', { orderId: _orderId, doctorId: _doctorId })
|
|
313
314
|
wx.hideLoading()
|
|
314
315
|
this.setData({ loading: false })
|
|
316
|
+
const _env = (hhDoctor.getOptions() || {}).profileName === 'test' ? 'trial' : 'release'
|
|
317
|
+
hhDoctor.addLog('1', '跳转京城小程序预挂号 appId=' + (res?.data?.wmpAppId ?? 'wx4295659640b04161') + ' path=' + (res?.data?.jumpUrl ?? '') + ' env=' + _env)
|
|
315
318
|
wx.openEmbeddedMiniProgram({
|
|
316
319
|
appId: res?.data?.wmpAppId ?? 'wx4295659640b04161',
|
|
317
320
|
path: res?.data?.jumpUrl ?? '',
|
|
318
|
-
envVersion:
|
|
321
|
+
envVersion: _env,
|
|
319
322
|
success: res => { },
|
|
320
323
|
fail: err => {
|
|
321
324
|
wx.showToast({ title: '正在取消挂号,请稍候', icon: 'none', duration: 5000 })
|
|
@@ -285,79 +285,79 @@
|
|
|
285
285
|
margin-left: 10rpx;
|
|
286
286
|
flex-shrink: 0;
|
|
287
287
|
}
|
|
288
|
-
.notice-capsule:active {
|
|
289
|
-
background: #E1F3FF;
|
|
290
|
-
}
|
|
291
|
-
|
|
292
|
-
/* 半屏示意图弹窗 */
|
|
293
|
-
.sample-container {
|
|
294
|
-
height: 90vh;
|
|
295
|
-
background: #fff;
|
|
296
|
-
display: flex;
|
|
297
|
-
flex-direction: column;
|
|
298
|
-
}
|
|
299
|
-
|
|
300
|
-
.sample-header {
|
|
301
|
-
position: relative;
|
|
302
|
-
padding: 49rpx 0 40rpx;
|
|
303
|
-
text-align: center;
|
|
304
|
-
}
|
|
305
|
-
|
|
306
|
-
.sample-title {
|
|
307
|
-
font-size: 34rpx;
|
|
308
|
-
line-height: 48rpx;
|
|
309
|
-
font-weight: 500;
|
|
310
|
-
color: #323232;
|
|
311
|
-
}
|
|
312
|
-
|
|
313
|
-
.sample-close {
|
|
314
|
-
position: absolute;
|
|
315
|
-
right: 30rpx;
|
|
316
|
-
top: 50%;
|
|
317
|
-
transform: translateY(-50%);
|
|
318
|
-
width: 60rpx;
|
|
319
|
-
height: 60rpx;
|
|
320
|
-
}
|
|
321
|
-
|
|
322
|
-
.sample-body {
|
|
323
|
-
flex: 1;
|
|
324
|
-
overflow-y: auto;
|
|
325
|
-
-webkit-overflow-scrolling: touch;
|
|
326
|
-
}
|
|
327
|
-
|
|
328
|
-
.sample-item {
|
|
329
|
-
padding: 0 20rpx;
|
|
330
|
-
margin-bottom: 30rpx;
|
|
331
|
-
}
|
|
332
|
-
|
|
333
|
-
.sample-item-header {
|
|
334
|
-
display: flex;
|
|
335
|
-
align-items: center;
|
|
336
|
-
margin-bottom: 20rpx;
|
|
337
|
-
}
|
|
338
|
-
|
|
339
|
-
.sample-bar {
|
|
340
|
-
width: 8rpx;
|
|
341
|
-
height: 26rpx;
|
|
342
|
-
border-radius: 4rpx;
|
|
343
|
-
background: #0592F5;
|
|
344
|
-
flex-shrink: 0;
|
|
345
|
-
margin-right: 10rpx;
|
|
346
|
-
}
|
|
347
|
-
|
|
348
|
-
.sample-item-title {
|
|
349
|
-
font-size: 30rpx;
|
|
350
|
-
line-height: 42rpx;
|
|
351
|
-
font-weight: 500;
|
|
352
|
-
color: #323232;
|
|
353
|
-
}
|
|
354
|
-
|
|
355
|
-
.sample-img {
|
|
356
|
-
width: 100%;
|
|
357
|
-
height: auto;
|
|
358
|
-
display: block;
|
|
359
|
-
}
|
|
360
|
-
|
|
361
|
-
.sample-bottom {
|
|
362
|
-
height: 70rpx;
|
|
363
|
-
}
|
|
288
|
+
.notice-capsule:active {
|
|
289
|
+
background: #E1F3FF;
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
/* 半屏示意图弹窗 */
|
|
293
|
+
.sample-container {
|
|
294
|
+
height: 90vh;
|
|
295
|
+
background: #fff;
|
|
296
|
+
display: flex;
|
|
297
|
+
flex-direction: column;
|
|
298
|
+
}
|
|
299
|
+
|
|
300
|
+
.sample-header {
|
|
301
|
+
position: relative;
|
|
302
|
+
padding: 49rpx 0 40rpx;
|
|
303
|
+
text-align: center;
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
.sample-title {
|
|
307
|
+
font-size: 34rpx;
|
|
308
|
+
line-height: 48rpx;
|
|
309
|
+
font-weight: 500;
|
|
310
|
+
color: #323232;
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
.sample-close {
|
|
314
|
+
position: absolute;
|
|
315
|
+
right: 30rpx;
|
|
316
|
+
top: 50%;
|
|
317
|
+
transform: translateY(-50%);
|
|
318
|
+
width: 60rpx;
|
|
319
|
+
height: 60rpx;
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
.sample-body {
|
|
323
|
+
flex: 1;
|
|
324
|
+
overflow-y: auto;
|
|
325
|
+
-webkit-overflow-scrolling: touch;
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
.sample-item {
|
|
329
|
+
padding: 0 20rpx;
|
|
330
|
+
margin-bottom: 30rpx;
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
.sample-item-header {
|
|
334
|
+
display: flex;
|
|
335
|
+
align-items: center;
|
|
336
|
+
margin-bottom: 20rpx;
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
.sample-bar {
|
|
340
|
+
width: 8rpx;
|
|
341
|
+
height: 26rpx;
|
|
342
|
+
border-radius: 4rpx;
|
|
343
|
+
background: #0592F5;
|
|
344
|
+
flex-shrink: 0;
|
|
345
|
+
margin-right: 10rpx;
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
.sample-item-title {
|
|
349
|
+
font-size: 30rpx;
|
|
350
|
+
line-height: 42rpx;
|
|
351
|
+
font-weight: 500;
|
|
352
|
+
color: #323232;
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
.sample-img {
|
|
356
|
+
width: 100%;
|
|
357
|
+
height: auto;
|
|
358
|
+
display: block;
|
|
359
|
+
}
|
|
360
|
+
|
|
361
|
+
.sample-bottom {
|
|
362
|
+
height: 70rpx;
|
|
363
|
+
}
|