From 0df3c99a23b6774c39abf16af51cf20bbfefc8a5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 10 五月 2024 15:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/appointmentDetails/appointmentDetails.vue | 119 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 44 deletions(-)
diff --git a/h5/pages/appointmentDetails/appointmentDetails.vue b/h5/pages/appointmentDetails/appointmentDetails.vue
index 9d85809..a58e09b 100644
--- a/h5/pages/appointmentDetails/appointmentDetails.vue
+++ b/h5/pages/appointmentDetails/appointmentDetails.vue
@@ -1,15 +1,20 @@
<template>
<view class="box">
- <view class="box_head">
- <canvas class="box_head_qrcode" canvas-id="img" v-if="[2,5,7,8,9].includes(info.status)"></canvas>
- <image class="box_head_logo" src="../../static/logo@2x.png" mode="widthFix" v-else></image>
- <text class="box_head_a" v-if="[0, 1].includes(info.status)">璁垮棰勭害寰呭鏍�</text>
- <text class="box_head_a" style="color: #03AF76;" v-if="info.status === 2">璁垮棰勭害瀹℃牳閫氳繃</text>
- <text class="box_head_a" style="color: #ED4545;" v-if="info.status === 3">璁垮棰勭害瀹℃牳涓嶉�氳繃</text>
- <text class="box_head_b" v-if="[0, 1].includes(info.status)">鎮ㄧ殑棰勭害鍗曞凡鎻愪氦瀹℃牳锛岃绛夊緟琚浜哄鏍�</text>
- <text class="box_head_b" v-if="info.status === 2">鎮ㄧ殑鏉ヨ鐢宠宸插鏍搁�氳繃锛岃鍦ㄩ棬鍗杩涜鐧昏鍏ュ満
-濡傞亣鐗规畩鎯呭喌锛屽彲鑱旂郴琚浜烘垨瀹変繚浜哄憳</text>
- <text class="box_head_b" v-if="info.status === 3">鎮ㄧ殑鏉ヨ鐢宠宸茶椹冲洖锛屽鏈夌枒闂紝鍙仈绯昏璁夸汉</text>
+ <view class="head_wrap head_success" v-if="info.status == 1">
+ <view class="h1">璁垮棰勭害瀹℃牳閫氳繃</view>
+ <view class="h2">鎮ㄧ殑鏉ヨ鐢宠宸插鏍搁�氳繃锛岃鍦ㄨ瀹㈡満绛惧埌鍏ュ巶銆傚閬囩壒娈婃儏鍐碉紝鍙仈绯昏璁夸汉鎴栧畨淇濅汉鍛�</view>
+ </view>
+ <view class="qr_wrap" v-if="info.status == 1">
+ <canvas class="box_head_qrcode" canvas-id="img"></canvas>
+ <view class="text">浣跨敤璁垮鏈烘壂鐮佺鍒�</view>
+ </view>
+ <view class="head_wrap head_padding" v-if="info.status == 2">
+ <view class="h1">璁垮棰勭害寰呭鏍�</view>
+ <view class="h2">鎮ㄧ殑棰勭害鍗曞凡鎻愪氦瀹℃牳锛岃绛夊緟琚浜哄鏍�</view>
+ </view>
+ <view class="head_wrap head_error" v-if="info.status == 3">
+ <view class="h1">璁垮棰勭害瀹℃牳涓嶉�氳繃</view>
+ <view class="h2">鎮ㄧ殑鏉ヨ鐢宠宸茶椹冲洖锛屽鏈夌枒闂紝鍙仈绯昏璁夸汉</view>
</view>
<view class="box_list">
<view class="box_list_label">鎷滆淇℃伅</view>
@@ -60,26 +65,30 @@
<script>
import wxcode from 'uniapp-qrcode'
-
+ import { visitorSubDetail } from '@/api'
+
export default {
data() {
return {
- info: {},
+ info: {
+ status: 1
+ },
show: false
};
},
onLoad(option) {
- this.$u.api.detail({ id: option.id })
- .then(res => {
- if (res.code === 200) {
- this.info = res.data
- if (res.data.qrcode) {
- this.$nextTick(() => {
- wxcode.qrcode('img', res.data.qrcode, 320, 320)
- })
- }
- }
- })
+ // this.$u.api.detail({ id: option.id })
+ // visitorSubDetail({ id: option.id })
+ // .then(res => {
+ // if (res.code === 200) {
+ // this.info = res.data
+ // if (res.data.qrcode) {
+ // this.$nextTick(() => {
+ // wxcode.qrcode('img', res.data.qrcode, 320, 320)
+ // })
+ // }
+ // }
+ // })
},
methods: {
close() {
@@ -117,35 +126,57 @@
height: 100%;
}
}
- .box_head {
- width: 100%;
- padding: 40rpx 0;
- box-sizing: border-box;
- background-color: #ffffff;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
+ .qr_wrap{
+ background-color: #fff;
+ text-align: center;
.box_head_qrcode {
width: 320rpx;
height: 320rpx;
}
- .box_head_logo {
- width: 220rpx;
- height: 220rpx;
+ .text{
+ font-size: 30rpx;
+ color: #279BAA;
+ padding: 20rpx 0 30rpx;
}
- .box_head_a {
- font-size: 36rpx;
+ }
+ .head_wrap{
+ padding: 30px;
+
+ .h1{
+ margin-bottom: 16rpx;
font-weight: 600;
- color: #025EEF;
- margin-top: 30rpx;
+ font-size: 36rpx;
}
- .box_head_b {
- font-size: 26rpx;
+ .h2{
font-weight: 400;
- color: #666666;
- margin-top: 24rpx;
- text-align: center;
+ font-size: 26rpx;
+ }
+ }
+ .head_padding{
+ background: #279BAA;
+ .h1{
+ color: #FFFFFF;
+ }
+ .h2{
+ color: #FFFFFF;
+ }
+ }
+ .head_error{
+ background: #FDEDED;
+ .h1{
+ color: #ED4545;
+ }
+ .h2{
+ color: #333333;
+ }
+ }
+ .head_success{
+ background: #E8F4F6;
+ .h1{
+ color: #279BAA;
+ }
+ .h2{
+ color: #333333;
}
}
.box_list {
--
Gitblit v1.9.3