From 2b1d590aa423ba8acf3312ec179ba29ad5b132bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 7 Aug 2024 14:47:06 +0800 Subject: [PATCH 1/3] 'commit' --- ZhuQue/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZhuQue/pom.xml b/ZhuQue/pom.xml index b5cfcd4..c09c4fb 100644 --- a/ZhuQue/pom.xml +++ b/ZhuQue/pom.xml @@ -5,7 +5,7 @@ 4.0.0 dsideal ZhuQue - 1.0-SNAPSHOT + 1.0 21 From 3419e1db1c1b07dd92f5b13675f0f364b85044a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 7 Aug 2024 14:48:43 +0800 Subject: [PATCH 2/3] 'commit' --- ZhuQue/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZhuQue/pom.xml b/ZhuQue/pom.xml index c09c4fb..2bdc26e 100644 --- a/ZhuQue/pom.xml +++ b/ZhuQue/pom.xml @@ -37,7 +37,7 @@ com.jfinal jfinal-undertow - 3.5 + 3.6 From caaf5413920888a78058ae05c2706990ce3585a0 Mon Sep 17 00:00:00 2001 From: wubin Date: Wed, 7 Aug 2024 14:50:04 +0800 Subject: [PATCH 3/3] 'commit' --- .../rzyc-weapp-ylt-main/project.config.json | 11 +++++++-- .../project.private.config.json | 6 +++++ MiniProgram/rzyc-weapp-ylt-main/src/app.tsx | 1 + .../src/pages/index/index.tsx | 4 ++-- .../labor-union-login/labor-union-login.tsx | 2 +- .../src/pages/test/test.tsx | 24 +++++++++++++++++++ .../src/services/labor-union.ts | 17 +++++++++++-- 7 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 MiniProgram/rzyc-weapp-ylt-main/src/pages/test/test.tsx diff --git a/MiniProgram/rzyc-weapp-ylt-main/project.config.json b/MiniProgram/rzyc-weapp-ylt-main/project.config.json index eaebadc..fe13771 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/project.config.json +++ b/MiniProgram/rzyc-weapp-ylt-main/project.config.json @@ -147,8 +147,15 @@ }, { "id": -1, - "name": "pages/llabor-union-login/labor-union-login", - "pathName": "pages/llabor-union-login/labor-union-login", + "name": "pages/labor-union-login/labor-union-login", + "pathName": "pages/labor-union-login/labor-union-login", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "pages/test/test", + "pathName": "pages/test/test", "query": "", "scene": null }, diff --git a/MiniProgram/rzyc-weapp-ylt-main/project.private.config.json b/MiniProgram/rzyc-weapp-ylt-main/project.private.config.json index 155e99b..d5d8b67 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/project.private.config.json +++ b/MiniProgram/rzyc-weapp-ylt-main/project.private.config.json @@ -86,6 +86,12 @@ "query": "", "scene": null }, + { + "name": "pages/test/test", + "pathName": "pages/test/test", + "query": "", + "scene": null + }, { "name": "pages/order-list/order-list", "pathName": "pages/order-list/order-list", diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/app.tsx b/MiniProgram/rzyc-weapp-ylt-main/src/app.tsx index 7fdf522..8a2f9f0 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/src/app.tsx +++ b/MiniProgram/rzyc-weapp-ylt-main/src/app.tsx @@ -110,6 +110,7 @@ class App extends Component { 'pages/enterprise-order/index', 'pages/labor-union/labor-union', 'pages/labor-union-login/labor-union-login', + 'pages/test/test', ], subPackages: [ { diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/pages/index/index.tsx b/MiniProgram/rzyc-weapp-ylt-main/src/pages/index/index.tsx index 38773ce..82e4555 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/src/pages/index/index.tsx +++ b/MiniProgram/rzyc-weapp-ylt-main/src/pages/index/index.tsx @@ -63,7 +63,7 @@ export default function Index() { // const res = await huangHaiTest(); // console.log(res.data[0].columns.dictValue); - Taro.navigateTo({ url: `/pages/labor-union/labor-union?id=333` }); + Taro.navigateTo({ url: `/pages/test/test` }); // Taro.navigateTo({ // url: `/pages/labor-union/labor-union`, @@ -197,7 +197,7 @@ export default function Index() { onScrollToLower={handleScrollToLower}> {currentTabElement} */} - {/* */} + {currentTabElement} { - 已阅读并同意1 + 已阅读并同意 diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/pages/test/test.tsx b/MiniProgram/rzyc-weapp-ylt-main/src/pages/test/test.tsx new file mode 100644 index 0000000..4b649eb --- /dev/null +++ b/MiniProgram/rzyc-weapp-ylt-main/src/pages/test/test.tsx @@ -0,0 +1,24 @@ +import { View, Button } from '@tarojs/components'; + +import { test } from '@/services/labor-union'; + + +export const LaborUnion: Taro.FC = () => { + + const bindMemberHandle = async () => { + + const res = await test( + { xm: '张三', xb: '男', yw_id: 1 } + ); + console.log(res); + }; + return ( + + + + ); +}; + +LaborUnion.config = { + navigationBarTitleText: '工会会员绑定', +}; diff --git a/MiniProgram/rzyc-weapp-ylt-main/src/services/labor-union.ts b/MiniProgram/rzyc-weapp-ylt-main/src/services/labor-union.ts index 1e225a9..a81e855 100644 --- a/MiniProgram/rzyc-weapp-ylt-main/src/services/labor-union.ts +++ b/MiniProgram/rzyc-weapp-ylt-main/src/services/labor-union.ts @@ -15,7 +15,20 @@ export const batchSaasAddCompanyUser = async (params: batchSaasAddCompanyUserReq const res = await RzRequest.postNew( '/stationapi/saas/company/batchSaasAddCompanyUser', params - ); - console.log(res) + ); + return res; +}; + +export type testPostWithAuth = { + xm: string; + xb: string; + yw_id: number; +}; + +export const test = async (params: testPostWithAuth) => { + const res = await RzRequest.postNew( + '/ZhuQue/Ylt/testPostWithAuth', + params + ); return res; }; \ No newline at end of file