xxxx

public/locales/th-TH.json

@@ -177,8 +177,8 @@
         "askvolume": "ปริมาณเสนอขาย",
         "buyusername": "ผู้ซื้อ",
         "sellusername": "ผู้ขาย",
-        "bid": "ราคาเสนอซื้อ",
-        "ask": "ราคาเสนอขาย",
+        "bid": "ซื้อ",
+        "ask": "ขาย",
         "time": "เวลา",
         "vol": "ปริมาณปัจจุบัน",
         "holdvolume": "ปริมาณคงค้าง",
@@ -1159,7 +1159,7 @@
             "tradesettings": "ตั้งค่าการสั่งซื้อ",
             "tipssetting": "ตั้งค่าคำแนะนำ",
             "others": "ตั้งค่าอื่น ๆ",
-            "language": "ตั้งค่าภาษา",
+            "language": "ภาษา",
             "chinese": "简体中文",
             "english": "English",
             "enth": "ภาษาไทย",

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

@@ -143,7 +143,7 @@ const showComponent = ((componentName: string) => {
 
 const beforeShowComponent = (row: Model.BankAccountSignRsp) => {
     if (row.cusbankid === 'jdjs') {
-        ElMessageBox.alert('请先发函到结算中心修改信息后再修改，否则将会影响入金、出金。').finally(() => {
+        ElMessageBox.alert(t('banksign.tips9')).finally(() => {
             showComponent('sign')
         })
     } else {

src/packages/pc/views/market/trade/pricing/index.vue

@@ -45,6 +45,7 @@ import { shallowRef, onMounted, onUnmounted, defineAsyncComponent, computed } fr
 import { useComponent } from '@/hooks/component'
 import { parsePercent, handleNumberValue, formatDecimal } from '@/filters'
 import { useFuturesStore, useGlobalStore } from '@/stores'
+import { ETradeMode } from '@/constants/client'
 import quoteSocket from '@/services/websocket/quote'
 import AppTable from '@pc/components/base/table/index.vue'
 
@@ -58,10 +59,12 @@ const componentMap = new Map<string, unknown>([
     ['detail', defineAsyncComponent(() => import('@pc/components/modules/goods-detail/index.vue'))], // 详情
 ])
 
-const { quoteGoodsList: dataList } = futuresStore
+const dataList = computed(() => {
+    return futuresStore.getGoodsListByTradeMode(ETradeMode.TRADEMODE_MARKETMAKE)
+}) 
 
 const tableList = computed(() => {
-    return dataList.map((item ) => {
+    return dataList.value.map((item ) => {
         const quote = futuresStore.getGoodsQuote(item.goodscode)
         const { lastColor, openedColor, lowestColor, highestColor, last = 0, presettle = 0, rise = 0, change, amplitude, highest = 0, lowest = 0, opened = 0, ask = 0, bid = 0, bidColor, askColor, decimalplace } = quote.value ?? {}
         return {

src/stores/modules/futures.ts

@@ -5,12 +5,10 @@ import { handlePriceColor } from '@/filters'
 import { queryMemberGoodsLimitConfig } from '@/services/api/common'
 import { getTodayAccountConfigInfo } from '@/services/api/account'
 import { queryErmcpGoods, queryQuoteDay } from '@/services/api/goods'
-import { queryQuoteGoodsList } from '@/services/api/swap'
 import { wordArrayToUint8Array } from '@/services/websocket/package/crypto'
 import { decodeProto } from '@/services/websocket/package/package50/proto'
 import { defineStore } from '../store'
 import { useAccountStore } from './account'
-import { useUserStore } from './user'
 import CryptoJS from 'crypto-js'
 import eventBus from '@/services/bus'
 import moment from 'moment'
@@ -35,7 +33,6 @@ export const useFuturesStore = defineStore(() => {
         goodsList: <(Model.GoodsRsp & Partial<Model.MemberGoodsLimitConfigRsp>)[]>[], // 商品列表
         quotationList: <Model.GoodsQuote[]>[], // 行情列表
         selectedGoodsId: <number | undefined>undefined, // 当前选中的商品ID
-        quoteGoodsList: <(Model.QuoteGoodsListRsp & Partial<Model.MemberGoodsLimitConfigRsp>)[]>[], // 挂牌点价商品列表
     })
 
     // 指定市场ID的商品列表
@@ -75,12 +72,10 @@ export const useFuturesStore = defineStore(() => {
     const getGoodsList = async () => {
         state.loading = true
         state.goodsList = []
-        state.quoteGoodsList = []
         state.quotationList = []
         timerTask.clearTimeout('quoteDay')
 
         const accountStore = useAccountStore()
-        const userStore = useUserStore()
         // 任务 #5511
         const { data: accountConfig } = await getTodayAccountConfigInfo()
         // 任务 #5197
@@ -90,12 +85,6 @@ export const useFuturesStore = defineStore(() => {
             }
         })
         const { data: goodsList } = await queryErmcpGoods()
-        const { data: qGoodsList } = await queryQuoteGoodsList({
-            data: {
-                usertype: userStore.userType ?? 0,
-                marketids: '10101'
-            }
-        })
 
         for (let i = 0; i < goodsList.length; i++) {
             const item = goodsList[i]
@@ -135,24 +124,6 @@ export const useFuturesStore = defineStore(() => {
             })
         }
 
-        /// 挂牌点价商品
-        for (let i = 0; i < qGoodsList.length; i++) {
-            const item = qGoodsList[i]
-            const limit = limitConfig.find((e) => e.goodsid === item.goodsid)
-
-            // 跳过不显示的商品
-            if (limit?.isnodisplay) {
-                continue
-            }
-
-            // 组合商品属性
-            state.quoteGoodsList.push({
-                ...item,
-                iscannotbuy: limit?.iscannotbuy ?? 0,
-                iscannotsell: limit?.iscannotsell ?? 0
-            })
-        }
-
         // 待优化
         getQuoteDay().then(() => {
             dataCompletedCallback.forEach((callback) => callback())