diff --git a/Laravel/app/Http/Controllers/API/DxAppController.php b/Laravel/app/Http/Controllers/API/DxAppController.php index 19247cc..a40bf59 100644 --- a/Laravel/app/Http/Controllers/API/DxAppController.php +++ b/Laravel/app/Http/Controllers/API/DxAppController.php @@ -10,7 +10,7 @@ class DxAppController extends Controller //大兴app根据userid查询用户信息 public function getUserInfo(){ $userId=request('userId'); - $base_url="http://114.242.58.53:8782"; + $base_url="http://223.71.106.241:8097"; $url =$base_url.'/family/api/getUserFamilyDataList?userId='.$userId; $encryptStr=self::post($url,''); $r_data=json_decode($encryptStr, true); diff --git a/Laravel/app/Http/Controllers/API/mH5/IndustryController.php b/Laravel/app/Http/Controllers/API/mH5/IndustryController.php new file mode 100644 index 0000000..5bb8bba --- /dev/null +++ b/Laravel/app/Http/Controllers/API/mH5/IndustryController.php @@ -0,0 +1,18 @@ +get(); + return \Yz::Return(true,'查询成功',$list); + } +} diff --git a/Laravel/app/Services/Admin/UserService.php b/Laravel/app/Services/Admin/UserService.php index 5596676..810959f 100644 --- a/Laravel/app/Services/Admin/UserService.php +++ b/Laravel/app/Services/Admin/UserService.php @@ -6,7 +6,7 @@ use App\Services\Login\LoginService; class UserService { public function GetInfoList($arr){ - $q=DB::select("select a.id, a.cn_name as cname,a.username as uname,a.status,a.created_at,b.group_name from users as a left join `group` as b on a.`group` =b.id where a.status in(0,1) "); + $q=DB::select("select a.id, a.cn_name as cname,a.username as uname,a.status,a.created_at,b.group_name from users as a left join `group` as b on a.`group` =b.id where a.status in(0,1) order by id desc limit ?,? ",[($arr['page']-1)*$arr['pagesize'],$arr['pagesize']]); $count=DB::select("select count(1) as c from users as a left join `group` as b on a.`group` =b.id where a.status in(0,1)"); $result['list']=$q; $result['count']=$count[0]->c; diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index 84ba03e..e9b1851 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -67,6 +67,7 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1/mH5'],function () Route::post('StartYuYue','App\Http\Controllers\API\mH5\OrganizationController@StartYuYue'); //开始预约 Route::post('UpFile','App\Http\Controllers\API\UpLoadController@UpFile'); //上传文件 Route::post('GetPersonReportDetail','App\Http\Controllers\API\mH5\PersonController@GetPersonReportDetail');//获取用户pdf + Route::post('GetIndustryList','App\Http\Controllers\API\mH5\IndustryController@GetIndustry'); }); diff --git a/mH5/src/api/api.js b/mH5/src/api/api.js index b0cfef1..c63fdc0 100644 --- a/mH5/src/api/api.js +++ b/mH5/src/api/api.js @@ -47,4 +47,9 @@ export const AppLogin = (data) => { //大兴APP获取登录用户信息 export const AppGetUserInfo = (data) => { return axios({url:import.meta.env.VITE_APP_API+'AppGetUserInfo',data:data}) +} + +//获取行业列表 +export const GetIndustryList = (data) => { + return axios({url:import.meta.env.VITE_APP_API+'v1/mH5/GetIndustryList',data:data}) } \ No newline at end of file diff --git a/mH5/src/views/SelectIndustry.vue b/mH5/src/views/SelectIndustry.vue index ea6ce4c..4ebe3a4 100644 --- a/mH5/src/views/SelectIndustry.vue +++ b/mH5/src/views/SelectIndustry.vue @@ -13,12 +13,12 @@ -
+
- {{item.label}} + {{item.name}}
@@ -34,7 +34,10 @@ import yinyongshui from '@/assets/image/yinyongshui.png' import xiaodupng from '@/assets/image/xiaodu.png' import { - ref + GetIndustryList + } from "@/api/api.js"; + import { + ref,onMounted } from 'vue'; import { @@ -49,33 +52,8 @@ console.log(pinia.yuyue_info) let type=ref('') - let DocInfo=ref([{ - id:1, - label:'食品类', - content:'《食品生产许可证》《食品经营许可证》《北京市小规模食品生产经营许可证》《北京市小食杂店备案卡》或《网络食品交易第三方平台提供者备案信息表》复印件。（以上材料有其一即可)', - img:foodpng - },{ - id:2, - label:'化妆品类', - content:'《化妆品生产许可证》复印件、营业执照复印件（经营范围应包括：化妆品生产或相关内容）、化妆品注册备案信息服务平台中的化妆品注册人/备案人企业信息资料管理界面截图。（以上材料有其一即可)', - img:huazhuangpin - },{ - id:3, - label:'公共场所类', - content:'《卫生许可证》复印件', - img:gonggongpng - },{ - id:4, - label:'生活饮用水类', - content:'营业执照（经营范围应包括：饮用水供水服务或相关内容）或《卫生许可证》复印件。（以上材料有其一即可)', - img:yinyongshui - },{ - id:5, - label:'消毒产品生产类', - content:'营业执照（经营范围应包括：生产消毒产品）或《消毒产品生产卫生许可证》复印件。（以上材料有其一即可）', - img:xiaodupng - }]) - let t_info=ref('上述复印件均须加盖从业场所用人单位公章。\n 二、用工证明或拟录用证明（如劳动合同、工作证、就业协议书等；原件现场核查，复印件加盖用人单位公章存档）\n三、免费健康检查申请单\n四、从业人员有效身份证件（原件现场核查，复印件留存存档）\n') + let DocInfo=ref([]) + const check=(id,label)=>{ let info = pinia.yuyue_info info.doc_id=id @@ -86,7 +64,7 @@ type.value=id showDialog({ title:DocInfo.value[id-1].label, - message:"体检时请携带以下证件 \n" +"一、"+DocInfo.value[id-1].content +"\n"+t_info.value, + message:DocInfo.value[id-1].content, messageAlign:'left', confirmButtonText:'我已经知晓', theme: 'round-button', @@ -95,12 +73,25 @@ }); } + let loading=ref(false) const to=()=>{ // router.push('/selectDate') router.push('/uploadFiles') - - } + onMounted(()=>{ + loading.value=true + GetIndustryList().then(res => { + loading.value=false + if (res.status == true) { + DocInfo.value=res.data + DocInfo.value.forEach((v,i)=>{ + DocInfo.value[i].content=v.content.replace(/\\n/g, '\n'); + }) + } else { + showToast(res.msg); + } + }) + })