kola
/
xinda-miniprogram
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2.3.0

dev
kola-web 2 weeks ago
parent
0de235c1aa
commit
e949a70008
21 changed files with 172 additions and 139 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      README.md
  2. 2
      project.config.json
  3. 12
      src/app.ts
  4. 1
      src/gift/pages/dtpDurg/index.ts
  5. BIN
      src/images/icon98.png
  6. 2
      src/pages/d_patientDetail/index.ts
  7. 2
      src/pages/d_patientDetail/index.wxml
  8. 122
      src/patient/pages/doctor/index.ts
  9. 51
      src/patient/pages/enterInfo/index.scss
  10. 17
      src/patient/pages/enterInfo/index.ts
  11. 45
      src/patient/pages/enterInfo/index.wxml
  12. 4
      src/patient/pages/hormones/index.wxml
  13. 1
      src/patient/pages/hospital/index.ts
  14. 1
      src/patient/pages/infusionCenter/index.ts
  15. 8
      src/patient/pages/interactivePatient/index.ts
  16. 1
      src/patient/pages/interactivePatient/index.wxml
  17. 1
      src/patient/pages/live/index.ts
  18. 1
      src/patient/pages/login/index.scss
  19. 6
      src/patient/pages/login/index.wxml
  20. 1
      src/patient/pages/medical/index.ts
  21. 23
      src/patient/pages/personalInformation/index.wxml

10
README.md
Unescape View File

@ -48,3 +48,13 @@ wx.showModal({ @@ -48,3 +48,13 @@ wx.showModal({
正整数 2
正整数 3
已修改未上线内容
1. 医生端首页 统计数据改为实时更新
2. 就诊地图重新定位，在非北京地区重新定位会重新定位到北京，再次切换才会定位到当地
3. 患者端注册页导航栏增加返回上一页按钮
4. 量表安奈德修改为甲泼尼龙
5. 患者端聊天页点击任意区域都可关闭底部操作浮层
6. 患者顿啊登录页底部隐私政策区域展示异常修复

2
project.config.json
Unescape View File

@ -71,5 +71,5 @@ @@ -71,5 +71,5 @@
}
]
},
"appid": "wxf9ce8010f1ad24aa"
"appid": "wx71ac9c27c3c3e3f4"
}

12
src/app.ts
Unescape View File

@ -18,15 +18,15 @@ App<IAppOption>({ @@ -18,15 +18,15 @@ App<IAppOption>({
// 测试号 wx2b0bb13edf717c1d
// dev
// appid:wxf9ce8010f1ad24aa
url: 'https://m.xd.hbraas.com',
upFileUrl: 'https://m.xd.hbraas.com/',
imageUrl: 'https://m.xd.hbraas.com/xd/',
// url: 'https://m.xd.hbraas.com',
// upFileUrl: 'https://m.xd.hbraas.com/',
// imageUrl: 'https://m.xd.hbraas.com/xd/',
// pro
// appid:wx71ac9c27c3c3e3f4
// url: 'https://m.xd.hbsaas.com',
// upFileUrl: 'https://m.xd.hbsaas.com/',
// imageUrl: 'https://m.xd.hbsaas.com/api/xd/',
url: 'https://m.xd.hbsaas.com',
upFileUrl: 'https://m.xd.hbsaas.com/',
imageUrl: 'https://m.xd.hbsaas.com/api/xd/',
loginState: '',
isLogin: 0,

1
src/gift/pages/dtpDurg/index.ts
Unescape View File

@ -56,7 +56,6 @@ Page({ @@ -56,7 +56,6 @@ Page({
icon: 'success',
duration: 1000,
})
// 再次授权，调用wx.getLocation的API
this.getFuzzyLocation()
}
else {

BIN
src/images/icon98.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 616 B

After

Width:  |  Height:  |  Size: 952 B

2
src/pages/d_patientDetail/index.ts
Unescape View File

@ -14,6 +14,7 @@ Page({ @@ -14,6 +14,7 @@ Page({
id: '',
remark: '',
showDetail: false,
detail: {} as any,
ec: {
lazyLoad: true,
@ -278,6 +279,7 @@ Page({ @@ -278,6 +279,7 @@ Page({
: dayjs(res.LastUseDrugsTime).from(dayjs().format('YYYY-MM-DD')).replace(' ', '')
}
this.setData({
showDetail: true,
detail: {
...res,
hideName: res.Name.replace(/^(.)(.*)$/, (_, first, rest) => first + '*'.repeat(rest.length)),

2
src/pages/d_patientDetail/index.wxml
Unescape View File

@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
</view>
</view>
</view>
<view class="b-container">
<view class="b-container" wx:if="{{showDetail}}">
<view class="row">
<view class="label">甲状腺眼病分级</view>
<view class="col">{{detail.DiseaseStageName}}</view>

122
src/patient/pages/doctor/index.ts
Unescape View File

@ -93,72 +93,62 @@ Page({ @@ -93,72 +93,62 @@ Page({
})
},
handleToggleSite() {
if (!this.data.LNG) {
wx.getSetting({
success: (res) => {
if (
res.authSetting['scope.userFuzzyLocation'] != undefined
&& res.authSetting['scope.userFuzzyLocation'] == true
) {
// 获取当前位置
this.getFuzzyLocation()
}
else if (res.authSetting['scope.userFuzzyLocation'] == undefined) {
// 获取当前位置
this.getFuzzyLocation()
}
else {
wx.showModal({
title: '请求授权当前位置',
content: '需要获取您的地理位置，请确认授权',
confirmColor: '#8c75d0',
success: (res) => {
if (res.cancel) {
// 取消授权
wx.showToast({
title: '拒绝授权',
icon: 'none',
duration: 1000,
})
this.getList()
}
else if (res.confirm) {
// 确定授权，通过wx.openSetting发起授权请求
wx.openSetting({
success: (res) => {
if (res.authSetting['scope.userFuzzyLocation'] == true) {
wx.showToast({
title: '授权成功',
icon: 'success',
duration: 1000,
})
// 再次授权，调用wx.getLocation的API
this.getFuzzyLocation()
}
else {
wx.showToast({
title: '授权失败',
icon: 'none',
duration: 1000,
})
this.getList()
}
},
})
}
},
})
}
},
})
}
else {
this.setData({
LNG: '',
LAT: '',
})
this.getLocationInfo()
}
wx.getSetting({
success: (res) => {
if (
res.authSetting['scope.userFuzzyLocation'] != undefined
&& res.authSetting['scope.userFuzzyLocation'] == true
) {
// 获取当前位置
this.getFuzzyLocation()
}
else if (res.authSetting['scope.userFuzzyLocation'] == undefined) {
// 获取当前位置
this.getFuzzyLocation()
}
else {
wx.showModal({
title: '请求授权当前位置',
content: '需要获取您的地理位置，请确认授权',
confirmColor: '#8c75d0',
success: (res) => {
if (res.cancel) {
// 取消授权
wx.showToast({
title: '拒绝授权',
icon: 'none',
duration: 1000,
})
this.getList()
}
else if (res.confirm) {
// 确定授权，通过wx.openSetting发起授权请求
wx.openSetting({
success: (res) => {
if (res.authSetting['scope.userFuzzyLocation'] == true) {
wx.showToast({
title: '授权成功',
icon: 'success',
duration: 1000,
})
this.getFuzzyLocation()
}
else {
wx.showToast({
title: '授权失败',
icon: 'none',
duration: 1000,
})
this.getList()
}
},
})
}
},
})
}
},
})
},
getFuzzyLocation() {
wx.getFuzzyLocation({

51
src/patient/pages/enterInfo/index.scss
Unescape View File

@ -45,41 +45,38 @@ page { @@ -45,41 +45,38 @@ page {
.switch {
margin-bottom: 50rpx;
display: flex;
gap: 22rpx;
justify-content: center;
gap: 86rpx;
align-items: center;
gap: 26rpx;
.item {
.icon-wrap {
background: #f6f8f9;
border-radius: 24rpx 24rpx 24rpx 24rpx;
border: 1px solid transparent;
text-align: center;
.icon {
display: block;
margin-bottom: -2px;
width: 186rpx;
height: 164rpx;
}
flex: 1;
display: flex;
align-items: center;
justify-content: center;
background-color: #f6f8f9;
border-radius: 16rpx;
border: 1px solid #f6f8f9;
.icon {
flex-shrink: 0;
width: 118rpx;
height: 118rpx;
}
.name {
margin-top: 24rpx;
font-size: 32rpx;
color: #211d2e;
text-align: center;
}
&.active {
.icon-wrap {
border-color: rgba(185, 130, 255, 1);
background-color: transparent;
}
border-color: #b982ff;
background: #fff;
.name {
color: rgba(185, 130, 255, 1);
color: #b982ff;
}
}
}
}
.row-title {
margin-top: 48rpx;
margin-top: 60rpx;
margin-bottom: 24rpx;
font-size: 32rpx;
font-weight: bold;
@ -152,20 +149,6 @@ page { @@ -152,20 +149,6 @@ page {
.input-place {
color: rgba(173, 172, 178, 1);
}
.input-required {
display: flex;
justify-content: space-between;
align-items: center;
&::after {
flex-shrink: 0;
margin-right: 20rpx;
content: '';
width: 12rpx;
height: 12rpx;
border-radius: 50%;
background: rgba(185, 130, 255, 1);
}
}
.item {
flex: 1;
padding: 10rpx 62rpx;

17
src/patient/pages/enterInfo/index.ts
Unescape View File

@ -34,6 +34,10 @@ Page({ @@ -34,6 +34,10 @@ Page({
proces: '0',
dict: {},
bolList: {
1: '是',
2: '否',
},
show: false,
@ -59,6 +63,7 @@ Page({ @@ -59,6 +63,7 @@ Page({
gender: zdUserInfo.Gender,
ageRange: zdUserInfo.AgeRange,
IsGraves: zdUserInfo.IsGraves,
isKnowTituyo: zdUserInfo.IsKnowTituyo,
diseaseStage: zdUserInfo.DiseaseStage,
diseasePeriod: zdUserInfo.DiseaseStage,
HasTedSurgery: zdUserInfo.HasTedSurgery,
@ -119,6 +124,12 @@ Page({ @@ -119,6 +124,12 @@ Page({
HasTedSurgery: id,
})
},
handleSelectIsKnowTituyo(e) {
const { id } = e.currentTarget.dataset
this.setData({
isKnowTituyo: id,
})
},
handleSelectKnowTituyo(e) {
const { id } = e.currentTarget.dataset
const { tituyo } = this.data
@ -142,8 +153,8 @@ Page({ @@ -142,8 +153,8 @@ Page({
})
},
handleNext() {
const { name, gender, ageRange, relationType } = this.data
if (!name || !gender || !ageRange || !relationType) {
const { name, gender, ageRange, relationType, diseaseStage } = this.data
if (!name || !gender || !ageRange || !relationType || !diseaseStage) {
wx.showToast({ title: '完善个人信息，可获得【医生】更多关注', icon: 'none' })
return
}
@ -186,6 +197,7 @@ Page({ @@ -186,6 +197,7 @@ Page({
diseasePeriod,
IsGraves,
HasTedSurgery,
isKnowTituyo,
tituyo,
prescriptionImg,
@ -224,6 +236,7 @@ Page({ @@ -224,6 +236,7 @@ Page({
diseaseStage,
diseasePeriod,
prescriptionImg,
isKnowTituyo,
tituyo: Object.keys(tituyo),
WorkerId,

45
src/patient/pages/enterInfo/index.wxml
Unescape View File

@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
<view class="page">
<navbar fixed title="注册" custom-style="background:{{background}}"></navbar>
<navbar fixed title="注册" custom-style="background:{{background}}">
<van-icon name="arrow-left" slot="left" size="18px" color="#000" bind:tap="handleBack" />
</navbar>
<image class="bg" src="{{imageUrl}}bg10.png?t={{Timestamp}}"></image>
<view class="page-container" style="padding-top:{{pageTop+24}}px;">
<view class="container">
@ -10,16 +12,12 @@ @@ -10,16 +12,12 @@
<view class="content" wx:if="{{step==0}}">
<view class="switch">
<view class="item {{relationType==1 && 'active'}}" bind:tap="handleRelationType" data-id="1">
<view class="icon-wrap">
<image class="icon" src="{{imageUrl}}icon28.png?t={{Timestamp}}"></image>
</view>
<view class="name">我是本人</view>
<image class="icon" src="{{imageUrl}}icon140.png?t={{Timestamp}}"></image>
<view class="name">本人</view>
</view>
<view class="item {{relationType==2 && 'active'}}" bind:tap="handleRelationType" data-id="2">
<view class="icon-wrap">
<image class="icon" src="{{imageUrl}}icon29.png?t={{Timestamp}}"></image>
</view>
<view class="name">我是亲友</view>
<image class="icon" style="margin-right: 10rpx;" src="{{imageUrl}}icon141.png?t={{Timestamp}}"></image>
<view class="name">亲友</view>
</view>
</view>
<view class="row-title required">患者姓名</view>
@ -29,11 +27,10 @@ @@ -29,11 +27,10 @@
class="input input-required"
placeholder-class="input-place"
focus
maxlength="{{8}}"
placeholder="怎么称呼{{relationType==1?'您':'患者'}}？"
placeholder="输入真实姓名，便于医生识别随访"
/>
</view>
<view class="tip">请您输入真实姓名，便于医生识别随访</view>
<!-- <view class="tip">请您输入真实姓名，便于医生识别随访</view> -->
<view class="row-title required">患者性别</view>
<view class="row">
<view class="item {{gender==2 && 'active'}}" bind:tap="handleGender" data-id="2">
@ -57,8 +54,6 @@ @@ -57,8 +54,6 @@
{{item}}
</view>
</view>
</view>
<view class="content" wx:elif="{{step==1}}">
<view class="row-title required">您的甲状腺眼病分级</view>
<view class="row row-age">
<view
@ -71,7 +66,9 @@ @@ -71,7 +66,9 @@
{{item}}
</view>
</view>
<view class="row-title required">您的甲状腺眼病分期</view>
</view>
<view class="content" wx:elif="{{step==1}}">
<view class="row-title required" style="margin-top: 10rpx;">您的甲状腺眼病分期</view>
<view class="row row-age">
<view
class="age-item {{diseasePeriod==index && 'active'}}"
@ -95,7 +92,7 @@ @@ -95,7 +92,7 @@
{{item}}
</view>
</view>
<view class="row-title">是否有TED（甲状腺眼突) 及其相关眼部手术史</view>
<view class="row-title">是否有甲状腺眼病相关眼部手术史</view>
<view class="row row-age">
<view
class="age-item {{HasTedSurgery==index && 'active'}}"
@ -108,7 +105,21 @@ @@ -108,7 +105,21 @@
</view>
</view>
<view class="row-title">
如何看待新药替妥尤单抗
是否了解生物制剂替妥尤单抗N01
</view>
<view class="row row-age">
<view
class="age-item {{isKnowTituyo==index && 'active'}}"
data-id="{{index}}"
wx:for="{{bolList}}"
wx:key="index"
bind:tap="handleSelectIsKnowTituyo"
>
{{item}}
</view>
</view>
<view class="row-title">
如何看待新药替妥尤单抗N01
<text class="sub">（多选）</text>
</view>
<view class="row row-age">

4
src/patient/pages/hormones/index.wxml
Unescape View File

@ -196,7 +196,7 @@ @@ -196,7 +196,7 @@
<view class="sub">mg</view>
</view>
</view>
<view class="title-tip">说明:此处按曲安奈德注射剂量计算</view>
<view class="title-tip">说明:此处按甲泼尼龙注射剂量计算</view>
<view class="end">
<view class="pre" bind:tap="handlePrev">上一页</view>
<view class="submit" bind:tap="handleSubmit">提交</view>
@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
<view class="sub">mg</view>
</view>
</view>
<view class="title-tip">说明:此处按曲安奈德注射剂量计算</view>
<view class="title-tip">说明:此处按甲泼尼龙注射剂量计算</view>
<view class="end">
<view class="pre" bind:tap="handlePrev">上一页</view>
<view class="submit" bind:tap="handleSubmit">提交</view>

1
src/patient/pages/hospital/index.ts
Unescape View File

@ -67,7 +67,6 @@ Page({ @@ -67,7 +67,6 @@ Page({
icon: 'success',
duration: 1000,
})
// 再次授权，调用wx.getLocation的API
this.getFuzzyLocation()
}
else {

1
src/patient/pages/infusionCenter/index.ts
Unescape View File

@ -55,7 +55,6 @@ Page({ @@ -55,7 +55,6 @@ Page({
icon: 'success',
duration: 1000,
})
// 再次授权，调用wx.getLocation的API
this.getFuzzyLocation()
}
else {

8
src/patient/pages/interactivePatient/index.ts
Unescape View File

@ -303,6 +303,14 @@ Page({ @@ -303,6 +303,14 @@ Page({
unReadCount: 0,
})
},
hideFooter() {
const { expend } = this.data
if (expend) {
this.setData({
expend: false,
})
}
},
handleFooter() {
app.mpBehavior({ PageName: 'BTN_PatientImAsk' })
this.setData({

1
src/patient/pages/interactivePatient/index.wxml
Unescape View File

@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
<view
class="page"
style="background: url('{{imageUrl}}bg10.png?t={{Timestamp}}') no-repeat top center/100% 610rpx;padding-top:{{pageTop+22}}px;"
catch:tap="hideFooter"
>
<view class="page-header" bind:tap="handleDoctorDetail">
<image class="avatar" mode="aspectFill" src="{{doctorDetail.doctorAvatar}}"></image>

1
src/patient/pages/live/index.ts
Unescape View File

@ -146,7 +146,6 @@ Page({ @@ -146,7 +146,6 @@ Page({
// icon: 'success',
// duration: 1000
// })
// 再次授权，调用wx.getLocation的API
that.getFuzzyLocation()
}
else {

1
src/patient/pages/login/index.scss
Unescape View File

@ -65,6 +65,7 @@ pgae { @@ -65,6 +65,7 @@ pgae {
font-size: 28rpx;
color: rgba(105, 104, 110, 1);
.link {
display: inline;
color: rgba(185, 130, 255, 1);
}
}

6
src/patient/pages/login/index.wxml
Unescape View File

@ -52,10 +52,10 @@ @@ -52,10 +52,10 @@
></image>
<view class="a-content">
我同意依照
<text class="link" bind:tap="handleLink" data-url="/doc/pages/doc2/index">《隐私政策》</text>
<text class="link" bind:tap="handleLink" data-url="/doc/pages/doc2/index?active=2">
<view class="link" bind:tap="handleLink" data-url="/doc/pages/doc2/index">《隐私政策》</view>
<view class="link" bind:tap="handleLink" data-url="/doc/pages/doc2/index?active=2">
《个人信息共享知情同意书》
</text>
</view>
规定收集和共享我的个人敏感信息
</view>
</view>

1
src/patient/pages/medical/index.ts
Unescape View File

@ -68,7 +68,6 @@ Page({ @@ -68,7 +68,6 @@ Page({
icon: 'success',
duration: 1000,
})
// 再次授权，调用wx.getLocation的API
this.getFuzzyLocation()
}
else {

23
src/patient/pages/personalInformation/index.wxml
Unescape View File

@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
</view>
<view class="row">
<view class="row-header">
<view class="label">是否有TED（甲状腺眼突）及其相关眼部手术史</view>
<view class="label">是否有甲状腺眼病相关眼部手术史</view>
</view>
<view class="row-content">
<view class="radio-btns radio-btns3">
@ -163,7 +163,26 @@ @@ -163,7 +163,26 @@
</view>
<view class="row">
<view class="row-header">
<view class="label">如何看待新药替妥尤单抗</view>
<view class="label">是否了解生物制剂替妥尤单抗N01</view>
</view>
<view class="row-content">
<view class="radio-btns radio-btns3">
<view
class="btn {{zdUserInfo.IsKnowTituyo==index && 'active'}}"
wx:for="{{bolList}}"
wx:key="index"
bind:tap="handleRedioSelect"
data-key="IsKnowTituyo"
data-id="{{index}}"
>
{{item}}
</view>
</view>
</view>
</view>
<view class="row">
<view class="row-header">
<view class="label">如何看待新药替妥尤单抗N01</view>
</view>
<view class="row-content">
<view class="radio-btns radio-btns3">

Write Preview
Loading…
Cancel
Save