xxxxx

src/business/bank/index.ts

@@ -126,7 +126,6 @@ export function useDoBankSign() {
     /// 查询签约银行信息
     const request = queryCusBankSignBank().then((res) => {
         if (res.data.length) {
-            console.log(res.data)
             const data = res.data[0]
             cusSignBank.value = data
             formData.Currency = data.currency

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

@@ -21,7 +21,7 @@
                 <Button type="warning" round block @click="formSubmit"
                     v-if="bankInfo.signstatus === SignStatus.Signed">解约</Button>
                 <Button type="danger" round block @click="openComponent('edit')"
-                    v-if="[SignStatus.Unsigned, SignStatus.Refuse, SignStatus.Signed].includes(bankInfo.signstatus)">修改</Button>
+                    v-if="[SignStatus.Unsigned, SignStatus.Refuse, SignStatus.Signed, SignStatus.Rescinded].includes(bankInfo.signstatus)">修改</Button>
             </div>
         </template>
         <component ref="componentRef" :is="componentMap.get(componentId)" @closed="closeComponent" v-if="componentId" />
@@ -36,6 +36,7 @@ import { useComponent } from '@/hooks/component'
 import { getSignStatusName, SignStatus } from '@/constants/bank'
 import { useDoCancelBankSign } from '@/business/bank'
 import { useNavigation } from '../../../router/navigation'
+import { useErrorInfoStore } from '@/stores'
 
 const componentMap = new Map<string, unknown>([
     ['edit', defineAsyncComponent(() => import('./components/edit/Index.vue'))],
@@ -53,11 +54,12 @@ const formSubmit = () => {
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
                 hideLoading()
-                dialog('签约提交成功，请耐心等待审核。').then(() => {
+                dialog('解约提交成功，请耐心等待审核。').then(() => {
                     router.back()
                 })
             }).catch((err) => {
-                showFailToast(err)
+                const { getErrorInfoByCode } = useErrorInfoStore()
+                showFailToast(getErrorInfoByCode(Number(err)) ?? '')
             })
         })
     })

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

@@ -37,7 +37,9 @@ import { fullloading, dialog } from '@/utils/vant'
 import { useDoBankSign } from '@/business/bank'
 import AppSelect from '../../../../../components/base/select/index.vue'
 import { validateRules } from '@/constants/regex'
+import { useErrorInfoStore } from '@/stores'
 import AppModal from '@/components/base/modal/index.vue'
+import { number } from 'echarts'
 
 const { formData, onSubmit, banklist, bankInfo } = useDoBankSign()
 const showModal = shallowRef(true)
@@ -80,7 +82,8 @@ const formSubmit = () => {
                 closed(true)
             })
         }).catch((err) => {
-            showFailToast(err)
+            const { getErrorInfoByCode } = useErrorInfoStore()
+            showFailToast(getErrorInfoByCode(Number(err)) ?? '')
         })
     })
 }

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

@@ -1,49 +0,0 @@
-.planstep-info {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  align-content: center;
-  border: 0.5px solid #387BDC;
-  border-radius: 10px;
-  color: #333;
-  font-size: 0.25rem;
-  margin: 15px 10px;
-}
-.planstep-info__up,
-.planstep-info__mid,
-.planstep-info__dwn {
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  align-content: center;
-  padding: 10px 0px;
-}
-.planstep-info__up :nth-child(1),
-.planstep-info__mid :nth-child(1),
-.planstep-info__dwn :nth-child(1) {
-  margin-left: 10px;
-}
-.planstep-info__up :nth-last-child(1),
-.planstep-info__mid :nth-last-child(1),
-.planstep-info__dwn :nth-last-child(1) {
-  margin-right: 10px;
-}
-.planstep-info__up {
-  color: #fff;
-  border-radius: 10px 10px 0px 0px;
-}
-.planstep-info .stepindex {
-  width: 25px;
-  height: 25px;
-  border-radius: 50%;
-  background-color: #fff;
-  color: #666;
-  text-align: center;
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-}

src/packages/pc/views/account/sign/components/cancel/index.vue

@@ -15,14 +15,14 @@ import { ElMessage } from 'element-plus'
 import { useDoCancelBankSign } from '@/business/bank'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
-defineProps({
+const props = defineProps({
     selectedRow: {
         type: Object as PropType<Model.BankAccountSignRsp>,
         required: true
     }
 })
 
-const { cancelSubmit, loading } = useDoCancelBankSign()
+const { cancelSubmit, loading, formData } = useDoCancelBankSign()
 
 const show = ref(true)
 const refresh = ref(false)
@@ -33,12 +33,15 @@ const onCancel = (isRefresh = false) => {
 }
 
 const onCancelSumit = () => {
+    const { cusbankid, currency, accountcode} = props.selectedRow
+    formData.Currency = currency
+    formData.CusBankID = cusbankid
+    formData.AccountCode = accountcode
     /// 提交
     cancelSubmit().then(() => {
         ElMessage.success('提交成功')
-        onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(err)
     })
 }
 </script>

src/packages/pc/views/account/sign/components/sign/index.vue

@@ -31,8 +31,9 @@ import { ref } from 'vue'
 import { ElMessage } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useDoBankSign } from '@/business/bank'
-import AppDrawer from '@pc/components/base/drawer/index.vue'
+import { useErrorInfoStore } from '@/stores'
 import { validateRules } from '@/constants/regex'
+import AppDrawer from '@pc/components/base/drawer/index.vue'
 
 const formRules: FormRules = {
     OpenBankAccId: [{
@@ -78,7 +79,8 @@ const formSubmit = () => {
         ElMessage.success(bankInfo ? '签约信息修改成功' : '签约提交成功，请耐心等待审核。')
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败：' + err)
+        const { getErrorInfoByCode } = useErrorInfoStore()
+        ElMessage(getErrorInfoByCode(Number(err)) ?? '')
     })
 }
 

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

@@ -7,7 +7,7 @@
                 <el-input-number placeholder="请输入" :max="9999999999" :precision="2" v-model="formData.Amount" :rules="formRules.Amount"/>
             </el-form-item>
             <el-form-item label="凭证" prop="filePath">
-                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="onUploadChange" :rules="formRules.filePath"/>
+                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="onUploadChange"/>
             </el-form-item>
         </el-form>
         <template #footer>
@@ -23,7 +23,6 @@ import { ElMessage, FormInstance, FormRules } from 'element-plus'
 import { useDoDeposit } from '@/business/bank'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppUpload from '@pc/components/base/upload/index.vue'
-import { shallowRef } from 'vue'
 
 const props = defineProps({
     selectedRow: {
@@ -36,15 +35,12 @@ const { formData, onSubmit, extendInfo, loading } = useDoDeposit(props.selectedR
 const show = ref(true)
 const refresh = ref(false)
 const formRef = ref<FormInstance>()
-const filePath = shallowRef('')
 
 const formRules: FormRules = {
     Amount: [{ required: true, message: '请输入充值金额' }],
-    filePath: [{ required: true, message: '请上传转账凭证' }],
 }
 
 const onUploadChange = (file: { filePath: string }) => {
-    filePath.value = file.filePath
     extendInfo.certificate_photo_url = file.filePath
 }
 

src/packages/pc/views/footer/goods/order/cancel/index.vue

@@ -3,8 +3,8 @@
     <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
         <div>确认要撤销吗？</div>
         <template #footer>
-            <el-button type="primary" @click="onCancelSumit()">提交</el-button>
             <el-button @click="onCancel(false)" plain>取消</el-button>
+            <el-button type="primary" @click="onCancelSumit()">提交</el-button>
         </template>
     </app-drawer>
 </template>

src/packages/pc/views/footer/spot/order/cancel/index.vue

@@ -3,8 +3,8 @@
     <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
         <div>确认要撤销吗？</div>
         <template #footer>
-            <el-button type="primary" @click="onCancelSumit()">提交</el-button>
             <el-button @click="onCancel(false)" plain>取消</el-button>
+            <el-button type="primary" @click="onCancelSumit()">提交</el-button>
         </template>
     </app-drawer>
 </template>

src/packages/pc/views/footer/spot/order/index.vue

@@ -70,8 +70,8 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'wrstandardname', label: '商品' },
     { prop: 'warehousename', label: '仓库' },
     { prop: 'wrpricetype', label: '挂牌方式' },
-    { prop: 'goodsname', label: '期货合约' },
-    { prop: 'fixedprice', label: '价格/基差' },
+    // { prop: 'goodsname', label: '期货合约' },
+    { prop: 'fixedprice', label: '价格' },
     { prop: 'orderqty', label: '挂牌数量' },
     { prop: 'tradeqty', label: '成交数量' },
     { prop: 'ordertime', label: '挂牌时间' }

src/services/http/index.ts

@@ -243,7 +243,7 @@ export default new (class {
                     return Promise.resolve(res as T)
                 }
                 const { getErrorInfoByCode } = useErrorInfoStore()
-                const msg = getErrorInfoByCode([6003, 6007].includes(res.status) ? res.status : res.RetCode)
+                const msg = getErrorInfoByCode([6003, 6007, 6019].includes(res.status) ? res.status : res.RetCode)
                 const error = String(res.RetDesc || res.RetCode || res.Status)
                 return Promise.reject(msg ?? error)
             }