update

oem/gstj/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.gstj",
   "appName": "甘肃碳交",
-  "version": "1.0.18",
-  "versionCode": "100018",
+  "version": "1.0.19",
+  "versionCode": "100019",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

oem/tjmd/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.tjmd",
   "appName": "海南掉期市场",
-  "version": "1.0.10",
-  "versionCode": "100010",
+  "version": "1.0.11",
+  "versionCode": "100011",
   "apiUrl": "http://192.168.31.132:8080/cfg?key=test_132",
   "tradeChannel": "ws",
   "modules": [

oem/tjmd/manifest.json

@@ -5,9 +5,9 @@
     "name" : "海南掉期市场",
     /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.0.1",
+        "name" : "1.0.11",
         /*应用版本名称*/
-        "code" : 100001
+        "code" : 100011
     },
     "description" : "",
     /*应用描述信息*/
@@ -155,7 +155,7 @@
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
                 "autoSdkPermissions" : false,
-                "minSdkVersion" : 26
+                "minSdkVersion" : 29
             },
             /*使用Native.js调用原生安卓API需要使用到的系统权限*/
             "orientation" : [ "portrait-primary" ],

src/packages/gstj/views/mine/Index.vue

@@ -26,18 +26,36 @@
                     </div>
                 </div>
                 <div class="bank">
-                    <div class="bank-item">
-                        <span>余额</span>
-                        <span>{{ currentAccount.currentbalance?.toFixed(2) ?? '0.00' }}</span>
-                    </div>
-                    <div class="bank-item">
-                        <span>预扣</span>
-                        <span>{{ currentAccount.freezeMargin?.toFixed(2) }}</span>
-                    </div>
-                    <div class="bank-item">
-                        <span>可用</span>
-                        <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
-                    </div>
+                    <ul>
+                        <li>
+                            <span>余额</span>
+                            <span>{{ currentAccount.currentbalance?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>净值</span>
+                            <span>{{ currentAccount.hazardValue?.toFixed(2) }}</span>
+                        </li>
+                    </ul>
+                    <ul>
+                        <li>
+                            <span>预扣</span>
+                            <span>{{ currentAccount.freezeMargin?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>占用</span>
+                            <span>{{ currentAccount.usedmargin?.toFixed(2) }}</span>
+                        </li>
+                    </ul>
+                    <ul>
+                        <li>
+                            <span>可用</span>
+                            <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>风险率</span>
+                            <span>{{ parsePercent(currentAccount.hazardRatio) }}</span>
+                        </li>
+                    </ul>
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>
@@ -119,6 +137,7 @@
 <script lang="ts" setup>
 import { shallowRef, onMounted, onActivated, computed } from 'vue'
 import { Cell, CellGroup, Button, Icon } from 'vant'
+import { parsePercent } from '@/filters'
 import { fullloading, dialog } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { AuthStatus } from '@/constants/account'

src/packages/gstj/views/mine/index.less

@@ -99,29 +99,28 @@
         .bank {
             display: flex;
             justify-content: space-around;
-            padding: .48rem 0;
+            padding: .36rem 0;
 
-            &-item {
-                display: flex;
-                flex-direction: column;
+            ul {
+                li {
+                    display: flex;
+                    flex-direction: column;
+                    padding-bottom: .1rem;
 
-                span {
-                    line-height: .4rem;
+                    span {
+                        line-height: .4rem;
 
-                    &:first-child {
-                        font-size: .24rem;
-                        color: #A1B1C5;
-                    }
+                        &:first-child {
+                            font-size: .24rem;
+                            color: #A1B1C5;
+                        }
 
-                    &:last-child {
-                        font-size: .3rem;
-                        font-weight: bold;
+                        &:last-child {
+                            font-size: .3rem;
+                            font-weight: bold;
+                        }
                     }
                 }
-
-                a {
-                    color: #00577C;
-                }
             }
         }
 

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

@@ -64,7 +64,7 @@ useRequest(queryMarketRun, {
 })
 
 watch(() => quote.value, (q) => {
-    if (q?.last && q.lastvolume) {
+    if (q?.last && (q.lastvolume || quote.value?.trademode === 99)) {
         const list = dataList.value
         if (list.length > 9) {
             // 移除列表最后一条记录

src/packages/mobile/views/goods/detail/Index.vue

@@ -34,7 +34,7 @@ defineProps({
 })
 
 const Price = defineAsyncComponent(() => import('@mobile/components/modules/quote/price/index.vue'))
-const Chart = defineAsyncComponent(() => import('@mobile/components/modules/hqchart/index.vue'))
+const Chart = defineAsyncComponent(() => import('@mobile/components/modules/quote/chart/index.vue'))
 const Forex = defineAsyncComponent(() => import('@mobile/components/modules/quote/forex/index.vue'))
 const Tik = defineAsyncComponent(() => import('@mobile/components/modules/quote/tik/index.vue'))
 

src/packages/mobile/views/market/detail/Index.vue

@@ -15,7 +15,7 @@ import { useNavigation } from '@mobile/router/navigation'
 import { useFuturesStore } from '@/stores'
 
 const Price = defineAsyncComponent(() => import('@mobile/components/modules/quote/price/index.vue'))
-const Chart = defineAsyncComponent(() => import('@mobile/components/modules/hqchart/index.vue'))
+const Chart = defineAsyncComponent(() => import('@mobile/components/modules/quote/chart/index.vue'))
 const Tik = defineAsyncComponent(() => import('@mobile/components/modules/quote/tik/index.vue'))
 
 const { getQueryString } = useNavigation()

src/packages/mobile/views/order/inout/components/in/list/index.vue

@@ -37,7 +37,7 @@
                         </li>
                         <li>
                             <span>手续费</span>
-                            <span>{{ item.outcharge }}</span>
+                            <span>{{ item.incharge }}</span>
                         </li>
                     </ul>
                 </div>

src/packages/pc/components/modules/goods-detail/chart/index.vue

@@ -13,7 +13,7 @@
 
 <script lang="ts" setup>
 import Price from '@pc/components/modules/quote/price/index.vue'
-import Chart from '@pc/components/modules/hqchart/index.vue'
+import Chart from '@pc/components/modules/quote/chart/index.vue'
 import Forex from '@pc/components/modules/quote/forex/index.vue'
 import Tik from '@pc/components/modules/quote/tik/index.vue'
 

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

@@ -65,7 +65,7 @@ useRequest(queryMarketRun, {
 // 监听行情推送
 quoteWatch(props.goodsCode, (quote) => {
     const { last = 0, lasttime = '', lastvolume = 0 } = quote
-    if (last && lastvolume) {
+    if (last && (lastvolume || quoteDay.value?.trademode === 99)) {
         const list = dataList.value
         if (list.length > 19) {
             // 移除列表最后一条记录

src/packages/pc/views/footer/inout/in/index.vue

@@ -47,7 +47,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'transferprice', label: '转让价格' },
     { prop: 'freezedays', label: '冻结天数' },
     { prop: 'goodscurprice', label: '商品价格' },
-    { prop: 'outcharge', label: '手续费' },
+    { prop: 'incharge', label: '手续费' },
     { prop: 'transferapplystatus', label: '状态' },
     { prop: 'applytime', label: '申请时间' }
 ])

src/packages/tjmd/views/mine/Index.vue

@@ -26,18 +26,36 @@
                     </div>
                 </div>
                 <div class="bank">
-                    <div class="bank-item">
-                        <span>余额</span>
-                        <span>{{ currentAccount.currentbalance?.toFixed(2) ?? '0.00' }}</span>
-                    </div>
-                    <div class="bank-item">
-                        <span>预扣</span>
-                        <span>{{ currentAccount.freezeMargin?.toFixed(2) }}</span>
-                    </div>
-                    <div class="bank-item">
-                        <span>可用</span>
-                        <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
-                    </div>
+                    <ul>
+                        <li>
+                            <span>余额</span>
+                            <span>{{ currentAccount.currentbalance?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>净值</span>
+                            <span>{{ currentAccount.hazardValue?.toFixed(2) }}</span>
+                        </li>
+                    </ul>
+                    <ul>
+                        <li>
+                            <span>预扣</span>
+                            <span>{{ currentAccount.freezeMargin?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>占用</span>
+                            <span>{{ currentAccount.usedmargin?.toFixed(2) }}</span>
+                        </li>
+                    </ul>
+                    <ul>
+                        <li>
+                            <span>可用</span>
+                            <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>风险率</span>
+                            <span>{{ parsePercent(currentAccount.hazardRatio) }}</span>
+                        </li>
+                    </ul>
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>
@@ -124,6 +142,7 @@
 <script lang="ts" setup>
 import { shallowRef, onMounted, onActivated, computed } from 'vue'
 import { Cell, CellGroup, Button, Icon } from 'vant'
+import { parsePercent } from '@/filters'
 import { fullloading, dialog } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { AuthStatus } from '@/constants/account'

src/packages/tjmd/views/mine/index.less

@@ -99,29 +99,28 @@
         .bank {
             display: flex;
             justify-content: space-around;
-            padding: .48rem 0;
+            padding: .36rem 0;
 
-            &-item {
-                display: flex;
-                flex-direction: column;
+            ul {
+                li {
+                    display: flex;
+                    flex-direction: column;
+                    padding-bottom: .1rem;
 
-                span {
-                    line-height: .4rem;
+                    span {
+                        line-height: .4rem;
 
-                    &:first-child {
-                        font-size: .24rem;
-                        color: #A1B1C5;
-                    }
+                        &:first-child {
+                            font-size: .24rem;
+                            color: #A1B1C5;
+                        }
 
-                    &:last-child {
-                        font-size: .3rem;
-                        font-weight: bold;
+                        &:last-child {
+                            font-size: .3rem;
+                            font-weight: bold;
+                        }
                     }
                 }
-
-                a {
-                    color: #00577C;
-                }
             }
         }