From 4676715af5659b0fbf5fc11008f779c482d53519 Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Tue, 19 Jul 2022 11:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/orderHall/addOrder.vue | 19 +++++++
src/pages/orderHall/orderHall.vue | 6 +-
src/pages/orderHall/orderHallDetails.vue | 70 ++++++++++++++++++++----
src/pages/pageHome/pageHome.vue | 6 +-
4 files changed, 84 insertions(+), 17 deletions(-)
diff --git a/src/pages/orderHall/addOrder.vue b/src/pages/orderHall/addOrder.vue
index 5118a4f..555db57 100644
--- a/src/pages/orderHall/addOrder.vue
+++ b/src/pages/orderHall/addOrder.vue
@@ -355,6 +355,25 @@
this.ok = false
return
}
+ if(this.morePer){
+ if(this.perNumber < 2){
+ uni.showToast({
+ title: '支持多人接单时，可接单人数应大于1',
+ icon: "none",
+ });
+ this.ok = false
+ return
+ }
+ }else{
+ if(this.perNumber > 1){
+ uni.showToast({
+ title: '不支持多人接单时，可接单人数应等于1',
+ icon: "none",
+ });
+ this.ok = false
+ return
+ }
+ }
if(this.ok){
let image = []
this.fileList3.forEach(function(item) {
diff --git a/src/pages/orderHall/orderHall.vue b/src/pages/orderHall/orderHall.vue
index 88b5f79..5698673 100644
--- a/src/pages/orderHall/orderHall.vue
+++ b/src/pages/orderHall/orderHall.vue
@@ -3,7 +3,7 @@
-
+
{{item.text}}
@@ -15,7 +15,7 @@
- ![]()
+ ![]()
{{item.title}}
@@ -84,6 +84,8 @@
this.getData();
},
onShow() {
+ this.pages = 1
+ this.mainList = []
this.getData()
},
methods: {
diff --git a/src/pages/orderHall/orderHallDetails.vue b/src/pages/orderHall/orderHallDetails.vue
index a7a505d..98dd2f0 100644
--- a/src/pages/orderHall/orderHallDetails.vue
+++ b/src/pages/orderHall/orderHallDetails.vue
@@ -3,7 +3,7 @@
-
+
@@ -63,11 +63,26 @@
{{data.activityTime}}
-
- 取消接单
+
+
+ 取消接单
+
+
+ 申请接单
+
-
- 申请接单
+
+
+ 已报名人员
+
+
+
+
+
+
+ {{v.userName}}
+
+
@@ -82,11 +97,16 @@
data: {},
list: [],
list2: [],
+ userList:[],
currentNum: 0,
+ isCheck: 0,
}
},
onLoad(op) {
this.id = op.id
+ if(op.isCheck){
+ this.isCheck = op.isCheck
+ }
},
onShow() {
this.getData()
@@ -116,6 +136,11 @@
})
}
this.data = res.data
+ this.userList = res.data.users
+ this.userList.forEach(function(el){
+ let img = JSON.stringify(el.userTx)
+ el.userTx = img
+ })
this.load = false
}
}).catch(e => {
@@ -170,6 +195,10 @@