update

app/package.json

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

file/android/fxgl.txt

@@ -10,9 +10,12 @@ SHA-256: 3D:B9:CF:30:FD:E3:73:8D:2F:2B:FF:37:4B:39:BA:8E:A9:60:FB:BA:A1:D3:59:ED
 
 
 多元演示
-cn.muchinfo.demo_v1.0.0.apk
+cn.muchinfo.trade_v1.0.0.apk
 http://103.40.249.126:18280/cfg?key=mtp_20
 2100000006/Aa123456
+订单管理系统
+cn.muchinfo.ddgl_v1.0.0.apk
+http://103.40.249.126:8280/cfg?key=ddgl_demo
 
 
 甘肃碳交

oem/mobile52101/config/appconfig.json → oem/mobile52/config/appconfig.json

@@ -1,6 +1,6 @@
 {
-  "appId": "com.muchinfo.52101",
-  "appName": "多元世纪",
+  "appId": "cn.muchinfo.ddgl",
+  "appName": "订单管理系统",
   "version": "1.0.0",
   "versionCode": "100000",
   "apiUrl": "http://192.168.31.171:8080/cfg?key=test_171",

oem/sbyj/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.sbyj",
   "appName": "水贝亿爵",
-  "version": "1.0.12",
-  "versionCode": "100012",
+  "version": "1.0.13",
+  "versionCode": "100013",
   "apiUrl": "http://192.168.31.171:8080/cfg?key=test_171",
   "tradeChannel": "ws",
   "modules": [

oem/thj/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.thj",
   "appName": "铁合金掌上行",
-  "version": "1.0.3",
-  "versionCode": "100003",
+  "version": "1.0.4",
+  "versionCode": "100004",
   "apiUrl": "http://192.168.31.167:8080/cfg?key=test_167",
   "tradeChannel": "ws",
   "modules": [
@@ -11,5 +11,6 @@
   ],
   "quotationPropertys": [
     "totalvolume"
-  ]
+  ],
+  "slogan": "铁合金供应链\r\n交易服务平台"
 }

oem/zrwyt/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.zrwyt",
   "appName": "中融文遗通",
-  "version": "1.0.29",
-  "versionCode": "100029",
+  "version": "1.0.31",
+  "versionCode": "100031",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

public/config/appconfig.json

@@ -1,5 +1,5 @@
 {
-  "appId": "com.muchinfo.app",
+  "appId": "com.muchinfo.trade",
   "appName": "多元世纪交易中心",
   "appTitle": "多元世纪交易中心",
   "version": "1.0.5",
@@ -14,6 +14,5 @@
     "holdvolume"
   ],
   "forcedPasswordChange": false,
-  "tradeChannel": "ws",
-  "slogan": "数字化交易平台\r\n现代化综合服务"
+  "tradeChannel": "ws"
 }

public/config/columns.json

@@ -286,7 +286,7 @@
             },
             {
                 "field": "closepl",
-                "label": "平仓盈亏"
+                "label": "交收盈亏"
             },
             {
                 "field": "charge",

script/oem.env.json

@@ -94,10 +94,10 @@
         "VUE_APP_TRADE_CHANNEL": "ws"
     },
     {
-        "VUE_APP_ENV": "mobile52101",
-        "VUE_APP_NAME": "多元世纪",
+        "VUE_APP_ENV": "mobile52",
+        "VUE_APP_NAME": "订单管理系统",
         "VUE_APP_ROOT": "src/packages/sbyj/",
-        "VUE_APP_OEM": "oem/mobile52101/",
+        "VUE_APP_OEM": "oem/mobile52/",
         "VUE_APP_TRADE_CHANNEL": "ws"
     },
     {

src/packages/mobile/components/modules/performance/list/index.vue

@@ -12,8 +12,7 @@
                                 <span>{{ item.templatename }}</span>
                                 <ul class="app-performance__step">
                                     <li v-for="(step, i) in item.LstStep" :key="i">
-                                        <Tag type="primary " size="large" plain>{{ step.stepinfo }}
-                                        </Tag>
+                                        <Tag type="primary" size="large" plain>{{ step.stepinfo }}</Tag>
                                         <span>{{ step.stepdate }}</span>
                                     </li>
                                 </ul>

src/packages/mobile/views/order/performance/components/modify/Index.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, PropType } from 'vue'
+import { shallowRef, PropType, onMounted } from 'vue'
 import { CellGroup, Button, Field, Form, FormInstance, FieldRule } from 'vant'
 import { dialog, fullloading } from '@/utils/vant'
 import { handleRequestBigNumber } from '@/filters'
@@ -39,6 +39,7 @@ import AppModal from '@/components/base/modal/index.vue'
 import AppContact from '@mobile/components/modules/contact/index.vue'
 import AppReceipt from '@mobile/components/modules/receipt/index.vue'
 import { getReceiptTypeName } from '@/constants/receipt'
+import { BuyOrSell } from '@/constants/order'
 
 const showModal = shallowRef(true)
 // 是否刷新父组件数据
@@ -167,9 +168,24 @@ const closed = (isRefresh = false) => {
     }
 }
 
+onMounted(() => {
+    try {
+        const { buyorsell, buyerinfo, sellerinfo } = props.selectedRow
+        const info = buyorsell === BuyOrSell.Buy ? buyerinfo : sellerinfo
+
+        if (info) {
+            const res = JSON.parse(info)
+            Contract.value = res.ContactInfo
+            Receive.value = res.ReceiveInfo
+            Receipt.value = res.ReceiptInfo
+        }
+    } catch (err) {
+        console.error(err)
+    }
+})
+
 // 暴露组件属性给父组件调用
 defineExpose({
     closed,
 })
-
 </script>

src/packages/pc/views/auth/components/layout/index.vue

@@ -2,8 +2,7 @@
   <div class="sign-layout">
     <div class="sign-layout__wrapper">
       <div class="left">
-        <span>数字化交易平台</span>
-        <span>现代化综合服务</span>
+        <pre>{{ slogan }}</pre>
       </div>
       <div class="right">
         <div class="right-logo">
@@ -22,6 +21,9 @@
 </template>
 
 <script lang="ts" setup>
+import { shallowRef } from 'vue'
+import { useGlobalStore } from '@/stores'
+
 defineProps({
   title: {
     type: String,
@@ -29,7 +31,14 @@ defineProps({
   },
 })
 
+const globalStore = useGlobalStore()
 const year = new Date().getFullYear()
+const slogan = shallowRef('')
+
+globalStore.getSystemConfig().then((res) => {
+  console.log(res)
+  slogan.value = res.slogan
+})
 </script>
 
 <style lang="less">

src/stores/modules/global.ts

@@ -35,7 +35,7 @@ export const useGlobalStore = defineStore(() => {
             modules: [],
             quotationPropertys: [],
             forcedPasswordChange: false,
-            slogan: ''
+            slogan: '数字化交易平台\r\n现代化综合服务'
         }
     })
 

src/types/model/goods.d.ts

@@ -491,6 +491,7 @@ declare namespace Model {
         minivalue: number; // 现货商品最小变动值
         orderqty: number; // 买(卖)量(=委托量-成交量)
         ordertime: string; // 委托时间
+        performancetemplateid: number; // 履约模板id
         pricemove: number; // 买(卖)升贴水- 基差
         userid: number; // 购买方(销售方)用户ID
         username: string; // 购买方(销售方)