update

oem/mobile52/config/appconfig.json

@@ -12,5 +12,6 @@
   "quotationPropertys": [
     "holdvolume"
   ],
-  "forcedPasswordChange": false
+  "forcedPasswordChange": false,
+  "riskType": 1
 }

oem/sbyj/config/appconfig.json

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

public/locales/zh-CN.json

@@ -4,7 +4,9 @@
     },
     "common": {
         "more": "更多",
-        "details": "明细"
+        "details": "明细",
+        "placeholder": "请输入",
+        "logout": "退出登录"
     },
     "tabbar": {
         "home": "首页",
@@ -31,19 +33,39 @@
         "details": "详情",
         "deposit": "补足定金",
         "deposit2": "追加定金",
-        "close": "平仓"
+        "close": "平仓",
+        "default": "违约",
+        "default2": "申请违约",
+        "modify": "修改",
+        "modify2": "修改信息",
+        "extension": "延期申请",
+        "execution": "立即执行",
+        "payment": "付款"
     },
     "chart": {
         "time": "分时",
         "minutes": "分钟"
     },
     "account": {
+        "title": "资金信息",
         "account": "资金账户",
+        "accountid": "资金账号",
         "balance": "余额",
+        "balance2": "期初余额",
+        "currentbalance": "期末余额",
         "freezeMargin": "预扣",
+        "freezeMargin2": "预扣保证金",
         "availableFunds": "可用",
+        "availableFunds2": "可用资金",
         "netWorth": "净值",
         "usedMargin": "占用",
+        "usedMargin2": "占用资金",
+        "profitLoss": "浮动盈亏",
+        "inamount": "今日入金",
+        "outamount": "今日出金",
+        "closepl": "今日损益",
+        "paycharge": "贸易手续费",
+        "tradestatus": "状态",
         "riskRate": "风险率"
     },
     "bank": {
@@ -362,6 +384,35 @@
             "outcharge": "手续费"
         }
     },
+    "performance": {
+        "title": "履约信息",
+        "title2": "买历史履约信息",
+        "title3": "卖历史履约信息",
+        "subtitle": "执行信息",
+        "buy": "买履约",
+        "sell": "卖履约",
+        "performancetype": "类型",
+        "wrstandardname": "商品",
+        "warehousename": "仓库",
+        "qty": "数量",
+        "amount": "履约金额",
+        "buyusername": "买方",
+        "sellusername": "卖方",
+        "buypaidamount": "买方已付",
+        "sellreceivedamount": "卖方已收",
+        "curstepname": "当前步骤",
+        "starttime": "开始时间",
+        "relatedorderid": "关联单号",
+        "performanceplanid": "履约单号",
+        "applyremark": "备注",
+        "attachment": "附件",
+        "contract": "联络信息",
+        "receive": "收货地址",
+        "receipt": "发票信息"
+    },
+    "settlement":{
+        "title": "结算单"
+    },
     "rules": {
         "zcxy": "用户注册协议",
         "yszc": "关于隐私",

src/packages/mobile/assets/themes/default/default.less

@@ -41,30 +41,36 @@
     --van-tabs-bottom-bar-color: #DD364A;
 
     --van-dialog-confirm-button-text-color: #DD364A;
+}
 
-    .app-tabs {
-        .tabs {
-            flex-wrap: wrap;
+.app-tabs {
+    .tabs {
+        flex-wrap: wrap;
 
-            &-item {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                color: #626675;
-                cursor: pointer;
-                border-radius: 2px;
-                background-color: #f0f0f1;
-                padding: 4px 8px;
+        &-item {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: #626675;
+            cursor: pointer;
+            border-radius: 2px;
+            background-color: #f0f0f1;
+            padding: 4px 8px;
 
-                &:not(:first-child) {
-                    margin-left: 5px;
-                }
+            &:not(:first-child) {
+                margin-left: 5px;
+            }
 
-                &.is-active {
-                    color: #222;
-                    font-weight: bold;
-                }
+            &.is-active {
+                color: #222;
+                font-weight: bold;
             }
         }
     }
+}
+
+.van-cell {
+    &.nowrap &__title {
+        flex: none;
+    }
 }

src/packages/sbyj/assets/themes/default/default.less

@@ -41,30 +41,36 @@
     --van-tabs-bottom-bar-color: #DD364A;
 
     --van-dialog-confirm-button-text-color: #DD364A;
+}
 
-    .app-tabs {
-        .tabs {
-            flex-wrap: wrap;
+.app-tabs {
+    .tabs {
+        flex-wrap: wrap;
 
-            &-item {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                color: #626675;
-                cursor: pointer;
-                border-radius: 2px;
-                background-color: #f0f0f1;
-                padding: 4px 8px;
+        &-item {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: #626675;
+            cursor: pointer;
+            border-radius: 2px;
+            background-color: #f0f0f1;
+            padding: 4px 8px;
 
-                &:not(:first-child) {
-                    margin-left: 5px;
-                }
+            &:not(:first-child) {
+                margin-left: 5px;
+            }
 
-                &.is-active {
-                    color: #222;
-                    font-weight: bold;
-                }
+            &.is-active {
+                color: #222;
+                font-weight: bold;
             }
         }
     }
+}
+
+.van-cell {
+    &.nowrap &__title {
+        flex: none;
+    }
 }

src/packages/sbyj/views/delivery/detail/index.vue

@@ -7,7 +7,7 @@
             </template>
             <div class="g-form__container">
                 <CellGroup inset>
-                    <Cell :title="getTagName() + '单号'" :value="selectedRow.deliveryorderid" />
+                    <Cell class="nowrap" :title="getTagName() + '单号'" :value="selectedRow.deliveryorderid" />
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
                     <Cell :title="getTagName() + '重量'"
                         :value="selectedRow.deliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />

src/packages/sbyj/views/order/detail/index.vue

@@ -7,7 +7,7 @@
             </template>
             <div class="order-detail__container g-form__container">
                 <CellGroup inset>
-                    <Cell :title="detail.buyOrSell === BuyOrSell.Buy ? '买料订单' : '卖料订单'" :value="detail.tradeID" />
+                    <Cell class="nowrap" :title="detail.buyOrSell === BuyOrSell.Buy ? '买料订单' : '卖料订单'" :value="detail.tradeID" />
                     <Cell title="商品代码/名称" :value="selectedRow.goodsCode + '/' + selectedRow.goodsName" />
                     <Cell title="订单重量"
                         :value="(detail.openQty * selectedRow.agreeUnit) + getGoodsUnitName(selectedRow.goodsUnitID)" />

src/packages/sbyj/views/order/history/components/detail/index.vue

@@ -7,7 +7,7 @@
             </template>
             <div class="order-detail__container g-form__container">
                 <CellGroup inset>
-                    <Cell :title="selectedRow.buyorsell === BuyOrSell.Buy ? '买料订单' : '卖料订单'"
+                    <Cell class="nowrap" :title="selectedRow.buyorsell === BuyOrSell.Buy ? '买料订单' : '卖料订单'"
                         :value="selectedRow.tradeid" />
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
                     <Cell title="订单重量"
@@ -42,11 +42,6 @@ const props = defineProps({
 
 const showModal = shallowRef(true)
 
-// 获取标签名称
-const getTagName = () => {
-    return props.selectedRow.buyorsell === BuyOrSell.Buy ? '提料' : '交料'
-}
-
 // 可用重量
 const enableqty = (item: Model.TradeHolderDetailExRsp) => {
     return (item.holderqty - item.freezeqty) * item.agreeunit

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

@@ -8,11 +8,13 @@
             <div class="form-price" v-if="quote">
                 <dl>
                     <dt>回购价</dt>
-                    <dd :class="quote.bidColor">{{ handleNumberValue(formatDecimal(quote.bid, quote.decimalplace)) }}</dd>
+                    <dd :class="quote.bidColor">{{ handleNumberValue(formatDecimal(quote.bid, quote.decimalplace)) }}
+                    </dd>
                 </dl>
                 <dl>
                     <dt>销售价</dt>
-                    <dd :class="quote.askColor">{{ handleNumberValue(formatDecimal(quote.ask, quote.decimalplace)) }}</dd>
+                    <dd :class="quote.askColor">{{ handleNumberValue(formatDecimal(quote.ask, quote.decimalplace)) }}
+                    </dd>
                 </dl>
             </div>
             <Form ref="formRef" class="g-form__container" @submit="onSubmit">
@@ -54,7 +56,7 @@ import { handleRequestBigNumber, handleNumberValue, formatDecimal, parsePercent
 import { getGoodsUnitName } from '@/constants/unit'
 import { useOrder } from '@/business/trade'
 import { useFuturesStore } from '@/stores'
-import { EPriceMode, EValidType, EOrderOperateType, EBuildType } from '@/constants/client'
+import { EPriceMode, EValidType, EBuildType } from '@/constants/client'
 import { BuyOrSell } from '@/constants/order'
 import quoteSocket from '@/services/websocket/quote'
 import AppModal from '@/components/base/modal/index.vue'
@@ -115,7 +117,7 @@ const onSubmit = () => {
     formData.PriceMode = EPriceMode.PRICEMODE_MARKET
     formData.GoodsID = goodsid
     formData.TimevalidType = EValidType.VALIDTYPE_DR
-    formData.OperateType = EOrderOperateType.ORDEROPERATETYPE_NORMAL
+    formData.OperateType = 24
     formData.BuildType = EBuildType.BUILDTYPE_CLOSE
     formData.OrderQty = orderQty.value / agreeunit.value // 数量÷合约乘数
     formData.RelatedID = handleRequestBigNumber(tHDetailEx.tradeID) // 关联单号