li.shaoyi 10 mesi fa
parent
commit
5fef2ecd18

+ 1 - 1
app/package.json

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

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

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.gzcj",
   "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": [

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

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.sjgj",
   "appName": "纯金网金银报价结算中心",
-  "version": "1.0.0",
-  "versionCode": "100000",
+  "version": "1.0.1",
+  "versionCode": "100001",
   "apiUrl": "http://192.168.31.139:8080/cfg?key=test_139",
   "tradeChannel": "ws",
   "modules": [

+ 2 - 2
oem/sjgj/manifest.json

@@ -1,8 +1,8 @@
 {
     "@platforms" : [ "android", "iPhone", "iPad" ],
-    "id" : "H5A27263D",
+    "id" : "H5CD911EF",
     /*应用的标识*/
-    "name" : "纯金网",
+    "name" : "纯金网结算中心",
     /*应用名称,程序桌面图标名称*/
     "version" : {
         "name" : "1.0.0",

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

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.tss",
   "appName": "TCE",
-  "version": "1.0.35",
-  "versionCode": "100035",
+  "version": "1.0.38",
+  "versionCode": "100038",
   "apiUrl": "http://192.168.31.210:8080/cfg?key=test_210",
   "tradeChannel": "ws",
   "showLoginAlert": true,

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

@@ -1,8 +1,8 @@
 {
   "appId": "cn.muchinfo.ykhj2",
   "appName": "宇坤黄金",
-  "version": "1.0.0",
-  "versionCode": "100000",
+  "version": "1.0.1",
+  "versionCode": "100001",
   "apiUrl": "http://192.168.31.139:8080/cfg?key=test_139",
   "tradeChannel": "ws",
   "modules": [

+ 2 - 3
src/packages/sbyj/views/order/list/components/close-holder/index.vue

@@ -24,8 +24,8 @@
                         :value="formatDecimal(selectedRow.tHDetailEx.holderPrice, selectedRow.decimalPlace)" />
                     <Cell title="可用重量" :value="enableqty + getGoodsUnitName(selectedRow.goodsUnitID)" />
                     <!-- 任务 #6631 -->
-                    <Field name="OrderQty" label="终止重量" :rules="formRules.OrderQty"
-                        v-if="globalStore.getSystemInfo('allCloseEnabled')">
+                    <Cell title="终止重量" :value="orderQty" v-if="globalStore.getSystemInfo('allCloseEnabled')" />
+                    <Field name="OrderQty" label="终止重量" :rules="formRules.OrderQty" v-else>
                         <template #input>
                             <div class="g-qty-group">
                                 <div class="g-qty-group__stepper">
@@ -40,7 +40,6 @@
                             </div>
                         </template>
                     </Field>
-                    <Cell title="终止重量" :value="orderQty" v-else />
                 </CellGroup>
             </Form>
             <template #footer>

+ 3 - 3
src/packages/sbyj/views/order/list/components/market-order-delivery/index.vue

@@ -12,8 +12,9 @@
                         :value="formatDecimal(selectedRow.tHDetailEx.holderPrice, selectedRow.decimalPlace)" />
                     <Cell title="可用重量" :value="enableqty + getGoodsUnitName(selectedRow.goodsUnitID)" />
                     <!-- 任务 #6631 -->
-                    <Field name="OrderQty" :label="getTagName() + '重量'" :rules="formRules.OrderQty"
-                        v-if="globalStore.getSystemInfo('allDeliveryEnabled')">
+                    <Cell :title="getTagName() + '重量'" :value="orderQty"
+                        v-if="globalStore.getSystemInfo('allDeliveryEnabled')" />
+                    <Field name="OrderQty" :label="getTagName() + '重量'" :rules="formRules.OrderQty" v-else>
                         <template #input>
                             <div class="g-qty-group">
                                 <div class="g-qty-group__stepper">
@@ -28,7 +29,6 @@
                             </div>
                         </template>
                     </Field>
-                    <Cell :title="getTagName() + '重量'" :value="orderQty" v-else />
                 </CellGroup>
                 <CellGroup inset>
                     <Cell title="交收时间" :value="param326 && param327 ? `${param326} - ${param327}` : '--'" />

+ 2 - 2
src/packages/tss/views/home/main/index.less

@@ -17,8 +17,8 @@
 
             &::before {
                 content: '';
-                width: 32px;
-                height: 32px;
+                width: 30px;
+                height: 30px;
                 background-image: url(../../../assets/images/logo.svg);
                 background-repeat: no-repeat;
                 background-size: contain;