-
-
-
-
-
-
-
-
-
-
-
- 各体检机构体检量统计
-
-
-
-
-
-
-
-
+
+
@@ -32,100 +9,18 @@
ref,
onMounted
} from 'vue'
- import * as echarts from 'echarts';
+ import {
+ ElMessage,
+ ElMessageBox
+ } from 'element-plus'
+ import {
+
+ } from '@/api/api.js'
let loading = ref(false)
- let tableData = ref([{
- name:'医管中心',
- count:'500'
- },{
- name:'亦庄医院',
- count:'636'
- },{
- name:'采育卫生院',
- count:'425'
- },{
- name:'西红门医院',
- count:'266'
- }])
- let currentPage = ref(1) //当前页码
- let pageSize = ref(15) //每页数量
- let total = 0 //总数量
- const PageSizeChange = (e) => { // 修改每页数量
- pageSize.value = e
- GetUserList()
- }
- const PageCurrentChange = (e) => { //切换页码
- currentPage.value = e
- GetUserList()
- }
- const GetList=()=>{
-
- }
+
onMounted(()=>{
- var ChartMonthCount = echarts.init(document.getElementById('MonthCount'));
- // 绘制图表
- ChartMonthCount.setOption({
- title: {
- text: '2023-01-01~2023-06-30体检数量统计(月)'
- },
- tooltip: {},
- xAxis: {
- data: ['1月', '2月', '3月', '4月', '5月', '6月']
- },
- yAxis: {},
- series: [
- {
- name: '数量',
- type: 'bar',
- data: [5, 20, 36, 10, 10, 20]
- }
- ]
- });
- var ChartTypeCount = echarts.init(document.getElementById('TypeCount'));
- ChartTypeCount.setOption(
- {
- title: {
- text: '2023-01-01~2023-06-30体检行业分类统计'
- },
- tooltip: {
- trigger: 'item'
- },
- legend: {
- top: '5%',
- left: 'center'
- },
- series: [
- {
- name: '数量',
- type: 'pie',
- radius: ['40%', '70%'],
- avoidLabelOverlap: false,
- label: {
- show: false,
- position: 'center'
- },
- emphasis: {
- label: {
- show: true,
- fontSize: 40,
- fontWeight: 'bold'
- }
- },
- labelLine: {
- show: false
- },
- data: [
- { value: 1048, name: '食品类' },
- { value: 735, name: '化妆品类' },
- { value: 580, name: '公共场所类' },
- { value: 484, name: '生活饮用水类' },
- { value: 300, name: '消毒产品生产类' }
- ]
- }
- ]
-
- })
+
})
@@ -134,7 +29,7 @@
\ No newline at end of file
diff --git a/h5/config.js b/h5/config.js
index 3b2c143..0afd50b 100644
--- a/h5/config.js
+++ b/h5/config.js
@@ -1,5 +1,5 @@
const app_type = 'gzh'
-// const base_url = "https://api.hainan2024.sa0.online" //开发环境
+//const base_url = "https://api.hainan2024.sa0.online" //开发环境
const base_url="https://tj-h5.hnxdfe.com" //正式环境
const config = {
api_map_url: base_url + '/api/ApiMap/h5',
diff --git a/h5/pages/main/combo/combo.vue b/h5/pages/main/combo/combo.vue
index fa780a8..cbba206 100644
--- a/h5/pages/main/combo/combo.vue
+++ b/h5/pages/main/combo/combo.vue
@@ -496,7 +496,7 @@ const toRouter = () => {
>¥{{ i.original_price }}
-
已售{{ i.count }}
+
diff --git a/h5/pages/main/combo/tcdb.vue b/h5/pages/main/combo/tcdb.vue
index a3e5e3d..3aa20d7 100755
--- a/h5/pages/main/combo/tcdb.vue
+++ b/h5/pages/main/combo/tcdb.vue
@@ -86,15 +86,15 @@ onShow(() => {
v-for="(obj, f) in comboInfo"
:key="f"
>
-
-
+
{
>
-
+ /> -->
{{ obj.name }}
@@ -153,9 +153,8 @@ onShow(() => {
{{
obj.original_price
}}
- 已售{{ obj.saleCount }}
+
diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue
index 7d9bc89..7282d7b 100644
--- a/h5/pages/main/order/src/order.vue
+++ b/h5/pages/main/order/src/order.vue
@@ -120,12 +120,27 @@
url: '/pages/main/ctime/ctime?id=' + id
})
}
- let erweima_popup=ref(null);
- let show_erweima_text=ref('');
- const erweima_click=(text)=>{
- show_erweima_text.value=text
+ let erweima_popup = ref(null);
+ let show_erweima_text = ref('');
+ const erweima_click = (text) => {
+ show_erweima_text.value = text
erweima_popup.value.open()
}
+ let detail_popup = ref(null);
+ let OrderInfoDetail = ref({});
+ const click_detail = async (order) => {
+ detail_popup.value.open()
+ uni.showLoading();
+ const response = await $api("GetOrderDetail", {
+ id: order.id,
+ });
+ uni.hideLoading();
+ $response(response, () => {
+ if (response.status) {
+ OrderInfoDetail.value = response.data.info
+ }
+ })
+ }
onMounted(() => {
deepInfo();
});
@@ -142,11 +157,72 @@
}">
+
+
+ {{OrderInfoDetail.title}}
+
+ 体检人:
+ {{OrderInfoDetail.name}}
+
+
+ 订单号:
+ {{OrderInfoDetail.order_number}}
+
+
+ 类型:
+ 个检团检
+
+
+ 预约时间:
+ {{OrderInfoDetail.appointment_date}} {{OrderInfoDetail.appointment_time}}
+
+
+
+ 核磁项目:
+
+ {{item.name}}
+ 预约时间:{{OrderInfoDetail.erxian_appointment_info[0].date}} {{OrderInfoDetail.erxian_appointment_info[0].time}}
+
+
+
+ 自选项目:
+
+ {{item.name}}
+
+
+
+ 订单状态:
+
+ 待支付
+
+ 已支付
+ 交易关闭
+ 已完成
+
+
+
+ 预约状态:
+ 已预约预约未成功
+
+
+ 下单时间:
+ {{OrderInfoDetail.created_at}}
+
+
+
+
待支付
- 已预约
- 预约失败
+
+ 已预约
+
+ 预约失败
交易关闭
已完成
@@ -163,12 +239,13 @@
预约时间:
- {{order_info.date}} {{order_info.time.substring(',',5)}}
+ {{order_info.date}} {{order_info.time.substring(',',5)}}
+
-
-
+
订单号:
- {{
- order_info.order
- }}
+
+ {{order_info.order}}
+
类型:
- {{
- order_info.type
- }}
+
+ {{order_info.type}}
+
-
- 需支付
- 实付款
- 已退款
- (实付:{{ order_info.true_price }})
- {{ order_info.price }}
+
+ 查看详情>>>
+
+ 需支付
+ 实付款
+ 已退款
+ (实付:{{ order_info.true_price }})
+ {{ order_info.price }}
+
+
@@ -215,8 +296,9 @@
继续付款
-
+
改约
退款
@@ -314,7 +396,7 @@
font-weight: 400;
color: #111111;
line-height: 1;
- margin-top: 28rpx;
+
text-align: right;
margin-right: 30rpx;
font-size: 26rpx;
@@ -404,4 +486,28 @@
padding-top: 35rpx;
margin-top: 16rpx;
}
+
+ .click_detail {
+ font-size: 24rpx;
+ color: #239ea3;
+ margin-left: 30rpx;
+ margin-top: 20rpx;
+ font-weight: 700;
+ }
+
+ .OrderInfoRow {
+ display: flex;
+ font-size: 26rpx;
+ margin-top: 16rpx;
+ color: #666;
+
+ }
+
+ .row_label {
+ width: 150rpx
+ }
+
+ .row_value {
+ margin-left: 20rpx;
+ }
\ No newline at end of file
diff --git a/h5/pages/main/question/question/question.vue b/h5/pages/main/question/question/question.vue
index 5901be1..4e2c239 100644
--- a/h5/pages/main/question/question/question.vue
+++ b/h5/pages/main/question/question/question.vue
@@ -659,7 +659,7 @@
.push_log_wrapper {
position: absolute;
z-index: 9;
- width: 210rpx;
+ width: 250rpx;
height: 50rpx;
background: #38C6BC;
right: 30rpx;
@@ -667,7 +667,7 @@
border-radius: 6rpx;
margin: 40rpx auto 0;
font-weight: 500;
- font-size: 16rpx;
+ font-size: 22rpx;
color: #FFFFFF;
line-height: 50rpx;
text-align: center;
diff --git a/h5/pages/main/questionnaire/index.vue b/h5/pages/main/questionnaire/index.vue
index 0dd7014..327f06c 100644
--- a/h5/pages/main/questionnaire/index.vue
+++ b/h5/pages/main/questionnaire/index.vue
@@ -17,6 +17,7 @@ const $store = useStore();
let topicList = ref([]); // 题目列表
let topicIndex = ref(0); // 题目索引
+let question_count=ref(0);//题目总数
const tabPatients = () => {
uni.navigateTo({
@@ -28,10 +29,12 @@ const getmyddcSelect = async () => {
uni.showLoading();
const response = await $api("QuestionGetList", {
hospital_id: $store.save.hospital,
+ person:$store.user,
q_type: 2,
}); //目前请求的套餐 头的接口
$response(response, () => {
uni.hideLoading();
+ question_count.value=response.data.count
topicList.value = response.data.list.map((val) => {
let answer = val.type != 1 ? [] : ""
let content = val.content
@@ -46,6 +49,18 @@ const getmyddcSelect = async () => {
content = ''
}
}
+ if(val.question=='请问您的性别'){
+ if($store.user.sex==1){
+ answer=['男性']
+ }
+ if($store.user.sex==2){
+ answer=['女性']
+ }
+
+ }
+ if(val.question.includes('女性') && $store.user.sex==1){
+ answer=['不涉及']
+ }
return {
...val,
content: content,
@@ -297,11 +312,11 @@ onShow(() => {
- 共 {{ topicList.length }} 题
+ 共 {{ question_count }} 题
{
+ uni.hideLoading();
if (groupId.value && response.data.group_info.length) {
// 团检
groupInfo.value = response.data.group_info[0];
@@ -203,7 +204,7 @@
}
totalPrice.value = response.data.true_price;
tabIndex.value = 0;
- uni.hideLoading();
+
});
};
diff --git a/h5/pages/main/yytjsj/yytjsj.vue b/h5/pages/main/yytjsj/yytjsj.vue
index a61e402..8756f0d 100755
--- a/h5/pages/main/yytjsj/yytjsj.vue
+++ b/h5/pages/main/yytjsj/yytjsj.vue
@@ -709,8 +709,8 @@
-
@@ -762,6 +762,14 @@