update

public/config/appconfig.json

@@ -1,5 +1,5 @@
 {
   "version": "1.0.0",
   "versionCode": "100000",
-  "apiUrl": "http://192.168.31.104:8080/cfg?key=test_104"
+  "apiUrl": "http://192.168.31.201:8080/cfg?key=test_201"
 }

src/business/table/columns.ts

@@ -122,7 +122,7 @@ export const pcTableColumnMap = new Map<TableColumnKey, Ermcp.TableColumn[]>([
         { prop: 'qty', label: '重量' },
         { prop: 'price', label: '价格' },
         { prop: 'exchangerate', label: '汇率' },
-        { prop: 'tradeamount', label: '成交价格' },
+        { prop: 'tradeamount', label: '成交价格(￥)' },
         { prop: 'tradetime', label: '成交时间', width: 200 },
         { prop: 'operate', label: '操作' }
     ]],

src/business/trade/desting.ts

@@ -106,6 +106,9 @@ export function useSellOrderBargain(selectedRow: Ermcp.BuyOrderRsp) {
     })
 
     const columns = shallowRef<Ermcp.TableColumn[]>([
+        { prop: 'price', label: '价格' },
+        { prop: 'weight', label: '克拉重量' },
+        { prop: 'priceper', label: '克拉单价' },
         { prop: 'warehousenamedisplay', label: '仓库' },
         { prop: 'zsshapetypedisplay', label: '形状', width: 200 },
         { prop: 'zscolortype1display', label: '颜色' },
@@ -115,9 +118,6 @@ export function useSellOrderBargain(selectedRow: Ermcp.BuyOrderRsp) {
         { prop: 'zssymmetrytype1display', label: '对称' },
         { prop: 'zsfluorescencetype1display', label: '荧光' },
         { prop: 'sizedisplay', label: '尺寸' },
-        { prop: 'price', label: '价格' },
-        { prop: 'weight', label: '克拉重量' },
-        { prop: 'priceper', label: '克拉单价' },
     ])
 
     const formSubmit = async () => {

src/packages/pc/views/mine/profile/index.vue

@@ -32,9 +32,10 @@
                 </el-descriptions-item>
                 <el-descriptions-item label="银行卡户名">{{ bankInfo.bankaccountname }}</el-descriptions-item>
                 <el-descriptions-item label="证件号码">{{ handleNoneValue(bankInfo.cardno) }}</el-descriptions-item>
+                <el-descriptions-item label="银行卡账号">{{ handleNoneValue(bankInfo.bankaccountno) }}</el-descriptions-item>
+                <el-descriptions-item label="手机号">{{ handleNoneValue(bankInfo.mobilephone) }}</el-descriptions-item>
                 <el-descriptions-item label="银行子账号">{{ handleNoneValue(bankInfo.bankchildaccount) }}
                 </el-descriptions-item>
-                <el-descriptions-item label="手机号">{{ handleNoneValue(bankInfo.mobilephone) }}</el-descriptions-item>
                 <el-descriptions-item label="签约状态">{{ getSignStatusName(bankInfo.signstatus) }}</el-descriptions-item>
             </template>
         </el-descriptions>

src/packages/pc/views/report/components/daterange/index.vue

@@ -47,7 +47,8 @@ const selectedType = computed({
 // 当前选中的日期值
 const selectedValue = computed<string[]>({
     get: () => props.dateValue,
-    set: ([begindate, enddate]) => {
+    set: (date) => {
+        const [begindate, enddate] = date ?? []
         const value = []
         if (begindate && enddate) {
             switch (props.cycleType) {

src/packages/pc/views/trade/delisting/components/details/index.less

@@ -42,4 +42,27 @@
             }
         }
     }
+
+    .app-performance-rule {
+        display: flex;
+
+        &:empty {
+            display: none;
+        }
+
+        .block {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+
+            &:not(:first-child) {
+                margin-left: 10px;
+            }
+
+            &-label {
+                font-size: 12px;
+                margin-top: 4px;
+            }
+        }
+    }
 }

src/packages/pc/views/trade/delisting/components/details/index.vue

@@ -25,9 +25,8 @@
                         </li>
                         <li>
                             <span>资金账号</span>
-                            <span>{{ buyorsell === BuyOrSell.Buy ? selectedRow.buyaccountid :
-                                    selectedRow.sellaccountid
-                            }}</span>
+                            <span>{{ buyorsell === BuyOrSell.Buy ? selectedRow.buyaccountid
+                                : selectedRow.sellaccountid }}</span>
                         </li>
                         <li>
                             <span>对手方</span>
@@ -35,13 +34,12 @@
                         </li>
                         <li>
                             <span>成交价格</span>
-                            <span>{{ selectedRow.tradeprice }}</span>
+                            <span>{{ selectedRow.tradeamount }}</span>
                         </li>
                         <li>
                             <span>手续费</span>
-                            <span>{{ buyorsell === BuyOrSell.Buy ? selectedRow.buychargevalue :
-                                    selectedRow.sellchargevalue
-                            }}</span>
+                            <span>{{ buyorsell === BuyOrSell.Buy ? selectedRow.buychargevalue
+                                : selectedRow.sellchargevalue }}</span>
                         </li>
                         <li>
                             <span>汇率</span>
@@ -55,12 +53,16 @@
                             <span>履约计划</span>
                             <span>{{ selectedRow.performanceplanid }}</span>
                         </li>
-                        <li>
+                        <li v-if="dataList.length">
                             <span>履约规则</span>
                             <span>
-                                <span v-for="(item, index) in dataList" :key="index">
-                                    {{ item.steptypename }}
-                                </span>
+                                <div class="app-performance-rule">
+                                    <div class="block" v-for="(step, i) in dataList" :key="i">
+                                        <el-tag :type="i % 2 ? 'warning' : ''" disable-transitions>{{
+                                            step.steptypename }}</el-tag>
+                                        <span class="block-label">T+{{ step.stepdays }}</span>
+                                    </div>
+                                </div>
                             </span>
                         </li>
                     </ul>

src/packages/pc/views/trade/delisting/index.vue

@@ -19,10 +19,6 @@
             <template #price="{ row }">
                 {{ row.zscurrencytypedisplayunit + formatDecimal(row.price) }}
             </template>
-            <!-- 成交价格 -->
-            <template #tradeprice="{ row }">
-                {{ row.zscurrencytypedisplayunit + formatDecimal(row.tradeprice) }}
-            </template>
             <!-- 操作 -->
             <template #operate="{ row }">
                 <app-auth-operation type="dropdown" :options="{ selectedRow: row, buyorsell: buyOrSell }"