From eae59b2d0c6f23529b4ab22c0bc4ed528e4d64f5 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 31 十二月 2025 10:03:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
index 5732f29..00687db 100644
--- a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
@@ -75,6 +75,19 @@
></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"
@@ -107,7 +120,13 @@
:is-show-custom-address="false"
@selected="selected"
exist-address-title="閫夋嫨鍦板潃"
- ></nut-address>
+ >
+ <template #bottom>
+ <div class="select-address-bottom">
+ <nut-button type="primary" @click="goSelectAddress">鏂板鍦板潃</nut-button>
+ </div>
+ </template>
+ </nut-address>
</LoadingLayout>
</template>
@@ -118,6 +137,7 @@
List,
ListItem,
ChooseInputWithDatePicker,
+ ChooseInputWithPicker,
} from '@12333/components';
import Taro from '@tarojs/taro';
import { RouterPath } from '@/constants';
@@ -125,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',
@@ -147,6 +168,7 @@
enterpriseEmployeeId: '',
enterpriseEmployeeName: '',
remark: '',
+ payAccess: EnumUserBankCardAccess.WeChatPay,
});
const nowDate = dayjs().toDate();
@@ -169,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({
@@ -184,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);
@@ -198,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: '',
@@ -293,11 +317,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>
--
Gitblit v1.10.0