li.shaoyi 2 jaren geleden
bovenliggende
commit
acef0c04bd

+ 2 - 2
src/packages/mobile/components/modules/hqchart/candlestick/index.vue

@@ -38,8 +38,8 @@ const goods = getGoodsQuote(props.goodsCode)
 const chartInstance = shallowRef() // 图表实例
 
 const tabs = [
-    { label: 'VOL', value: 'VOL' },
     { label: 'MACD', value: 'MACD' },
+    { label: 'VOL', value: 'VOL' },
     { label: 'KDJ', value: 'KDJ' },
     { label: 'RSI', value: 'RSI' },
     { label: 'CCI', value: 'CCI' }
@@ -83,7 +83,7 @@ const chartOption = {
     // https://blog.csdn.net/jones2000/article/details/102928907
     Windows: [
         { Index: 'MA', Change: false, Modify: false },
-        { Index: 'VOL', Change: false, Modify: false, Close: false }
+        { Index: 'MACD', Change: false, Modify: false, Close: false }
     ],
     IsCorssOnlyDrawKLine: true,  // 十字光标只能在K线上
     CorssCursorTouchEnd: true, // 手指离开屏幕 隐藏十字光标

+ 2 - 2
src/packages/pc/components/modules/hqchart/candlestick/index.vue

@@ -41,8 +41,8 @@ const goods = getGoodsQuote(props.goodsCode)
 const chartInstance = shallowRef() // 图表实例
 
 const tabs = [
-    { label: 'VOL', value: 'VOL' },
     { label: 'MACD', value: 'MACD' },
+    { label: 'VOL', value: 'VOL' },
     { label: 'KDJ', value: 'KDJ' },
     { label: 'RSI', value: 'RSI' },
     { label: 'WR', value: 'WR' },
@@ -143,7 +143,7 @@ const changeIndex = (index: number) => {
 
 const onReady = (chart: unknown) => {
     if (props.showIndex) {
-        chartOption.Windows.push({ Index: 'VOL', Change: true, Close: false })
+        chartOption.Windows.push({ Index: 'MACD', Change: true, Close: false })
     }
     chartInstance.value = chart
     chartInstance.value.SetOption(chartOption)

+ 2 - 2
src/packages/pc/views/market/trade/index.vue

@@ -16,7 +16,7 @@ import { queryTjmdMarketSection } from '@/services/api/swap'
 import AppTabs from '@/components/base/tabs/index.vue'
 
 const componentMap = new Map<string, unknown>([
-    ['order', defineAsyncComponent(() => import('./goods/list/index.vue'))], // 订单挂牌
+    ['orderList', defineAsyncComponent(() => import('./goods/list/index.vue'))], // 订单挂牌
     ['99201', defineAsyncComponent(() => import('./market/index.vue'))], // 参考行情
 ])
 
@@ -49,7 +49,7 @@ const onMarketChange = (index: number) => {
     const item = marketList.value[index]
     if (item) {
         if ([50101, 50102, 50103, 50104, 16201].includes(item.marketid)) {
-            openComponent('order')
+            openComponent('orderList')
         } else {
             openComponent(item.marketid.toString())
         }

+ 3 - 0
src/services/http/index.ts

@@ -247,6 +247,9 @@ export default new (class {
             case 0: {
                 return Promise.resolve(res)
             }
+            case -1: {
+                return Promise.reject(res.RetDesc)
+            }
             case 12018: {
                 if (res.RetDesc) {
                     const word = cryptojs.enc.Base64.parse(res.RetDesc) // 解析base64