From a767d905c384b577cc76d25dd3f6040df77eba9a Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 21 Mar 2024 19:57:47 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app
---
subPackage/workbench/views/examine.vue | 27 ++++++-------
pages/circle/publish.vue | 69 +++++++++++++++++++---------------
2 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/pages/circle/publish.vue b/pages/circle/publish.vue
index 5c41f62..53b1a56 100644
--- a/pages/circle/publish.vue
+++ b/pages/circle/publish.vue
@@ -22,7 +22,9 @@
<script>
import uploadMixin from "@/mixin/uploadMixinPicCheck";
- import { handlePublish } from "@/api/circle/circle.js"
+ import {
+ handlePublish
+ } from "@/api/circle/circle.js"
export default {
mixins: [uploadMixin],
data() {
@@ -30,50 +32,55 @@
form: {
images: []
},
- content:"",
- roleType:0
+ content: "",
+ roleType: 0
}
},
-
- onLoad(){
- let role = uni.getStorageSync('activeRole')
- if(role.roleAlias == "inhabitant"){
+
+ onLoad() {
+ let role = uni.getStorageSync('activeRole')
+ if (role.roleAlias == "inhabitant") {
this.roleType = 0
- }else {
+ } else {
this.roleType = 1;
}
},
-
+
methods: {
-
- getImagesUrl(){
- if(this.form.images.length){
+
+ getImagesUrl() {
+ if (this.form.images.length) {
let arr = [];
- for(let i of this.form.images){
+ for (let i of this.form.images) {
arr.push(i.name)
}
return arr.join(",")
- }else {
+ } else {
return ""
- }
+ }
},
-
+
submitInfo() {
- handlePublish({
- circleText:this.content,
- circleImages:this.getImagesUrl(),
- circleType:this.roleType
- }).then(res=>{
- if(res.code == 200){
- uni.showToast({
- title:res.msg
- })
- setTimeout(()=>{
- uni.navigateBack();
- uni.$emit("refreshList")
- },1000)
- }
- })
+ let param = {
+ circleText: this.content,
+ circleImages: this.getImagesUrl(),
+ circleType: this.roleType,
+ }
+ let role = uni.getStorageSync('activeRole')
+ if (role.roleAlias == "inhabitant") {
+ param.houseCode = uni.getStorageSync("siteInfo").houseCode
+ }
+ handlePublish(param).then(res => {
+ if (res.code == 200) {
+ uni.showToast({
+ title: res.msg
+ })
+ setTimeout(() => {
+ uni.navigateBack();
+ uni.$emit("refreshList")
+ }, 1000)
+ }
+ })
}
}
}
diff --git a/subPackage/workbench/views/examine.vue b/subPackage/workbench/views/examine.vue
index fab411e..01c916a 100644
--- a/subPackage/workbench/views/examine.vue
+++ b/subPackage/workbench/views/examine.vue
@@ -45,18 +45,6 @@
<text>{{ item.name || '未完善' }}</text>
</view>
<view class="content">
- <text>电话号码</text>
- <text>{{ item.telephone || '未完善' }}</text>
- </view>
- <view class="content">
- <text>微信号</text>
- <text>{{ item.wxAccount || '未完善' }}</text>
- </view>
- <view class="content">
- <text>身份证号</text>
- <text>{{ item.idCard || '未完善' }}</text>
- </view>
- <view class="content">
<text>性别</text>
<text>{{ item.gender || '未完善' }}</text>
</view>
@@ -66,17 +54,26 @@
</view>
<view class="content">
- <text>岗位</text>
- <text>{{ item.jobNature || '未完善' }}</text>
+ <text>身份证号</text>
+ <text>{{ item.idCard || '未完善' }}</text>
+ </view>
+ <view class="content">
+ <text>电话号码</text>
+ <text>{{ item.telephone || '未完善' }}</text>
</view>
<view class="content">
<text>现居住地</text>
<text>{{ item.tempAddress || '未完善' }}</text>
</view>
<view class="content">
+ <text>岗位</text>
+ <text>{{ item.jobNature || '未完善' }}</text>
+ </view>
+
+ <!-- <view class="content">
<text>户籍地址</text>
<text>{{ item.registeredAddress || '未完善' }}</text>
- </view>
+ </view> -->
<!-- <view class="content">
<text>入职时间</text>
--
Gitblit v1.9.3