diff --git a/property-uniapp-project/pageSubPack/api/apiSub.js b/property-uniapp-project/pageSubPack/api/apiSub.js index 7aca36b..29744e7 100644 --- a/property-uniapp-project/pageSubPack/api/apiSub.js +++ b/property-uniapp-project/pageSubPack/api/apiSub.js @@ -284,4 +284,26 @@ export const getRevenueList = (data) =>{ // 详情 export const revenueDetails = (data) =>{ return get(`/api/resident/revenueNotice/${data.id}`) +} + +// =======积分相关========= +// 获取积分余额 +export const getPointsBalance = (data) => { + return get('/api/resident/points/balance', data) +} +// 获取积分商城商品列表 +export const getPointsMallList = (data) => { + return get('/api/resident/points/mall/list', data) +} +// 积分兑换 +export const postPointsExchange = (data) => { + return post('/api/resident/points/mall/exchange', data) +} +// 获取积分明细列表 +export const getPointsRecordList = (data) => { + return get('/api/resident/points/record/list', data) +} +// 获取积分兑换订单列表 +export const getPointsOrderList = (data) => { + return get('/api/resident/points/order/list', data) } \ No newline at end of file diff --git a/property-uniapp-project/pageSubPack/my/myPointsIndex.vue b/property-uniapp-project/pageSubPack/my/myPointsIndex.vue new file mode 100644 index 0000000..0f36480 --- /dev/null +++ b/property-uniapp-project/pageSubPack/my/myPointsIndex.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/property-uniapp-project/pageSubPack/my/myPointsMall.vue b/property-uniapp-project/pageSubPack/my/myPointsMall.vue new file mode 100644 index 0000000..1f4dc4f --- /dev/null +++ b/property-uniapp-project/pageSubPack/my/myPointsMall.vue @@ -0,0 +1,232 @@ + + + + + + + diff --git a/property-uniapp-project/pageSubPack/my/myPointsOrder.vue b/property-uniapp-project/pageSubPack/my/myPointsOrder.vue new file mode 100644 index 0000000..ca71fa3 --- /dev/null +++ b/property-uniapp-project/pageSubPack/my/myPointsOrder.vue @@ -0,0 +1,229 @@ + + + + + + + diff --git a/property-uniapp-project/pageSubPack/my/myPointsRecord.vue b/property-uniapp-project/pageSubPack/my/myPointsRecord.vue new file mode 100644 index 0000000..e90730c --- /dev/null +++ b/property-uniapp-project/pageSubPack/my/myPointsRecord.vue @@ -0,0 +1,190 @@ + + + + + + + diff --git a/property-uniapp-project/pageSubPack/service-list/complaintsDetail.vue b/property-uniapp-project/pageSubPack/service-list/complaintsDetail.vue index 8f91712..10c0589 100644 --- a/property-uniapp-project/pageSubPack/service-list/complaintsDetail.vue +++ b/property-uniapp-project/pageSubPack/service-list/complaintsDetail.vue @@ -72,8 +72,8 @@ const photoList = ref([]) // 状态映射 const statusMap = { '0': { text: '待处理', class: 'pending' }, - '1': { text: '处理中', class: 'processing' }, - '2': { text: '已完成', class: 'completed' } + // '1': { text: '处理中', class: 'processing' }, + '1': { text: '已完成', class: 'completed' } } const statusText = computed(() => { diff --git a/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue b/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue index d069cfd..a2be6d2 100644 --- a/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue +++ b/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue @@ -1,9 +1,11 @@ diff --git a/property-uniapp-project/pages.json b/property-uniapp-project/pages.json index a3a9091..bcbe6ab 100644 --- a/property-uniapp-project/pages.json +++ b/property-uniapp-project/pages.json @@ -225,6 +225,31 @@ "navigationStyle": "custom" } }, + { + "path": "myPointsIndex", + "style": { + "navigationBarTitleText": "我的积分", + "navigationStyle": "custom" + } + }, + { + "path": "myPointsMall", + "style": { + "navigationBarTitleText": "积分商城" + } + }, + { + "path": "myPointsRecord", + "style": { + "navigationBarTitleText": "积分明细" + } + }, + { + "path": "myPointsOrder", + "style": { + "navigationBarTitleText": "积分订单" + } + }, { "path": "myHouseIndex", "style": { diff --git a/property-uniapp-project/pages/myIndex/myIndex.vue b/property-uniapp-project/pages/myIndex/myIndex.vue index 2c906c5..f5b5d2a 100644 --- a/property-uniapp-project/pages/myIndex/myIndex.vue +++ b/property-uniapp-project/pages/myIndex/myIndex.vue @@ -3,7 +3,7 @@ - + {{loginName}} @@ -25,7 +25,7 @@ style="align-self: flex-end;font-size: 24rpx;vertical-align: baseline;">{{ item.desc }} - + @@ -51,25 +51,26 @@ import { requireLogin } from '@/common/checkLogin.js' - const list = ref([{ - icon:'https://wuyeadmin.bugtc.com/images/propertyImgs/house.png', + const list = ref([ + { + icon:'https://wuye.ckdzkj.com/images/propertyImgs/points.png', + title: "我的积分", + desc:'999' + }, + { + icon:'https://wuye.ckdzkj.com/images/propertyImgs/house.png', title: "我的房屋" }, - // { - // icon: "https://wuyeadmin.bugtc.com/images/propertyImgs/user.png", - // title: "住户管理", - // // desc: "您可以在这里添加家人、朋友、租客~" - // }, { - icon: "https://wuyeadmin.bugtc.com/images/propertyImgs/parking.png", + icon: "https://wuye.ckdzkj.com/images/propertyImgs/parking.png", title: "我的车位" }, { - icon: "https://wuyeadmin.bugtc.com/images/propertyImgs/car.png", + icon: "https://wuye.ckdzkj.com/images/propertyImgs/car.png", title: "我的车辆" }, { - icon: "https://wuyeadmin.bugtc.com/images/propertyImgs/setting.png", + icon: "https://wuye.ckdzkj.com/images/propertyImgs/setting.png", title: "设置" } ]) @@ -101,7 +102,7 @@ if (!requireLogin()) return const cachedVillageId = uni.getStorageSync('currentVillageId') // 设置和我的房屋不需要绑定小区(我的房屋用于首次绑定) - if (item.title !== '设置' && item.title !== '我的房屋') { + if (item.title !== '设置' && item.title !== '我的房屋' && item.title !== '我的积分') { if (!cachedVillageId || cachedVillageId === '0' || cachedVillageId === 0) { uni.showToast({ title: '未绑定小区,没有权限', icon: 'none', duration: 2000 }) return @@ -129,7 +130,11 @@ url: '/pageSubPack/my/myCarIndex', }); - } else if (item.title == '设置') { + } else if (item.title == '我的积分') { + uni.navigateTo({ + url: '/pageSubPack/my/myPointsIndex' + }); + } else if (item.title == '设置') { goSetting() } }