增加 预约开关

Laravel/app/Http/Controllers/API/Admin/YeWu/ConfigsController.php

@@ -35,4 +35,16 @@ class ConfigsController extends Controller
 
         }
     }
+    //获取某些项目的配置信息
+    public function GetConfigInArray()
+    {
+        $labels=request('labels');
+        $list=DB::table('configs')->select('label','value')->whereIn('label',$labels)->get();
+        if(count($list)>0){
+            return \Yz::Return(true,'',$list);
+        }else{
+            return \Yz::echoError1("获取配置信息失败");
+        }
+
+    }
 }

Laravel/routes/api.php

@@ -64,6 +64,8 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1'],function () {
 Route::post('wxGetOpenid','App\Http\Controllers\API\mH5\LoginController@wxGetOpenid')->middleware('log'); //mH5手机用户获取openid
 Route::post('AppLogin','App\Http\Controllers\API\mH5\LoginController@AppLogin')->middleware('log'); //APP嵌套h5登录，参数APP内用户唯一id
 Route::post('H5GetPersonReportDetail','App\Http\Controllers\API\mH5\PersonController@H5GetPersonReportDetail')->middleware('log');//用户扫码跳转输入身份证和电话 查询用户体检详情和pdf
+Route::post('GetConfigInArray','App\Http\Controllers\API\Admin\YeWu\ConfigsController@GetConfigInArray')->middleware('log');//获取设置
+
 Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1/mH5'],function () {  //手机H5路由分组
     Route::post('Register','App\Http\Controllers\API\mH5\PersonController@Register');  //手机H5端用户注册
     Route::post('GetPersonRecode','App\Http\Controllers\API\mH5\PersonController@GetPersonRecode');  //查询用户本年度体检记录
@@ -75,8 +77,8 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1/mH5'],function ()
     Route::post('GetPersonReportDetail','App\Http\Controllers\API\mH5\PersonController@GetPersonReportDetail');//获取用户pdf
     Route::post('GetIndustryList','App\Http\Controllers\API\mH5\IndustryController@GetIndustry');
     Route::post('GetPersonPdfDetailByLink','App\Http\Controllers\API\mH5\PersonController@GetPersonPdfDetailByLink');//根据链接获取体检那边的pdf
-});
 
+});
 
 
 //对外接口

mH5/.env.production

@@ -1,4 +1,9 @@
 ENV = 'production'
+VITE_APP_API__J = 'https://www.yanzai.vip/common/laravel/public/api/'
+VITE_APP_WXCODE_URL__J = 'http://www.yanzai.vip/common/laravel/public/wxLogin/production'
+VITE_APP_FILE_URL__J= 'http://www.yanzai.vip/common/laravel/public/'
+VITE_APPID__J = "wx526430047d34c85c"
+
 VITE_APP_API = 'http://223.71.106.251:82/common/la/public/api/'
 VITE_APP_WXCODE_URL = 'http://223.71.106.251:82/common/la/public/wxLogin/production'
 VITE_APP_FILE_URL= 'http://223.71.106.251:82/common/la/public/'

mH5/src/api/api.js

@@ -61,4 +61,9 @@ export const GetIndustryList =   (data) =>  {
 //根据链接获取体检那边的pdf
 export const GetPersonPdfDetailByLink =   (data) =>  {
     	return 	axios({url:import.meta.env.VITE_APP_API+'v1/mH5/GetPersonPdfDetailByLink',data:data,responseType: 'blob'})
+}
+
+//获取config配置信息
+export const GetConfigInArray =   (data) =>  {
+    	return 	axios({url:import.meta.env.VITE_APP_API+'GetConfigInArray',data:data})
 }

mH5/src/router/index.js

@@ -2,7 +2,7 @@ import {
 	createRouter,
 	createWebHashHistory
 } from 'vue-router'
-
+import PreviewReport from '../views/PreviewReport.vue'
 const router = createRouter({
 	history: createWebHashHistory(import.meta.env.BASE_URL),
 	routes: [{
@@ -63,7 +63,7 @@ const router = createRouter({
 	},{
 		path: '/previewReport',
 		name: 'PreviewReport',
-		component: () => import('../views/PreviewReport.vue')
+		component:PreviewReport
 	},{
 		path: '/personReportLogin',
 		name: 'PersonReportLogin',

mH5/src/views/AppLogin.vue

@@ -8,7 +8,7 @@
 
 <script setup>
 	import {
-		AppLogin,AppGetUserInfo,mH5Register
+		AppLogin,AppGetUserInfo,mH5Register,GetConfigInArray
 	} from "@/api/api.js";
 	import {
 		ref,
@@ -59,7 +59,12 @@
 	let loading = ref(false)
 	let buttonText = ref('开始预约')
 	
+
 	const gotoYuyue=()=>{
+		if(JianKangZhengEnable.value !=1){
+			showToast('暂未开放健康证预约');
+			return false;
+		}
 		if( sessionStorage.getItem('sfz')){
 			 router.push('/selectOrganization')
 		}else{
@@ -125,11 +130,49 @@
 			}
 		})
 	}
+	let configInfo=ref(null);
+	let LaoNianRenEnable=ref(0);
+	let JianKangZhengEnable=ref(0);
+	//获取配置信息
+	const GetConfigInArrayFunc=()=>{
+		GetConfigInArray({
+			labels: ['是否开启H5老年人','是否开启H5健康证']
+		}).then(res => {
+			loading.value=false
+			if (res.status) {
+				configInfo.value=res.data 
+				configInfo.value.forEach(function(v,i){
+					 if(v.label=='是否开启H5老年人'){
+						 if(v.value==1){
+							 LaoNianRenEnable.value=1
+						 }
+					 }
+					 if(v.label=='是否开启H5健康证'){
+					 	if(v.value==1){
+					 		JianKangZhengEnable.value=1
+					 	}
+					 }
+				})
+			} else {
+				showToast(res.msg);
+			}
+		})
+	}
 	onMounted(() => {
 		openid= route.query.userId
-		AppGetUserinfoAction()
+		//AppGetUserinfoAction()
+		tiaoGuoAppYanzheng();
+		GetConfigInArrayFunc();
 		console.log(openid);
 	})
+	//测试 跳过大兴app验证
+	const  tiaoGuoAppYanzheng=()=>{
+		sessionStorage.setItem('sfz', "13030219880808587X");
+		sessionStorage.setItem('name', '测试');
+		sessionStorage.setItem('tel', "13333356789");
+		sessionStorage.setItem('sex', 1);
+		login()
+	}
 </script>
 
 <style scoped>

mH5/src/views/PreviewReport.vue

@@ -1,5 +1,6 @@
 <template>
 	<div>
+		 <LoadingD :status="loading"></LoadingD>
 		<vue-pdf-app style="height: 100vh; width: 100vw" :pdf="pdfData"></vue-pdf-app>
 	</div>
 </template>
@@ -36,9 +37,7 @@
 
 	let pdfData = ref(null);
 
-	let filePath = ref(
+	 
-		'https://bgdq-api.sixinyun.com/storage/assets/upload/pdf/2306070013/3309d209-1e10-4475-a1ac-bf437e748feb.pdf');
-
 
 	const getPdf = () => {
 		loading.value = true

mH5/src/views/SelectOrganization.vue

@@ -152,8 +152,11 @@
 		width: calc(100vw - 40px);
 		background-color: #33cdc9;
 		border: 0px;
-		position: fixed;
+		/* position: fixed; */
 		bottom: 20px;
+		
+		
+		margin-top: 50px;
 	}
 	
 </style>