From 73ed247bec8b1346b4e04283f8eb0f514175e535 Mon Sep 17 00:00:00 2001
From: kaeery <3491123437@qq.com>
Date: Wed, 22 Jan 2025 15:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8D=95=E3=80=91=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E#=20=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E5=AE=8C=E6=88=90=E6=97=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8B=8D=E7=85=A7=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service_order/components/order-list.vue   |  7 ++---
 .../pages/service_order_detail/index.vue      | 24 +++++++++++------
 .../components/TUpload.vue                    |  1 +
 .../pages/service_order_image/index.vue       |  9 ++++---
 src/components/order-footer/index.vue         | 26 ++++++++++++++++---
 src/pages/order_detail/index.vue              |  2 +-
 6 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/bundle/pages/service_order/components/order-list.vue b/src/bundle/pages/service_order/components/order-list.vue
index 9f2dbbb..08637b2 100644
--- a/src/bundle/pages/service_order/components/order-list.vue
+++ b/src/bundle/pages/service_order/components/order-list.vue
@@ -28,6 +28,7 @@
                     :appointTime="item.appointTime"
                     :appointTimeStartStr="item.appointTimeStart"
                     :isDispatch="item.isDispatch"
+                    :uploadServiceImgBtn="item.uploadServiceImgBtn"
                     @refresh="queryList"
                 />
             </order-card>
@@ -36,10 +37,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, watch, nextTick, shallowRef, unref } from 'vue'
-import orderCard from './order-card.vue'
-import orderFooter from '@/components/order-footer/index.vue'
 import { apiStaffOrderLists } from '@/api/order'
+import orderFooter from '@/components/order-footer/index.vue'
+import { nextTick, ref, shallowRef, unref, watch } from 'vue'
+import orderCard from './order-card.vue'
 
 const props = withDefaults(
     defineProps<{
diff --git a/src/bundle/pages/service_order_detail/index.vue b/src/bundle/pages/service_order_detail/index.vue
index 9627e11..b20bc10 100644
--- a/src/bundle/pages/service_order_detail/index.vue
+++ b/src/bundle/pages/service_order_detail/index.vue
@@ -125,18 +125,26 @@
             </view>
 
             <view
+                v-if="orderData.serviceImages"
                 class="card bg-white card normal text-base flex flex-col gap-[12rpx] rounded-[12rpx]"
             >
                 <text>服务照片</text>
                 <view class="flex gap-[12rpx] flex-wrap">
-                    <u-image
-                        v-for="(image, index) in orderData.serviceImages"
-                        :key="index"
-                        :src="image"
-                        width="200"
-                        height="200"
-                        @click="handlePreviewImage(index)"
-                    ></u-image>
+                    <template v-if="orderData.serviceImages?.length > 0">
+                        <u-image
+                            v-for="(image, index) in orderData.serviceImages"
+                            :key="index"
+                            :src="image"
+                            width="200"
+                            height="200"
+                            @click="handlePreviewImage(index)"
+                        ></u-image>
+                    </template>
+                    <template v-else>
+                        <view class="text-center w-full">
+                            <u-empty text="暂无上传图片" mode="data"></u-empty>
+                        </view>
+                    </template>
                 </view>
             </view>
             <!-- Main End -->
diff --git a/src/bundle/pages/service_order_image/components/TUpload.vue b/src/bundle/pages/service_order_image/components/TUpload.vue
index 4f31443..2417859 100644
--- a/src/bundle/pages/service_order_image/components/TUpload.vue
+++ b/src/bundle/pages/service_order_image/components/TUpload.vue
@@ -94,6 +94,7 @@ onMounted(() => {
 })
 /** Life Cycle End **/
 const setFileList = computed(() => list => {
+    if (!list) return []
     return list.map((item: string) => {
         return {
             url: item
diff --git a/src/bundle/pages/service_order_image/index.vue b/src/bundle/pages/service_order_image/index.vue
index dd036fb..5626305 100644
--- a/src/bundle/pages/service_order_image/index.vue
+++ b/src/bundle/pages/service_order_image/index.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script setup lang="ts">
-import { apiStaffOrderDetail } from '@/api/order'
+import { apiServiceImages, apiStaffOrderDetail } from '@/api/order'
 import { toast } from '@/utils/util'
 import { onLoad } from '@dcloudio/uni-app'
 import { ref } from 'vue'
@@ -46,7 +46,7 @@ onLoad(option => {
 const initOrderDetail = async () => {
     const result = await apiStaffOrderDetail({ id: formData.value.id })
     formData.value.orderStatus = result.orderStatus
-    formData.value.serviceImages = result.serviceImages
+    formData.value.serviceImages = result.serviceImages ?? []
 }
 
 const handleSubmit = async () => {
@@ -54,10 +54,11 @@ const handleSubmit = async () => {
     if (!serviceImages.length) return toast('请上传服务图片')
     try {
         const data = {
-            ...formData.value
+            ...formData.value,
+            serviceImages
         }
         await apiServiceImages(data)
-        toast('提交成功', 'success')
+        toast('提交成功')
         uni.navigateBack()
     } catch (error) {}
 }
diff --git a/src/components/order-footer/index.vue b/src/components/order-footer/index.vue
index 75c154f..ab50c28 100644
--- a/src/components/order-footer/index.vue
+++ b/src/components/order-footer/index.vue
@@ -59,12 +59,19 @@
 
         <!-- 联系客户 -->
         <template v-if="mobile && (confirmService || verification)">
-            <button
+            <!-- <button
                 class="Btn flex-1 mr-2 bg-white text-sm text-black leading-[70rpx] h-[70rpx] rounded-full"
                 @click.stop="handleCustomerMobile()"
             >
                 联系客户
-            </button>
+            </button> -->
+            <view
+                class="px-[24rpx] items-center flex-1 mr-2 bg-white text-sm text-black leading-[70rpx] h-[70rpx] rounded-full"
+                style="border: 1px solid rgb(187, 187, 187)"
+                @click.stop="handleCustomerMobile()"
+            >
+                <u-icon size="40" name="phone"></u-icon>
+            </view>
         </template>
 
         <!-- 去支付 -->
@@ -115,7 +122,7 @@
                     class="bg-primary text-sm text-white leading-[70rpx] h-[70rpx] rounded-full"
                     @click.stop="handleNavigate"
                 >
-                    核
+                    拍照上传
                 </button>
             </view>
 
@@ -141,6 +148,15 @@
                 </view>
             </u-modal>
         </template>
+        <!-- 已完成 -->
+        <template v-if="uploadServiceImgBtn && orderStatus == 3">
+            <button
+                class="bg-primary text-sm text-white leading-[70rpx] h-[70rpx] rounded-full"
+                @click.stop="handleNavigate"
+            >
+                拍照上传
+            </button>
+        </template>
     </view>
     <u-popup
         v-model="showConfirmPop"
@@ -251,6 +267,7 @@ const props = withDefaults(
         staffMobile?: string | null // 师傅联系电话
         contract: number | null
         goodsId?: number | string
+        uploadServiceImgBtn: number | string | boolean
     }>(),
     {
         orderId: '',
@@ -273,7 +290,8 @@ const props = withDefaults(
         isDispatch: 0, // 是否派单 0=否 1=是 默认为0
         staffMobile: '',
         contract: null,
-        goodsId: ''
+        goodsId: '',
+        uploadServiceImgBtn: false
     }
 )
 const code = ref<number | string>('') // 输入核销码
diff --git a/src/pages/order_detail/index.vue b/src/pages/order_detail/index.vue
index 34b5270..0c9a70e 100644
--- a/src/pages/order_detail/index.vue
+++ b/src/pages/order_detail/index.vue
@@ -87,7 +87,7 @@
             </template>
 
             <!-- 我的核销码 -->
-            <template v-if="orderData.orderStatus === 2">
+            <template v-if="orderData.orderStatus === 2 && orderData?.staff?.id">
                 <view class="card normal text-base">
                     <view class="">
                         <view>我的核销码</view>