diff --git a/src/project/fengdu/AppMine/userInfo.vue b/src/project/fengdu/AppMine/userInfo.vue
index ad6c857..8fcf13c 100644
--- a/src/project/fengdu/AppMine/userInfo.vue
+++ b/src/project/fengdu/AppMine/userInfo.vue
@@ -48,18 +48,15 @@
-
所属地区
-
-
{{ user.areaName || '' }}
+
所属网格
+
+
{{ user.girdName || '' }}
-
-
- {{ userAreaName }}
- 请选择
-
-
-
+
+
+
+
{{ btnText? '提交': '修改' }}
@@ -90,14 +87,14 @@ export default {
editPhone: false,
editRealName: false,
editIdNumber: false,
- editArea: false,
+ editGird: false,
avatar: '',
userName: '',
userPhone: '',
userRealName: '',
userIdNumber: '',
- userAreaId: '',
- userAreaName: '',
+ userGirdId: '',
+ userGirdName: '',
btnText: false,
isFromTabbar: '',
path: '',
@@ -117,9 +114,9 @@ export default {
this.userRealName = this.user.realName
this.editIdNumber = true;
this.userIdNumber = this.user.idNumber
- this.editArea = true;
- this.userAreaId = this.user.areaId
- this.userAreaName = this.user.areaName
+ this.editGird = true
+ this.userGirdId = this.user.girdId
+ this.userGirdName = this.user.girdName
},
submit() {
if(this.flag) return
@@ -141,12 +138,15 @@ export default {
if (!this.$idCardNoUtil.checkIdCardNo(this.userIdNumber)) {
return this.$u.toast('请输入正确的身份证号码')
}
- if (!this.userAreaId) {
- return this.$u.toast('请选择所属地区')
- }
- if (!/[^0]0{0,2}$/.test(this.userAreaId)) {
- return this.$u.toast('所属地区必须选到村级')
+ if (!this.userGirdId) {
+ return this.$u.toast('请选择所属网格')
}
+ // if (!this.userAreaId) {
+ // return this.$u.toast('请选择所属地区')
+ // }
+ // if (!/[^0]0{0,2}$/.test(this.userAreaId)) {
+ // return this.$u.toast('所属地区必须选到村级')
+ // }
this.flag = true
this.$instance.post(`/app/appwechatuserqujing/idNumberAttestation`, {
avatarUrl: this.avatar,
@@ -154,8 +154,8 @@ export default {
phone: this.userPhone,
name: this.userRealName,
idNumber: this.userIdNumber,
- areaId: this.userAreaId,
- areaName: this.userAreaName
+ girdId: this.userGirdId,
+ girdName: this.userGirdName
}).then(res=> {
if(res?.code==0) {
this.$u.toast('提交成功')
@@ -198,6 +198,10 @@ export default {
if(avatarUrl?.length) {
this.upLoad(avatarUrl)
}
+ },
+ handleSelectGrid(v) {
+ this.userGirdName = v.girdName
+ this.userGirdId = v.id
}
}
}
diff --git a/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue b/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue
index 5d9eb59..744f245 100644
--- a/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue
+++ b/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue
@@ -102,7 +102,7 @@ export default {
},
getList() {
- this.$instance.post(`/app/appintegralsupermarketgoods/list`).then(res => {
+ this.$instance.post(`/app/appintegralsupermarketshop/goodsListXCX`).then(res => {
if (res.code === 0) {
this.flowList = res.data.records
if(res.data && res.data.records.length) {