Merge branch 'jxg_test_h5' into prod
This commit is contained in:
xg-29
commit
5d94b3a309
|
|
@ -4224,6 +4224,27 @@
|
|||
"whatwg-fetch": "^3.6.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@vue/vue-loader-v15": {
|
||||
"version": "npm:vue-loader@15.11.1",
|
||||
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
|
||||
"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@vue/component-compiler-utils": "^3.1.0",
|
||||
"hash-sum": "^1.0.2",
|
||||
"loader-utils": "^1.1.0",
|
||||
"vue-hot-reload-api": "^2.3.0",
|
||||
"vue-style-loader": "^4.1.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"hash-sum": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
|
||||
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"acorn": {
|
||||
"version": "8.10.0",
|
||||
"resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz",
|
||||
|
|
@ -4479,19 +4500,6 @@
|
|||
"resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.3.4.tgz",
|
||||
"integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
|
||||
},
|
||||
"@vue/vue-loader-v15": {
|
||||
"version": "npm:vue-loader@15.11.1",
|
||||
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
|
||||
"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@vue/component-compiler-utils": "^3.1.0",
|
||||
"hash-sum": "^1.0.2",
|
||||
"loader-utils": "^1.1.0",
|
||||
"vue-hot-reload-api": "^2.3.0",
|
||||
"vue-style-loader": "^4.1.0"
|
||||
}
|
||||
},
|
||||
"@vue/web-component-wrapper": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
|
||||
|
|
|
|||
|
|
@ -39,12 +39,14 @@
|
|||
<view class="card">
|
||||
<block v-if="shuju.diseases!='95'">
|
||||
<view class="text-df grey">{{illustrate}}</view>
|
||||
<view class="btn-descri" @click="onShowStatement">免责声明</view>
|
||||
</block>
|
||||
<block v-else>
|
||||
<view class="text-bold color">说明：</view>
|
||||
<view class="text-df grey marginTop-sm">1、填写本问卷，您将获得您的专属健康报告及生活方式改善建议。</view>
|
||||
<view class="text-df grey margin-top-xs">2、本问卷测试结果仅供您自测参考，不作为医学诊断。</view>
|
||||
<view class="text-df grey margin-top-xs">3、您的所有信息，都将保密。</view>
|
||||
<view class="btn-descri" @click="onShowStatement">免责声明</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -64,6 +66,22 @@
|
|||
</block>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 触底弹框 -->
|
||||
<uni-popup type="center" ref="popup" :is-mask-click="false">
|
||||
<view class="pupupCard">
|
||||
<view class="text-center wenTitle">免责声明</view>
|
||||
<view class="statement statement-descri" style="margin-top: 20rpx;">本健康评估仅为提供一般性的信息和参考，不构成任何具体的医疗诊断、建议或治疗方案。</view>
|
||||
<view class="statement statement-descri" style="margin-top: 5rpx;">进行健康评估是您自愿的行为，您应明确知晓并理解以下几点：</view>
|
||||
<view class="statement " style="margin-top: 5rpx;">1. 本评估的结果并不能完全准确地反映您的实际健康状况，不能替代专业医疗机构的全面检查和诊断。</view>
|
||||
<view class="statement">2. 我们不对评估结果的绝对准确性和完整性承担任何法律责任。</view>
|
||||
<view class="statement">3. 您在依据本评估结果采取任何行动或决策时，应谨慎考虑并结合自身实际情况，必要时咨询专业医疗人员。</view>
|
||||
<view class="statement">4. 若因您依赖本评估结果而导致任何身体损害、经济损失或其他不利后果，我们不承担任何责任。</view>
|
||||
<view class="statement statement-descri">请您仔细阅读并理解本免责声明，一旦您参与健康评估，即视为您同意本声明的所有内容。</view>
|
||||
<view class="flex-conter">
|
||||
<view class="btn" @click="close">我知道了</view>
|
||||
</view>
|
||||
</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -150,6 +168,12 @@
|
|||
})
|
||||
}
|
||||
},
|
||||
onShowStatement(){
|
||||
this.$refs.popup.open('bottom')
|
||||
},
|
||||
close(){
|
||||
this.$refs.popup.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -191,6 +215,18 @@
|
|||
.grey {
|
||||
color: #909292;
|
||||
}
|
||||
.btn-descri{
|
||||
margin-top: 16rpx;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #3AAFB8;
|
||||
line-height: 33rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-decoration-line: underline;
|
||||
text-transform: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.avare {
|
||||
$wh: 80rpx;
|
||||
|
|
@ -250,4 +286,48 @@
|
|||
margin: 60rpx 0 20rpx;
|
||||
}
|
||||
}
|
||||
.pupupCard {
|
||||
width: 100%;
|
||||
height: 900rpx;
|
||||
border-radius: 16rpx 16rpx 0 0;
|
||||
overflow: hidden;
|
||||
font-size: 28rpx;
|
||||
position: relative;
|
||||
background: #FFFFFF;
|
||||
.wenTitle {
|
||||
padding-top: 10rpx;
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #17191A;
|
||||
line-height: 75rpx;
|
||||
border-bottom: 1px solid #f4f4f4;
|
||||
}
|
||||
.statement{
|
||||
padding:0 40rpx;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #3F4040;
|
||||
line-height: 42rpx;
|
||||
}
|
||||
.statement-descri{
|
||||
text-indent:28px
|
||||
}
|
||||
.left-statement{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: flex-end;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.btn {
|
||||
position: absolute;
|
||||
bottom: 30rpx;
|
||||
width: 328rpx;
|
||||
line-height: 80rpx;
|
||||
text-align: center;
|
||||
background: #3AAFB8;
|
||||
border-radius: 50rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -105,7 +105,7 @@ import {
|
|||
formatTime
|
||||
} from "/tool/index.js"
|
||||
|
||||
import jweixin from 'weixin-js-sdk'
|
||||
// import jweixin from 'weixin-js-sdk'
|
||||
export default {
|
||||
|
||||
data () {
|
||||
|
|
|
|||
Loading…
Reference in New Issue