update

app/package.json

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

oem/gstj/config/appconfig.json

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

oem/gstj/manifest.json

@@ -5,9 +5,9 @@
     "name" : "甘肃碳交",
     /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.0.8",
+        "name" : "1.0.18",
         /*应用版本名称*/
-        "code" : 100008
+        "code" : 100018
     },
     "description" : "",
     /*应用描述信息*/
@@ -155,7 +155,7 @@
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
                 "autoSdkPermissions" : false,
-                "minSdkVersion" : 26
+                "minSdkVersion" : 29
             },
             /*使用Native.js调用原生安卓API需要使用到的系统权限*/
             "orientation" : [ "portrait-primary" ],

oem/qdhs/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.qdhs",
   "appName": "青岛海商",
-  "version": "1.0.9",
-  "versionCode": "100009",
+  "version": "1.0.10",
+  "versionCode": "100010",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

oem/qdhs/manifest.json

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

oem/tjmd/config/appconfig.json

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

src/business/login/index.ts

@@ -108,7 +108,7 @@ export function useLogin(persist = false) {
                     GUID: v4(),
                     LoginType: 0,
                     ClientType: payload.clientType,
-                    Version: '2.0.0.0',
+                    Version: '2.0.0.1',
                     DeviceID: ''
                 })
                 // 更新登录信息

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

@@ -29,7 +29,8 @@
                                 </li>
                                 <li>
                                     <span>方向类型</span>
-                                    <span>{{ getBuyOrSellName(item.buyorsell) }}{{ getBuildTypeName(item.buildtype) }}</span>
+                                    <span>{{ getBuyOrSellName(item.buyorsell) }}{{ getBuildTypeName(item.buildtype)
+                                    }}</span>
                                 </li>
                                 <li>
                                     <span>委托数量</span>
@@ -92,6 +93,7 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryHisTradeOrderDeta
     manual: true,
     params: {
         pagesize: 20,
+        pageflag: 1,
         tradeMode: '50,16',
     },
     onSuccess: (res) => {

src/packages/mobile/views/order/list/components/goodstrade/history/Index.vue

@@ -97,6 +97,7 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryHisTradeDetail, {
     manual: true,
     params: {
         pagesize: 20,
+        pageflag: 1,
         tradeMode: '50,16',
     },
     onSuccess: (res) => {

src/packages/pc/components/modules/hqchart/timeline/index.vue

@@ -49,7 +49,7 @@ const chartOption = {
     MinuteLine: {
         IsShowAveragePrice: false, // 不显示均线
     },
-    MinuteLineTitle:
+    MinuteTitle:
     {
         IsShowName: false, // 不显示股票名称
     },

src/packages/pc/views/query/order/goods/history/index.vue

@@ -43,7 +43,7 @@ const filterDate = shallowRef<string[]>([])
 
 const { loading, dataList, run } = useRequest(queryHisTradeOrderDetail, {
     params: {
-        tradeMode: '50'
+        tradeMode: '50,16'
     },
     manual: true
 })
@@ -52,7 +52,7 @@ filterOptons.selectList = [
     {
         key: 'orderStatus',
         selectedValue: 3,
-        options: getWRTradeOrderStatusList().filter(e => { return [1, 2, 3, 4, 6, 7, 8, 9, 10, 11].includes(e.value)}),
+        options: getWRTradeOrderStatusList().filter(e => { return [1, 2, 3, 4, 6, 7, 8, 9, 10, 11].includes(e.value) }),
         locked: true,
     }
 ]

src/packages/pc/views/query/trade/goods/history/index.vue

@@ -43,7 +43,7 @@ const filterDate = shallowRef<string[]>([])
 
 const { loading, dataList, run } = useRequest(queryHisTradeDetail, {
     params: {
-        tradeMode: '50'
+        tradeMode: '50,16'
     },
     manual: true
 })

src/packages/pc/views/query/trade/goods/list/index.vue

@@ -30,7 +30,7 @@ import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryTradeDetail, {
     params: {
-        tradeMode: '50'
+        tradeMode: '50,16'
     },
 })
 

src/services/http/index.ts

@@ -132,7 +132,6 @@ export default new (class {
      * @returns 
      */
     async commonRequest<T>(config: AxiosRequestConfig, errMsg?: string) {
-        console.log(config)
         const baseUrl = service.getConfig('goCommonSearchUrl')
         config.url = baseUrl + config.url
         const res = await this.request<CommonResult<T>>(config, errMsg)

src/types/model/order.d.ts

@@ -1025,6 +1025,9 @@ declare namespace Model {
         startDate?: string
         /// 结束时间 - 闭区间，格式：yyyy-MM-dd
         endDate?: string
+        page?: number; // 页码
+        pagesize?: number; // 每页条数
+        pageflag?: number; // 分页标志 0-page从0开始 1-page从1开始
     }
 
     /* 查询我的订单/历史成交 回应 */
@@ -1161,6 +1164,9 @@ declare namespace Model {
         startDate?: string
         /// 结束时间 - 闭区间，格式：yyyy-MM-dd
         endDate?: string
+        page?: number; // 页码
+        pagesize?: number; // 每页条数
+        pageflag?: number; // 分页标志 0-page从0开始 1-page从1开始
     }
 
     /* 查询我的订单/历史订单 回应 */