update

app/package.json

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

oem/qxst/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.qxst",
   "appName": "贵州茶交数字化中心",
-  "version": "1.0.31",
-  "versionCode": "100031",
+  "version": "1.0.32",
+  "versionCode": "100032",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

public/config/appconfig.json

@@ -1,6 +1,6 @@
 {
   "appId": "com.muchinfo.app",
-  "appName": "多元世纪交易中心",
+  "appName": "多元世纪",
   "appTitle": "多元世纪交易中心",
   "version": "1.0.5",
   "versionCode": "10005",
@@ -13,6 +13,6 @@
     "totalvolume",
     "holdvolume"
   ],
-  "forcedPasswordChange": true,
+  "forcedPasswordChange": false,
   "tradeChannel": "ws"
 }

src/business/login/index.ts

@@ -107,9 +107,7 @@ export function useLogin(persist = false) {
                     GUID: v4(),
                     LoginType: 0,
                     ClientType: payload.clientType,
-                    Version: '2.0.0.2',
-                    EnvironmentInfo: '2.0.0.2',
-                    DeviceID: ''
+                    Version: '2.0.0.2'
                 })
                 // 首次登录是否强制修改密码
                 forcedPasswordChange = globalStore.getSystemInfo('forcedPasswordChange') && res.HasUpdatedPwd === 0

src/packages/mobile/components/base/updater/index.vue

@@ -88,11 +88,13 @@ onMounted(() => {
     if (os === 'Android') {
         // 获取应用更新信息
         getAppUpdateInfo().then((res) => {
-            const data = JSON.parse(res)
-            if (data) {
-                const { LastVersionCode, ApkUrl } = data[0] as Model.AppUpdateInfo
-                if (Number(LastVersionCode) > Number(currentVersionCode)) {
-                    downloadUrl.value = ApkUrl
+            const packageName = plus.getSystemInfo('packageName')
+            const data: Model.AppUpdateInfo[] = JSON.parse(res)
+            const updateInfo = data.find((e) => e.pkg === packageName) // 校验包名
+
+            if (updateInfo) {
+                if (Number(updateInfo.LastVersionCode) > Number(currentVersionCode)) {
+                    downloadUrl.value = updateInfo.ApkUrl
                     message.value = '发现新版本，是否更新？'
                     confirmButtonText.value = '下载'
                     show.value = true

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

@@ -98,7 +98,7 @@ const posChangedNtf = eventBus.$on('OrderDealedNtf', () => {
 })
 
 // 接收委托回应通知
-const orderRspNotify = eventBus.$on(['OrderRsp',], () => {
+const orderRspNotify = eventBus.$on('OrderRsp', () => {
     const [firstItem] = tableList.value
     runAsync({
         incOrderID: firstItem?.orderid

src/packages/pc/views/footer/presell/transferorder/index.vue

@@ -34,20 +34,21 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, defineAsyncComponent } from 'vue'
+import { ref, defineAsyncComponent,onUnmounted } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeOrders } from '@/services/api/transfer'
 import { getOrderStatusName } from '@/constants/order'
 import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
+import eventBus from '@/services/bus'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
     ['cancel', defineAsyncComponent(() => import('./cancel/index.vue'))], // 撤单
 ])
 
-const { loading, run, dataList } = useRequest(queryMineTradeOrders, {})
+const { loading, run, dataList } = useRequest(queryMineTradeOrders)
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     run()
@@ -71,4 +72,11 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'ordertime', label: '委托时间' },
     { field: 'orderid', label: '委托单号' }
 ])
+
+// 接收委托回应通知
+const orderRspNotify = eventBus.$on('OrderRsp', () => run())
+
+onUnmounted(() => {
+    orderRspNotify.cancel()
+})
 </script>

src/types/proto/account.d.ts

@@ -14,7 +14,7 @@ declare global {
             GUID: string; // 唯一标识码
             LoginIp?: string; // 登录IP地址
             LoginPort?: number; // 登陆通信端口
-            DeviceID: string; // 设备标识
+            DeviceID?: string; // 设备标识
             EnvironmentInfo?: string; // 软件环境信息
             LoginCode?: string; // 登陆码
             ClientSystemInfo?: number; // 终端系统信息

src/utils/h5plus/index.ts

@@ -37,10 +37,11 @@ export default new (class {
      * 系统信息
      */
     private systemInfo: SystemInfo = {
-        os: 'Web', // 客户端操作系统
-        version: '1.0.0', // 客户端版本号
-        versionCode: '100000', // 客户端版本代码
-        statusBarHeight: 0, // 状态栏高度
+        os: 'Web',
+        version: '1.0.0',
+        versionCode: '100000',
+        statusBarHeight: 0,
+        packageName: ''
     }
 
     constructor() {
@@ -49,6 +50,20 @@ export default new (class {
             this.systemInfo.os = plus.os.name
             this.systemInfo.statusBarHeight = plus.navigator.getStatusbarHeight()
 
+            switch (this.systemInfo.os) {
+                case 'Android': {
+                    const main = plus.android.runtimeMainActivity()
+                    this.systemInfo.packageName = main.getPackageName()
+                    break
+                }
+                case 'iOS': {
+                    const bundle = plus.ios.import('NSBundle')
+                    const main = bundle.mainBundle()
+                    this.systemInfo.packageName = main.bundleIdentifier()
+                    break
+                }
+            }
+            
             plus.runtime.getProperty(plus.runtime.appid, (info: any) => {
                 this.systemInfo.version = info.version
                 this.systemInfo.versionCode = info.versionCode

src/utils/h5plus/types.ts

@@ -3,6 +3,7 @@ export interface SystemInfo {
     version: string; // 客户端版本号
     versionCode: string; // 客户端版本代码
     statusBarHeight: number; // 状态栏高度
+    packageName: string; // 应用包名
 }
 
 /**