update

app/package.json

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

oem/zrwyt/config/appconfig.json

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

oem/zrwyt/manifest.json

@@ -5,9 +5,9 @@
     "name" : "中融文遗通",
     /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.0.8",
+        "name" : "1.0.13",
         /*应用版本名称*/
-        "code" : 100008
+        "code" : 100013
     },
     "description" : "",
     /*应用描述信息*/
@@ -155,7 +155,7 @@
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
                 "autoSdkPermissions" : false,
-                "minSdkVersion" : 26
+                "minSdkVersion" : 29
             },
             /*使用Native.js调用原生安卓API需要使用到的系统权限*/
             "orientation" : [ "portrait-primary" ],

src/packages/pc/views/footer/inout/out/add/index.vue

@@ -72,25 +72,29 @@ const formData = reactive<Partial<Proto.HolderTransferDetail>>({
 
 const formRules: FormRules = {
     InUserID: [{
+        required: true,
         message: '请输入客户编号或手机号',
         validator: () => !!formData.InUserID
     }],
     GoodsID: [{
+        required: true,
         message: '请选择转让商品',
         validator: () => !!selectedGoods.value
     }],
     TransferPrice: [{
+        required: true,
         message: '请输入转让价格',
         validator: () => !!formData.TransferPrice
     }],
     Qty: [{
+        required: true,
         message: '请输入转让数量',
         validator: () => !!formData.Qty
     }],
     FreezeDays: [{
+        required: true,
         message: '请输入冻结天数',
         type: 'number',
-        required: true
     }]
 }
 

src/packages/pc/views/query/capital/history/index.vue

@@ -88,4 +88,8 @@ const plTotal = computed(() => dataList.value.reduce((pre, cur) => {
     }
     return pre
 }, 0))
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

src/packages/pc/views/query/capital/list/index.less

@@ -1,5 +1,5 @@
 .query-capital {
-    &-total {
+    &__total {
         display: flex;
         color: #fff;
 

src/packages/pc/views/query/capital/list/index.vue

@@ -5,7 +5,7 @@
             <app-filter :options="filterOptons" />
         </template>
         <template #headerRight>
-            <ul class="query-capital-total">
+            <ul class="query-capital__total">
                 <li>
                     <span>手续费汇总：</span>
                     <span>{{ feeTotal.toFixed(2) }}</span>

src/packages/zrwyt/router/index.ts

@@ -260,7 +260,12 @@ const routes: Array<RouteRecordRaw> = [
         name: 'order-performance',
         component: () => import('@mobile/views/order/performance/Index.vue'),
       },
-    ],
+      {
+        path: 'inout',
+        name: 'order-inout',
+        component: () => import('@mobile/views/order/inout/index.vue'),
+      }
+    ]
   },
   {
     path: '/mine',

src/packages/zrwyt/views/mine/Index.vue

@@ -26,18 +26,36 @@
                     </div>
                 </div>
                 <div class="bank">
-                    <div class="bank-item">
-                        <span>余额</span>
-                        <span>{{ currentAccount.currentbalance?.toFixed(2) ?? '0.00' }}</span>
-                    </div>
-                    <div class="bank-item">
-                        <span>预扣</span>
-                        <span>{{ currentAccount.freezeMargin?.toFixed(2) }}</span>
-                    </div>
-                    <div class="bank-item">
-                        <span>可用</span>
-                        <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
-                    </div>
+                    <ul>
+                        <li>
+                            <span>余额</span>
+                            <span>{{ currentAccount.currentbalance?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>净值</span>
+                            <span>{{ currentAccount.hazardValue?.toFixed(2) }}</span>
+                        </li>
+                    </ul>
+                    <ul>
+                        <li>
+                            <span>预扣</span>
+                            <span>{{ currentAccount.freezeMargin?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>占用</span>
+                            <span>{{ currentAccount.usedmargin?.toFixed(2) }}</span>
+                        </li>
+                    </ul>
+                    <ul>
+                        <li>
+                            <span>可用</span>
+                            <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
+                        </li>
+                        <li>
+                            <span>风险率</span>
+                            <span>{{ parsePercent(currentAccount.hazardRatio) }}</span>
+                        </li>
+                    </ul>
                 </div>
                 <div class="button">
                     <Button type="danger" size="small" round @click="doInOutMoney('0')">入金</Button>
@@ -50,6 +68,9 @@
                 <li @click="routerTo('order-position')">
                     <Iconfont label-direction="bottom" icon="g-icon-position--line">我的持仓</Iconfont>
                 </li>
+                <li @click="routerTo('order-inout')">
+                    <Iconfont label-direction="bottom" icon="g-icon-inout--line">持仓过户</Iconfont>
+                </li>
                 <li @click="routerTo('order-list')">
                     <Iconfont label-direction="bottom" icon="g-icon-order--line">我的订单</Iconfont>
                 </li>
@@ -119,6 +140,7 @@
 <script lang="ts" setup>
 import { shallowRef, onMounted, onActivated, computed } from 'vue'
 import { Cell, CellGroup, Button, Icon } from 'vant'
+import { parsePercent } from '@/filters'
 import { fullloading, dialog } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { AuthStatus } from '@/constants/account'

src/packages/zrwyt/views/mine/index.less

@@ -99,29 +99,28 @@
         .bank {
             display: flex;
             justify-content: space-around;
-            padding: .48rem 0;
+            padding: .36rem 0;
 
-            &-item {
-                display: flex;
-                flex-direction: column;
+            ul {
+                li {
+                    display: flex;
+                    flex-direction: column;
+                    padding-bottom: .1rem;
 
-                span {
-                    line-height: .4rem;
+                    span {
+                        line-height: .4rem;
 
-                    &:first-child {
-                        font-size: .24rem;
-                        color: #A1B1C5;
-                    }
+                        &:first-child {
+                            font-size: .24rem;
+                            color: #A1B1C5;
+                        }
 
-                    &:last-child {
-                        font-size: .3rem;
-                        font-weight: bold;
+                        &:last-child {
+                            font-size: .3rem;
+                            font-weight: bold;
+                        }
                     }
                 }
-
-                a {
-                    color: #00577C;
-                }
             }
         }