diff --git a/src/project/pidu/AppPointsChange/AppPointsChange.vue b/src/project/pidu/AppPointsChange/AppPointsChange.vue index 442de186..42bbb1fb 100644 --- a/src/project/pidu/AppPointsChange/AppPointsChange.vue +++ b/src/project/pidu/AppPointsChange/AppPointsChange.vue @@ -4,7 +4,7 @@
★ - 积分余额：428 + 积分余额：{{userIntegral}}
我的订单
@@ -13,35 +13,24 @@
-
最新上架
-
价格⏶⏷
-
可兑换的 - +
最新上架
+
价格⏶⏷
+
可兑换的 +
{{item}}
-
+
- +
-

天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾可湿水天薇抽纸天然无香纸巾可湿水

-

10积分

- +

{{item.merchandiseName}}

+

{{item.merchandiseIntegral}}积分

-
-
-
- -
-
-

天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾可湿水天薇抽纸天然无香纸巾可湿水

-

10积分

- -
- +
@@ -58,29 +47,44 @@ export default { return { current: 1, list: [], - typeList: ['全部', '100分以下', '500分以下', '1000分以下', '5000分以下', '10000分以下'], - typeIndex: 0 + typeList: ['全部', '100分以下', '500分以下', '1000分以下', '5000分以下'], + typeIndex: 0, + search: { + status: '', + newStatus: '', + priceStatus: '1' + }, + userIntegral: '' } }, computed: { ...mapState(['user']), }, onLoad() { - // this.getList() - // uni.$on('reload', () => { - // this.getListInit() - // }) + this.getList() + this.getIntegral() + uni.$on('reloadIntegral', () => { + this.getIntegral() + }) }, onShow() { document.title = '积分兑换' }, methods: { + getIntegral() { + this.$http.post('/app/appintegraluser/appGirdIntegral?current=1&size=1').then((res) => { + if (res.code == 0) { + this.userIntegral = res.data.nowIntegral + } + }) + }, getList() { - this.$http.post('/app/apppartyintegralinfo/list', null, { + this.$http.post('/app/appintegralmerchandise/listByGirdMember', null, { params: { + ...this.search, size: 20, current: this.current, - partyName: this.partyName + queryIntegralType: this.typeIndex }, }) .then((res) => { @@ -97,12 +101,24 @@ export default { typeClick(index) { this.typeIndex = index }, - toDetail() { - uni.navigateTo({url:'./detail'}) + toDetail(item) { + uni.navigateTo({url:`./detail?id=${item.id}&userIntegral=${this.userIntegral}`}) }, toMyOrder() { uni.navigateTo({url:`./myOrder`}) - } + }, + clickStatus() { + this.search.status = this.search.status == 2 ? '' : 2 + this.getListInit() + }, + clickNew() { + this.search.newStatus = this.search.newStatus == 1 ? '' : 1 + this.getListInit() + }, + clickPrice() { + this.search.priceStatus = this.search.priceStatus == 1 ? '' : 1 + this.getListInit() + }, }, onReachBottom() { this.current = this.current + 1 diff --git a/src/project/pidu/AppPointsChange/detail.vue b/src/project/pidu/AppPointsChange/detail.vue index 969a8ab2..922c4d0d 100644 --- a/src/project/pidu/AppPointsChange/detail.vue +++ b/src/project/pidu/AppPointsChange/detail.vue @@ -3,18 +3,16 @@
-
- 天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾可湿水… -
+
{{goodsInfo.merchandiseName}}
-

10积分

-
库存100
+

{{goodsInfo.merchandiseIntegral}}积分

+
库存{{goodsInfo.merchandiseNumber}}
-
积分余额:438
-
立即兑换
- - +
积分余额:{{userIntegral}}
+
立即兑换
+
积分不足
+
缺货
@@ -26,23 +24,35 @@ export default { name: 'detail', data() { return { - list: [ - { image: 'https://cdn.uviewui.com/uview/swiper/1.jpg'}, - { image: 'https://cdn.uviewui.com/uview/swiper/2.jpg'}, - { image: 'https://cdn.uviewui.com/uview/swiper/3.jpg'} - ], + list: [], + userIntegral: '', + id: '', + goodsInfo: {} } }, computed: { ...mapState(['user']), }, + onLoad(option) { + this.userIntegral = option.userIntegral + this.id = option.id + this.getDetail() + }, onShow() { document.title = '商品详情' }, methods: { toOrder() { - uni.navigateTo({url:'./order'}) - } + uni.navigateTo({url:`./order?userIntegral=${this.userIntegral}&id=${this.id}`}) + }, + getDetail() { + this.$http.post(`/app/appintegralmerchandise/queryDetailById?id=${this.id}`).then((res) => { + if (res.code == 0) { + this.goodsInfo = res.data + this.list = [{image: res.data.imageUrl}] + } + }) + }, }, } diff --git a/src/project/pidu/AppPointsChange/order.vue b/src/project/pidu/AppPointsChange/order.vue index 1793a3c5..861a53a3 100644 --- a/src/project/pidu/AppPointsChange/order.vue +++ b/src/project/pidu/AppPointsChange/order.vue @@ -2,14 +2,14 @@
- +
-

天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾天薇抽纸可湿水面巾纸1天薇抽纸天

+

{{goodsInfo.merchandiseName}}

-

10积分

+

{{goodsInfo.merchandiseIntegral}}积分

- +
@@ -22,11 +22,11 @@
积分余额
-
484
+
{{userIntegral}}
支付积分
-
-10
+
-{{number*goodsInfo.merchandiseIntegral}}
提交订单
@@ -41,20 +41,38 @@ export default { name: 'order', data() { return { - value: 1, - remark: '' + number: 1, + remark: '', + userIntegral: '', + id: '', + goodsInfo: {}, + max: 1 } }, computed: { ...mapState(['user']), }, + onLoad(option) { + this.userIntegral = option.userIntegral + this.id = option.id + this.getDetail() + }, onShow() { document.title = '提交订单' }, methods: { valChange(e) { - console.log('当前值为: ' + e.value) - } + this.number = e.value + + }, + getDetail() { + this.$http.post(`/app/appintegralmerchandise/queryDetailById?id=${this.id}`).then((res) => { + if (res.code == 0) { + this.goodsInfo = res.data + this.max = parseInt(this.userIntegral/this.goodsInfo.merchandiseIntegral) + } + }) + }, }, } diff --git a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue index 3977d6de..a3f0587f 100644 --- a/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue +++ b/src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue @@ -169,7 +169,7 @@ export default { }, getList() { var startDate = this.dateList?.length ? this.dateList[0] + ' 00:00:00' : '' - var endDate = this.dateList?.length ? this.dateList[1] + ' 00:00:00' : '' + var endDate = this.dateList?.length ? this.dateList[1] + ' 23:59:59' : '' this.$http.post('/app/appepidemicpreventioncommunitymanagement/list', null, { params: { size: 10, diff --git a/src/project/pingchang/AppCommunityManagement/Edit.vue b/src/project/pingchang/AppCommunityManagement/Edit.vue index 431525f1..d6bf1917 100644 --- a/src/project/pingchang/AppCommunityManagement/Edit.vue +++ b/src/project/pingchang/AppCommunityManagement/Edit.vue @@ -9,7 +9,7 @@ *身份证号
- +
@@ -49,7 +49,7 @@
{{ form.startAreaName }} - 请选择 + 请选择
@@ -103,7 +103,7 @@
{{ form.arriveAreaName }} - 请选择 + 请选择
diff --git a/src/project/pingchang/AppCommunityManagement/HandleDetail.vue b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue index 781d6baa..9107da51 100644 --- a/src/project/pingchang/AppCommunityManagement/HandleDetail.vue +++ b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue @@ -18,7 +18,7 @@
身份证号
- + {{info.idNumberText}}
diff --git a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue index cfd51e28..1af83b34 100644 --- a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue +++ b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue @@ -26,7 +26,7 @@
身份证号
- + {{info.idNumberText}}
@@ -158,7 +158,7 @@ *身份证号
- +
@@ -172,7 +172,7 @@
- *隔离时间 + *管理时间
请选择 @@ -182,7 +182,7 @@
- *隔离策略 + *管理策略
{{ $dict.getLabel('EP_quarantineStrategy', form.quarantineStrategy) || '请选择'}} @@ -340,14 +340,25 @@ export default { this.getDetail() }, submit(status) { + if (!this.form.idNumber) { + return this.$u.toast('请输入身份证号') + } + let reg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/; + + if (this.form.idNumber.length == 18 && !reg.test(this.form.idNumber)) { + return this.$u.toast('请输入正确的身份证账号') + } + if (this.form.idNumber.length == 18 && !reg.test(this.form.idNumber)) { + return this.$u.toast('请输入正确的身份证账号') + } if(this.form.homeStatus === '') { return this.$u.toast('请选择居家状态') } if(!this.form.quarantineBeginTime) { - return this.$u.toast('请选择隔离时间') + return this.$u.toast('请选择管理时间') } if(this.form.quarantineStrategy === '' || this.form.quarantineStrategy === null) { - return this.$u.toast('请选择隔离策略') + return this.$u.toast('请选择管理策略') } if(!this.form.controllerUserName) { return this.$u.toast('请输入管控人姓名') diff --git a/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue b/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue index 968d4c81..80648022 100644 --- a/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue +++ b/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue @@ -4,11 +4,11 @@

{{totalInfo['登记人数']}}

-

返乡人员

+

报备人员

{{totalInfo['今日新增返乡']}}

-

今日返乡

+

今日报备

{{totalInfo['今日风险人数']}}

@@ -20,7 +20,7 @@
-
返乡人员
+
报备人员
风险人员
@@ -82,9 +82,9 @@ export default { showGateSelect: false, gateList: [], statusImgList: [ - require('./components/img/status0.png'), - require('./components/img/status1.png'), - require('./components/img/status2.png'), + require('./components/img/status0.png'), + require('./components/img/status1.png'), + require('./components/img/status2.png'), ], options: [ { @@ -393,7 +393,7 @@ export default { } } } - .gateway-name { + .gateway-name { max-width: calc(100% - 48px); word-break: break-all; overflow: hidden;