li.shaoyi пре 2 година
родитељ
комит
6cb4dfc5e4

+ 1 - 1
app/package.json

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

+ 2 - 0
file/android/fxgl.txt

@@ -31,6 +31,8 @@ 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
+实盘链路2
+http://8.130.28.27:8280/cfg?key=mtp_20
 
 
 中融文遗通

+ 2 - 2
oem/gstj/config/appconfig.json

@@ -1,7 +1,7 @@
 {
   "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": "ws",
   "modules": [

+ 3 - 3
oem/qdhs/config/appconfig.json

@@ -1,9 +1,9 @@
 {
   "appName": "青岛海商",
-  "version": "1.0.0",
-  "versionCode": "100000",
+  "version": "1.0.6",
+  "versionCode": "100006",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
-  "tradeChannel": "ws",
+  "tradeChannel": "http",
   "modules": [
     "delivery"
   ]

+ 2 - 2
oem/qxst/config/appconfig.json

@@ -1,7 +1,7 @@
 {
   "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": [

+ 2 - 2
oem/zrwyt/config/appconfig.json

@@ -1,7 +1,7 @@
 {
   "appName": "中融文遗通",
-  "version": "1.0.8",
-  "versionCode": "100008",
+  "version": "1.0.9",
+  "versionCode": "100009",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

+ 7 - 7
package.json

@@ -16,15 +16,15 @@
     "build:pc": "set \"NODE_ENV=production\" && vue-cli-service build --mode pc",
     "build:gstj": "set \"NODE_ENV=production\" && vue-cli-service build --mode gstj",
     "build:gstj@pc": "set \"NODE_ENV=production\" && vue-cli-service build --mode gstj@pc",
-    "build:sbyj": "vue-cli-service build --mode sbyj",
+    "build:sbyj": "set \"NODE_ENV=production\" && vue-cli-service build --mode sbyj",
     "build:qxst": "set \"NODE_ENV=production\" && vue-cli-service build --mode qxst",
     "build:qxst@pc": "set \"NODE_ENV=production\" && vue-cli-service build --mode qxst@pc",
-    "build:zrwyt": "vue-cli-service build --mode zrwyt",
-    "build:zrwyt@pc": "vue-cli-service build --mode zrwyt@pc",
-    "build:qdhs": "vue-cli-service build --mode qdhs",
-    "build:qdhs@pc": "vue-cli-service build --mode qdhs@pc",
-    "build:tc": "vue-cli-service build --mode tc",
-    "build:tc@pc": "vue-cli-service build --mode tc@pc",
+    "build:zrwyt": "set \"NODE_ENV=production\" && vue-cli-service build --mode zrwyt",
+    "build:zrwyt@pc": "set \"NODE_ENV=production\" && vue-cli-service build --mode zrwyt@pc",
+    "build:qdhs": "set \"NODE_ENV=production\" && vue-cli-service build --mode qdhs",
+    "build:qdhs@pc": "set \"NODE_ENV=production\" && vue-cli-service build --mode qdhs@pc",
+    "build:tc": "set \"NODE_ENV=production\" && vue-cli-service build --mode tc",
+    "build:tc@pc": "set \"NODE_ENV=production\" && vue-cli-service build --mode tc@pc",
     "lint": "vue-cli-service lint",
     "dev": "electron .",
     "build": "node app/electron.build.js",

+ 4 - 4
public/config/appconfig.json

@@ -1,9 +1,9 @@
 {
-  "appName": "多元世纪交易中心",
-  "version": "1.0.0",
-  "versionCode": "10000",
+  "appName": "多元世纪",
+  "version": "1.0.3",
+  "versionCode": "10003",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
-  "tradeChannel": "ws",
+  "tradeChannel": "http",
   "modules": [
     "register",
     "delivery"

+ 5 - 1
src/packages/mobile/router/animateRouter.ts

@@ -26,7 +26,11 @@ export default new (class {
     constructor() {
         const state = sessionStorage.getItem(this.storageKey);
         if (state) {
-            this._state.value = JSON.parse(state);
+            // 合并赋值,防止 sessionStorage 获取的值有问题
+            this._state.value = {
+                ...this._state.value,
+                ...JSON.parse(state)
+            };
         }
         this.state = readonly(toRefs(this._state.value));
     }