From 9a6cb79dabd887bf9e7f3f5db0f429c6c3b6fcfe Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 9 Jul 2024 21:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Admin/YeWu/ConfigsController.php | 12 +++++ Laravel/routes/api.php | 4 +- mH5/.env.production | 5 ++ mH5/src/api/api.js | 5 ++ mH5/src/router/index.js | 4 +- mH5/src/views/AppLogin.vue | 47 ++++++++++++++++++- mH5/src/views/PreviewReport.vue | 5 +- mH5/src/views/SelectOrganization.vue | 5 +- 8 files changed, 78 insertions(+), 9 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ConfigsController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ConfigsController.php index 5172fde..9d56361 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ConfigsController.php +++ b/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("获取配置信息失败"); + } + + } } diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index 9465a6f..401cae7 100644 --- a/Laravel/routes/api.php +++ b/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 -}); +}); //对外接口 diff --git a/mH5/.env.production b/mH5/.env.production index da99997..a6d16fe 100644 --- a/mH5/.env.production +++ b/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/' diff --git a/mH5/src/api/api.js b/mH5/src/api/api.js index c6f7ed3..dbd985b 100644 --- a/mH5/src/api/api.js +++ b/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}) } \ No newline at end of file diff --git a/mH5/src/router/index.js b/mH5/src/router/index.js index a358221..5ad287d 100644 --- a/mH5/src/router/index.js +++ b/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', diff --git a/mH5/src/views/AppLogin.vue b/mH5/src/views/AppLogin.vue index 246895f..8ecd764 100644 --- a/mH5/src/views/AppLogin.vue +++ b/mH5/src/views/AppLogin.vue @@ -8,7 +8,7 @@ \ No newline at end of file