From 15385ad1bc0218d4290f159e0c7fd82eef243d66 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 30 十二月 2025 19:17:14 +0800
Subject: [PATCH] fix: 甲方小程序

---
 apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue |   63 +++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
index d19c8d7..9deb69b 100644
--- a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
@@ -71,9 +71,23 @@
             :endTime="form.endTime"
             v-model:enterpriseEmployeeId="form.enterpriseEmployeeId"
             v-model:enterpriseEmployeeName="form.enterpriseEmployeeName"
+            v-model:supplierEnterpriseName="form.supplierEnterpriseName"
           ></ChooseInputWithSuppliers>
         </nut-form-item>
         <nut-form-item
+          label="鏀粯閫氶亾:"
+          class="bole-form-item"
+          prop="payAccess"
+          label-width="90px"
+          required
+        >
+          <ChooseInputWithPicker
+            v-model="form.payAccess"
+            placeholder="璇烽�夋嫨鏀粯閫氶亾"
+            :value-enum="EnumUserBankCardAccessTextFormStandard"
+          />
+        </nut-form-item>
+        <nut-form-item
           label="澶囨敞:"
           class="bole-form-item alignTop"
           prop="remark"
@@ -89,9 +103,9 @@
         </nut-form-item>
       </nut-form>
     </ContentScrollView>
-    <PageFooter>
-      <div class="addStandardOrder-price-wrapper">
-        <div class="addStandardOrder-price-text">鏀粯锛�</div>
+    <PageFooter class="order-settle-bar">
+      <div class="order-settle-price-wrapper">
+        <div class="order-settle-price-label">鏀粯锛�</div>
         <nut-price :price="totlePrice" size="large" />
       </div>
       <PageFooterBtn type="primary" class="business-card-btn" @click="goConfirm"
@@ -117,6 +131,7 @@
   List,
   ListItem,
   ChooseInputWithDatePicker,
+  ChooseInputWithPicker,
 } from '@12333/components';
 import Taro from '@tarojs/taro';
 import { RouterPath } from '@/constants';
@@ -124,7 +139,7 @@
 import * as standardOrderServices from '@12333/services/apiV2/standardOrder';
 import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
 import dayjs from 'dayjs';
-import { EnumUserBankCardAccess } from '@12333/constants';
+import { EnumUserBankCardAccess, EnumUserBankCardAccessTextFormStandard } from '@12333/constants';
 import { Message } from '@12333/utils';
 
 defineOptions({
@@ -142,9 +157,11 @@
   beginTime: '',
   endTime: '',
   supplierEnterpriseId: '',
+  supplierEnterpriseName: '',
   enterpriseEmployeeId: '',
   enterpriseEmployeeName: '',
   remark: '',
+  payAccess: EnumUserBankCardAccess.WeChatPay,
 });
 
 const nowDate = dayjs().toDate();
@@ -167,6 +184,7 @@
   beginTime: [{ required: true, message: '璇烽�夋嫨鏈嶅姟寮�濮嬫椂闂�' }],
   endTime: [{ required: true, message: '璇烽�夋嫨鏈嶅姟缁撴潫鏃堕棿' }],
   enterpriseEmployeeId: [{ required: true, message: '璇烽�夋嫨鏈嶅姟鏈烘瀯' }],
+  payAccess: [{ required: true, message: '璇烽�夋嫨鏀粯閫氶亾' }],
 });
 
 const { isLoading, isError, detail, refetch } = useStandardServiceDetail({
@@ -182,6 +200,7 @@
 
 const { infiniteLoadingProps } = useEnterpriseAddresses({
   rows: 100,
+  refeshDidShow: false,
   onSuccess(res) {
     const data = res.pages[0].data;
     const address = data.find((item) => item.isDefault);
@@ -196,7 +215,7 @@
 const existAddress = computed(() => {
   return infiniteLoadingProps.value.flattenListData.map((x) => ({
     id: x.id,
-    addressDetail: x.addressDetail,
+    addressDetail: `${x.addressName}${x.addressDetail}`,
     cityName: '',
     countyName: '',
     provinceName: '',
@@ -271,12 +290,12 @@
     };
     let res = await standardOrderServices.addStandardOrder(params);
     if (res) {
-      pay(res);
+      payStandardOrder(res);
     }
   } catch (error) {}
 }
 
-async function pay(orderId: string) {
+async function payStandardOrder(orderId: string) {
   try {
     let params: API.PayStandardOrderCommand = {
       id: orderId,
@@ -291,11 +310,13 @@
         paySign: res.paySign,
       });
       Message.success('鏀粯鎴愬姛');
-      Taro.redirectTo({
-        url: `${RouterPath.mineOrderDetail}?id=${orderId}`,
-      });
     }
-  } catch (error) {}
+  } catch (error) {
+  } finally {
+    Taro.redirectTo({
+      url: `${RouterPath.serciceDetail}?id=${id}`,
+    });
+  }
 }
 </script>
 
@@ -314,16 +335,18 @@
     }
   }
 
-  .addStandardOrder-price-wrapper {
-    display: flex;
-    flex: 2;
-    min-width: 0;
-    align-items: center;
-    padding-left: 28px;
+  .order-settle-bar {
+    .order-settle-price-wrapper {
+      height: 100%;
+      flex: 1;
+      min-width: 0;
+      display: flex;
+      align-items: center;
+      margin-left: 28px;
 
-    .addStandardOrder-price-text {
-      font-size: 32px;
-      color: boleGetCssVar('text-color', 'primary');
+      .order-settle-price-label {
+        color: boleGetCssVar('text-color', 'primary');
+      }
     }
   }
 }

--
Gitblit v1.10.0