diff --git a/src/common/axios.js b/src/common/axios.js index 8ccaf91b..da0ae36f 100644 --- a/src/common/axios.js +++ b/src/common/axios.js @@ -35,7 +35,7 @@ instance.interceptors.response.use(res => { return res.data } else if (res.config.alwaysReturn) { return res.data - } else if (res.data.code == 0) { + } else if (res.data.code == 200) { return res.data } else if (res.data.code === 1) { uni.showToast({ diff --git a/src/components/AiUploader.vue b/src/components/AiUploader.vue index 544a35c3..6c200745 100644 --- a/src/components/AiUploader.vue +++ b/src/components/AiUploader.vue @@ -57,7 +57,15 @@ export default { preview: Boolean, size: {default: 10 * 1024 * 1024}, disabled: Boolean, - sourceType: {default: () => ['album', 'camera']} + sourceType: {default: () => ['album', 'camera']}, + withoutToken: { + type: Boolean, + default: false, + }, + imgUrlHttp: { + type: String, + default: '', + }, }, computed: { ...mapState(['token']), @@ -140,6 +148,7 @@ export default { } else { this.$http.post(this.api, formData, { params: {type: this.type}, + withoutToken: this.withoutToken }).then((res) => { if (res?.data) { this.$emit('data', res.data) @@ -162,6 +171,8 @@ export default { this.fileList.push(res.data) } else if (this.api == '/admin/file/add-portrait') { this.fileList.push({url: res.data?.split(";")?.[0], id: res.data?.split(";")?.[1]}) + }else if (this.api == '/common/upload') { //图片url回显需先拼接imgUrlHttp + this.fileList.push({url: this.imgUrlHttp + res.data.fileName, fileName: res.data.originalFilename, filePath: this.imgUrlHttp + res.data.fileName}) } this.$emit("update:def", this.fileList) this.$emit("list", this.fileList) diff --git a/src/manifest.json b/src/manifest.json index 5e9463ef..aee53b67 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -29,7 +29,7 @@ "open": true, "proxy": { "/lan": { - "target": "http://192.168.1.87:9000", + "target": "http://8.148.23.227:8080", "changeOrigin": true, "pathRewrite": { "^/lan": "/" diff --git a/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue b/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue index 3ccbe04b..3018b403 100644 --- a/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue +++ b/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue @@ -14,10 +14,10 @@ - @@ -126,7 +123,7 @@
办理人
- +
@@ -135,7 +132,7 @@
办理人联系电话
- +
@@ -144,21 +141,24 @@
办理机构
- +
+ + + @@ -93,6 +217,22 @@ uni-page-body { font-size: 28px; color: #222; border-bottom: 1px solid #E4E5E6; + .img-list { + img { + width: 200px; + height: 200px; + margin-right: 16px; + margin-bottom: 16px; + } + img:nth-child(3n) { + margin-right: 0; + } + } + p { + color: #999; + line-height: 44px; + padding: 8px 0; + } } } } diff --git a/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue b/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue index d729b178..4d8aec03 100644 --- a/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue +++ b/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue @@ -6,24 +6,23 @@
{{navName == '个人助养' ? '助养人名称' : '助养方名称'}}
- +
-
+
@@ -34,7 +33,8 @@ export default { appName: "查询个人助养", data() { return { - value: '', + assistanceName: '', + assistanceIdNumber: '', navName: '' } }, @@ -50,7 +50,17 @@ export default { }, methods: { toList() { - uni.navigateTo({url: './AppRecognizeSearchList'}) + if(!this.assistanceName) { + return this.$u.toast(this.navName == '个人助养' ? '请输入助养人名称' : '请输入助养方名称') + } + // if(this.navName == '个人助养' && !this.assistanceIdNumber) { + // return this.$u.toast('请输入助养人身份证号') + // } + var assistanceMethod = this.navName == '个人助养' ? 2 : 1 + uni.navigateTo({url: `./AppRecognizeSearchList?assistanceName=${this.assistanceName}&assistanceMethod=${assistanceMethod}`}) + }, + back() { + uni.navigateBack() } }, } diff --git a/src/project/hljjm/AppRecognize/AppRecognizeSearchList.vue b/src/project/hljjm/AppRecognize/AppRecognizeSearchList.vue index 7068f177..8d3f01be 100644 --- a/src/project/hljjm/AppRecognize/AppRecognizeSearchList.vue +++ b/src/project/hljjm/AppRecognize/AppRecognizeSearchList.vue @@ -1,24 +1,14 @@ diff --git a/src/project/hljjm/AppSecurityObject/AppSecurityObject.vue b/src/project/hljjm/AppSecurityObject/AppSecurityObject.vue new file mode 100644 index 00000000..e69de29b