update

src/packages/mobile/components/modules/hqchart/candlestick/index.vue

@@ -138,12 +138,13 @@ const chartOption = {
             const decimalplace = goods.value?.decimalplace
             // 自定义标题栏，参考源码 DynamicKLineTitlePainting.GetFormatTitle
             paint.GetFormatTitle = (data) => {
-                const { Open, High, Low, Close, YClose } = data.Data
+                const { Open, High, Low, Close, YClose, YFClose } = data.Data
+                const yclose = YFClose ?? YClose
                 const AryText = [
-                    { Text: '开:' + handleNumberValue(Open.toFixed(decimalplace)), Color: paint.GetColor(Open, YClose) },
-                    { Text: '高:' + handleNumberValue(High.toFixed(decimalplace)), Color: paint.GetColor(High, YClose) },
-                    { Text: '低:' + handleNumberValue(Low.toFixed(decimalplace)), Color: paint.GetColor(Low, YClose) },
-                    { Text: '收:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Close, YClose) }
+                    { Text: '开:' + handleNumberValue(Open.toFixed(decimalplace)), Color: paint.GetColor(Open, yclose || Open) },
+                    { Text: '高:' + handleNumberValue(High.toFixed(decimalplace)), Color: paint.GetColor(High, yclose || High) },
+                    { Text: '低:' + handleNumberValue(Low.toFixed(decimalplace)), Color: paint.GetColor(Low, yclose || Low) },
+                    { Text: '收:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Close, yclose || Close) }
                 ]
                 return {
                     AryText

src/packages/mobile/components/modules/hqchart/timeline/index.vue

@@ -77,7 +77,7 @@ const chartOption = {
                 const { DateTime, Open, Close, Vol, Amount, YClose, Increase = 0 } = data.Data
                 const AryText = [
                     { Text: FormatDateTimeString(DateTime, true, paint.IsShowTime), Color: paint.DateTimeColor },
-                    { Text: '价:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Open, YClose) },
+                    { Text: '价:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Open, YClose || Open) },
                     { Text: '幅:' + Increase.toFixed(2) + '%', Color: paint.GetColor(Increase, 0) }
                 ]
                 if (goods.value?.trademode !== 99) {

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

@@ -4,7 +4,7 @@
             {{ formatDate(value, 'HH:mm:ss') }}
         </template>
         <template #PE="{ value }">
-            <span>{{ handleNumberValue(value) }}</span>
+            <span>{{ handleNumberValue(formatDecimal(value, quote?.decimalplace)) }}</span>
         </template>
         <template #Vol="{ value }">
             <span>{{ handleNumberValue(value) }}</span>
@@ -14,7 +14,7 @@
 
 <script lang="ts" setup>
 import { ref, shallowReactive, onMounted } from 'vue'
-import { formatDate, handleNumberValue } from '@/filters'
+import { formatDate, handleNumberValue, formatDecimal } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryHistoryTikDatas, queryMarketRun } from '@/services/api/market'
 import { useFuturesStore } from '@/stores'

src/packages/pc/components/modules/hqchart/candlestick/index.vue

@@ -148,10 +148,10 @@ const chartOption = {
                     AryText.push({ Text: FormatTimeString(Time), Color: paint.DateTimeColor })
                 }
                 AryText.push(
-                    { Text: '开:' + handleNumberValue(Open.toFixed(decimalplace)), Color: paint.GetColor(Open, yclose) },
-                    { Text: '高:' + handleNumberValue(High.toFixed(decimalplace)), Color: paint.GetColor(High, yclose) },
-                    { Text: '低:' + handleNumberValue(Low.toFixed(decimalplace)), Color: paint.GetColor(Low, yclose) },
-                    { Text: '收:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Close, yclose) }
+                    { Text: '开:' + handleNumberValue(Open.toFixed(decimalplace)), Color: paint.GetColor(Open, yclose || Open) },
+                    { Text: '高:' + handleNumberValue(High.toFixed(decimalplace)), Color: paint.GetColor(High, yclose || High) },
+                    { Text: '低:' + handleNumberValue(Low.toFixed(decimalplace)), Color: paint.GetColor(Low, yclose || Low) },
+                    { Text: '收:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Close, yclose || Close) }
                 )
                 if (goods.value?.trademode !== 99) {
                     AryText.push(
@@ -191,23 +191,23 @@ const customHistoryDataStringFormat = () => {
         Text: '',
         Operator: function () {
             const { FormatDateString, FormatTimeString } = Chart.IFrameSplitOperator
-            const { Data } = this.Value
-            const yclose = Data.YFClose ?? Data.YClose
-            const rise = yclose ? Data.Close - yclose : 0 // 涨跌
+            const { Date, Time, Open, High, Low, Close, Vol, Amount, YClose, YFClose } = this.Value.Data
+            const yclose = YFClose ?? YClose
+            const rise = yclose ? Close - yclose : 0 // 涨跌
             const increase = rise ? rise / yclose : 0 // 幅度
 
             this.Height = 165
             this.Text = `<dl class="app-hqchart-tooltip">`
-            this.Text += `<dt><span>${FormatDateString(Data.Date)}</span>${Data.Time ? '<span>' + FormatTimeString(Data.Time) + '</span>' : ''}</dt>`
-            this.Text += `<dd><span>开盘:</span><span class="${handlePriceColor(Data.Open, yclose)}">${handleNumberValue(Data.Open.toFixed(decimalplace))}</span></dd>`
-            this.Text += `<dd><span>最高:</span><span class="${handlePriceColor(Data.High, yclose)}">${handleNumberValue(Data.High.toFixed(decimalplace))}</span></dd>`
-            this.Text += `<dd><span>最低:</span><span class="${handlePriceColor(Data.Low, yclose)}">${handleNumberValue(Data.Low.toFixed(decimalplace))}</span></dd>`
-            this.Text += `<dd><span>收盘:</span><span class="${handlePriceColor(Data.Close, yclose)}">${handleNumberValue(Data.Close.toFixed(decimalplace))}</span></dd>`
+            this.Text += `<dt><span>${FormatDateString(Date)}</span>${Time ? '<span>' + FormatTimeString(Time) + '</span>' : ''}</dt>`
+            this.Text += `<dd><span>开盘:</span><span class="${handlePriceColor(Open, yclose || Open)}">${handleNumberValue(Open.toFixed(decimalplace))}</span></dd>`
+            this.Text += `<dd><span>最高:</span><span class="${handlePriceColor(High, yclose || High)}">${handleNumberValue(High.toFixed(decimalplace))}</span></dd>`
+            this.Text += `<dd><span>最低:</span><span class="${handlePriceColor(Low, yclose || Low)}">${handleNumberValue(Low.toFixed(decimalplace))}</span></dd>`
+            this.Text += `<dd><span>收盘:</span><span class="${handlePriceColor(Close, yclose || Close)}">${handleNumberValue(Close.toFixed(decimalplace))}</span></dd>`
             this.Text += `<dd><span>涨跌:</span><span class="${handlePriceColor(rise)}">${rise.toFixed(decimalplace)}</span></dd>`
             this.Text += `<dd><span>幅度:</span><span class="${handlePriceColor(increase)}">${parsePercent(increase)}</span></dd>`
             if (goods.value?.trademode !== 99) {
-                this.Text += `<dd><span>数量:</span><span>${changeUnit(Data.Vol)}</span></dd>`
-                this.Text += `<dd><span>金额:</span><span>${changeUnit(Data.Amount)}</span></dd>`
+                this.Text += `<dd><span>数量:</span><span>${changeUnit(Vol)}</span></dd>`
+                this.Text += `<dd><span>金额:</span><span>${changeUnit(Amount)}</span></dd>`
                 this.Height = 210
             }
             this.Text += `</dd>`

src/packages/pc/components/modules/hqchart/timeline/index.vue

@@ -71,7 +71,7 @@ const chartOption = {
                 const { DateTime, Open, Close, Vol, Amount, YClose, Increase = 0 } = data.Data
                 const AryText = [
                     { Text: FormatDateTimeString(DateTime, true, paint.IsShowTime), Color: paint.DateTimeColor },
-                    { Text: '价:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Open, YClose) },
+                    { Text: '价:' + handleNumberValue(Close.toFixed(decimalplace)), Color: paint.GetColor(Open, YClose || Open) },
                     { Text: '幅:' + Increase.toFixed(2) + '%', Color: paint.GetColor(Increase, 0) }
                 ]
                 if (goods.value?.trademode !== 99) {

src/packages/pc/views/footer/capital/statement/index.vue

@@ -5,8 +5,8 @@
         <template #createtime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="showLoadMore">加载更多</el-button>
+        <template #append v-if="showLoadMore">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

src/packages/pc/views/footer/goods/detail/index.vue

@@ -12,8 +12,8 @@
             </div>
             <span v-else>--</span>
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="showLoadMore">加载更多</el-button>
+        <template #append v-if="showLoadMore">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
         <template #footer>
             <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)"

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

@@ -25,8 +25,8 @@
         <template #ordertime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="showLoadMore">加载更多</el-button>
+        <template #append v-if="showLoadMore">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
         <template #footer>
             <component ref="componentRef" v-bind="{ dataList, selectedRows }" :is="componentMap.get(componentId)"

src/packages/pc/views/footer/goods/trade/index.vue

@@ -33,8 +33,8 @@
         <template #tradetime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="showLoadMore">加载更多</el-button>
+        <template #append v-if="showLoadMore">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

src/packages/pc/views/query/capital/history/index.vue

@@ -26,8 +26,8 @@
         <template #createtime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

src/packages/pc/views/query/capital/list/index.vue

@@ -20,8 +20,8 @@
         <template #createtime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="showLoadMore">加载更多</el-button>
+        <template #append v-if="showLoadMore">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

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

@@ -26,8 +26,8 @@
         <template #orderstatus="{ value }">
             {{ getWRTradeOrderStatusName(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

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

@@ -17,8 +17,8 @@
         <template #orderstatus="{ value }">
             {{ getWRTradeOrderStatusName(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="showLoadMore">加载更多</el-button>
+        <template #append v-if="showLoadMore">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

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

@@ -38,8 +38,8 @@
         <template #orderstatus="{ value }">
             {{ getOrderStatusName(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

src/packages/pc/views/query/order/presell/transferhistory/index.vue

@@ -22,8 +22,8 @@
         <template #ordertime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

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

@@ -26,8 +26,8 @@
         <template #wrtradeorderstatus="{ value }">
             {{ getWRTradeOrderStatusName(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

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

@@ -30,8 +30,8 @@
         <template #ordertime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

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

@@ -26,8 +26,8 @@
         <template #tradetime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

src/packages/pc/views/query/trade/goods/list/index.vue

@@ -17,8 +17,8 @@
         <template #tradetime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="showLoadMore">加载更多</el-button>
+        <template #append v-if="showLoadMore">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

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

@@ -22,8 +22,8 @@
         <template #tradedate="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

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

@@ -18,8 +18,8 @@
         <template #ordertime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>

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

@@ -34,8 +34,8 @@
         <template #tradetime="{ value }">
             {{ formatDate(value) }}
         </template>
-        <template #append>
-            <el-button size="small" plain @click="loadMore" v-if="pageIndex < pageCount">加载更多</el-button>
+        <template #append v-if="pageIndex < pageCount">
+            <el-button size="small" plain @click="loadMore">加载更多</el-button>
         </template>
     </app-table>
 </template>