update

.env.zrwyt

@@ -2,4 +2,4 @@ VUE_APP_ENV = 'zrwyt'
 VUE_APP_NAME = 中融文遗通
 VUE_APP_ROOT = src/packages/zrwyt/
 VUE_APP_OEM = oem/zrwyt/
-VUE_APP_TRADE_CHANNEL = http
+VUE_APP_TRADE_CHANNEL = ws

app/electron.build.js

@@ -28,7 +28,9 @@ axios.get(appConfig.apiUrl).then((res) => {
     const data = res.data.data
     console.log(data)
 
+    // https://www.electron.build/configuration/configuration
     const config = {
+        appId: appConfig.appId ?? 'com.electron.app',
         productName: appConfig.appName + (isBeta ? '模拟盘' : ''),
         directories: {
             output: outputDir
@@ -38,6 +40,7 @@ axios.get(appConfig.apiUrl).then((res) => {
             'main.js',
         ],
         nsis: {
+            //include: './installer.nsh', // 自定义默认安装路径
             oneClick: false,
             allowToChangeInstallationDirectory: true
         },

app/installer.nsh

@@ -0,0 +1,9 @@
+#针对windows进行配置
+!macro preInit
+    SetRegView 64
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files"
+    SetRegView 32
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files (x86)"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files (x86)"
+!macroend

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trading",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "main": "main.js",
   "dependencies": {
     "electron-updater": "^6.1.4",

file/android/fxgl.txt

@@ -57,3 +57,8 @@ http://47.104.103.190:8280/cfg?key=qdsp_sp
 实盘
 cn.muchinfo.tc_release_v1.0.0.apk
 http://39.108.156.35:8280/cfg?key=tc_sp
+
+水贝亿爵
+实盘
+cn.muchinfo.sbyj_release_v1.0.0.apk
+http://112.74.182.230:8280/cfg?key=yjhj_sp

oem/gstj/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appId": "com.muchinfo.gstj",
   "appName": "甘肃碳交",
   "version": "1.0.13",
   "versionCode": "100013",

oem/qdhs/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appId": "com.muchinfo.qdhs",
   "appName": "青岛海商",
   "version": "1.0.8",
   "versionCode": "100008",

oem/qxst/config/appconfig.json

@@ -1,9 +1,10 @@
 {
-  "appName": "贵茶数字化",
+  "appId": "com.muchinfo.qxst",
+  "appName": "贵州茶交数字化中心",
   "version": "1.0.23",
   "versionCode": "100023",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
-  "tradeChannel": "http",
+  "tradeChannel": "ws",
   "modules": [
     "register"
   ],

oem/sbyj/config/appconfig.json

@@ -1,9 +1,10 @@
 {
+  "appId": "com.muchinfo.sbyj",
   "appName": "水贝亿爵",
   "version": "1.0.0",
   "versionCode": "100000",
   "apiUrl": "http://192.168.31.171:8080/cfg?key=test_171",
-  "tradeChannel": "ws",
+  "tradeChannel": "http",
   "modules": [
     "register",
     "delivery"

oem/tc/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appId": "com.muchinfo.tc",
   "appName": "探茶",
   "version": "1.0.0",
   "versionCode": "100000",

oem/zrwyt/config/appconfig.json

@@ -1,9 +1,10 @@
 {
+  "appId": "com.muchinfo.zrwyt",
   "appName": "中融文遗通",
-  "version": "1.0.10",
-  "versionCode": "100010",
+  "version": "1.0.11",
+  "versionCode": "100011",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
-  "tradeChannel": "http",
+  "tradeChannel": "ws",
   "modules": [
     "register",
     "delivery"

public/config/appconfig.json

@@ -1,4 +1,5 @@
 {
+  "appId": "com.muchinfo.app",
   "appName": "多元世纪交易中心",
   "version": "1.0.5",
   "versionCode": "10005",

src/business/login/index.ts

@@ -142,12 +142,10 @@ export function useLogin(persist = false) {
         quoteSocket.close()
         timerTask.clearAll()
 
-        logout().finally(() => {
-            accountStore.$reset() // 待处理，重置后可能会出现多个重复的 store 实例
-            loginStore.clearAutoLoginData()
-            loginStore.clearLoginInfo()
-            callback && callback()
-        })
+        accountStore.$reset() // 待处理，重置后可能会出现多个重复的 store 实例
+        loginStore.clearAutoLoginData()
+        loginStore.clearLoginInfo()
+        callback && callback()
     }
 
     // 初始化业务数据

src/hooks/echarts/candlestick/options.ts

@@ -72,19 +72,28 @@ export function useOptions(dataset: EchartsDataset) {
                     color: '#777',
                     margin: 12,
                     formatter: (val: string) => {
-                        switch (options.cycleType) {
-                            case ChartCycleType.Day: {
-                                return moment(val).format('YYYY-MM-DD')
-                            }
-                            default: {
-                                return moment(val).format('HH:mm')
+                        if (val) {
+                            switch (options.cycleType) {
+                                case ChartCycleType.Day: {
+                                    return moment(val).format('YYYY-MM-DD')
+                                }
+                                default: {
+                                    return moment(val).format('HH:mm')
+                                }
                             }
                         }
+                        return ''
                     },
                     // interval: (index) => {
                     //     return index % 8 === 0
                     // }
                 },
+                max: (value) => {
+                    if (value.max < 60) {
+                        value.max = 60
+                    }
+                    return value.max
+                },
                 axisLine: {
                     lineStyle: {
                         color: xAxisLineColor, // 坐标轴线线的颜色

src/packages/mobile/components/modules/chart/index.vue

@@ -81,6 +81,9 @@ const reqeustHistoryData = () => {
                 moment(e.ts).format('HHmm'),
             ]))
         })
+
+
+        console.log('chartInstance', chartInstance.value)
     })
 }
 
@@ -197,6 +200,10 @@ onMounted(() => {
     const resource = Chart.JSChart.GetResource()
     resource.FrameLogo.Text = ''
 
+    // https://blog.csdn.net/jones2000/article/details/104122774
+    Chart.JSConsole.Chart.Log = () => ({})
+    Chart.JSConsole.Complier.Log = () => ({})
+
     chartInstance.value = Chart.JSChart.Init(chartRef.value)
     chartInstance.value.SetOption(option)
 })

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

@@ -68,7 +68,23 @@ const h_afterRead = (filePath: string) => {
 
 // 表单验证规则
 const formRules: { [key in keyof Model.AddAuthReq]?: FieldRule[] } = {
+    username: [{
+        required: true,
+        message: '请输入用户姓名',
+    }],
+    cardnum: [{
+        required: true,
+        message: '请输入证件号码',
 
+    }],
+    cardbackphotourl: [{
+        required: true,
+        message: '请上传证件背面照片',
+    }],
+    cardfrontphotourl: [{
+        required: true,
+        message: '请上传证件正面照片',
+    }],
 }
 
 const onSubmit = () => {

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

@@ -1,6 +1,6 @@
 <!-- 商品订单-持仓汇总 -->
 <template>
-    <app-table :data="positionList" v-model:columns="tableColumns" @row-click="showComponent">
+    <app-table :data="positionList" v-model:columns="tableColumns">
         <!-- 挂牌类型 -->
         <template #buyorsell="{ value }">
             {{ getBuyOrSellName(value) }}
@@ -23,18 +23,13 @@
         <template #operate="{ row }">
             <app-auth-operation :code="code" :menus="handleOperateButtons(row)" :options="{ selectedRow: row }" />
         </template>
-        <template #footer>
-            <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)"
-                @closed="closeComponent" v-if="componentId" />
-        </template>
     </app-table>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, defineAsyncComponent } from 'vue'
+import { shallowRef } from 'vue'
 import { handleNumberValue, formatDecimal } from '@/filters'
 import { getBuyOrSellName } from '@/constants/order'
-import { useComponent } from '@/hooks/component'
 import { usePosition } from '@/business/position'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppAuthOperation from '@pc/components/modules/auth-operation/index.vue'
@@ -43,13 +38,7 @@ defineProps({
     code: String
 })
 
-const componentMap = new Map<string, unknown>([
-    ['transfer', defineAsyncComponent(() => import('./components/transfer/index.vue'))],
-])
-
 const { positionList } = usePosition(50, 16)
-const selectedRow = shallowRef<Model.TradePositionRsp>()
-const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodsname', label: '订单合约' },
@@ -77,9 +66,4 @@ const handleOperateButtons = (row: Model.TradePositionRsp) => {
     }
     return buttons
 }
-
-const showComponent = (row: Model.TradePositionRsp) => {
-    selectedRow.value = row
-    openComponent('transfer')
-}
 </script>