Merge branch 'v20' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL into v20

src/business/user/account.ts

@@ -1,5 +1,5 @@
 import { shallowRef, reactive } from 'vue'
-import { useLoginStore, useAccountStore } from '@/stores'
+import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
 import { investorDel, modifyPassword, requestAddAuth, requestAddUser, requestCreateContractAndAddSigner, requestCreateFlowByTemplateDirectly, requestSignCompleted, requestWillFace } from '@/services/api/account'
 import cryptojs from 'crypto-js'
 
@@ -9,10 +9,12 @@ const accountStore = useAccountStore()
 // 用户实名认证
 export function addAuthReq() {
     const loading = shallowRef(false)
+    /// 审核备注
+    const modifyremark = useUserStore().userAccount.modifyremark ?? ''
 
     const formData = reactive<Model.AddAuthReq>({
         userid: loginStore.userId,
-        cardtype: 0
+        cardtype: 0,
     })
 
     const formSubmit = async () => {
@@ -29,6 +31,7 @@ export function addAuthReq() {
 
     return {
         loading,
+        modifyremark,
         formData,
         formSubmit
     }

src/constants/order.ts

@@ -122,7 +122,6 @@ export function getPaymentTypeList() {
     ]
 }
 
-
 /**
  * 获取交易状态名称
  * @returns 

src/packages/mobile/components/modules/quote/price/index.vue

@@ -50,19 +50,19 @@
         </Divider>
         <div class="app-quote-price__more" v-if="quote">
             <ul v-show="showMore">
-                <li>
+                <li v-if="quote.marketid != 99201">
                     <span>买量</span>
                     <span>{{ handleNumberValue(quote.bidvolume) }}</span>
                 </li>
-                <li>
+                <li v-if="quote.marketid != 99201">
                     <span>卖量</span>
                     <span>{{ handleNumberValue(quote.askvolume) }}</span>
                 </li>
-                <li>
+                <li v-if="quote.marketid != 99201">
                     <span>买价</span>
                     <span :class="quote.bidColor">{{ handleNumberValue(quote.bid.toFixed(quote.decimalplace)) }}</span>
                 </li>
-                <li>
+                <li v-if="quote.marketid != 99201">
                     <span>卖价</span>
                     <span :class="quote.askColor">{{ handleNumberValue(quote.ask.toFixed(quote.decimalplace)) }}</span>
                 </li>

src/packages/mobile/views/account/certification/Index.vue

@@ -29,6 +29,7 @@
                         <app-uploader @success="h_afterRead" />
                     </template>
                 </Field>
+                <Field v-if="modifyremark != ''" v-model="modifyremark" readonly name="modifyremark" label="审核备注" />
             </CellGroup>
         </Form>
         <img src="../../../assets/images/certification.png" />
@@ -51,7 +52,7 @@ import { useNavigation } from '@mobile/router/navigation'
 import AppUploader from '@mobile/components/base/uploader/index.vue'
 
 const formRef = shallowRef<FormInstance>()
-const { formData, formSubmit } = addAuthReq()
+const { formData, formSubmit, modifyremark } = addAuthReq()
 const { router } = useNavigation()
 
 const b_afterRead = (filePath: string) => {

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

@@ -12,6 +12,7 @@
                     <Cell title="手机号码" :value="bankInfo.mobilephone" v-if="bankInfo.mobilephone" />
                 </template>
                 <Cell title="支行名称" v-if="bankInfo.branchbankname != ''" :value="bankInfo.branchbankname" />
+                <Cell title="备注" v-if="bankInfo.dealstatus === 5 && bankInfo.remark != ''" :value="bankInfo.remark" />
                 <Cell title="状态" :value="getSignStatusName(bankInfo.signstatus)" />
             </CellGroup>
         </div>

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

@@ -20,10 +20,7 @@
                         v-model="formData.MobilePhone" placeholder="请输入手机号码" />
                     <template v-for="(item, index) in configs" :key="index">
                         <template v-if="(item.fieldcode === 'verify_code')">
-                            <Field v-if="(bankInfo === undefined) &&
-                                ((item.usabletype === 1) ||
-                                    (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
-                                    (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1))"
+                            <Field v-if="(bankInfo === undefined) && showExtendInfo(item)"
                                 v-model="item.value" type="digit" name="vcode" :label="item.fieldname" placeholder="必填"
                                 autocomplete="off" :rules="item.fieldname">
                                 <template #button>
@@ -34,24 +31,18 @@
                                 </template>
                             </Field>
                         </template>
-                        <!-- <template v-else-if="(item.fieldcode === 'bank_branch_name')">
-                            <Field v-if="(item.usabletype === 1) ||
-                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
-                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)" name="OpenBankName"
+                        <template v-else-if="(item.fieldcode === 'bank_branch_name')">
+                            <Field v-if="showExtendInfo(item)" name="OpenBankName"
                                 :label="item.fieldname"
                                 v-model="item.value" maxlength="50" :placeholder="`请输入${item.fieldname}`" :rules="formRules.OpenBankName"/>
                         </template>
                         <template v-else-if="(item.fieldcode === '100')">
-                            <Field v-if="(item.usabletype === 1) ||
-                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
-                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)" name="OpenBankNo"
+                            <Field v-if="showExtendInfo(item)" name="OpenBankNo"
                                 :label="item.fieldname"
                                 v-model="item.value" maxlength="50" :placeholder="`请输入${item.fieldname}`" :rules="formRules.OpenBankNo"/>
-                        </template> -->
+                        </template>
                         <template v-else>
-                            <Field v-if="(item.usabletype === 1) ||
-                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
-                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)" :name="item.fieldcode"
+                            <Field v-if="showExtendInfo(item)" :name="item.fieldcode"
                                 :label="item.fieldname"
                                 :readonly="item.fieldcode === 'legal_name' && userStore.userInfo?.legalpersonname != ''"
                                 v-model="item.value" maxlength="50" :placeholder="`请输入${item.fieldname}`" />
@@ -109,6 +100,13 @@ const props = defineProps({
     }
 })
 
+/// 是否显示拓展信息
+const showExtendInfo = (item: Model.BankCusBankExtendConfigRsp) => {
+    return (item.usabletype === 1) || 
+           (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
+           (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)
+}
+
 // 发送手机验证码
 const sendVerifyCode = () => {
     formRef.value?.validate('MobilePhone').then(() => {

src/packages/pc/components/modules/quote/forex/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="app-quote-forex">
+    <div class="app-quote-forex"  v-if="quote?.marketid != 99201">
         <ul class="top">
             <template v-for="(item, index) in sellList" :key="index">
                 <li :class="active === 'sell_' + index ? 'is-active' : ''" @click="onPriceClick(BuyOrSell.Sell, index)">

src/packages/pc/components/modules/quote/price/index.vue

@@ -53,7 +53,7 @@
                     <span>振幅</span>
                     <span>{{ parsePercent(quote.amplitude) }}</span>
                 </li>
-                <li>
+                <li v-if="quote.marketid != 99201">
                     <span>成交额</span>
                     <span>{{ quote.totalturnover ? changeUnit(quote.totalturnover) : handleNumberValue() }}</span>
                 </li>
@@ -61,7 +61,7 @@
                     <span>持仓量</span>
                     <span>{{ handleNumberValue(quote.holdvolume) }}</span>
                 </li>
-                <li v-if="globalStore.hasQuotationProperty('totalvolume')">
+                <li v-if="globalStore.hasQuotationProperty('totalvolume') && quote.marketid != 99201">
                     <span>成交量</span>
                     <span>{{ handleNumberValue(quote.totalvolume) }}</span>
                 </li>

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

@@ -22,10 +22,7 @@
             <template v-for="(item, index) in configs" :key="index">
                 <template v-if="(item.fieldcode === 'verify_code')">
                     <el-form-item :label="item.fieldname" :prop="item.fieldcode" 
-                    v-if="(bankInfo === undefined) && 
-                            ((item.usabletype === 1) || 
-                            (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
-                            (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1))">
+                    v-if="bankInfo === undefined && showExtendInfo(item)">
                         <el-input placeholder="请必须输入" type="number" v-model="item.value" :rules="formRules.vcode">
                             <template #append>
                                 <el-button size="small" type="primary" :disabled="isCountdown" @click="sendVerifyCode">
@@ -38,25 +35,19 @@
                     </template>
                     <template v-else-if="(item.fieldcode === 'bank_branch_name')">
                         <el-form-item :label="item.fieldname" prop="OpenBankName"
-                                v-if="(item.usabletype === 1) || 
-                                    (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
-                                    (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)">
+                                v-if="showExtendInfo(item)">
                             <el-input maxlength="50" :name="item.fieldcode" placeholder="请必须输入" v-model="item.value" />
                         </el-form-item>
                     </template>
                     <template v-else-if="(item.fieldcode === '100')">
                         <el-form-item :label="item.fieldname" prop="OpenBankNo"
-                                v-if="(item.usabletype === 1) || 
-                                    (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
-                                    (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)">
+                                v-if="showExtendInfo(item)">
                             <el-input maxlength="50" :name="item.fieldcode" placeholder="请必须输入" v-model="item.value" />
                         </el-form-item>
                     </template>
                 <template v-else>
                     <el-form-item :label="item.fieldname" :prop="item.fieldcode"
-                            v-if="(item.usabletype === 1) || 
-                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
-                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)">
+                            v-if="showExtendInfo(item)">
                         <el-input :readonly="item.fieldcode === 'legal_name' && userStore.userInfo?.legalpersonname != ''" maxlength="50" :name="item.fieldcode" placeholder="请必须输入" v-model="item.value" />
                     </el-form-item>
                 </template>
@@ -80,6 +71,19 @@ import service from '@/services'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import { shallowRef } from 'vue'
 
+const { formData, onSubmit, banklist, bankInfo, loading } = useDoBankSign()
+const { configs } = useDoCusBankExtendConfigs(1)
+const { smsVerificationCode } = useT2bSMSVerificationCode()
+
+const userStore = useUserStore()
+const show = ref(true)
+const refresh = ref(false)
+const formRef = ref<FormInstance>()
+const seconds = ref(60) //倒计时剩余时间
+const isCountdown = ref(false) // 是否正在倒计时
+/// 短信验证码交易中心信息
+const CenterErrMsg = shallowRef('')
+
 const formRules: FormRules = {
     OpenBankAccId: [{
         message: '请选择银行信息',
@@ -116,24 +120,18 @@ const formRules: FormRules = {
     }]
 }
 
-const { formData, onSubmit, banklist, bankInfo, loading } = useDoBankSign()
-const { configs } = useDoCusBankExtendConfigs(1)
-const { smsVerificationCode } = useT2bSMSVerificationCode()
-
-const userStore = useUserStore()
-const show = ref(true)
-const refresh = ref(false)
-const formRef = ref<FormInstance>()
-const seconds = ref(60) //倒计时剩余时间
-const isCountdown = ref(false) // 是否正在倒计时
-/// 短信验证码交易中心信息
-const CenterErrMsg = shallowRef('')
-
 const onCancel = (isRefresh = false) => {
     show.value = false
     refresh.value = isRefresh
 }
 
+/// 是否显示拓展信息
+const showExtendInfo = (item: Model.BankCusBankExtendConfigRsp) => {
+    return (item.usabletype === 1) || 
+           (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
+           (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)
+}
+
 // 发送手机验证码
 const sendVerifyCode = () => {
     formRef.value?.validateField('MobilePhone', (valid) => {

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

@@ -114,6 +114,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'bankaccountno', label: '签约银行账号' },
     { prop: 'currency', label: '币种' },
     { prop: 'signstatus', label: '状态' },
+    { prop: 'remark', label: '备注' },
 ])
 
 onMounted(() => {

src/packages/pc/views/query/order/goods/history/index.vue

@@ -34,7 +34,7 @@ import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
-import { getBuildTypeName, getWRTradeOrderStatusName, getBuyOrSellName } from '@/constants/order'
+import { getBuildTypeName, getWRTradeOrderStatusName, getBuyOrSellName, getWRTradeOrderStatusList } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -48,6 +48,15 @@ const { loading, dataList, run } = useRequest(queryHisTradeOrderDetail, {
     manual: true
 })
 
+filterOptons.selectList = [
+    {
+        key: 'orderStatus',
+        selectedValue: 3,
+        options: getWRTradeOrderStatusList().filter(e => { return [1, 2, 3, 4, 6, 7, 8, 9, 10, 11].includes(e.value)}),
+        locked: true,
+    }
+]
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodscode', label: '订单合约' },
     { prop: 'buyorsell', label: '方向' },

src/packages/pc/views/query/order/swap/history/index.vue

@@ -38,13 +38,22 @@ import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
-import { getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
+import { getBuyOrSellName, getWRTradeOrderStatusName, getWRTradeOrderStatusList } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
 const { filterOptons, getQueryParams } = useDataFilter<Model.HisTradeOrderDetailReq>()
 const filterDate = shallowRef<string[]>([])
 
+filterOptons.selectList = [
+    {
+        key: 'orderStatus',
+        selectedValue: 3,
+        options: getWRTradeOrderStatusList().filter(e => { return [1, 2, 3, 4, 6, 7, 8, 9, 10, 11].includes(e.value)}),
+        locked: true,
+    }
+]
+
 const formData = reactive<Model.HisTradeOrderDetailReq>({
     tradeMode: '46',
 })

src/packages/pc/views/query/performance/buy/all/index.vue

@@ -3,7 +3,7 @@
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
         <template #headerLeft>
             <app-filter :options="filterOptons">
-                <template #after>
+                <template #before>
                     <el-date-picker type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYYMMDD"
                         v-model="filterDate" />
                 </template>

src/packages/pc/views/query/trade/swap/history/index.vue

@@ -42,7 +42,7 @@ import { formatDate, formatDecimal, tmMatchAccountID } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable'
 import { queryHisTradeDetail, } from '@/services/api/order'
-import { getBuildTypeName, getBuyOrSellName } from '@/constants/order'
+import { getBuildTypeName, getBuyOrSellName, getBuildTypeList } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -60,6 +60,16 @@ const { loading, dataList, run } = useRequest(queryHisTradeDetail, {
     manual: true
 })
 
+
+filterOptons.selectList = [
+    {
+        key: 'buildType',
+        selectedValue: 1,
+        options: getBuildTypeList(),
+        locked: true,
+    }
+]
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'tradeid', label: '成交单号' },
     { prop: 'goodsname', label: '商品代码/名称' },

src/packages/tjmd/views/account/certification/Index.vue

@@ -65,7 +65,7 @@ const { formData, formSubmit, loading } = addAuthReq()
 const isReadonly = false//computed(() => userESignRecords.value.some((e) => e.recordstatus === 3))
 
 /// 查询记录
-const { loading: buttonLoading, dataList: userESignRecords } = useRequest(queryTencentUsereSignRecords, {
+const { loading: buttonLoading } = useRequest(queryTencentUsereSignRecords, {
     params: {
         userId: getUserId(),
         memberUserId: getMemberUserId()

src/packages/tjmd/views/account/protocol/Index.vue

@@ -29,7 +29,6 @@ import { useRequest } from '@/hooks/request'
 import { queryTencentUsereSignRecords, requestInitTencentESS } from '@/services/api/account';
 import { useRequestCreateFlowByTemplateDirectly } from '@/business/user/account';
 import plus from '@/utils/h5plus'
-import { getFileUrl } from '@/filters';
 import { getUserId } from '@/services/methods/user'
 import { useUserStore } from '@/stores'
 import { decryptAES } from '@/services/websocket/package/crypto'

src/types/model/bank.d.ts

@@ -79,12 +79,15 @@ declare namespace Model {
         cardtype: string;//证件类型
         currency: string;//币种
         cusbankid: string;//托管银行编号
+        dealstatus: number // Log处理状态
         direct: number;//方向(可以判断那方先发起的签约)
         exchticket: string;//最后一次签约成功的流水号
         extendinfo: string;//扩展信息(JSON字符串)
         mobilephone: string;//手机号
         mobilephone2: string;//手机号 - 密文
         netaddr: string;//调转网址
+        relateduserid: number // 关联使用者userid
+        remark: string // Log备注
         relateduserid: number;//关联使用者userid
         signstatus: number;//签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中 1number;
         //:审核拒绝 11:换签待审核

src/types/model/goods.d.ts

@@ -380,7 +380,6 @@ declare namespace Model {
         sellreleaseratio: number
         /// 更新时间
         updatetime: string
-
     }
 
     /** 查询供求列表 请求 */