diff --git a/packages/conv/creditScore/scoreFamily/detail.vue b/packages/conv/creditScore/scoreFamily/detail.vue
index 4876fb06..b989039f 100644
--- a/packages/conv/creditScore/scoreFamily/detail.vue
+++ b/packages/conv/creditScore/scoreFamily/detail.vue
@@ -26,7 +26,7 @@
@@ -89,7 +89,7 @@ export default {
methods: {
getList() {
this.instance.post('/app/appvillagerintegraldetail/list', null, {
- params: {...this.page, familyId: this.detailInfo.id}
+ params: {...this.page, familyId: this.detailInfo.id, type: this.type}
}).then(res => {
if (res?.data) {
this.tableData = res.data.records
diff --git a/packages/conv/creditScore/scoreSupermarket/orderManagement.vue b/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
index bf43503a..7c51013e 100644
--- a/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
+++ b/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
@@ -198,9 +198,9 @@
详情
-
- 确认兑换
- 取消订单
+
+ 确认兑换
+ 取消订单
diff --git a/packages/conv/creditScore/scoreSysUser/ssuDetail.vue b/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
index 4c66374f..67f9b00c 100644
--- a/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
+++ b/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
@@ -89,7 +89,8 @@ export default {
integral: {required: true, message: "请输入赠送分值,最多保留一位小数", pattern: /^\d*[.\d]\d?$/},
objectType: {required: true, message: "请选择对象"},
userId: {required: true, message: "请选择人员"},
- }
+ },
+ flag: false
}
},
created() {
@@ -121,12 +122,15 @@ export default {
this.detail = res.data
this.tableData = res.data.details?.records || []
this.page.total = res.data.details?.total || 0
+ this.flag = false
}
})
},
handleGiveScore() {
+ if(this.flag) return
this.$refs.DialogForm.validate(v => {
if (v) {
+ this.flag = true
this.instance.post("/admin/user/giveIntegral", null, {
params: {...this.form}
}).then(res => {
@@ -134,7 +138,11 @@ export default {
this.$message.success("提交成功!")
this.dialog = false
this.getDetail()
+ }else{
+ this.flag = false
}
+ }).catch(() => {
+ this.flag = false
})
}
})
diff --git a/packages/grid/AppBuildManage/components/List.vue b/packages/grid/AppBuildManage/components/List.vue
index d3d90f90..42a87865 100644
--- a/packages/grid/AppBuildManage/components/List.vue
+++ b/packages/grid/AppBuildManage/components/List.vue
@@ -316,5 +316,9 @@ export default {
}
}
}
+ ::v-deep .is-current>.el-tree-node__content{
+ width: 100%!important;
+ padding-right: 16px!important;
+ }
}
diff --git a/packages/meta/AppPartyMember/components/neighbourSetting.vue b/packages/meta/AppPartyMember/components/neighbourSetting.vue
index e40a2b72..90740316 100644
--- a/packages/meta/AppPartyMember/components/neighbourSetting.vue
+++ b/packages/meta/AppPartyMember/components/neighbourSetting.vue
@@ -10,7 +10,7 @@
-
@@ -92,7 +92,7 @@ export default {
},
data() {
return {
- search: {name: "", ids: ""},
+ search: {residentName: "", ids: ""},
page: {current: 1, size: 10, total: 0},
tableData: [],
dialog: false,