xxxxx

src/business/bank/index.ts

@@ -211,24 +211,18 @@ export function useDoCancelBankSign() {
     /// 获取当前是否已签约
     const sign = shallowRef<Model.BankAccountSignRsp[]>([])
 
-    const request = queryBankAccountSign({
-        data: {
-            userid: loginStore.userId
-        }
-    }).then((res) => {
-        if (res.data.length) {
+    const formRefresh = () => {
+        queryBankAccountSign().then((res) => {
             bankInfo.value = res.data[0];
             ({
                 currency: formData.Currency,
                 cusbankid: formData.CusBankID,
                 accountcode: formData.AccountCode,
             } = bankInfo.value ?? {})
-        }
-    })
+        })
+    }
 
     const cancelSubmit = async () => {
-        await request
-        // await request
         loading.value = true
         /// 发起请求
         return t2bBankCancelSign({
@@ -246,7 +240,8 @@ export function useDoCancelBankSign() {
         cancelSubmit,
         formData,
         sign,
-        bankInfo
+        bankInfo,
+        formRefresh
     }
 }
 

src/packages/mobile/views/bank/sign/Index.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onActivated, defineAsyncComponent } from 'vue'
+import { defineAsyncComponent, onActivated } from 'vue'
 import { CellGroup, Cell, Button, Empty, showFailToast } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { useComponent } from '@/hooks/component'
@@ -41,8 +41,8 @@ const componentMap = new Map<string, unknown>([
     ['edit', defineAsyncComponent(() => import('./components/edit/Index.vue'))],
 ])
 
-const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => formRefresh())
-const { cancelSubmit, formRefresh, bankInfo } = useDoCancelBankSign()
+const { componentRef, componentId, openComponent, closeComponent } = useComponent()
+const { cancelSubmit, bankInfo, formRefresh } = useDoCancelBankSign()
 const { router } = useNavigation()
 
 const formSubmit = () => {
@@ -64,6 +64,7 @@ const formSubmit = () => {
 }
 
 onActivated(() => formRefresh())
+
 </script>
 
 <style lang="less">

src/packages/mobile/views/order/performance/components/detail/Index.vue

@@ -7,7 +7,7 @@
             </template>
             <div class="order-detail__container g-form__container">
                 <CellGroup title="履约信息">
-                    <Cell title="类型" :value="selectedRow.typename" />
+                    <Cell title="类型" :value="getPerformanceTypeName(selectedRow.performancetype)" />
                     <Cell title="商品" :value="selectedRow.wrstandardname" />
                     <Cell title="仓库" :value="selectedRow.warehousename" />
                     <Cell title="数量" :value="selectedRow.qty" />
@@ -61,7 +61,7 @@ import { fullloading } from '@/utils/vant'
 import { formatDate, formatDecimal, handleNoneValue } from '@/filters'
 import { usePerformanceDelayApply, usePerformanceManualConfirm } from '@/business/performance'
 import { queryWrPerformancePlanStep } from '@/services/api/performance'
-import { getPerformanceStepStatusName } from '@/constants/order'
+import { getPerformanceStepStatusName, getPerformanceTypeName } from '@/constants/order'
 
 import AppModal from '@/components/base/modal/index.vue'
 import { useRequest } from '@/hooks/request'

src/packages/mobile/views/order/position/components/transfer/list/Index.vue

@@ -24,7 +24,7 @@
                         </li>
                         <li>
                             <span>持仓金额</span>
-                            <span>{{ item.buycurholderamount }}</span>
+                            <span>{{ formatDecimal(item.buycurholderamount) }}</span>
                         </li>
                         <li>
                             <span>转让定金比例</span>
@@ -68,7 +68,7 @@
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { Button } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
-import { parsePercent } from '@/filters'
+import { parsePercent, formatDecimal } from '@/filters'
 import { useComponent } from '@/hooks/component'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradePositionExs } from '@/services/api/transfer'

src/packages/mobile/views/order/position/components/transfer/listing/Index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar title="转让" @back="closed" />
             </template>
-            <Form ref="formRef" class="g-form__container" @submit="onSubmit">
+            <Form ref="formRef" :label-width="100" class="g-form__container" @submit="onSubmit">
                 <CellGroup inset>
                     <Field label="商品代码/名称">
                         <template #input>

src/packages/pc/views/account/certification/index.vue

@@ -0,0 +1,97 @@
+<!-- 账户管理-实名认证 -->
+<!-- <template>
+    <app-view class="g-form account-certification">
+        <template #header>
+            <app-navbar title="实名认证" />
+        </template>
+        <Form ref="formRef" class="g-form__container" @submit="onSubmit">
+            <CellGroup inset>
+                <Field v-model="formData.username" name="username" label="姓名" placeholder="请输入用户姓名"
+                    :rules="formRules.username" />
+                <Field name="cardtype" label="证件类型" :rules="formRules.cardtype" is-link>
+                    <template #input>
+                        <app-select v-model="formData.cardtype" placeholder="请选择证件类型" :options="enums" />
+                    </template>
+                </Field>
+                <Field v-model="formData.cardnum" name="cardnum" label="证件号码" placeholder="请输入证件号码"
+                    :rules="formRules.cardnum" />
+                <Field name="cardfrontphotourl" label="证件正面照片" :rules="formRules.cardfrontphotourl">
+                    <template #input>
+                        <app-uploader @success="b_afterRead" />
+                    </template>
+                </Field>
+                <Field name="cardbackphotourl" label="证件反面照片" :rules="formRules.cardbackphotourl">
+                    <template #input>
+                        <app-uploader @success="f_afterRead" />
+                    </template>
+                </Field>
+            </CellGroup>
+        </Form>
+        <img src="../../../assets/images/certification.png" />
+        <template #footer>
+            <div class="g-form__footer">
+                <Button type="primary" @click="formRef?.submit" round block>提交实名认证</Button>
+            </div>
+        </template>
+    </app-view>
+</template> -->
+
+<script lang="ts" setup>
+// import { ref, PropType, computed } from 'vue'
+// import { ElMessage, FormInstance, FormRules } from 'element-plus'
+// import { getCertificateTypeList } from "@/constants/account";
+// import { addAuthReq } from '@/business/user'
+// import AppUpload from '@pc/components/base/upload/index.vue'
+// import AppDrawer from '@pc/components/base/drawer/index.vue'
+
+// const show = ref(true)
+// const refresh = ref(false)
+// const formRef = ref<FormInstance>()
+// const { formData, formSubmit } = addAuthReq()
+
+/// 获取对应的证件枚举类型
+// const enums = computed(() => { return getCertificateTypeList().map(obj => { return { label: obj.label, value: obj.value } }) })
+
+// const b_afterRead = (filePath: string) => {
+//     formData.cardfrontphotourl = filePath
+// }
+
+// const f_afterRead = (filePath: string) => {
+//     formData.cardbackphotourl = filePath
+// }
+
+// 表单验证规则
+// const formRules: FormRules = {
+//     username: [{
+//         required: true,
+//         message: '请输入用户姓名',
+//     }],
+//     cardnum: [{
+//         required: true,
+//         message: '请输入证件号码',
+
+//     }],
+//     cardbackphotourl: [{
+//         required: true,
+//         message: '请上传证件背面照片',
+//     }],
+//     cardfrontphotourl: [{
+//         required: true,
+//         message: '请上传证件正面照片',
+//     }],
+// }
+
+// const onCancel = (isRefresh = false) => {
+//     show.value = false
+//     refresh.value = isRefresh
+// }
+
+// const onSubmit = () => {
+//     formSubmit().then(() => {
+//         ElMessage.success('实名认证提交请求成功')
+//         onCancel(true)
+//     }).catch((err) => {
+//         ElMessage.error('实名认证提交请求失败：' + err)
+//     })
+// }
+</script>

src/packages/pc/views/footer/capital/summary/deposit/index.vue

@@ -1,6 +1,6 @@
 <!-- 资金信息-资金汇总-充值 -->
 <template>
-    <app-drawer title="充值" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer title="充值" :width="500" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" class="el-form--vertical" label-width="100px" label-position="left" :model="formData"
             :rules="formRules">
             <el-form-item prop="Amount" label="充值金额">
@@ -11,7 +11,7 @@
             </el-form-item>
         </el-form>
         <template #footer>
-            <el-button type="info" @click="onCancel(false)">取消</el-button>
+            <el-button type="info" @click="onCancel(false)" plain>取消</el-button>
             <el-button type="primary" @click="formSubmit">提交</el-button>
         </template>
     </app-drawer>

src/packages/pc/views/footer/capital/summary/withdraw/index.vue

@@ -1,7 +1,7 @@
 <!-- 资金信息-资金汇总-出金申请 -->
 <template>
-    <app-drawer title="提现申请" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" class="el-form--horizontal" label-width="100px" :model="formData" :rules="formRules">
+    <app-drawer title="提现申请" :width="500" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules">
             <el-form-item label="资金账号">
                 <span>{{ accountStore.currentAccountId }}</span>
             </el-form-item>