Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

public/locales/en-US.json

@@ -345,6 +345,15 @@
             "enableqty": "enableqty",
             "closepl": "closepl",
             "expiredate": "expiredate"
+        },
+        "pricing": {
+            "title": "Pricing Position",
+            "curpositionqty": "CurPositionQty",
+            "averageprice": "AveragePrice",
+            "frozenqty": "FrozenQty",
+            "curholderamount": "CurHolderAmount",
+            "enableqty": "EnableQty",
+            "closepl": "ClosePl"
         }
     },
     "delivery": {
@@ -353,48 +362,50 @@
             "title": "Online Order",
             "title2": "History Online Order",
             "subtitle": "Online Order Information",
-            "wrtypename": "wrtypename",
-            "deliveryqty": "deliveryqty",
-            "xdeliveryprice": "xdeliveryprice",
-            "deliverypricemove": "deliverypricemove",
-            "deliveryamount": "deliveryamount",
-            "xgoodsremainamount": "xgoodsremainamount",
-            "deliverytotalamount": "deliverytotalamount",
-            "remaintotalamount": "remaintotalamount",
-            "warehousename": "warehousename",
-            "matchusername": "matchusername",
-            "deliverytime": "deliverytime",
-            "xgoodscode": "xgoodscode",
-            "deliveryid": "orderid"
+            "wrtypename": "WrTypeName",
+            "deliveryqty": "DeliveryQty",
+            "xdeliveryprice": "XDeliveryPrice",
+            "deliverypricemove": "DeliveryPriceMove",
+            "deliveryamount": "DeliveryAmount",
+            "xgoodsremainamount": "XGoodsRemainAmount",
+            "deliverytotalamount": "DeliveryTotalAmount",
+            "remaintotalamount": "RemainTotalAmount",
+            "warehousename": "WarehouseName",
+            "matchusername": "MatchUserName",
+            "deliverytime": "DeliveryTime",
+            "xgoodscode": "Code/Name",
+            "deliveryid": "DeliveryId"
         },
         "offline": {
             "title": "Offline Order",
             "subtitle": "Offline Order Information",
-            "goodsname": "name/code",
-            "buyorselldisplay": "direction",
-            "deliveryqty": "deliveryqty",
-            "deliveryprice": "deliveryprice",
-            "deliveryamount": "deliveryamount",
-            "matchusername": "matchusername",
-            "deliveryinfo": "deliveryinfo",
-            "reqtime": "reqtime",
-            "orderstatusdisplay": "orderstatus",
-            "deliveryorderid": "orderid"
+            "goodsname": "Name/Code",
+            "buyorselldisplay": "Direction",
+            "deliveryqty": "DeliveryQty",
+            "deliveryprice": "DeliveryPrice",
+            "deliveryamount": "DeliveryAmount",
+            "matchusername": "MatchuserName",
+            "deliveryinfo": "DeliveryInfo",
+            "reqtime": "ApplyTime",
+            "applydate": "ApplyDate",
+            "orderstatusdisplay": "OrderStatus",
+            "deliveryorderid": "OrderId"
         },
         "spot": {
             "title": "Spot Order",
             "subtitle": "Pick Up Information",
-            "goodsname": "name/code",
-            "warehousename": "warehouse",
-            "qty": "qty",
-            "appointmentmodeldisplay": "deliveryway",
-            "contactname": "username",
-            "contactnum": "mobile",
-            "address": "address",
-            "appointmentremark": "appointment",
-            "applytime": "applytime",
-            "applystatus": "applystatus",
-            "applyid": "orderid"
+            "goodsname": "Name/Code",
+            "warehousename": "WarehouseName",
+            "qty": "Qty",
+            "appointmentmodeldisplay": "DeliveryWay",
+            "contactname": "UserName",
+            "contactnum": "Mobile",
+            "address": "Address",
+            "appointmentremark": "AppointmentRemark",
+            "applytime": "ApplyTime",
+            "date": "Date",
+            "applystatus": "ApplyStatus",
+            "applyid": "ApplyId"
         }
     },
     "transfer": {
@@ -536,7 +547,12 @@
         "signagain": "SignAgain",
         "cancel": "Cancel",
         "modify": "Modify",
-        "add": "Add",
+        "addbanksign": "Add Bank Sign",
+        "modifybanksign": "Modify Bank Sign",
+        "Pleaseselectyourbank": "Please select your bank",
+        "Pleaseenteryourmobilephonenumber": "Please enter mobile number",
+        "Pleaseenterbankaccountname": "Please enter bank account name",
+        "Pleaseenterbankaccountno": "Please enter bank account no",
         "youhavenotaddedasignedaccount": "You have not added a signed account",
         "fundstype": "fundstype",
         "pleasechoicefundstype": "Please choice funds type",
@@ -544,6 +560,13 @@
         "operatetype": "operatetype",
         "amount": "amount",
         "bankaccountno": "BankAccountNo",
+        "search": {
+            "title": "Search BranchBank",
+            "Pleaseenterbranchbankname": "Please enter branch bank name",
+            "choicebranchbank": "choice branch bank",
+            "nodatas": "No Datas",
+            "searching": "Searching..."
+        },
         "capital": {
             "title": "Funds",
             "hisamountlogs": "Historys"

public/locales/zh-CN.json

@@ -345,6 +345,15 @@
             "enableqty": "可用量",
             "closepl": "参考损益",
             "expiredate": "到期日"
+        },
+        "pricing": {
+            "title": "点价持仓",
+            "curpositionqty": "持有量",
+            "averageprice": "持仓均价",
+            "frozenqty": "冻结量",
+            "curholderamount": "持仓金额",
+            "enableqty": "可用量",
+            "closepl": "参考损益"
         }
     },
     "delivery": {
@@ -378,6 +387,7 @@
             "matchusername": "交收对手方",
             "deliveryinfo": "交收信息",
             "reqtime": "申请时间",
+            "applydate": "申请日期",
             "orderstatusdisplay": "单据状态",
             "deliveryorderid": "交收单号"
         },
@@ -393,6 +403,7 @@
             "address": "收货地址",
             "appointmentremark": "发票信息",
             "applytime": "申请时间",
+            "date": "日期",
             "applystatus": "提货状态",
             "applyid": "提货单号"
         }
@@ -536,7 +547,12 @@
         "signagain": "重新签约",
         "cancel": "解约",
         "modify": "修改",
-        "add": "添加签约账户",
+        "addbanksign": "添加签约账户",
+        "modifybanksign": "修改签约账户",
+        "Pleaseselectyourbank": "请选择开户银行",
+        "Pleaseenteryourmobilephonenumber": "请输入手机号码",
+        "Pleaseenterbankaccountno": "请输入银行卡账号",
+        "Pleaseenterbankaccountname": "请输入银行卡账户名",
         "youhavenotaddedasignedaccount": "您还未添加签约账户",
         "fundstype": "资金类型",
         "pleasechoicefundstype": "请选择资金类型",
@@ -544,6 +560,13 @@
         "operatetype": "操作类型",
         "amount": "金额",
         "bankaccountno": "银行卡号",
+        "search": {
+            "title": "查询支行",
+            "Pleaseenterbranchbankname": "请输入支行名称",
+            "choicebranchbank": "选择支行",
+            "nodatas": "暂无数据",
+            "searching": "搜索中..."
+        },
         "capital": {
             "title": "资金",
             "hisamountlogs": "历史资金流水"

src/packages/mobile/views/bank/sign/Index.vue

@@ -18,7 +18,7 @@
         </div>
         <div class="bank-sign__empty" v-else-if="isloaded">
             <Empty :description="$t('banksign.youhavenotaddedasignedaccount')" />
-            <Button type="danger" @click="showComponent(false)" round>{{ $t('banksign.add') }}</Button>
+            <Button type="danger" @click="showComponent(false)" round>{{ $t('banksign.addbanksign') }}</Button>
         </div>
         <template #footer>
             <div class="g-form__footer inset" v-if="bankInfo">
@@ -29,7 +29,7 @@
                 <Button type="danger" round block @click="beforeShowComponent"
                     v-if="bankInfo.signstatus === SignStatus.Signed && cusBank?.canmodifysigninfo === 1">{{ $t('banksign.modify') }}</Button>
                 <Button type="danger" round block @click="showComponent(false)"
-                    v-if="bankInfo.signstatus === SignStatus.Unsigned && cusBank?.cansign === 1">{{ $t('banksign.add') }}</Button>
+                    v-if="bankInfo.signstatus === SignStatus.Unsigned && cusBank?.cansign === 1">{{ $t('banksign.addbanksign') }}</Button>
             </div>
         </template>
         <component ref="componentRef" v-bind="{ isedit }" :is="componentMap.get(componentId)" @closed="closeComponent"

src/packages/mobile/views/bank/sign/components/edit/Index.vue

@@ -2,26 +2,26 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar :title="isedit ? '修改签约账户' : '添加签约账户'" @back="closed" />
+                <app-navbar :title="isedit ? $t('banksign.modifybanksign') : $t('banksign.addbanksign')" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="formSubmit">
                 <CellGroup inset>
-                    <Field name="OpenBankAccId" label="开户银行" :rules="formRules.OpenBankAccId" is-link>
+                    <Field name="OpenBankAccId" :label="$t('banksign.bankname')" :rules="formRules.OpenBankAccId" is-link>
                         <template #input>
-                            <app-select :readonly="bankaccount != ''" v-model="formData.OpenBankAccId" placeholder="请选择开户银行" :options="banklist"
+                            <app-select :readonly="bankaccount != ''" v-model="formData.OpenBankAccId" :placeholder="$t('banksign.Pleaseselectyourbank')" :options="banklist"
                                 :optionProps="{ label: 'bankname', value: 'bankid' }" />
                         </template>
                     </Field>
-                    <Field type="number" name="BankNo" label="银行卡号" :readonly="bankaccount != ''" maxlength="30" v-model.trim="formData.BankAccountNo"
-                        placeholder="请输入银行卡账号" :rules="formRules.BankAccountNo" />
-                    <Field name="AccountName" label="姓名" readonly v-model="formData.AccountName" placeholder="请输入银行卡账户名"
+                    <Field type="number" name="BankNo" :label="$t('banksign.bankaccountno')" :readonly="bankaccount != ''" maxlength="30" v-model.trim="formData.BankAccountNo"
+                    :placeholder="$t('banksign.Pleaseenterbankaccountno')" :rules="formRules.BankAccountNo" />
+                    <Field name="AccountName" :label="$t('banksign.bankaccountname')" readonly v-model="formData.AccountName" :placeholder="$t('banksign.Pleaseenterbankaccountname')"
                         :rules="formRules.AccountName" />
-                    <Field name="MobilePhone" label="手机号码" :readonly="mobile2 != ''" maxlength="50"
-                        v-model="formData.MobilePhone" placeholder="请输入手机号码" :rules="formRules.MobilePhone" />
+                    <Field name="MobilePhone" :label="$t('banksign.mobilephone')" :readonly="mobile2 != ''" maxlength="50"
+                        v-model="formData.MobilePhone" :placeholder="$t('banksign.Pleaseenteryourmobilephonenumber')" :rules="formRules.MobilePhone" />
                     <template v-for="(item, index) in configs" :key="index">
                         <template v-if="(item.fieldcode === 'verify_code')">
                             <Field v-if="(bankInfo === undefined) && showExtendInfo(item)" v-model="item.value" type="digit"
-                                name="vcode" :label="item.fieldname" placeholder="必填" autocomplete="off">
+                                name="vcode" :label="item.fieldname" :placeholder="$t('common.required')" autocomplete="off">
                                 <template #button>
                                     <Button size="small" type="danger" :disabled="isCountdown" @click="sendVerifyCode">
                                         <span v-if="isCountdown">重新发送({{ currentTime.seconds }})</span>
@@ -51,7 +51,7 @@
             </Form>
             <template #footer>
                 <div class="g-form__footer inset">
-                    <Button type="danger" round block @click="formRef?.submit()">{{ bankInfo ? '修改' : '提交' }}</Button>
+                    <Button type="danger" round block @click="formRef?.submit()">{{ bankInfo ? $t('operation.modify') : $t('operation.submit') }}</Button>
                 </div>
             </template>
             <Search v-model:show="showSearch" @change="onBankChange" />

src/packages/mobile/views/bank/sign/components/edit/search/index.vue

@@ -2,16 +2,16 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="查询支行">
+                <app-navbar :title="$t('banksign.search.title')">
                     <template #footer>
                         <Form action="/">
-                            <Search placeholder="请输入支行名称" v-model="keyword" @search="onSearch" />
+                            <Search :placeholder="$t('banksign.search.Pleaseenterbranchbankname')" v-model="keyword" @search="onSearch" />
                         </Form>
                     </template>
                 </app-navbar>
             </template>
             <RadioGroup v-model="checked" style="padding-bottom: 50px;" v-if="dataList.length">
-                <CellGroup title="选择支行">
+                <CellGroup :title="$t('banksign.search.choicebranchbank')">
                     <template v-for="(item, index) in dataList" :key="index">
                         <Cell :title="item.branchname" :label="item.branchnum" clickable @click="onChange(item)">
                             <template #icon>
@@ -21,7 +21,7 @@
                     </template>
                 </CellGroup>
             </RadioGroup>
-            <Empty description="暂无数据" v-else />
+            <Empty :description="$t('banksign.search.nodatas')" v-else />
         </app-view>
     </app-modal>
 </template>

src/packages/mobile/views/goods/detail/components/listing/Index.vue

@@ -153,7 +153,6 @@ const total = computed(() => {
 
 // 买方向持仓数量
 const buyQty = computed(() => positionStore.getOrderQty(BuyOrSell.Buy, props.goodsCode))
-
 // 卖方向持仓数量
 const sellQty = computed(() => positionStore.getOrderQty(BuyOrSell.Sell, props.goodsCode))
 

src/packages/mobile/views/order/delivery/Index.vue

@@ -1,10 +1,10 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="交收提货" >
+            <app-navbar :title="$t('delivery.title')" >
                 <template #right v-if="selectedComponent.history">
                     <div class="button-more" @click="openComponent(selectedComponent.name)">
-                        <span>更多</span>
+                        <span>{{ $t('common.more') }}</span>
                     </div>
                 </template>
             </app-navbar>

src/packages/mobile/views/order/delivery/components/offline/detail/Index.vue

@@ -3,20 +3,20 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="线下交收单" @back="closed" />
+                <app-navbar :title="$t('delivery.offline.title')" @back="closed" />
             </template>
             <div class="g-form__container">
-                <CellGroup title="线下交收单信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodsnamedisplay" />
-                    <Cell title="交收方向" :value="selectedRow.buyorselldisplay" />
-                    <Cell title="交收数量" :value="selectedRow.deliveryqty" />
-                    <Cell title="交收价格" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryprice" />
-                    <Cell title="交收货款" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryamount" />
-                    <Cell title="交收对手方" :value="selectedRow.matchusername" />
-                    <Cell title="交收信息" :value="selectedRow.deliveryinfo" />
-                    <Cell title="申请时间" :value="selectedRow.reqtime" />
-                    <Cell title="单据状态" :value="selectedRow.orderstatusdisplay" />
-                    <Cell title="交收单号" :value="selectedRow.deliveryorderid" />
+                <CellGroup :title="$t('delivery.offline.subtitle')">
+                    <Cell :title="$t('delivery.offline.goodsname')" :value="selectedRow.goodsnamedisplay" />
+                    <Cell :title="$t('delivery.offline.buyorselldisplay')" :value="selectedRow.buyorselldisplay" />
+                    <Cell :title="$t('delivery.offline.deliveryqty')" :value="selectedRow.deliveryqty" />
+                    <Cell :title="$t('delivery.offline.deliveryprice')" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryprice" />
+                    <Cell :title="$t('delivery.offline.deliveryamount')" :value="selectedRow.orderstatus === 1 ? '--' : selectedRow.deliveryamount" />
+                    <Cell :title="$t('delivery.offline.matchusername')" :value="selectedRow.matchusername" />
+                    <Cell :title="$t('delivery.offline.deliveryinfo')" :value="selectedRow.deliveryinfo" />
+                    <Cell :title="$t('delivery.offline.reqtime')" :value="selectedRow.reqtime" />
+                    <Cell :title="$t('delivery.offline.orderstatusdisplay')" :value="selectedRow.orderstatusdisplay" />
+                    <Cell :title="$t('delivery.offline.deliveryorderid')" :value="selectedRow.deliveryorderid" />
                 </CellGroup>
             </div>
         </app-view>

src/packages/mobile/views/order/delivery/components/offline/list/Index.vue

@@ -15,34 +15,34 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>交收方向</span>
+                            <span>{{ $t('delivery.offline.buyorselldisplay') }}</span>
                             <span>{{ item.buyorselldisplay }}</span>
                         </li>
                         <li>
-                            <span>交收数量</span>
+                            <span>{{ $t('delivery.offline.deliveryqty') }}</span>
                             <span>{{ item.deliveryqty }}</span>
                         </li>
                         <li>
-                            <span>交收价格</span>
+                            <span>{{ $t('delivery.offline.deliveryprice') }}</span>
                             <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
                         </li>
                         <li>
-                            <span>交收货款</span>
+                            <span>{{ $t('delivery.offline.deliveryamount') }}</span>
                             <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
                         </li>
                         <li>
-                            <span>交收信息</span>
+                            <span>{{ $t('delivery.offline.deliveryinfo') }}</span>
                             <span>{{ item.deliveryinfo }}</span>
                         </li>
                         <li>
-                            <span>申请日期</span>
+                            <span>{{ $t('delivery.offline.applydate') }}</span>
                             <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>撤销</Button>
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                    <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>{{ $t('operation.cancel2') }}</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/order/delivery/components/online/detail/Index.vue

@@ -3,23 +3,23 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="点选交收单" @back="closed" />
+                <app-navbar :title="$t('delivery.online.title')" @back="closed" />
             </template>
             <div class="g-form__container">
-                <CellGroup title="点选交收单信息">
-                    <Cell title="商品名称" :value="selectedRow.wrtypename" />
-                    <Cell title="交收数量" :value="selectedRow.deliveryqty" />
-                    <Cell title="订货价" :value="selectedRow.xdeliveryprice" />
-                    <Cell title="升贴水" :value="selectedRow.deliverypricemove" />
-                    <Cell title="总货款" :value="selectedRow.deliveryamount" />
-                    <Cell title="剩余货款" :value="selectedRow.xgoodsremainamount" />
-                    <Cell title="总金额" :value="selectedRow.deliverytotalamount" />
-                    <Cell title="剩余金额" :value="selectedRow.remaintotalamount" />
-                    <Cell title="仓库" :value="selectedRow.warehousename" />
-                    <Cell title="发货方" :value="selectedRow.matchusername" />
-                    <Cell title="申请时间" :value="selectedRow.deliverytime" />
-                    <Cell title="交收合约" :value="selectedRow.xgoodscode + '/' + selectedRow.xgoodsname" />
-                    <Cell title="交收单号" :value="selectedRow.deliveryid" />
+                <CellGroup :title="$t('delivery.online.subtitle')">
+                    <Cell :title="$t('delivery.online.wrtypename')" :value="selectedRow.wrtypename" />
+                    <Cell :title="$t('delivery.online.deliveryqty')" :value="selectedRow.deliveryqty" />
+                    <Cell :title="$t('delivery.online.xdeliveryprice')" :value="selectedRow.xdeliveryprice" />
+                    <Cell :title="$t('delivery.online.deliverypricemove')" :value="selectedRow.deliverypricemove" />
+                    <Cell :title="$t('delivery.online.deliveryamount')" :value="selectedRow.deliveryamount" />
+                    <Cell :title="$t('delivery.online.xgoodsremainamount')" :value="selectedRow.xgoodsremainamount" />
+                    <Cell :title="$t('delivery.online.deliverytotalamount')" :value="selectedRow.deliverytotalamount" />
+                    <Cell :title="$t('delivery.online.remaintotalamount')" :value="selectedRow.remaintotalamount" />
+                    <Cell :title="$t('delivery.online.warehousename')" :value="selectedRow.warehousename" />
+                    <Cell :title="$t('delivery.online.matchusername')" :value="selectedRow.matchusername" />
+                    <Cell :title="$t('delivery.online.deliverytime')" :value="selectedRow.deliverytime" />
+                    <Cell :title="$t('delivery.online.xgoodscode')" :value="selectedRow.xgoodscode + '/' + selectedRow.xgoodsname" />
+                    <Cell :title="$t('delivery.online.deliveryid')" :value="selectedRow.deliveryid" />
                 </CellGroup>
             </div>
         </app-view>

src/packages/mobile/views/order/delivery/components/online/history/Index.vue

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史点选交收单" @back="closed">
+                <app-navbar :title="$t('delivery.online.title2')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -24,29 +24,29 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>交收数量</span>
+                                    <span>{{ $t('delivery.online.deliveryqty') }}</span>
                                     <span>{{ item.deliveryqty }}</span>
                                 </li>
                                 <li>
-                                    <span>订货价</span>
+                                    <span>{{ $t('delivery.online.xdeliveryprice') }}</span>
                                     <span>{{ item.xdeliveryprice }}</span>
                                 </li>
                                 <li>
-                                    <span>升贴水</span>
+                                    <span>{{ $t('delivery.online.deliverypricemove') }}</span>
                                     <span>{{ item.deliverypricemove }}</span>
                                 </li>
                                 <li>
-                                    <span>剩余金额</span>
+                                    <span>{{ $t('delivery.online.remaintotalamount') }}</span>
                                     <span>{{ item.remaintotalamount }}</span>
                                 </li>
                                 <li>
-                                    <span>申请日期</span>
+                                    <span>{{ $t('delivery.online.deliverytime') }}</span>
                                     <span>{{ formatDate(item.deliverytime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">
-                            <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                            <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                         </div>
                     </div>
                 </div>

src/packages/mobile/views/order/delivery/components/online/list/Index.vue

@@ -15,29 +15,29 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>交收数量</span>
+                            <span>{{ $t('delivery.online.deliveryqty') }}</span>
                             <span>{{ item.deliveryqty }}</span>
                         </li>
                         <li>
-                            <span>订货价</span>
+                            <span>{{ $t('delivery.online.xdeliveryprice') }}</span>
                             <span>{{ item.xdeliveryprice }}</span>
                         </li>
                         <li>
-                            <span>升贴水</span>
+                            <span>{{ $t('delivery.online.deliverypricemove') }}</span>
                             <span>{{ item.deliverypricemove }}</span>
                         </li>
                         <li>
-                            <span>剩余金额</span>
+                            <span>{{ $t('delivery.online.remaintotalamount') }}</span>
                             <span>{{ item.remaintotalamount }}</span>
                         </li>
                         <li>
-                            <span>申请日期</span>
+                            <span>{{ $t('delivery.online.deliverytime') }}</span>
                             <span>{{ formatDate(item.deliverytime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/order/delivery/components/spot/detail/Index.vue

@@ -3,25 +3,25 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="现货提货单" @back="closed" />
+                <app-navbar :title="$t('delivery.spot.title')" @back="closed" />
             </template>
             <div class="g-form__container">
-                <CellGroup title="提货信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.wrstandardcode+'/'+selectedRow.wrstandardname" />
-                    <Cell title="仓库" :value="selectedRow.warehousename" />
-                    <Cell title="提货数量" :value="selectedRow.qty" />
-                    <Cell title="提货方式" :value="selectedRow.appointmentmodeldisplay" />
-                    <Cell title="联系人" :value="selectedRow.contactname" />
-                    <Cell title="联系方式" :value="selectedRow.contactnum" />
-                    <Cell title="收货地址" :value="address" v-if="selectedRow.appointmentmodel === 1" />
-                    <Cell title="发票信息" title-style="flex:none" v-if="selectedRow.appointmentremark">
+                <CellGroup :title="$t('delivery.spot.subtitle')">
+                    <Cell :title="$t('delivery.spot.goodsname')" :value="selectedRow.wrstandardcode+'/'+selectedRow.wrstandardname" />
+                    <Cell :title="$t('delivery.spot.warehousename')" :value="selectedRow.warehousename" />
+                    <Cell :title="$t('delivery.spot.qty')" :value="selectedRow.qty" />
+                    <Cell :title="$t('delivery.spot.appointmentmodeldisplay')" :value="selectedRow.appointmentmodeldisplay" />
+                    <Cell :title="$t('delivery.spot.contactname')" :value="selectedRow.contactname" />
+                    <Cell :title="$t('delivery.spot.contactnum')" :value="selectedRow.contactnum" />
+                    <Cell :title="$t('delivery.spot.address')" :value="address" v-if="selectedRow.appointmentmodel === 1" />
+                    <Cell :title="$t('delivery.spot.appointmentremark')" title-style="flex:none" v-if="selectedRow.appointmentremark">
                         <template #value>
                             <div style="white-space: pre-line">{{ selectedRow.appointmentremark }}</div>
                         </template>
                     </Cell>
-                    <Cell title="申请时间" :value="selectedRow.applytime" />
-                    <Cell title="提货状态" :value="getApplyStatusName(selectedRow.applystatus)" />
-                    <Cell title="提货单号" :value="selectedRow.applyid" />
+                    <Cell :title="$t('delivery.spot.applytime')" :value="selectedRow.applytime" />
+                    <Cell :title="$t('delivery.spot.applystatus')" :value="getApplyStatusName(selectedRow.applystatus)" />
+                    <Cell :title="$t('delivery.spot.applyid')" :value="selectedRow.applyid" />
                 </CellGroup>
             </div>
         </app-view>

src/packages/mobile/views/order/delivery/components/spot/list/Index.vue

@@ -16,21 +16,21 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>数量</span>
+                            <span>{{ $t('delivery.spot.qty') }}</span>
                             <span>{{ item.qty }}</span>
                         </li>
                         <li>
-                            <span>类型</span>
+                            <span>{{ $t('delivery.spot.appointmentmodeldisplay') }}</span>
                             <span>{{ item.appointmentmodeldisplay }}</span>
                         </li>
                         <li>
-                            <span>日期</span>
+                            <span>{{ $t('delivery.spot.date') }}</span>
                             <span>{{ formatDate(item.applytime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>

src/packages/mobile/views/order/list/components/pricingorder/list/Index.vue

@@ -97,7 +97,7 @@ const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
         message: '确认要撤销吗？',
         showCancelButton: true,
     }).then(() => {
-        formData.Header = { MarketID: item.marketid }
+        formData.Header = { MarketID: item.marketid, GoodsID: item.goodsid }
         formData.OldOrderId = handleRequestBigNumber(item.orderid)
 
         /// loding....

src/packages/mobile/views/order/position/components/pricing/list/Index.vue

@@ -6,37 +6,40 @@
                 <div class="g-order-list__titlebar">
                     <div class="left">
                         <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
-                        <span>--</span>
                     </div>
                     <div class="right">
-                        <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
+                        <span :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
+                            {{ getBuyOrSellName(item.buyorsell) }}
+                        </span>
                     </div>
                 </div>
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>持有量：</span>
+                            <span>{{ $t('position.pricing.curpositionqty') }}</span>
                             <span>{{ formatDecimal(item.curpositionqty) }}</span>
                         </li>
                         <li>
-                            <span>持仓均价：</span>
+                            <span>{{ $t('position.pricing.averageprice') }}</span>
                             <span>{{ item.averageprice === 0.0 ? '--' : formatDecimal(item.averageprice) }}</span>
                         </li>
                         <li>
-                            <span>冻结量：</span>
+                            <span>{{ $t('position.pricing.frozenqty') }}</span>
                             <span>{{ formatDecimal(item.frozenqty) }}</span>
                         </li>
                         <li>
-                            <span>持仓金额：</span>
+                            <span>{{ $t('position.pricing.curholderamount') }}</span>
                             <span>{{ formatDecimal(item.curholderamount) }}</span>
                         </li>
                         <li>
-                            <span>可用量：</span>
+                            <span>{{ $t('position.pricing.enableqty') }}</span>
                             <span>{{ formatDecimal(item.enableqty) }}</span>
                         </li>
                         <li>
-                            <span>参考损益：</span>
-                            <span>--</span>
+                            <span>{{ $t('position.pricing.closepl') }}</span>
+                            <span :class="item.closeplColor">
+                                {{ formatDecimal(item.closepl, item.decimalplace) }}
+                            </span>
                         </li>
                     </ul>
                 </div>

src/packages/mobile/views/pricing/detail/components/trade/Index.vue

@@ -54,32 +54,32 @@
                         </template>
                     </Field>
                     <!-- 限价 -->
-                    <Field name="OrderPrice" :rules="formRules.OrderPrice" label="价格"
-                        v-if="formData.PriceMode === PriceMode.Limit">
+                    <Field name="OrderPrice" :rules="formRules.OrderPrice" label="价格" v-if="formData.PriceMode === PriceMode.Limit">
                         <template #input>
-                            <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :auto-fixed="false" />
+                            <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
+                             :auto-fixed="false" :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue" />
                         </template>
                     </Field>
-                    <Field name="SlPrice" :rules="formRules.SlPrice"
+                    <!-- <Field name="SlPrice" :rules="formRules.SlPrice"
                         v-if="formData.PriceMode === PriceMode.Limit && formData.BuildType === BuildType.Open">
                         <template #label>
                             <Checkbox v-model="sl">止损</Checkbox>
                         </template>
                         <template #input>
                             <Stepper v-model="formData.SlPrice" :disabled="!sl" theme="round" button-size="22" allow-empty
-                                :default-value="0" :min="0" integer />
+                                :default-value="0" :min="0" :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue" />
                         </template>
-                    </Field>
-                    <Field name="SpPrice" :rules="formRules.SpPrice"
+                    </Field> -->
+                    <!-- <Field name="SpPrice" :rules="formRules.SpPrice"
                         v-if="formData.PriceMode === PriceMode.Limit && formData.BuildType === BuildType.Open">
                         <template #label>
                             <Checkbox v-model="sp">止盈</Checkbox>
                         </template>
                         <template #input>
                             <Stepper v-model="formData.SpPrice" :disabled="!sp" theme="round" button-size="22" allow-empty
-                                :default-value="0" :min="0" integer />
+                                :default-value="0" :min="0" :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue" />
                         </template>
-                    </Field>
+                    </Field> -->
                     <template v-if="formData.BuyOrSell === BuyOrSell.Buy || quote?.tradeproperty !== 2">
                         <Field label="预估可订立量">
                             <template #input>
@@ -132,14 +132,11 @@
 import { useFuturesStore, useAccountStore, usePositionStore } from '@/stores'
 import { useNavigation } from '@mobile/router/navigation'
 import { handleNumberValue } from '@/filters'
-import quoteSocket from '@/services/websocket/quote'
-import { shallowRef, onMounted, onUnmounted, computed, defineAsyncComponent } from 'vue'
+import { shallowRef, onMounted, computed, defineAsyncComponent } from 'vue'
 import { Form, Field, Button, FieldRule, FormInstance, Radio, RadioGroup, Checkbox, CellGroup } from 'vant'
 import { useOrder } from '@/business/trade'
 import { BuyOrSell, getBuyOrSellList, BuildType, getPricemode2List, PriceMode } from '@/constants/order'
 import { fullloading, dialog } from '@/utils/vant'
-import { useRequest } from '@/hooks/request'
-import { queryTradePosition } from '@/services/api/order'
 import AppModal from '@/components/base/modal/index.vue'
 import Stepper from '@mobile/components/base/stepper/index.vue'
 
@@ -164,14 +161,13 @@ const positionStore = usePositionStore()
 const formRef = shallowRef<FormInstance>()
 const { formData, formSubmit } = useOrder()
 
+const quote = futuresStore.getGoodsQuote(props.goodsCode)
 const marketPrice = computed(() => {
     const { ask = 0, bid = 0 } = quote.value ?? {}
     return formData.BuyOrSell === BuyOrSell.Buy ? ask : bid
 })
-const quote = futuresStore.getGoodsQuote(props.goodsCode)
-const subscribe = quoteSocket.createSubscribe()
-const sl = shallowRef(false) // 止损
-const sp = shallowRef(false) // 止盈
+// const sl = shallowRef(false) // 止损
+// const sp = shallowRef(false) // 止盈
 const position = shallowRef<Model.TradePositionRsp[]>([]) // 持仓汇总
 // 是否刷新父组件数据
 const refresh = shallowRef(true) 
@@ -210,7 +206,6 @@ const total = computed(() => {
 
 // 买方向持仓数量
 const buyQty = computed(() => positionStore.getOrderQty(BuyOrSell.Buy, props.goodsCode))
-
 // 卖方向持仓数量
 const sellQty = computed(() => positionStore.getOrderQty(BuyOrSell.Sell, props.goodsCode))
 
@@ -232,50 +227,26 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
             return true
         }
     }],
-    SlPrice: [{
-        message: '请输入止损价',
-        validator: () => {
-            if (sl.value) {
-                return !!formData.SlPrice
-            }
-            return true
-        }
-    }],
-    SpPrice: [{
-        message: '请输入止盈价',
-        validator: () => {
-            if (sp.value) {
-                return !!formData.SpPrice
-            }
-            return true
-        }
-    }],
+    // SlPrice: [{
+    //     message: '请输入止损价',
+    //     validator: () => {
+    //         if (sl.value) {
+    //             return !!formData.SlPrice
+    //         }
+    //         return true
+    //     }
+    // }],
+    // SpPrice: [{
+    //     message: '请输入止盈价',
+    //     validator: () => {
+    //         if (sp.value) {
+    //             return !!formData.SpPrice
+    //         }
+    //         return true
+    //     }
+    // }],
 }
 
-onMounted(() => {
-    subscribe.start(props.goodsCode)
-    formData.BuyOrSell = props.buyOrSell
-    formData.BuildType = BuildType.Open
-    formData.PriceMode = PriceMode.Market
-    formData.MarketMaxSub = 100.0
-})
-
-onUnmounted(() => subscribe.stop())
-
-// 获取当前商品持仓汇总
-useRequest(queryTradePosition, {
-    params: {
-        tradeMode: '10'
-    },
-    onSuccess: (res) => {
-        position.value = res.data.filter(item => item.goodscode === props.goodsCode)
-        const datas = position.value.filter(item => formData.BuyOrSell === BuyOrSell.Buy ? item.buyorsell === BuyOrSell.Sell : item.buyorsell === BuyOrSell.Buy) // 反方向持仓
-        if (datas.length > 0) {
-            formData.OrderQty = datas[0].enableqty
-        }
-    },
-})
-
 const onBuyOrSellChanged = () => {
     if (formData.PriceMode === PriceMode.Limit) {
         const { ask = 0, bid = 0 } = quote.value ?? {}
@@ -323,8 +294,8 @@ const onSubmit = () => {
     // 市价
     if (formData.PriceMode === PriceMode.Market) { formData.OrderPrice = marketPrice.value }
     // 限价
-    if (!sl.value) { formData.SlPrice = undefined }
-    if (!sp.value) { formData.SpPrice = undefined }
+    // if (!sl.value) { formData.SlPrice = undefined }
+    // if (!sp.value) { formData.SpPrice = undefined }
 
     fullloading((hideLoading) => {
         formSubmit().then(() => {
@@ -355,6 +326,17 @@ const closed = (isRefresh = true) => {
     showModal.value = false
 }
 
+onMounted(() => {
+    formData.BuyOrSell = props.buyOrSell
+    formData.BuildType = BuildType.Open
+    formData.PriceMode = PriceMode.Market
+    formData.MarketMaxSub = 100.0
+    /// 默认价格和数量
+    const { last = 0, presettle = 0 } = quote.value ?? {}
+    formData.OrderPrice = last || presettle
+    formData.OrderQty = qtyStep.value
+})
+
 // 暴露组件属性给父组件调用
 defineExpose({
     closed,

src/packages/mobile/views/pricing/list/Index.vue

@@ -43,7 +43,7 @@
 <script lang="ts" setup>
 
 import { computed, onUnmounted, PropType } from 'vue'
-import { parsePercent, handleNumberValue } from '@/filters'
+import { parsePercent, handleNumberValue, formatDecimal } from '@/filters'
 import { useNavigation } from '@mobile/router/navigation'
 import { useRequest } from '@/hooks/request'
 import { queryQuoteGoodsList } from '@/services/api/swap'
@@ -84,23 +84,23 @@ const { dataList } = useRequest(queryQuoteGoodsList, {
 const tableList = computed(() => {
     return dataList.value.map((item) => {
         const quote = futuresStore.getGoodsQuote(item.goodscode)
-        const { lastColor, openedColor, lowestColor, highestColor, last, presettle, rise, change, amplitude, highest, lowest, opened, ask, bid, bidColor, askColor } = quote.value ?? {}
+        const { lastColor, openedColor, lowestColor, highestColor, last = 0, presettle = 0, rise = 0, change, amplitude, highest = 0, lowest = 0, opened = 0, ask = 0, bid = 0, bidColor, askColor, decimalplace } = quote.value ?? {}
         return {
             ...item,
             lastColor,
             openedColor,
             lowestColor,
             highestColor,
-            last: handleNumberValue(last),
-            rise: handleNumberValue(rise?.toFixed(item.decimalplace)),
+            last: handleNumberValue(formatDecimal(last, decimalplace)),
+            rise: handleNumberValue(formatDecimal(rise, decimalplace)),
             change: parsePercent(change),
-            opened: handleNumberValue(opened),
-            presettle: handleNumberValue(presettle),
-            lowest: handleNumberValue(lowest),
-            highest: handleNumberValue(highest),
+            opened: handleNumberValue(formatDecimal(opened, decimalplace)),
+            presettle: handleNumberValue(formatDecimal(presettle, decimalplace)),
+            lowest: handleNumberValue(formatDecimal(lowest, decimalplace)),
+            highest: handleNumberValue(formatDecimal(highest, decimalplace)),
             amplitude: parsePercent(amplitude),
-            ask: handleNumberValue(ask),
-            bid: handleNumberValue(bid),
+            ask: handleNumberValue(formatDecimal(ask, decimalplace)),
+            bid: handleNumberValue(formatDecimal(bid, decimalplace)),
             bidColor,
             askColor
         }

src/stores/modules/language.ts

@@ -6,7 +6,7 @@ import enUS from '@public/locales/en-US.json'
 const appLanguage = localData.getRef('appLanguage')
 
 export const i18n = createI18n({
-    locale: 'en-US',//appLanguage.value,
+    locale: appLanguage.value,
     fallbackLocale: 'zh-CN',
     messages: {
         'zh-CN': zhCN,