From 3900da9f2462d8e8c2e0b487eb0c28c93ff5ca63 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Tue, 31 Mar 2026 08:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../component/leftcontent/serveswipe.vue | 130 ++--
.../component/leftcontent/swipecard.vue | 667 +-----------------
2 files changed, 81 insertions(+), 716 deletions(-)
diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue
index 12c16d8..b69285e 100644
--- a/pages/NursingNew/component/leftcontent/serveswipe.vue
+++ b/pages/NursingNew/component/leftcontent/serveswipe.vue
@@ -17,13 +17,16 @@
-
-
-
+
+
+
+
+
-
+
+
@@ -54,13 +57,23 @@
-
- {{ indexmessage?.startTime?indexmessage?.startTime.slice(11, 16) :'' }}
+
+ {{ indexmessage?.servStartTime?indexmessage?.servStartTime.slice(11, 16) :'' }} -
+ {{ indexmessage?.servEndTime?indexmessage?.servEndTime.slice(11, 16) :'' }}
|
{{indexmessage?.serviceDuration!==`0` ?indexmessage?.serviceDuration: `∞`}}分钟
+
+ {{ indexmessage?.servStartTime?indexmessage?.servStartTime.slice(11, 16) :'' }} -
+ {{ indexmessage?.servEndTime?indexmessage?.servEndTime.slice(11, 16) :'' }}
+
+ |
+ {{indexmessage?.serviceDuration!==`0` ?indexmessage?.serviceDuration: `∞`}}分钟
+
+
+
@@ -69,13 +82,12 @@
-
-
-
-
-
+
{{v.match[0]}}
({{v.match[1]}})
-
-
-
+ -->
+
-
+
+
-
+
{{ indexmessage?.directiveName }}
@@ -295,7 +305,6 @@
import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
import { onBackPress, onShow, onHide } from "@dcloudio/uni-app"
import timeing from './sxy-Timeing.vue'
- import swipes from './swipes.vue'
import swipecard from './swipecard.vue'
import { queryOrderList, queryOrderInfoList, startOrder, endOrder, editSubPicPath, editSubMp4, queryEmpList, transferOrder, assistOrder, generateInstant } from '../../component/doctorask/api/api.js'
@@ -306,7 +315,7 @@
const topbuttontarget = ref(0);
const ilanarr = ref([]);
const listobj = ref({});
-
+ const botleft = ref(0)
const serverUrl = ref(uni.getStorageSync('imagebase'))
const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/')
const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
@@ -323,10 +332,20 @@
defineExpose({
init
})
+ const swipdcurrent = ref(0)
+ const currentswipd=(e)=>{
+ swipdcurrent.value = e
+ }
const change = (e) => {
+ console.log(e)
// return
+
current.value = e.detail.current;
let a = e.detail.current;
+ if(e.detail.key==1){
+ current2.value = a
+ }
+ botleft.value = (a-4)*20;
plsbuy.value.forEach((v, i) => {
if (i != a && v.izPackage == 'Y') {
v.flag = false
@@ -339,7 +358,7 @@
const djstinme = ref(0)
const timeacde = () => {
let obj = plsbuy.value[current.value];
- let timestampMs = new Date(obj.endTime).getTime();
+ let timestampMs = new Date(obj.servEndTime).getTime();
let times = new Date().getTime();
let djs = timestampMs - times;
@@ -350,6 +369,7 @@
}
const timeend = () => {
// 结束超时
+ return
plsbuy.value.splice(current.value, 1)
firstgetqueryCgdList(form.nuId)
}
@@ -371,7 +391,7 @@
}
const form = reactive({
pageNo: 1,
- pageSize: 30,
+ pageSize: -1,
employeeId: uni.getStorageSync('userInfo').employeesId,
nuId: uni.getStorageSync('nuId'),
workType: 5
@@ -529,12 +549,13 @@
form.nuId = nuId;
console.log(nuId)
queryOrderList(form).then(res => {
- console.log(`这啥啊啊啊啊啊`,form, res)
- if (res.result.records.length > 0) {
- res.result.records.forEach((item, l) => {
+ console.log(res)
+ console.log(`这啥啊啊啊啊啊`,res.result.length, res)
+ if (res.result.length > 0) {
+ res.result.forEach((item, l) => {
item.flag = false;
item.servebao = [];
- let timestampMs = new Date(item.endTime).getTime();
+ let timestampMs = new Date(item.servEndTime).getTime();
let times = new Date().getTime();
let djs = timestampMs - times;
if (djs < 0) {
@@ -544,8 +565,8 @@
clickLeftMenu(l, item)
}
})
- plsbuy.value = res.result.records;
- console.log(plsbuy.value)
+ plsbuy.value = res.result;
+ console.log(plsbuy.value,uni.getStorageSync('imagebase'))
change({ detail: { current: current.value } })
} else {
plsbuy.value = [];
@@ -676,7 +697,7 @@
const cshigb = () => {
let obj = plsbuy.value[current.value];
// console.log("啥啊",current.value)
- let timestampMs = new Date(obj.endTime).getTime();
+ let timestampMs = new Date(obj.servEndTime).getTime();
let times = new Date().getTime();
let djs = timestampMs - times;
// let timeendamp = timestampMs + (Number(plsbuy.value[current.value].timeoutDuration)*60);
@@ -694,13 +715,12 @@
}
const start = (v) => {
- if (!cshigb()) {
-
- errmsg.value = "服务已超时，不能开始服务！"
- openerror.value = true;
- firstgetqueryCgdList(form.nuId);
- return
- }
+ // if (!cshigb()) {
+ // errmsg.value = "服务已超时，不能开始服务！"
+ // openerror.value = true;
+ // firstgetqueryCgdList(form.nuId);
+ // return
+ // }
if (v.izStart != 'N') { return }
startOrder({ id: v.id }).then(res => {
console.log(res)
@@ -717,15 +737,12 @@
const endobj = ref({})
const end = (v) => {
// console.log("走着了吗?2",v.izStart,v.izFinish)
- if (!cshigb()) {
-
- errmsg.value = "服务已超时，不能结束服务指令！"
- // console.log("走着了吗?1")
- openerror.value = true;
- firstgetqueryCgdList(form.nuId);
-
- return
- }
+ // if (!cshigb()) {
+ // errmsg.value = "服务已超时，不能结束服务指令！"
+ // openerror.value = true;
+ // firstgetqueryCgdList(form.nuId);
+ // return
+ // }
if (v.izStart == 'Y' && v.izFinish == 'N') {
// console.log("aaaaa",v)
endobj.value = v;
@@ -739,7 +756,7 @@
const ends = () => {
// console.log("看看传的", { id: endobj.value.id })
endOrder({ id: endobj.value.id }).then(res => {
- // console.log(res)
+ console.log(res)
if (res.success) {
open.value = 0;
endobj.value = {};
@@ -956,16 +973,19 @@
border-radius: 1.6vw;
margin-top: 0.5vw;
padding: 3vw 0 0;
-
- .bots {
+ .scrolbox{
width: 60%;
position: absolute;
- height: 30rpx;
- bottom: 2.2vw;
+ height: 60rpx;
+ bottom: 1.2vw;
left: 20%;
+ z-index: 999;
+ }
+ .bots {
+ height: 100%;
+ white-space: nowrap;
display: flex;
justify-content: center;
-
view {
width: 1.3vw;
height: 0.6vw;
@@ -973,6 +993,7 @@
border-radius: 0.2vw;
margin: 0.7vw;
position: relative;
+ display: inline-block;
.bots-red{
position: absolute;
left: 0.2vw;
@@ -1214,9 +1235,8 @@
}
.big-img {
- height: 420rpx;
+ height: 460rpx;
z-index: 100;
- margin-top: -50rpx;
// background-color: red;
image {
diff --git a/pages/NursingNew/component/leftcontent/swipecard.vue b/pages/NursingNew/component/leftcontent/swipecard.vue
index 13f27a6..8d7a3ed 100644
--- a/pages/NursingNew/component/leftcontent/swipecard.vue
+++ b/pages/NursingNew/component/leftcontent/swipecard.vue
@@ -3,7 +3,7 @@
-
+
@@ -14,668 +14,12 @@