From 7f922eb1e96e21e72fccc651167348021af039d2 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Mon, 13 Nov 2023 08:53:22 +0800
Subject: [PATCH] fix:小程序详情修改
---
pages/actionChange/workOrderDetails/index.vue | 12 +++++++++---
pages/actionChange/agencyPage/index.vue | 10 ++++++++++
pages/actionChange/newPage/index.vue | 6 +++---
pages/index/index.vue | 4 ++--
4 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/pages/actionChange/agencyPage/index.vue b/pages/actionChange/agencyPage/index.vue
index cb67a5d..e5b728e 100644
--- a/pages/actionChange/agencyPage/index.vue
+++ b/pages/actionChange/agencyPage/index.vue
@@ -206,6 +206,7 @@
onReachBottom() {
//������������������������������������������
if (this.isLoading) {
+ console.log('1122111')
this.status = 'loading'
//������������������,���������++
this.page.currentPage = ++this.page.currentPage
@@ -294,6 +295,14 @@
}
this.getWorkOrder()
},
+ setData() {
+ this.workOderList = []
+ this.page = {
+ currentPage: 1,
+ pageSize: 10
+ }
+ this.getContaminateList()
+ },
// ������������������list
getUnitList() {
this.$http.httpGet('/allocation/unit').then(res => {
@@ -352,6 +361,7 @@
data.allocationId = e.allocationId
data.state = e.state
data.allocationNum = e.allocationNum
+ data.current = this.current
let myData = JSON.stringify(data)
uni.navigateTo({
url: '/pages/actionChange/workOrderDetails/index?infor=' + myData + '&type=jump',
diff --git a/pages/actionChange/newPage/index.vue b/pages/actionChange/newPage/index.vue
index 897b1bc..9fcdd37 100644
--- a/pages/actionChange/newPage/index.vue
+++ b/pages/actionChange/newPage/index.vue
@@ -62,9 +62,8 @@
</view>
</u-form-item>
</u-form>
- <u-picker v-if="showCheckBox" :show="showCheckBox" keyName="label" :columns="actionOptionList"
- @cancel="showCheckBox = false" :default-selector="[0]" :immediateChange='true'
- @confirm="selectBack"></u-picker>
+ <u-picker :show="showCheckBox" keyName="label" :columns="actionOptionList" @cancel="showCheckBox = false"
+ :default-selector="[0]" :immediateChange='true' @confirm="selectBack"></u-picker>
<!-- <u-action-sheet v-if="actionOptionList.length > 0" :actions="actionOptionList" :show="showCheckBox" title="���������"
@close="showCheckBox = false" @select="selectBack" /> -->
<view class="bunts">
@@ -184,6 +183,7 @@
},
methods: {
handleFile(data) {
+ console.log('datadata', data)
this.fileBaseList = data
},
close() {
diff --git a/pages/actionChange/workOrderDetails/index.vue b/pages/actionChange/workOrderDetails/index.vue
index 550a248..0f7dd49 100644
--- a/pages/actionChange/workOrderDetails/index.vue
+++ b/pages/actionChange/workOrderDetails/index.vue
@@ -135,9 +135,15 @@
showTabBar: true
}
})
- uni.redirectTo({
- url: '/pages/index/index',
- })
+ if (this.option.type === 'share') {
+ uni.redirectTo({
+ url: '/pages/index/index',
+ })
+ } else {
+ uni.navigateBack({
+ delta: 1, //������������������������������������������2
+ })
+ }
},
refuse() {
Promise.all([this.$refs.rectificationInfor && this.$refs.rectificationInfor.formVali(), this.$refs
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0c2d839..4b86e55 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -45,14 +45,14 @@
console.log('currIndexOn', data)
this.currIndex = data.data.index
this.showTabBar = data.data.showTabBar
- this.$refs.agencyPage.getContaminateList()
+ this.$refs.agencyPage.setData()
})
this.share.title = this.title
},
methods: {
getData() {
console.log('������������')
- this.$refs.agencyPage.getContaminateList()
+ this.$refs.agencyPage.setData()
},
handleChangeTabe(index) {
if (index === 2) {
--
Gitblit v1.8.0