From a7234d6030e7eca05256f7c1ceb7e93d1b9dc7b4 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Thu, 26 Sep 2024 16:15:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesOrder/vehicle/detail.vue | 143 +++++++++++++++++++++---------
 src/pagesOrder/vehicle/index.vue  |  19 +++-
 src/pagesVehicle/inquiry.vue      |   8 +-
 src/pagesVehicle/recovery.vue     |   8 +-
 src/pagesVehicle/registration.vue |   8 +-
 5 files changed, 129 insertions(+), 57 deletions(-)

diff --git a/src/pagesOrder/vehicle/detail.vue b/src/pagesOrder/vehicle/detail.vue
index 678c372..7f6bf23 100644
--- a/src/pagesOrder/vehicle/detail.vue
+++ b/src/pagesOrder/vehicle/detail.vue
@@ -1,55 +1,96 @@
 <template>
-  <view class="detail">
-    <!-- 订单状态：0已取消，1待登记，2待处理，3，待上门，4待打款，5已完结 -->
-    <block v-for="(item, value) in listMap" :key="value">
-      <view v-if="statusInfo[model1.status].indexOf(value) > -1">
-        <view>
-          <view class="title">{{ item.name }}</view>
-          <view class="content">
-            <view v-for="(iitem, index) in item.attrList" :key="index">
-              {{ iitem.name }}:
+  <view>
+    <view class="detail">
+      <!-- 订单状态：0已取消，1待登记，2待处理，3，待上门，4待打款，5已完结 -->
+      <block v-for="(item, value) in listMap" :key="value">
+        <view v-if="statusInfo[model1.status].indexOf(value) > -1">
+          <view>
+            <view class="title">{{ item.name }}</view>
+            <view class="content">
+              <view v-for="(iitem, index) in item.attrList" :key="index">
+                {{ iitem.name }}:
 
-              <view v-if="iitem.name === '行驶证'" class="license">
-                <up-row customStyle="flex-wrap: wrap" :gutter="8">
-                  <up-col span="6">
-                    <view class="grid-item">
-                      <image
-                        v-if="model1.formData[iitem.key]"
-                        :src="model1.formData[iitem.key]"
-                        :mode="'widthFix'"
-                        :width="'100%'"
-                      ></image>
-                    </view>
-                  </up-col>
+                <view v-if="iitem.name === '行驶证'" class="license">
+                  <up-row customStyle="flex-wrap: wrap" :gutter="8">
+                    <up-col span="6">
+                      <view class="grid-item">
+                        <image
+                          v-if="model1.formData[iitem.key]"
+                          :src="model1.formData[iitem.key]"
+                          :mode="'widthFix'"
+                          :width="'100%'"
+                        ></image>
+                      </view>
+                    </up-col>
 
-                  <up-col span="6">
-                    <view class="grid-item">
-                      <image
-                      v-if="model1.formData['licenseBackUrl']"
-                        :src="model1.formData['licenseBackUrl']"
-                        :mode="'widthFix'"
-                        :width="'100%'"
-                      ></image>
-                    </view>
-                  </up-col>
-                </up-row>
-                <view> </view>
-              </view>
-              <text v-else
-                >{{ model1.formData[iitem.key] || "-" }} {{ iitem.unit }}</text
-              >
-            </view></view
-          >
+                    <up-col span="6">
+                      <view class="grid-item">
+                        <image
+                          v-if="model1.formData['licenseBackUrl']"
+                          :src="model1.formData['licenseBackUrl']"
+                          :mode="'widthFix'"
+                          :width="'100%'"
+                        ></image>
+                      </view>
+                    </up-col>
+                  </up-row>
+                  <view> </view>
+                </view>
+                <text v-else
+                  >{{ model1.formData[iitem.key] || "-" }}
+                  {{ iitem.unit }}</text
+                >
+              </view></view
+            >
+          </view>
         </view>
+      </block>
+    </view>
+    <view class="btn-box-fix-btn"   v-if="model1.formData.status === 2 || model1.formData.status === 1">
+      <view
+        >
+        <u-button
+          v-if="model1.formData.status === 1"
+          type="primary"
+          shape="circle"
+          @click="goRegis(model1.formData.id);"
+          >去登记</u-button
+        >
+        <u-button
+          v-if="model1.formData.status === 2"
+          type="primary"
+          shape="circle"
+          @click="handleModal(true);"
+          >取消订单</u-button
+        >
       </view>
-    </block>
+    </view>
+
+    <SmallModal
+    :title="'确认取消订单吗？'"
+    :content="'退出后将返回至上一页'"
+    :okText="'确认'"
+    :isMain="true"
+    :show="isShowCancelModal"
+    @handleModal="(v:boolean) => {handleModal(v)}"
+    @handleOk="handleOk()"
+  />
+
   </view>
 </template>
 
 <script setup lang="ts">
 import { VehicleApi } from "@/services";
 import { onLoad } from "@dcloudio/uni-app";
+import SmallModal from "@/components/Modal/smallModal.vue";
 import { reactive } from "vue";
+const isShowCancelModal = ref(false);
+const handleModal = (v: boolean) => {
+  isShowCancelModal.value = v;
+};
+const handleOk = () => {
+  handelOrder(0)
+};
 const model1 = reactive<any>({
   formData: {},
   status: 0,
@@ -118,12 +159,12 @@ const listMap = reactive<any>({
       {
         name: "联系人",
         value: "",
-        key: "owner_name",
+        key: "ownerName",
       },
       {
         name: "联系方式",
         value: "",
-        key: "owner_phone",
+        key: "ownerPhone",
       },
       {
         name: "上门地址",
@@ -206,6 +247,21 @@ const listMap = reactive<any>({
   },
 });
 
+function handelOrder(type: number) {
+  VehicleApi.updateRegis({
+    ...model1.formData,
+    ownerType: model1.formData.ownerType === "单位",
+    status: 0,
+  }).then((res) => {
+    uni.navigateBack();
+  });
+}
+
+function goRegis(id: number) {
+  uni.navigateTo({
+    url: "/pagesVehicle/registration?id=" + id, // 要跳转到的页面路径
+  });
+}
 onLoad((option: any) => {
   // 接收传递的标题参数
   if (option.id) {
@@ -247,4 +303,7 @@ onLoad((option: any) => {
     }
   }
 }
+.btn-box-fix-btn {
+  display: block;
+}
 </style>
diff --git a/src/pagesOrder/vehicle/index.vue b/src/pagesOrder/vehicle/index.vue
index 656d6ab..1260475 100644
--- a/src/pagesOrder/vehicle/index.vue
+++ b/src/pagesOrder/vehicle/index.vue
@@ -48,8 +48,17 @@
             <uni-tr v-for="(item, index) in pageList.list" :key="index">
               <uni-td v-for="(tItem, index) in tableTitleList" :key="index">
                 <view @click="goDetail(item)">
-                  <text v-if="tItem.key === 'status'"> 
-                    {{ ['已取消', '待登记', '待处理', '待上门', '待打款', '已完结'][item[tItem.key]] }}
+                  <text v-if="tItem.key === 'status'">
+                    {{
+                      [
+                        "已取消",
+                        "待登记",
+                        "待处理",
+                        "待上门",
+                        "待打款",
+                        "已完结",
+                      ][item[tItem.key]]
+                    }}
                   </text>
                   <text v-else>
                     {{ item[tItem.key] }}
@@ -95,6 +104,7 @@ import TimeRangeFilter from "@/components/Dialog/TimeRangeFilter.vue";
 import { VehicleApi } from "@/services";
 import pinia from "@/store";
 import { useMemberStore } from "@/store/index";
+import { onShow } from "@dcloudio/uni-app";
 const state = reactive({
   startTime: "",
   endTime: "",
@@ -242,7 +252,10 @@ function goDetail(item: any) {
   });
 }
 
-getList();
+onShow(() => {
+  resetPageList()
+  getList();
+});
 </script>
 <style lang="scss" scoped>
 .filter {
diff --git a/src/pagesVehicle/inquiry.vue b/src/pagesVehicle/inquiry.vue
index 91db916..840fe5e 100644
--- a/src/pagesVehicle/inquiry.vue
+++ b/src/pagesVehicle/inquiry.vue
@@ -404,14 +404,14 @@ const formAttrList1 = reactive<any>([
   },
   {
     name: "联系人",
-    key: "owner_name",
+    key: "ownerName",
     type: "input",
     required: true,
     unit: "",
   },
   {
     name: "联系方式",
-    key: "owner_phone",
+    key: "ownerPhone",
     type: "input",
     required: true,
     unit: "",
@@ -539,13 +539,13 @@ const rules = reactive({
   //   message: "请输入详细地址",
   //   trigger: ["blur", "change"],
   // },
-  // "formData.owner_name": {
+  // "formData.ownerName": {
   //   type: "string",
   //   required: true,
   //   message: "请输入姓名",
   //   trigger: ["blur", "change"],
   // },
-  // "formData.owner_phone": {
+  // "formData.ownerPhone": {
   //   type: "string",
   //   required: true,
   //   message: "请输入联系方式",
diff --git a/src/pagesVehicle/recovery.vue b/src/pagesVehicle/recovery.vue
index 4541bdf..5dad6ba 100644
--- a/src/pagesVehicle/recovery.vue
+++ b/src/pagesVehicle/recovery.vue
@@ -369,14 +369,14 @@ const formAttrList1 = reactive<any>([
   },
   {
     name: "联系人",
-    key: "owner_name",
+    key: "ownerName",
     type: "input",
     required: true,
     unit: "",
   },
   {
     name: "联系方式",
-    key: "owner_phone",
+    key: "ownerPhone",
     type: "input",
     required: true,
     unit: "",
@@ -426,13 +426,13 @@ const formAttrList2 = reactive<any>([
   },
 ]);
 const rules = reactive({
-  "formData.owner_name": {
+  "formData.ownerName": {
     type: "string",
     required: true,
     message: "请输入姓名",
     trigger: ["blur", "change"],
   },
-  "formData.owner_phone": {
+  "formData.ownerPhone": {
     type: "string",
     required: true,
     message: "请输入联系方式",
diff --git a/src/pagesVehicle/registration.vue b/src/pagesVehicle/registration.vue
index e8e44bc..fee6361 100644
--- a/src/pagesVehicle/registration.vue
+++ b/src/pagesVehicle/registration.vue
@@ -370,14 +370,14 @@ const formAttrList1 = reactive<any>([
   },
   {
     name: "联系人",
-    key: "owner_name",
+    key: "ownerName",
     type: "input",
     required: true,
     unit: "",
   },
   {
     name: "联系方式",
-    key: "owner_phone",
+    key: "ownerPhone",
     type: "input",
     required: true,
     unit: "",
@@ -427,13 +427,13 @@ const formAttrList2 = reactive<any>([
   },
 ]);
 const rules = reactive({
-  "formData.owner_name": {
+  "formData.ownerName": {
     type: "string",
     required: true,
     message: "请输入姓名",
     trigger: ["blur", "change"],
   },
-  "formData.owner_phone": {
+  "formData.ownerPhone": {
     type: "string",
     required: true,
     message: "请输入联系方式",