From d6ec7528f6694aee6d2c57d1d9b2aab3ceddcdeb Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 31 十二月 2025 13:55:30 +0800
Subject: [PATCH] fix: bug
---
apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue | 86 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 22 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
index d19c8d7..c387fa1 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"
@@ -106,7 +120,13 @@
:is-show-custom-address="false"
@selected="selected"
exist-address-title="閫夋嫨鍦板潃"
- ></nut-address>
+ >
+ <template #bottom v-if="!infiniteLoadingProps?.flattenListData?.length">
+ <div class="select-address-bottom">
+ <nut-button type="primary" @click="goAddAddress">鏂板鍦板潃</nut-button>
+ </div>
+ </template>
+ </nut-address>
</LoadingLayout>
</template>
@@ -117,6 +137,7 @@
List,
ListItem,
ChooseInputWithDatePicker,
+ ChooseInputWithPicker,
} from '@12333/components';
import Taro from '@tarojs/taro';
import { RouterPath } from '@/constants';
@@ -124,8 +145,9 @@
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';
+import { template } from 'lodash';
defineOptions({
name: 'InnerPage',
@@ -142,9 +164,11 @@
beginTime: '',
endTime: '',
supplierEnterpriseId: '',
+ supplierEnterpriseName: '',
enterpriseEmployeeId: '',
enterpriseEmployeeName: '',
remark: '',
+ payAccess: EnumUserBankCardAccess.WeChatPay,
});
const nowDate = dayjs().toDate();
@@ -167,6 +191,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 +207,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 +222,7 @@
const existAddress = computed(() => {
return infiniteLoadingProps.value.flattenListData.map((x) => ({
id: x.id,
- addressDetail: x.addressDetail,
+ addressDetail: `${x.addressName}${x.addressDetail}`,
cityName: '',
countyName: '',
provinceName: '',
@@ -221,6 +247,12 @@
form.selectAddressVisible = true;
}
+function goAddAddress() {
+ Taro.navigateTo({
+ url: `${RouterPath.editAddress}`,
+ });
+}
+
const selected = (prevExistAdd, nowExistAdd, arr) => {
form.addressId = nowExistAdd.id;
};
@@ -250,7 +282,7 @@
specPrice: spec.value.price ?? 0,
specNumber: specNumber,
addressId: form.addressId,
- name: detail.value.name,
+ name: selectedAddress.value.name,
contactPhoneNumber: selectedAddress.value.contactPhoneNumber,
provinceCode: selectedAddress.value.provinceCode,
provinceContent: selectedAddress.value.provinceContent,
@@ -271,12 +303,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 +323,13 @@
paySign: res.paySign,
});
Message.success('鏀粯鎴愬姛');
- Taro.redirectTo({
- url: `${RouterPath.mineOrderDetail}?id=${orderId}`,
- });
}
- } catch (error) {}
+ } catch (error) {
+ } finally {
+ Taro.redirectTo({
+ url: `${RouterPath.mineOrderDetail}?id=${orderId}`,
+ });
+ }
}
</script>
@@ -314,17 +348,25 @@
}
}
- .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');
+ }
}
}
+
+ .select-address-bottom {
+ display: flex;
+ justify-content: center;
+ padding: 40px 0;
+ }
}
</style>
--
Gitblit v1.10.0