Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into ...

wupengfei

13 小时以前 c8c2f28f9008989f8035da5e78c262b326707065

Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui

 apps/taro/src/subpackages/my/applyAgent/applyAgent.vue

@@ -1,11 +1,7 @@
<template>
  <PageLayout title="立即申请" class="applyAgent-page-wrapper" hasBgColor :needAuth="false">
    <ContentScrollView hasPaddingTop style="background-color: transparent">
      <!-- <OrderApplyRefundView
      :id="id"
      @submitApplyRefund="submitApplyRefund"
      ref="orderApplyRefundViewRef"
    /> -->
      <ApplyAgentView @submit="submit" ref="orderApplyRefundViewRef" />
    </ContentScrollView>
    <PageFooter>
      <PageFooterBtn type="primary" @click="handleSubmit">提交申请</PageFooterBtn>
@@ -16,14 +12,22 @@
<script setup lang="ts">
import { PageLayout } from '@/components';
import { RouterPath } from '@/constants';
import { ApplyAgentView } from '@life-payment/components';
import { goBack } from '@/utils';
import type { ComponentExposed } from 'vue-component-type-helpers';

defineOptions({
  name: 'applyAgent',
});

const applyAgentViewRef =
  useTemplateRef<ComponentExposed<typeof ApplyAgentView>>('applyAgentViewRef');

function handleSubmit() {
  RouteHelper.navigateTo({
    url: RouterPath.applyResult,
  });
  applyAgentViewRef.value?.handleSubmit?.();
}

function submit() {
  goBack();
}
</script>

 packages/components/src/index.ts

@@ -18,4 +18,5 @@
export { default as EditGasUserAccount } from './views/userAccount/EditGasUserAccount.vue';
export { default as ShareQrcodeView } from './views/Mine/ShareQrcodeView.vue';
export { default as Dashboard } from './views/Mine/Dashboard.vue';
export { default as ApplyAgentView } from './views/Mine/ApplyAgentView.vue';
export * from './utils';

 packages/components/src/views/Mine/ApplyAgentView.vue

@@ -1,5 +1,57 @@
<template>
  <div></div>
  <NutForm
    :model-value="form"
    ref="formRef"
    :rules="rules"
    label-position="top"
    class="order-bill-recharge phone chunk-form"
  >
    <NutFormItem label="公司名称" class="bole-form-item" prop="companyName">
      <NutInput
        v-model.trim="form.companyName"
        class="bole-input-text"
        placeholder="请填写您的公司名称"
        type="text"
      />
    </NutFormItem>
    <NutFormItem label="姓名" class="bole-form-item" prop="name" required>
      <NutInput
        v-model.trim="form.name"
        class="bole-input-text"
        placeholder="请填写您的姓名"
        type="text"
      />
    </NutFormItem>
    <NutFormItem label="联系方式" class="bole-form-item" prop="phoneNumber" required>
      <NutInput
        v-model.trim="form.phoneNumber"
        class="bole-input-text"
        placeholder="请填写您的联系方式"
        type="text"
      />
    </NutFormItem>
    <NutFormItem label="意向代理类型 " class="bole-form-item" prop="type" required>
      <ChooseInputWithPicker
        v-model="form.type"
        placeholder="请选择您想申请的代理类型"
        :value-enum="[]"
        enum-label-key="gasOrgName"
        enum-value-key="gasOrgCode"
      />
    </NutFormItem>
    <NutFormItem label="客户资源" class="bole-form-item" prop="refundApplyRemark" required>
      <NutTextarea
        placeholder="请填写您拥有的客户资源"
        placeholderClass="bole-input-text-placeholder"
        autoSize
        class="bole-input-textarea"
        v-model="form.refundApplyRemark"
        :max-length="200"
        limit-show
      >
      </NutTextarea>
    </NutFormItem>
  </NutForm>
</template>

<script setup lang="ts">
@@ -11,12 +63,9 @@
} from '@nutui/nutui-taro';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import { reactive, ref, computed } from 'vue';
import {
  useLifeRechargeContext,
  LifeRechargeConstants,
  RefundUserLifePayOrderInput,
} from '@life-payment/core-vue';
import { useQueryClient } from '@tanstack/vue-query';
import { useLifeRechargeContext } from '@life-payment/core-vue';
import { FormValidator } from '../../utils';
import ChooseInputWithPicker from '../../components/Input/ChooseInputWithPicker.vue';

defineOptions({
  name: 'ApplyAgentView',
@@ -27,10 +76,19 @@
}>();

const form = reactive({
  companyName: '',
  name: '',
  phoneNumber: '',
  type: '',
  refundApplyRemark: '',
});

const rules = reactive<FormRules>({
  name: [{ required: true, message: '请填写您的姓名' }],
  phoneNumber: [
    { required: true, message: '请填写您的联系方式' },
    { validator: FormValidator.validatorPhoneNumber, message: '请输入正确的手机号' },
  ],
  refundApplyRemark: [{ required: true, message: '请输入退款原因' }],
});

@@ -46,8 +104,6 @@
    }
  });
}

const queryClient = useQueryClient();

async function refundUserLifePayOrder() {
  try {

 packages/components/src/views/userAccount/EditGasUserAccount.vue

@@ -45,7 +45,7 @@
  AddUpdateUserAccountInput,
} from '@life-payment/core-vue';
import { useAddUpdateUserAccount, useGetGasParValue } from '../../hooks';
import LoadingLayout from '../../components//Layout/LoadingLayout.vue';
import LoadingLayout from '../../components/Layout/LoadingLayout.vue';
import ChooseInputWithPicker from '../../components//Input/ChooseInputWithPicker.vue';
import { useQuery } from '@tanstack/vue-query';
import { GasUserAccountExtraProperties } from '../GasBillRecharge/context';