update

.gitignore

@@ -1,6 +1,6 @@
 .DS_Store
 node_modules
-electron
+electron_dist
 /dist
 
 

doc/android/fxgl.txt

@@ -16,21 +16,21 @@ http://103.40.249.126:18280/cfg?key=mtp_20
 
 
 甘肃碳交
-实盘
-cn.muchinfo.gstj_release_v1.0.0.apk
-http://8.130.69.63:8280/cfg?key=gstj
 模拟盘
 cn.muchinfo.gstj_demo_v1.0.0.apk
 http://8.130.36.162:8280/cfg?key=mtp_20
+实盘
+cn.muchinfo.gstj_release_v1.0.0.apk
+http://8.130.69.63:8280/cfg?key=gstj
 
 
 贵茶数字化
-实盘
-cn.muchinfo.qxst_release_v1.0.0.apk
-http://8.130.72.213:8280/cfg?key=mtp_20
 模拟盘
 cn.muchinfo.qxst_demo_v1.0.0.apk
 http://8.130.132.95:8280/cfg?key=mtp_20
+实盘
+cn.muchinfo.qxst_release_v1.0.0.apk
+http://8.130.72.213:8280/cfg?key=mtp_20
 
 
 中融文遗通
@@ -43,8 +43,12 @@ http://122.5.68.230:53005/cfg?key=zrwyt_sp
 
 
 青岛海商
+模拟盘
 cn.muchinfo.qdhs_demo_v1.0.0.apk
 http://47.104.156.140:8280/cfg?key=qdsp_demo
+实盘
+cn.muchinfo.qdhs_release_v1.0.0.apk
+http://47.104.103.190:8280/cfg?key=qdsp_sp
 
 
 探茶

doc/水贝亿爵.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="66.15" height="61.41" viewBox="0 0 66.15 61.41">
+  <defs>
+    <linearGradient id="linear-gradient" y1="0.5" x2="1" y2="0.5" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#d6a850"/>
+      <stop offset="0.49" stop-color="#fff79f"/>
+      <stop offset="1" stop-color="#d6a850"/>
+    </linearGradient>
+  </defs>
+  <g id="组_2210" data-name="组 2210" transform="translate(-187.997 -61.839)">
+    <path id="路径_2" data-name="路径 2" d="M250.884,96.984a35.125,35.125,0,0,0,1.3-3.657,8.276,8.276,0,0,0-.071-5.487c-.611-1.412-4.058-10.742-4.232-10.927a31.283,31.283,0,0,0-4.635-.029c.111.589,4.12,10.555,4.432,11.342.786,1.976,1.62,4.156,1.209,6.645-.327,1.982-1.509,4.185-3.694,4.365-3.645.248-2.654-3.73-2.9-4.345-.339.016-.176-.039-.361.163-.008.009-2.576,5.48-2.631,5.827l1.271.733c4.552,2.088,8.347.073,10.319-4.631Zm-2.329-35.145a22.588,22.588,0,1,1-15.972,6.616,22.517,22.517,0,0,1,15.972-6.616Zm15.42,7.168a21.806,21.806,0,1,1-15.42-6.387,21.738,21.738,0,0,1,15.42,6.387Zm-24.717,1.952c.1.479.076.285.606.457a3.213,3.213,0,0,1,1.6,1.5,15.379,15.379,0,0,1,1.273,2.815l4.882.124c-.242-.98-.58-1.9-.8-2.813a1.376,1.376,0,0,1,.352-1.327c.689-.7.98-.031,1.112-.758-.461-.327-5.58-.088-6.7-.112-.386-.008-.773-.013-1.158-.024a1.9,1.9,0,0,0-1.158.136Zm16.411,0c.441-.317,2.745-.12,3.473-.12a17.513,17.513,0,0,1,3.482.12c-.077.659-.166.129-1.134.708a6.153,6.153,0,0,0-2.111,3.1l-5.836,15.044a1.3,1.3,0,0,1-.292-.609c-1.031-2.979-1.078-2.046-.278-4.346l3.622-9.69c.333-.871,1.239-2.943.135-3.638C256.122,71.15,255.735,71.569,255.669,70.959Z" transform="translate(-27.618 0)" fill-rule="evenodd" fill="url(#linear-gradient)"/>
+    <path id="路径_958" data-name="路径 958" d="M4.425,1.245v-1H5.94A.715.715,0,0,0,6.42.1a.5.5,0,0,0,.165-.4v-9.96H9.1V-.18A1.312,1.312,0,0,1,8.67.87a1.513,1.513,0,0,1-1.02.375ZM.105-8.88H5.55v1.05L2.61,1.245H.06L3.045-7.92H.105Zm9.63,2.055L11.55-9.6h2.73L12.42-6.69,14.88,1.2H12.165Zm7.74-1.785a1.287,1.287,0,0,1,.39-.945,1.3,1.3,0,0,1,.96-.39H30.39a1.3,1.3,0,0,1,.96.39,1.287,1.287,0,0,1,.39.945v6.33H29.19V-8.535a.419.419,0,0,0-.128-.307.437.437,0,0,0-.322-.128H20.475a.437.437,0,0,0-.323.128.419.419,0,0,0-.128.307V-2.28h-2.55ZM32.01,1.23H28.965L24.6-2.355,20.49,1.23H17.37l5.97-5.4V-8.2h2.535v4.74l-.585.51H27.1Zm8.4-.03a.971.971,0,0,1-.57-.157.88.88,0,0,1-.322-.405A1.024,1.024,0,0,1,39.465.1,1.509,1.509,0,0,1,39.69-.48l6.33-8.46H39.525v-.975h9.42V-8.67L42.525-.06a.338.338,0,0,0-.053.195q.008.09.127.09h6.465V1.2Zm-4.725.045V-6.9h-1.35l1.77-3.42h2.7L37.5-7.83h.735V1.245ZM56.97,1.3,56.9.87l-3.66.33a2.1,2.1,0,0,1-.615-.03,1.515,1.515,0,0,1-.54-.218A1.186,1.186,0,0,1,51.7.548a1.2,1.2,0,0,1-.142-.608v-5.3H59.19V-2.64a1.156,1.156,0,0,1-.353.847,1.156,1.156,0,0,1-.847.352H54V-.15a.29.29,0,0,0,.075.2A.212.212,0,0,0,54.27.12l2.475-.21L56.58-1.155h2.46l.375,2.46Zm9.075-9.78V-6.9a1.156,1.156,0,0,1-.353.848,1.156,1.156,0,0,1-.847.352H52.755a1.156,1.156,0,0,1-.848-.352,1.156,1.156,0,0,1-.352-.848V-8.475H52.9l-.21-.54h2.4l.2.54h2.4l-.195-.54H59.88l.195.54H62.28l.225-.54h2.4l-.24.54ZM59.565-4.89h3.72V-5.4h2.55v.51h.375v.96h-.375V-.075a1.292,1.292,0,0,1-.4.96,1.312,1.312,0,0,1-.952.39h-3V.3h1.5a.288.288,0,0,0,.21-.09.288.288,0,0,0,.09-.21V-3.93h-3.72Zm-8.1-5.265h14.67v.93H51.465Zm8.145,7.38,3.015.525v.96L59.61-1.8Zm-3.24.45a.36.36,0,0,0,.263-.112.36.36,0,0,0,.112-.263v-.45H54v.825ZM57.945-6.54h1.71V-7.59h-1.71Zm-3.96-.21q0,.21.255.21h1.44V-7.59H53.985Zm9.375.21q.255,0,.255-.21v-.84H61.92v1.05ZM56.745-4.47H54v.435h2.745Z" transform="translate(187.937 121.944)" fill="url(#linear-gradient)"/>
+  </g>
+</svg>

electron.build.js

@@ -0,0 +1,38 @@
+const fs = require('fs')
+const path = require('path')
+const { exec } = require('child_process')
+const { build } = require('electron-builder')
+
+const res = fs.readFileSync(path.resolve('dist/config/appconfig.json'), 'utf-8')
+const { appName } = JSON.parse(res)
+
+// 打包之前清空目录
+exec('rd/s/q electron_dist')
+
+const config = {
+    productName: appName,
+    directories: {
+        output: 'electron_dist'
+    },
+    files: [
+        'dist',
+        'main.js',
+        '!node_modules'
+    ],
+    nsis: {
+        oneClick: false,
+        allowToChangeInstallationDirectory: true
+    },
+    win: {
+        icon: 'dist/favicon.ico',
+        target: [
+            {
+                target: 'nsis'
+            }
+        ]
+    }
+}
+
+build({
+    config
+})

oem/gstj/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appName": "甘肃碳交",
   "version": "1.0.2",
   "versionCode": "100002",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",

oem/qdhs/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appName": "青岛海商",
   "version": "1.0.0",
   "versionCode": "100000",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",

oem/qxst/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appName": "贵茶数字化",
   "version": "1.0.5",
   "versionCode": "100005",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",

oem/sbyj/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appName": "水贝亿爵",
   "version": "1.0.0",
   "versionCode": "100000",
   "apiUrl": "http://192.168.31.171:8080/cfg?key=test_171",

oem/tc/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appName": "探茶",
   "version": "1.0.0",
   "versionCode": "100000",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",

oem/zrwyt/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appName": "中融文遗通",
   "version": "1.0.0",
   "versionCode": "100000",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",

package.json

@@ -27,7 +27,7 @@
     "build:tc@pc": "vue-cli-service build --mode tc@pc",
     "lint": "vue-cli-service lint",
     "dev": "electron .",
-    "build": "electron-builder"
+    "build": "node electron.build.js"
   },
   "dependencies": {
     "@tinymce/tinymce-vue": "^5.0.0",
@@ -70,6 +70,7 @@
     "@vue/eslint-config-typescript": "^9.1.0",
     "compression-webpack-plugin": "^10.0.0",
     "copy-webpack-plugin": "^11.0.0",
+    "electron": "^22.0.0",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
     "less": "^4.0.0",
@@ -80,28 +81,5 @@
     "typescript": "~4.5.5",
     "vconsole": "^3.14.6",
     "worker-loader": "^3.0.8"
-  },
-  "build": {
-    "productName": "多元世纪交易中心",
-    "directories": {
-      "output": "electron"
-    },
-    "files":[
-      "dist",
-      "main.js",
-      "!node_modules"
-    ],
-    "nsis": {
-      "oneClick": false,
-      "allowToChangeInstallationDirectory": true
-    },
-    "win": {
-      "icon": "dist/app/icons/1024x1024.png",
-      "target": [
-        {
-          "target": "nsis"
-        }
-      ]
-    }
   }
 }

public/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appName": "多元世纪交易中心",
   "version": "1.0.0",
   "versionCode": "100000",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",

src/packages/gstj/router/index.ts

@@ -198,16 +198,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@mobile/views/bank/sign/Index.vue'),
       },
       {
-        path: 'statement',
-        name: 'bank-statement',
-        component: () => import('@mobile/views/bank/statement/Index.vue'),
-      },
-      {
-        path: 'statement/history',
-        name: 'bank-statement-history',
-        component: () => import('@mobile/views/bank/statement/history/Index.vue'),
-      },
-    ],
+        path: 'capital',
+        name: 'bank-capital',
+        component: () => import('@mobile/views/bank/capital/index.vue'),
+      }
+    ]
   },
   {
     path: '/order',

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

@@ -38,12 +38,6 @@
                         <span>可用</span>
                         <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
                     </div>
-                    <div class="bank-item">
-                        <span>
-                            <a @click="routerTo('bank-statement')">资金流水</a>
-                        </span>
-                        <span></span>
-                    </div>
                 </div>
                 <div class="button">
                     <Button size="small" round @click="doInOutMoney('0')">充值</Button>
@@ -69,6 +63,11 @@
         </app-block>
         <app-block class="g-navmenu">
             <CellGroup>
+                <Cell is-link :to="{ name: 'bank-capital' }">
+                    <template #title>
+                        <Iconfont icon="g-icon-capital">资金信息</Iconfont>
+                    </template>
+                </Cell>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>

src/packages/mobile/router/index.ts

@@ -348,16 +348,19 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('../views/bank/sign/Index.vue'),
       },
       {
-        path: 'statement',
-        name: 'bank-statement',
-        component: () => import('../views/bank/statement/Index.vue'),
+        path: 'capital',
+        name: 'bank-capital',
+        component: () => import('../views/bank/capital/index.vue'),
       },
       {
-        path: 'statement/history',
-        name: 'bank-statement-history',
-        component: () => import('../views/bank/statement/history/Index.vue'),
-      },
-    ],
+        path: 'statement',
+        name: 'bank-statement',
+        component: () => import('../views/bank/capital/index.vue'),
+        props: {
+          tabName: 'statement',
+        }
+      }
+    ]
   },
   {
     path: '/order',

src/packages/mobile/views/bank/capital/index.vue

@@ -0,0 +1,53 @@
+<template>
+    <app-view>
+        <template #header>
+            <app-navbar title="资金">
+                <template #right v-if="selectedComponent.history">
+                    <div class="button-more" @click="openComponent(selectedComponent.name)">
+                        <span>更多</span>
+                    </div>
+                </template>
+            </app-navbar>
+        </template>
+        <Tabs class="van-tabs--list" v-model:active="active">
+            <template v-for="(item, index) in components" :key="index">
+                <Tab :title="item.title" :name="item.name">
+                    <component :is="item.component" />
+                </Tab>
+            </template>
+        </Tabs>
+        <component ref="componentRef" :is="selectedComponent.history" @closed="closeComponent"
+            v-if="componentId && selectedComponent.history" />
+    </app-view>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef, computed, defineAsyncComponent } from 'vue'
+import { Tab, Tabs } from 'vant'
+import { useComponent } from '@/hooks/component'
+
+const props = defineProps({
+    tabName: {
+        type: String,
+        default: 'information'
+    }
+})
+
+const components = [
+    {
+        name: 'information',
+        title: '资金信息',
+        component: defineAsyncComponent(() => import('./information/index.vue')),
+    },
+    {
+        name: 'statement',
+        title: '资金流水',
+        component: defineAsyncComponent(() => import('./statement/index.vue')),
+        history: defineAsyncComponent(() => import('./statement/history/index.vue')),
+    }
+]
+
+const active = shallowRef(props.tabName)
+const selectedComponent = computed(() => components.find((e) => e.name === active.value) ?? components[0])
+const { componentRef, componentId, openComponent, closeComponent } = useComponent()
+</script>

src/packages/mobile/views/bank/capital/information/index.vue

@@ -0,0 +1,32 @@
+<template>
+    <div style="padding-top: .2rem;">
+        <CellGroup v-for="(item, index) in accountStore.accountComputedList" :key="index">
+            <Cell title="资金账号" :value="item.accountid" />
+            <Cell title="期初余额" :value="formatDecimal(item.balance)" />
+            <Cell title="期末余额" :value="formatDecimal(item.currentbalance)" />
+            <Cell title="净值" :value="formatDecimal(item.netvalue)" />
+            <Cell title="可用资金" :value="formatDecimal(item.avaiableMoney)" />
+            <Cell title="占用资金" :value="formatDecimal(item.usedmargin)" />
+            <Cell title="预扣保证金" :value="formatDecimal(item.freezeMargin)" />
+            <Cell title="浮动盈亏">
+                <template #value>
+                    <span :class="handlePriceColor(item.profitLoss)">{{ formatDecimal(item.profitLoss) }}</span>
+                </template>
+            </Cell>
+            <Cell title="今日入金" :value="formatDecimal(item.inamount)" />
+            <Cell title="今日出金" :value="formatDecimal(item.outamount)" />
+            <Cell title="今日损益" :value="formatDecimal(item.closepl)" />
+            <Cell title="今日手续费支出" :value="formatDecimal(item.paycharge)" />
+            <Cell title="状态" :value="getTradeStatusName(item.tradestatus)" />
+        </CellGroup>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { CellGroup, Cell } from 'vant'
+import { formatDecimal, handlePriceColor } from '@/filters'
+import { getTradeStatusName } from '@/constants/order'
+import { useAccountStore } from '@/stores'
+
+const accountStore = useAccountStore()
+</script>

src/packages/mobile/views/bank/statement/history/Index.vue → src/packages/mobile/views/bank/capital/statement/history/index.vue

@@ -1,18 +1,20 @@
 <template>
-    <app-view class="bank-hisstatement">
-        <template #header>
-            <app-navbar title="历史资金流水" />
-        </template>
-        <app-pull-refresh v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
-            :page-count="pageCount" @refresh="run">
-            <app-list class="bank-hisstatement__table" :columns="columns" :data-list="dataList">
-                <template #createtime="{ value }">
-                    <span>{{ formatDate(value, 'YYYY-MM-DD') }}</span>
-                    <span>{{ formatDate(value, 'HH:mm:ss') }}</span>
-                </template>
-            </app-list>
-        </app-pull-refresh>
-    </app-view>
+    <app-modal direction="right" height="100%" v-model:show="showModal">
+        <app-view class="bank-hisstatement">
+            <template #header>
+                <app-navbar title="历史资金流水" @back="closed" />
+            </template>
+            <app-pull-refresh v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
+                :page-count="pageCount" @refresh="run">
+                <app-list class="bank-hisstatement__table" :columns="columns" :data-list="dataList">
+                    <template #createtime="{ value }">
+                        <span>{{ formatDate(value, 'YYYY-MM-DD') }}</span>
+                        <span>{{ formatDate(value, 'HH:mm:ss') }}</span>
+                    </template>
+                </app-list>
+            </app-pull-refresh>
+        </app-view>
+    </app-modal>
 </template>
 
 <script lang="ts" setup>
@@ -20,9 +22,11 @@ import { shallowRef } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryHisAmountLog } from '@/services/api/bank'
+import AppModal from '@/components/base/modal/index.vue'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import AppList from '@mobile/components/base/list/index.vue'
 
+const showModal = shallowRef(true)
 const dataList = shallowRef<Model.HisAmountLogRsp[]>([])
 const error = shallowRef(false)
 
@@ -48,6 +52,16 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryHisAmountLog, {
         error.value = true
     }
 })
+
+// 关闭弹窗
+const closed = () => {
+    showModal.value = false
+}
+
+// 暴露组件属性给父组件调用
+defineExpose({
+    closed,
+})
 </script>
 
 <style lang="less">

src/packages/mobile/views/bank/statement/Index.vue → src/packages/mobile/views/bank/capital/statement/index.vue

@@ -1,36 +1,23 @@
 <template>
-    <app-view class="bank-statement">
-        <template #header>
-            <app-navbar title="资金流水">
-                <template #right>
-                    <div class="button-more" @click="routerTo('bank-statement-history')">
-                        <span>更多</span>
-                    </div>
-                </template>
-            </app-navbar>
-        </template>
-        <app-pull-refresh v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
-            :page-count="pageCount" @refresh="run">
-            <app-list class="bank-statement__table" :columns="columns" :data-list="dataList">
-                <template #createtime="{ value }">
-                    <span>{{ formatDate(value, 'YYYY-MM-DD') }}</span>
-                    <span>{{ formatDate(value, 'HH:mm:ss') }}</span>
-                </template>
-            </app-list>
-        </app-pull-refresh>
-    </app-view>
+    <app-pull-refresh class="bank-statement" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
+        :page-count="pageCount" @refresh="run">
+        <app-list class="bank-statement__table" :columns="columns" :data-list="dataList">
+            <template #createtime="{ value }">
+                <span>{{ formatDate(value, 'YYYY-MM-DD') }}</span>
+                <span>{{ formatDate(value, 'HH:mm:ss') }}</span>
+            </template>
+        </app-list>
+    </app-pull-refresh>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
-import { useNavigation } from '@mobile/router/navigation'
 import { queryAmountLog } from '@/services/api/bank'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import AppList from '@mobile/components/base/list/index.vue'
 
-const { routerTo } = useNavigation()
 const dataList = shallowRef<Model.AmountLogRsp[]>([])
 const error = shallowRef(false)
 
@@ -60,6 +47,8 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryAmountLog, {
 
 <style lang="less">
 .bank-statement {
+    padding-top: .2rem;
+
     &__table {
         td.app-list__column {
             &:first-child {

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

@@ -38,12 +38,6 @@
                         <span>可用</span>
                         <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
                     </div>
-                    <div class="bank-item">
-                        <span>
-                            <a @click="routerTo('bank-statement')">资金流水</a>
-                        </span>
-                        <span></span>
-                    </div>
                 </div>
                 <div class="button">
                     <Button size="small" round @click="doInOutMoney('0')">充值</Button>
@@ -69,6 +63,11 @@
         </app-block>
         <app-block class="g-navmenu">
             <CellGroup>
+                <Cell is-link :to="{ name: 'bank-capital' }">
+                    <template #title>
+                        <Iconfont icon="g-icon-capital">资金信息</Iconfont>
+                    </template>
+                </Cell>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>

src/packages/mobile/views/order/list/components/goodsorder/list/Index.vue

@@ -37,9 +37,9 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                     <Button size="small" v-if="[3, 7, 12].includes(item.orderstatus)" @click="onCancelSumit(item)"
                         round>撤销</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/order/list/components/listingorder/list/Index.vue

@@ -38,9 +38,9 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                     <Button size="small" v-if="[3, 7].includes(item.wrtradeorderstatus)" @click="onCancelSumit(item)"
                         round>撤销</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/order/list/components/pricingorder/list/Index.vue

@@ -37,9 +37,9 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                     <Button size="small" v-if="(item.orderstatus === 3 || item.orderstatus === 7)"
                         @click="onCancelSumit(item)" round>撤销</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/order/list/components/swaporder/list/Index.vue

@@ -37,9 +37,9 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                     <Button size="small" v-if="(item.orderstatus === 3 || item.orderstatus === 7)"
                         @click="onCancelSumit(item)" round>撤销</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/order/list/components/transferorder/list/Index.vue

@@ -33,8 +33,8 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                     <Button size="small" @click="cancel(item)" v-if="[3, 7].includes(item.orderstatus)" round>撤销</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/order/position/components/presale/list/Index.vue

@@ -49,9 +49,9 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                     <Button size="small" @click="depositPayment(item)" round
                         v-if="item.paystatus === PayStatus.UnPay">补足定金</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
                 </div>
             </div>
         </div>

src/packages/pc/components/layouts/header/components/report/index.vue

@@ -17,7 +17,7 @@
             <template #accountname>
                 {{ userinfo?.customername }}
             </template>
-            <!-- 结算时间 -->
+            <!-- 币种 -->
             <template #currencyid>
                 {{ 'RMB' }}
             </template>
@@ -183,7 +183,7 @@ const taDetailProps = [
     { prop: 'closepl', label: '平仓损益：' },
     { prop: 'outamount', label: '银行出金：' },
     { prop: 'reckonpl', label: '结算损益：' },
-    { prop: 'freezecharge', label: '服务费：' },
+    { prop: 'paycharge', label: '服务费：' },
     { prop: 'currentbalance', label: '期末余额：', entireRow: true },
     { prop: 'oriusedmargin', label: '占用资金：' },
     { prop: 'orioutamountfreeze', label: '冻结资金：' },

src/packages/pc/components/layouts/header/index.vue

@@ -10,7 +10,7 @@
                 <el-badge type="danger" :is-dot="noticeStore.unreadList.length > 0">
                     <app-icon icon="g-icon--notice" @click="openComponent('notice')" />
                 </el-badge>
-                <!-- <app-icon icon="Tickets" @click="openComponent('report')" /> -->
+                <app-icon icon="Tickets" @click="openComponent('report')" />
                 <app-icon icon="Setting" @click="openComponent('setting')" />
                 <span class="g-icon--minimize" @click="exitFullSreen" v-if="fullScreen"></span>
                 <span class="g-icon--maximize" @click="setFullSreen" v-else></span>
@@ -80,7 +80,7 @@ const exitFullSreen = () => {
 onMounted(() => {
     /// 如果未同意 或者跨天
     if (!localData.getValue('isReportAgree') || diffDays(localData.getValue('reportTime')) > 0) {
-        //openComponent('report')
+        openComponent('report')
     }
     // 监听全屏变化
     window.addEventListener('fullscreenchange', () => {

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

@@ -58,7 +58,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'netvalue', label: '净值' },
     { prop: 'avaiableMoney', label: '可用资金', decimal: 2 },
     { prop: 'usedmargin', label: '占用资金', decimal: 2 },
-    { prop: 'freezeMargin', label: '冻结资金', decimal: 2 },
+    { prop: 'freezeMargin', label: '预扣保证金', decimal: 2 },
     { prop: 'profitLoss', label: '浮动盈亏' },
     { prop: 'inamount', label: '今日入金', decimal: 2 },
     { prop: 'outamount', label: '今日出金', decimal: 2 },

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

@@ -56,7 +56,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'buyorsell', label: '方向' },
     { prop: 'curpositionqty', label: '持有数量' },
     { prop: 'enableqty', label: '可用数量' },
-    { prop: 'frozenqty', label: '冻结数量' },
+    { prop: 'frozenqty', label: '预扣数量' },
     { prop: 'averageprice', label: '均价' },
     { prop: 'lastprice', label: '现价' },
     { prop: 'curholderamount', label: '持仓金额' },

src/packages/qdhs/router/index.ts

@@ -172,16 +172,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@mobile/views/bank/sign/Index.vue'),
       },
       {
-        path: 'statement',
-        name: 'bank-statement',
-        component: () => import('@mobile/views/bank/statement/Index.vue'),
-      },
-      {
-        path: 'statement/history',
-        name: 'bank-statement-history',
-        component: () => import('@mobile/views/bank/statement/history/Index.vue'),
-      },
-    ],
+        path: 'capital',
+        name: 'bank-capital',
+        component: () => import('@mobile/views/bank/capital/index.vue'),
+      }
+    ]
   },
   {
     path: '/order',

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

@@ -40,8 +40,8 @@
                     </div>
                 </div>
                 <div class="button">
-                    <Button size="small" round @click="routerTo('bank-statement')">资金流水</Button>
-                    <Button type="danger" size="small" round @click="doInOutMoney">出金</Button>
+                    <Button size="small" round @click="doInOutMoney('0')">充值</Button>
+                    <Button type="danger" size="small" round @click="doInOutMoney('1')">出金</Button>
                 </div>
             </div>
         </div>
@@ -60,6 +60,11 @@
         </app-block>
         <app-block class="g-navmenu">
             <CellGroup>
+                <Cell is-link :to="{ name: 'bank-capital' }">
+                    <template #title>
+                        <Iconfont icon="g-icon-capital">资金信息</Iconfont>
+                    </template>
+                </Cell>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>
@@ -135,7 +140,7 @@ const onReady = (el: HTMLDivElement) => {
 }
 
 /// 进行出入金操作判断
-const doInOutMoney = () => {
+const doInOutMoney = (tab: string) => {
     if (authStatus.value === AuthStatus.Certified) {
         fullloading((hideLoading) => {
             queryBankAccountSign().then((res) => {
@@ -143,7 +148,7 @@ const doInOutMoney = () => {
                 const { signstatus } = res.data[0] ?? {}
                 /// 只有已签约的情况下才可以进行出入金
                 if (signstatus && signstatus === 4) {
-                    router.push({ name: 'bank-wallet' })
+                    router.push({ name: 'bank-wallet', query: { tab } })
                 } else {
                     dialog({
                         message: '请先添加签约账户信息！',

src/packages/qxst/router/index.ts

@@ -167,15 +167,10 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@mobile/views/bank/sign/Index.vue'),
       },
       {
-        path: 'statement',
-        name: 'bank-statement',
-        component: () => import('@mobile/views/bank/statement/Index.vue'),
-      },
-      {
-        path: 'statement/history',
-        name: 'bank-statement-history',
-        component: () => import('@mobile/views/bank/statement/history/Index.vue'),
-      },
+        path: 'capital',
+        name: 'bank-capital',
+        component: () => import('@mobile/views/bank/capital/index.vue'),
+      }
     ],
   },
   {

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

@@ -60,7 +60,7 @@ import AppUploader from '@mobile/components/base/uploader/index.vue'
 import { useNavigation } from '@mobile/router/navigation'
 
 const componentMap = new Map<string, unknown>([
-    ['certification-next', defineAsyncComponent(() => import('./components/certification-next/index.vue'))], // 爱签-实名认证第二步
+    ['certification-next', defineAsyncComponent(() => import('./components/certification-next/Index.vue'))], // 爱签-实名认证第二步
 ])
 
 const { router } = useNavigation()

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

@@ -38,12 +38,6 @@
                         <span>可用</span>
                         <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
                     </div>
-                    <div class="bank-item">
-                        <span>
-                            <a @click="routerTo('bank-statement')">资金流水</a>
-                        </span>
-                        <span></span>
-                    </div>
                 </div>
                 <div class="button">
                     <Button size="small" round @click="doInOutMoney('0')">充值</Button>
@@ -63,6 +57,11 @@
         </app-block>
         <app-block class="g-navmenu">
             <CellGroup>
+                <Cell is-link :to="{ name: 'bank-capital' }">
+                    <template #title>
+                        <Iconfont icon="g-icon-capital">资金信息</Iconfont>
+                    </template>
+                </Cell>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>

src/packages/sbyj/router/index.ts

@@ -170,16 +170,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@mobile/views/bank/sign/Index.vue'),
       },
       {
-        path: 'statement',
-        name: 'bank-statement',
-        component: () => import('@mobile/views/bank/statement/Index.vue'),
-      },
-      {
-        path: 'statement/history',
-        name: 'bank-statement-history',
-        component: () => import('@mobile/views/bank/statement/history/Index.vue'),
-      },
-    ],
+        path: 'capital',
+        name: 'bank-capital',
+        component: () => import('@mobile/views/bank/capital/index.vue'),
+      }
+    ]
   },
   {
     path: '/order',

src/packages/sbyj/views/mine/index.vue

@@ -38,12 +38,6 @@
                         <span>可用</span>
                         <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
                     </div>
-                    <div class="bank-item">
-                        <span>
-                            <a @click="routerTo('bank-statement')">资金流水</a>
-                        </span>
-                        <span></span>
-                    </div>
                 </div>
                 <div class="button">
                     <Button size="small" round @click="doInOutMoney('0')">充值</Button>
@@ -63,6 +57,11 @@
         </app-block>
         <app-block class="g-navmenu">
             <CellGroup>
+                <Cell is-link :to="{ name: 'bank-capital' }">
+                    <template #title>
+                        <Iconfont icon="g-icon-capital">资金信息</Iconfont>
+                    </template>
+                </Cell>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>

src/packages/tc/router/index.ts

@@ -213,16 +213,11 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@mobile/views/bank/sign/Index.vue'),
       },
       {
-        path: 'statement',
-        name: 'bank-statement',
-        component: () => import('@mobile/views/bank/statement/Index.vue'),
-      },
-      {
-        path: 'statement/history',
-        name: 'bank-statement-history',
-        component: () => import('@mobile/views/bank/statement/history/Index.vue'),
-      },
-    ],
+        path: 'capital',
+        name: 'bank-capital',
+        component: () => import('@mobile/views/bank/capital/index.vue'),
+      }
+    ]
   },
   {
     path: '/order',

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

@@ -38,12 +38,6 @@
                         <span>可用</span>
                         <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
                     </div>
-                    <div class="bank-item">
-                        <span>
-                            <a @click="routerTo('bank-statement')">资金流水</a>
-                        </span>
-                        <span></span>
-                    </div>
                 </div>
                 <div class="button">
                     <Button size="small" round @click="doInOutMoney('0')">充值</Button>
@@ -69,6 +63,11 @@
         </app-block>
         <app-block class="g-navmenu">
             <CellGroup>
+                <Cell is-link :to="{ name: 'bank-capital' }">
+                    <template #title>
+                        <Iconfont icon="g-icon-capital">资金信息</Iconfont>
+                    </template>
+                </Cell>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>

src/packages/zrwyt/router/index.ts

@@ -219,15 +219,10 @@ const routes: Array<RouteRecordRaw> = [
         component: () => import('@mobile/views/bank/sign/Index.vue'),
       },
       {
-        path: 'statement',
-        name: 'bank-statement',
-        component: () => import('@mobile/views/bank/statement/Index.vue'),
-      },
-      {
-        path: 'statement/history',
-        name: 'bank-statement-history',
-        component: () => import('@mobile/views/bank/statement/history/Index.vue'),
-      },
+        path: 'capital',
+        name: 'bank-capital',
+        component: () => import('@mobile/views/bank/capital/index.vue'),
+      }
     ],
   },
   {

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

@@ -38,12 +38,6 @@
                         <span>可用</span>
                         <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
                     </div>
-                    <div class="bank-item">
-                        <span>
-                            <a @click="routerTo('bank-statement')">资金流水</a>
-                        </span>
-                        <span></span>
-                    </div>
                 </div>
                 <div class="button">
                     <Button size="small" round @click="doInOutMoney('0')">充值</Button>
@@ -69,6 +63,11 @@
         </app-block>
         <app-block class="g-navmenu">
             <CellGroup>
+                <Cell is-link :to="{ name: 'bank-capital' }">
+                    <template #title>
+                        <Iconfont icon="g-icon-capital">资金信息</Iconfont>
+                    </template>
+                </Cell>
                 <Cell is-link :to="{ name: 'account-certification' }" v-if="authStatus !== AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-certification">实名认证</Iconfont>