From eb5338a53a0495a2e6f99547ae42769c8c5819a5 Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 28 Nov 2022 11:39:09 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=B9=B3=E6=98=8C=E6=96=B0=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pingchang/AppCommunityManagement/Edit.vue | 2 +- .../AppCommunityManagement/HandleDetail.vue | 2 +- .../AppCommunityManagement/ManageDetail.vue | 10 +++++----- .../AppReturnHomeReporting.vue | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/project/pingchang/AppCommunityManagement/Edit.vue b/src/project/pingchang/AppCommunityManagement/Edit.vue index 431525f1..a98ec025 100644 --- a/src/project/pingchang/AppCommunityManagement/Edit.vue +++ b/src/project/pingchang/AppCommunityManagement/Edit.vue @@ -9,7 +9,7 @@ *身份证号
- +
diff --git a/src/project/pingchang/AppCommunityManagement/HandleDetail.vue b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue index 781d6baa..7b38e6af 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..541b4ede 100644 --- a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue +++ b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue @@ -158,7 +158,7 @@ *身份证号
- +
@@ -172,7 +172,7 @@
- *隔离时间 + *管理时间
请选择 @@ -182,7 +182,7 @@
- *隔离策略 + *管理策略
{{ $dict.getLabel('EP_quarantineStrategy', form.quarantineStrategy) || '请选择'}} @@ -344,10 +344,10 @@ export default { 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; From 7ce7c22e40f672061856b085e6ac5f2434072874 Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 28 Nov 2022 15:14:57 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pingchang/AppCommunityManagement/AppCommunityManagement.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 3ed008b69165869410686af0dca376916f023ec9 Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 28 Nov 2022 15:22:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/pingchang/AppCommunityManagement/Edit.vue | 2 +- src/project/pingchang/AppCommunityManagement/HandleDetail.vue | 2 +- src/project/pingchang/AppCommunityManagement/ManageDetail.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/project/pingchang/AppCommunityManagement/Edit.vue b/src/project/pingchang/AppCommunityManagement/Edit.vue index a98ec025..7f00269b 100644 --- a/src/project/pingchang/AppCommunityManagement/Edit.vue +++ b/src/project/pingchang/AppCommunityManagement/Edit.vue @@ -9,7 +9,7 @@ *身份证号
- +
diff --git a/src/project/pingchang/AppCommunityManagement/HandleDetail.vue b/src/project/pingchang/AppCommunityManagement/HandleDetail.vue index 7b38e6af..41d8586f 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 541b4ede..5a5c55e2 100644 --- a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue +++ b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue @@ -26,7 +26,7 @@
身份证号
- + {{info.idNumberText}}
From f98388113f2e497cf490d4aefebc5048883ccb02 Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 28 Nov 2022 16:07:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pidu/AppPointsChange/AppPointsChange.vue | 66 +++++++++++-------- .../pingchang/AppCommunityManagement/Edit.vue | 6 +- .../AppCommunityManagement/HandleDetail.vue | 2 +- .../AppCommunityManagement/ManageDetail.vue | 2 +- 4 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/project/pidu/AppPointsChange/AppPointsChange.vue b/src/project/pidu/AppPointsChange/AppPointsChange.vue index 442de186..20510461 100644 --- a/src/project/pidu/AppPointsChange/AppPointsChange.vue +++ b/src/project/pidu/AppPointsChange/AppPointsChange.vue @@ -13,35 +13,24 @@
-
最新上架
-
价格⏶⏷
-
可兑换的 - +
最新上架
+
价格⏶⏷
+
可兑换的 +
{{item}}
-
+
- +
-

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

-

10积分

- +

{{item.merchandiseName}}

+

{{item.merchandiseIntegral}}积分

-
-
-
- -
-
-

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

-

10积分

- -
- +
@@ -58,29 +47,36 @@ 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' + } + } }, computed: { ...mapState(['user']), }, onLoad() { - // this.getList() - // uni.$on('reload', () => { - // this.getListInit() - // }) + this.getList() + uni.$on('reload', () => { + this.getListInit() + }) }, onShow() { document.title = '积分兑换' }, methods: { 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) => { @@ -102,7 +98,19 @@ export default { }, 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/pingchang/AppCommunityManagement/Edit.vue b/src/project/pingchang/AppCommunityManagement/Edit.vue index 7f00269b..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 41d8586f..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 5a5c55e2..7ba42111 100644 --- a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue +++ b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue @@ -158,7 +158,7 @@ *身份证号
- +
From 9b072dba5dda1d6114331350061edbcc12ae82de Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 28 Nov 2022 16:29:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pidu/AppPointsChange/AppPointsChange.vue | 24 +++++++---- src/project/pidu/AppPointsChange/detail.vue | 42 ++++++++++++------- src/project/pidu/AppPointsChange/order.vue | 38 ++++++++++++----- 3 files changed, 70 insertions(+), 34 deletions(-) diff --git a/src/project/pidu/AppPointsChange/AppPointsChange.vue b/src/project/pidu/AppPointsChange/AppPointsChange.vue index 20510461..42bbb1fb 100644 --- a/src/project/pidu/AppPointsChange/AppPointsChange.vue +++ b/src/project/pidu/AppPointsChange/AppPointsChange.vue @@ -4,7 +4,7 @@
★ - 积分余额：428 + 积分余额：{{userIntegral}}
我的订单
@@ -22,7 +22,7 @@
{{item}}
-
+
@@ -53,8 +53,8 @@ export default { status: '', newStatus: '', priceStatus: '1' - } - + }, + userIntegral: '' } }, computed: { @@ -62,14 +62,22 @@ export default { }, onLoad() { this.getList() - uni.$on('reload', () => { - this.getListInit() + 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/appintegralmerchandise/listByGirdMember', null, { params: { @@ -93,8 +101,8 @@ 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`}) 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) + } + }) + }, }, } From 1dc7f57df414f14bedbd856107dc337630a35124 Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 28 Nov 2022 16:57:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/pingchang/AppCommunityManagement/ManageDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue index 7ba42111..6a3cf58f 100644 --- a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue +++ b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue @@ -158,7 +158,7 @@ *身份证号
- +
From 0459c6e5682b8475786ba05a80f9b17b29002f78 Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 28 Nov 2022 17:13:03 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pingchang/AppCommunityManagement/ManageDetail.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue index 6a3cf58f..1af83b34 100644 --- a/src/project/pingchang/AppCommunityManagement/ManageDetail.vue +++ b/src/project/pingchang/AppCommunityManagement/ManageDetail.vue @@ -340,6 +340,17 @@ 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('请选择居家状态') }