diff --git a/collect_information/.gitignore b/collect_information/.gitignore
index 4abd8e3..e83724e 100644
--- a/collect_information/.gitignore
+++ b/collect_information/.gitignore
@@ -8,4 +8,5 @@ node_modules/
yarn.lock
components.d.ts
package-lock.json
+.idea
diff --git a/collect_information/package.json b/collect_information/package.json
index b1af349..f7d1452 100644
--- a/collect_information/package.json
+++ b/collect_information/package.json
@@ -2,7 +2,7 @@
"name": "collect_information",
"version": "1.0.0",
"private": true,
- "description": "智慧派出所信息采集小程序",
+ "description": "警保联勤联动小程序",
"templateInfo": {
"name": "default",
"typescript": true,
@@ -71,6 +71,7 @@
"@tarojs/webpack5-runner": "3.6.25",
"@types/jest": "^29.3.1",
"@types/node": "^18.15.11",
+ "@types/qrcode": "^1.5.5",
"@types/webpack-env": "^1.13.6",
"@typescript-eslint/eslint-plugin": "^6.2.0",
"@typescript-eslint/parser": "^6.2.0",
diff --git a/collect_information/project.config.json b/collect_information/project.config.json
index 4850484..4959a1d 100644
--- a/collect_information/project.config.json
+++ b/collect_information/project.config.json
@@ -1,7 +1,7 @@
{
"miniprogramRoot": "dist/",
"projectname": "collect_information",
- "description": "智慧派出所信息采集小程序",
+ "description": "警保联勤联动小程序",
"setting": {
"urlCheck": false,
"es6": false,
@@ -29,4 +29,4 @@
"tabSize": 2
},
"appid": "wx8902ddbfddb820d1"
-}
\ No newline at end of file
+}
diff --git a/collect_information/src/app.config.ts b/collect_information/src/app.config.ts
index 32cd338..c2b33bf 100644
--- a/collect_information/src/app.config.ts
+++ b/collect_information/src/app.config.ts
@@ -19,7 +19,6 @@ export default defineAppConfig({
pages: [
'pages/policeManager/index',
'pages/policeDetails/index',
-
'pages/myProject/myProject',
'pages/projectDetails/projectDetails',
'pages/form/form'
diff --git a/collect_information/src/app.ts b/collect_information/src/app.ts
index 150d716..95a2ac5 100644
--- a/collect_information/src/app.ts
+++ b/collect_information/src/app.ts
@@ -10,25 +10,25 @@ const pinia = createPinia()
// pinia.use(piniaPluginPersistedstate)
const App = createApp({
onShow(options) {
- try {
- const store = useCounterStore()
- const token = Taro.getStorageSync('token')
- console.log(token)
- if (token) {
- Taro.switchTab({
- url: '/pages/mine/mine'
- // url: '/pages/projectManager/index/index'
-
- })
- store.setSelected(2)
- } else {
- console.log(2222)
- }
- console.log('App onShow.')
- } catch (err) {
- console.log(err)
-
- }
+ // try {
+ // const store = useCounterStore()
+ // const token = Taro.getStorageSync('token')
+ // console.log(token)
+ // if (token) {
+ // Taro.switchTab({
+ // url: '/pages/mine/mine'
+ // // url: '/pages/projectManager/index/index'
+ //
+ // })
+ // store.setSelected(2)
+ // } else {
+ // console.log(2222)
+ // }
+ // console.log('App onShow.')
+ // } catch (err) {
+ // console.log(err)
+ //
+ // }
},
// 入口组件不需要实现 render 方法,即使实现了也会被 taro 所覆盖
diff --git a/collect_information/src/components/form/PersonnelInformationEntryForm.vue b/collect_information/src/components/form/PersonnelInformationEntryForm.vue
deleted file mode 100644
index c283038..0000000
--- a/collect_information/src/components/form/PersonnelInformationEntryForm.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-
-
-
-
-
- {{ streetCommunitySmallCommunityLabel || "请选择街道/小区" }}
-
-
-
-
- {{ buildingFloorHouseLabel || "请选择楼栋/门户" }}
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
- {{
- dayjs(formParams.dataOfBirth).format("YYYY-MM-DD") ||
- "请选择出生日期"
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/collect_information/src/request/index.ts b/collect_information/src/request/index.ts
index a7227d0..0947285 100644
--- a/collect_information/src/request/index.ts
+++ b/collect_information/src/request/index.ts
@@ -8,7 +8,7 @@ const requestInterceptor = (chain: Taro.Chain) => {
if (token) {
requestParams.header = {
...requestParams.header,
- token:token.value
+ token: token.value
}
}
return chain.proceed(requestParams)
@@ -30,7 +30,6 @@ class CustomRequest {
}).then()
}
- console.log(params,method)
Taro.request, object>({
url: this.BASE_API + url,
data: params,
@@ -62,7 +61,7 @@ class CustomRequest {
duration: 2000
}).then()
reject(res.errMsg);
- console.log(res.errMsg,'000')
+ console.log(res.errMsg, '000')
}
})
})
diff --git a/collect_information/src/subPages/pages/form/form.vue b/collect_information/src/subPages/pages/form/form.vue
index ccb86ec..04281ae 100644
--- a/collect_information/src/subPages/pages/form/form.vue
+++ b/collect_information/src/subPages/pages/form/form.vue
@@ -1,90 +1,78 @@
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提交
- 重置提示状态
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{
+ dayjs(formData.dateOfBirth).isValid() ? dayjs(formData.dateOfBirth).format('YYYY-MM-DD') : '请选择出生年月'
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 重置表单
+
+
+
+
+