From a37b107842a508885e3b4344f492d62550ade83e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Mar 2022 18:25:15 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/qfqk-android
---
pages/grabOrders/grabOrdersZAXC/map.vue | 8 ++++++++
pages/grabOrders/grabOrdersZAXC/grabOrders.vue | 4 ++--
pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue | 6 +++---
pages/grabOrders/grabOrdersZAYWXC/map.vue | 8 ++++++++
pages/grabOrders/grabOrdersZAFFPX/map.vue | 10 +++++++++-
pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue | 4 ++--
6 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue b/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
index 4ae19cd..620aca3 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
@@ -351,7 +351,7 @@
},
confirms() {
let that = this;
- this.popupData["serid"] = (uni.getStorageSync("ids") || that.$store.state.puserID) + ",";
+ this.popupData["serid"] = "," + (uni.getStorageSync("ids") || that.$store.state.puserID);
this.popupData["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
// return;
uni.request({
@@ -376,8 +376,8 @@
}
// that.listData = data;
// that.getGrabOrders(this.);
- that.current = 0;
- that.swiperCurrent = 0;
+ that.current = 1;
+ that.swiperCurrent = 1;
that.$store.commit("changegotuGrabOrders");
},
diff --git a/pages/grabOrders/grabOrdersZAFFPX/map.vue b/pages/grabOrders/grabOrdersZAFFPX/map.vue
index 669d946..fbcc10f 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/map.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/map.vue
@@ -68,6 +68,14 @@
</view>
<view class="once">
<span class="once-left">
+ 预计结束
+ </span>
+ <span class="once-right">
+ {{ourData.endtime}}
+ </span>
+ </view>
+ <view class="once">
+ <span class="once-left">
参培队伍
</span>
<span class="once-right">
@@ -215,7 +223,7 @@
let that = this;
if (type == "oks") {
let dataAppend = that.ourData;
- dataAppend["serid"] = (uni.getStorageSync("ids") || that.$store.state.puserID) + ",";
+ dataAppend["serid"] = "," + (uni.getStorageSync("ids") || that.$store.state.puserID);
dataAppend["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
uni.request({
url: that.$store.state.piAPI + "taskqd/Graborder",
diff --git a/pages/grabOrders/grabOrdersZAXC/grabOrders.vue b/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
index 089e6cd..5cdcb2c 100644
--- a/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
@@ -377,8 +377,8 @@
}
// that.listData = data;
// that.getGrabOrders(this.);
- that.current = 0;
- that.swiperCurrent = 0;
+ that.current = 1;
+ that.swiperCurrent = 1;
that.$store.commit("changegotuGrabOrders");
},
diff --git a/pages/grabOrders/grabOrdersZAXC/map.vue b/pages/grabOrders/grabOrdersZAXC/map.vue
index 5426e4d..ec1202e 100644
--- a/pages/grabOrders/grabOrdersZAXC/map.vue
+++ b/pages/grabOrders/grabOrdersZAXC/map.vue
@@ -70,6 +70,14 @@
</view>
<view class="once">
<span class="once-left">
+ 预计结束
+ </span>
+ <span class="once-right">
+ {{ourData.endtime}}
+ </span>
+ </view>
+ <view class="once">
+ <span class="once-left">
人数
</span>
<span class="once-right">
diff --git a/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue b/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
index bef65ad..e6adbb8 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
@@ -377,8 +377,8 @@
}
// that.listData = data;
// that.getGrabOrders(this.);
- that.current = 0;
- that.swiperCurrent = 0;
+ that.current = 1;
+ that.swiperCurrent = 1;
that.$store.commit("changegotuGrabOrders");
},
diff --git a/pages/grabOrders/grabOrdersZAYWXC/map.vue b/pages/grabOrders/grabOrdersZAYWXC/map.vue
index 4b25943..92d0c78 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/map.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/map.vue
@@ -68,6 +68,14 @@
</view>
<view class="once">
<span class="once-left">
+ 预计结束
+ </span>
+ <span class="once-right">
+ {{ourData.endtime}}
+ </span>
+ </view>
+ <view class="once">
+ <span class="once-left">
人数
</span>
<span class="once-right">
--
Gitblit v1.9.3