From e76819c020a3ae3397971845e6bc6bf76128d8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=9F=E5=B7=9D=E4=B8=9C?= <wyemail666@163.com>
Date: Wed, 28 May 2025 15:13:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E3=80=90=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E3=80=91=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                      |   7 ++
 pages/order/order-info.vue      |   5 +
 pages/order/update-progress.vue | 164 ++++++++++++++++++++++++++++++++
 static/css/form.scss            |   1 +
 utils/helpers.js                |   2 +
 5 files changed, 179 insertions(+)
 create mode 100644 pages/order/update-progress.vue

diff --git a/pages.json b/pages.json
index eb07409..64fd4b4 100644
--- a/pages.json
+++ b/pages.json
@@ -88,6 +88,13 @@
 			{
 				"navigationBarTitleText" : "隐私协议"
 			}
+		},
+		{
+			"path" : "pages/order/update-progress",
+			"style" : 
+			{
+				"navigationBarTitleText" : "更新进度"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue
index 9303191..7055936 100644
--- a/pages/order/order-info.vue
+++ b/pages/order/order-info.vue
@@ -182,6 +182,7 @@
 
     <!--    完成服务-->
     <view class="bottom" v-if="data.status === enums.ORDER_DISPATCH_STATUS.STATUS_CLOCK">
+      <me-button @click="updateProgress()" active-color="var(--contentBgColor)" text="更新进度" width="686rpx" text-color="var(--titleColor)" custom-icon-color="var(--titleColor)"></me-button>
       <me-button @click="completeService()" text="完成服务" width="686rpx" icon-type="icon-arrow-right-circle" margin-top="32rpx"></me-button>
     </view>
 	</view>
@@ -198,6 +199,10 @@ import {ref, computed} from 'vue'
 import api from "../../api/api";
 import enums from "../../utils/enums";
 
+const updateProgress = () => {
+  helpers.jumpToPage('update-progress', 'id=' + id.value)
+}
+
 //是否可上报异常，未接单和已拒接的无法上报
 const canReportOrderException = computed(() => {
   const excludedStatuses = [
diff --git a/pages/order/update-progress.vue b/pages/order/update-progress.vue
new file mode 100644
index 0000000..63cc9bf
--- /dev/null
+++ b/pages/order/update-progress.vue
@@ -0,0 +1,164 @@
+<template>
+  <view class="ctr">
+    <view class="form-group">
+      <picker @change="bindPickerChange" :range="typeList">
+        <view class="item input flex-sb line-after">
+          <view class="title flex-l">进度</view>
+          <view class="select-ctr flex-r select">{{ submitData.is_finish_today == 1 ? '今日能完工' : '今日不能完工'}}</view>
+        </view>
+      </picker>
+      <view :class="[submitData.is_finish_today == 0 ? 'line-after' : '', 'item', 'time']">
+        <view class="item-row flex-sb">
+          <view class="title flex-l">完工时间</view>
+          <uni-datetime-picker v-model="submitData.finish_date" :start="Date.now()" type="datetime" :hide-second="true">
+            <view class="value flex-r value-empty" v-if="submitData.finish_date === null">点击选择完工时间</view>
+            <view class="value flex-r" v-else>{{ helpers.removeSeconds(submitData.finish_date) }}</view>
+          </uni-datetime-picker>
+        </view>
+      </view>
+      <view class="textarea" v-if="submitData.is_finish_today == 0">
+        <view class="title flex-l">当前施工进度</view>
+        <view class="value">
+          <textarea maxlength="200" :disable-default-padding="true" class="input-textarea" v-model="submitData.detail"  placeholder-class="placeholder-class" placeholder="请简要描述当前的施工进度，方便平台知晓服（200字以内）"/>
+        </view>
+      </view>
+    </view>
+    <me-empty-space height="376"></me-empty-space>
+    <view class="bottom">
+      <me-button @click="submit()" text="更 新" width="686rpx" icon-type="icon-arrow-up-line" margin-top="32rpx"></me-button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+
+import MeEmptySpace from "../../components/me-empty-space/me-empty-space.vue";
+import MeButton from "../../components/me-button/me-button.vue";
+import helpers from "../../utils/helpers";
+import {ref, reactive, computed} from 'vue'
+import {onLoad} from '@dcloudio/uni-app'
+import api from "../../api/api";
+import {throttle} from "../../utils/throttle";
+
+const bindPickerChange = (e) => {
+  submitData.is_finish_today = e.detail.value
+}
+
+//提交
+const submit = throttle(() => {
+  if (!validate()) {
+    return false
+  }
+
+  uni.showModal({
+    title: '提示信息',
+    confirmText: '确认',
+    content: '确认上报异常？',
+    success: function (res) {
+      if (res.confirm) {
+        uni.showLoading({
+          title: '提交中'
+        });
+
+        submitData.order_id = orderId.value
+
+        api.createOrderAbnormal(submitData).then(() => {
+          helpers.delayHideLoading()
+          uni.showModal({
+            title: '提示信息',
+            showCancel: false,
+            content: '异常已上报',
+            success: function (res) {
+              if (res.confirm) {
+                uni.navigateBack();
+              }
+            }
+          });
+
+          init()
+        }).catch(() => {})
+      }
+    }
+  });
+})
+
+const orderInfo = ref(null)
+const init = () => {
+  // api.orderAbnormalInfo({order_id: orderId.value}).then(res => {
+  //   if (res.id !== undefined) {
+  //     orderInfo.value = res
+  //     submitData.abnormal_id = orderInfo.value.abnormal_id
+  //     submitData.detail = orderInfo.value.detail
+  //   }
+  //
+  //   helpers.delayHideLoading()
+  // }).catch(() => {})
+}
+
+const orderId = ref(null)
+onLoad((params) => {
+  orderId.value = params.order_id
+  // uni.showLoading({
+  //   title: '加载中'
+  // })
+  init()
+})
+
+const typeList = ref([
+    "今日不能完工",
+    "今日能完工",
+])
+
+//提交数据
+const submitData = reactive({
+  is_finish_today: 1,
+  finish_date: null,
+  detail: '',
+})
+
+//验证提交数据
+const validate = () => {
+  if (submitData.abnormal_id === 0) {
+    helpers.showToast('请选择异常原因')
+    return false
+  }
+
+  if (submitData.detail === '') {
+    helpers.showToast('请输入异常详情')
+    return false
+  }
+
+  return true
+}
+
+</script>
+
+<style lang="scss" scoped>
+.ctr {
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  height: 100vh;
+  .bottom {
+    width: 100%;
+    padding-top: 20rpx;
+    padding-bottom: 68rpx;
+    background: var(--pageBgColor);
+    box-sizing: border-box;
+    position: fixed;
+    bottom: 0;
+  }
+}
+</style>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/css/form.scss b/static/css/form.scss
index 211dd89..9400040 100644
--- a/static/css/form.scss
+++ b/static/css/form.scss
@@ -39,6 +39,7 @@
     }
   }
   .time {
+    position: relative;
     .item-row {
       width: 100%;
       height: 100rpx;
diff --git a/utils/helpers.js b/utils/helpers.js
index 954e07b..1b9eb74 100644
--- a/utils/helpers.js
+++ b/utils/helpers.js
@@ -33,6 +33,8 @@ class helpers {
 			'user-agreement': '/pages/user/user-agreement',
 			//隐私政策
 			'privacy-policy': '/pages/user/privacy-policy',
+			//更新进度
+			'update-progress': '/pages/order/update-progress',
 		}
 
 		url = paths[pathName]