update

oem/tjmd/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.tjmd",
   "appName": "海南掉期市场",
-  "version": "1.0.1",
-  "versionCode": "100001",
+  "version": "1.0.2",
+  "versionCode": "100002",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

src/packages/mobile/components/modules/hqchart/candlestick/index.vue

@@ -82,7 +82,8 @@ const chartOption = {
         { Index: 'MA', Change: false },
         { Index: 'VOL', Close: false }
     ],
-    IsShowCorssCursorInfo: false,
+    IsCorssOnlyDrawKLine: true,  // 十字光标只能在K线上
+    CorssCursorTouchEnd: true, // 手指离开屏幕 隐藏十字光标
     // https://blog.csdn.net/jones2000/article/details/97682466
     CorssCursorInfo: {
         Left: 0,
@@ -106,7 +107,7 @@ const chartOption = {
         // 最后数据和右边框空白间距,空白的宽度=RightSpaceCount*k线宽度
         RightSpaceCount: 1,
         // https://blog.csdn.net/jones2000/article/details/104443471
-        IsShowTooltip: true,
+        IsShowTooltip: false,
     },
     KLineTitle:
     {

src/packages/mobile/components/modules/quote/chart/index.vue

@@ -17,7 +17,7 @@
             <Icon name="setting-o" style="padding: 0 .32rem;" v-if="false" />
         </div>
         <TimeLine v-bind="{ goodsCode }" v-if="tabIndex === 0" />
-        <KLine v-bind="{ goodsCode, cycleType }" v-else />
+        <KLine v-bind="{ symbol, goodsCode, cycleType }" v-else />
     </div>
 </template>
 
@@ -27,6 +27,7 @@ import { Tab, Tabs, Popover, Icon, PopoverAction } from 'vant'
 import { ChartCycleType } from '@/constants/chart'
 import TimeLine from './timeline/index.vue'
 import KLine from './kline/index.vue'
+//import KLine from '../../hqchart/candlestick/index.vue'
 
 defineProps({
     goodsCode: {
@@ -35,6 +36,7 @@ defineProps({
     }
 })
 
+const symbol = '600000.sh' // 股票代码
 const tabIndex = shallowRef(0) // 当前选中的标签
 const selectedText = shallowRef('') // 当前选中的分钟线
 const cycleType = shallowRef(ChartCycleType.Minutes) // 图表周期类型

src/packages/mobile/views/bank/capital/index.vue

@@ -44,7 +44,12 @@ const components = [
         title: '资金流水',
         component: defineAsyncComponent(() => import('./statement/index.vue')),
         history: defineAsyncComponent(() => import('./statement/history/index.vue')),
-    }
+    },
+    // {
+    //     name: 'report',
+    //     title: '结算单',
+    //     component: defineAsyncComponent(() => import('./report/index.vue')),
+    // }
 ]
 
 const active = shallowRef(props.tabName)

src/packages/mobile/views/bank/capital/report/index.vue

@@ -0,0 +1,47 @@
+<template>
+    <div style="border-top: 1px solid #fbfbfb;">
+        <DropdownMenu :close-on-click-outside="false">
+            <DropdownItem title="日报表" v-model="reportTypeValue" :options="reportType" />
+            <DropdownItem ref="dropdownItemRef" title="2023-10-1" @open="showPicker = true" />
+        </DropdownMenu>
+        <CellGroup title="账户信息">
+            <Cell title="账号" value="250000000006" />
+            <Cell title="名称" value="交易商01" />
+            <Cell title="币种" value="RMB" />
+            <Cell title="结算日期" value="2023-10-02" />
+        </CellGroup>
+        <CellGroup title="资金信息">
+            <Cell title="期初余额" value="611950.93" />
+            <Cell title="银行入金" value="0.00" />
+            <Cell title="平仓损益" value="0.00" />
+            <Cell title="银行出金" value="0.00" />
+            <Cell title="结算损益" value="0.00" />
+        </CellGroup>
+        <Popup position="bottom" v-model:show="showPicker" @click-overlay="dropdownItemRef.toggle()">
+            <DatePicker @confirm="onPickerConfirm" @cancel="onPickerCancel" />
+        </Popup>
+    </div>
+</template>title
+
+<script lang="ts" setup>
+import { shallowRef } from 'vue'
+import { DropdownMenu, DropdownItem, DatePicker, Popup, CellGroup, Cell } from 'vant'
+
+const dropdownItemRef = shallowRef()
+const reportTypeValue = shallowRef(1)
+const showPicker = shallowRef(false)
+
+const reportType = [
+    { text: '日报表', value: 1 },
+    { text: '月报表', value: 2 }
+]
+
+const onPickerCancel = () => {
+    showPicker.value = false
+    dropdownItemRef.value?.toggle()
+}
+
+const onPickerConfirm = () => {
+    onPickerCancel()
+}
+</script>

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

@@ -12,7 +12,7 @@
                                 :optionProps="{ label: 'bankname', value: 'bankid' }" />
                         </template>
                     </Field>
-                    <Field name="BankNo" label="银行卡号" v-model.trim="formData.BankAccountNo" placeholder="请输入银行卡账号"
+                    <Field type="number" name="BankNo" label="银行卡号" maxlength="30" v-model.trim="formData.BankAccountNo" placeholder="请输入银行卡账号"
                         :rules="formRules.BankAccountNo" />
                     <Field name="AccountName" label="姓名" readonly v-model="formData.AccountName" placeholder="请输入银行卡账户名"
                         :rules="formRules.AccountName" />
@@ -134,13 +134,7 @@ const formRules: { [key in keyof Proto.t2bBankSignReq]?: FieldRule[] } = {
     }],
     BankAccountNo: [{
         required: true,
-        message: '请输入银行卡账号',
-        validator: (val) => {
-            if (validateRules.bankcardno.validate(val)) {
-                return true
-            }
-            return validateRules.bankcardno.message
-        }
+        message: '请输入银行卡账号'
     }],
     AccountName: [{
         required: true,

src/packages/pc/components/modules/hqchart/candlestick/index.vue

@@ -82,6 +82,7 @@ const chartOption = {
         { Index: 'MA', Change: false },
         { Index: 'VOL', Close: false }
     ],
+    IsCorssOnlyDrawKLine: true,  // 十字光标只能在K线上
     IsShowCorssCursorInfo: true,
     // https://blog.csdn.net/jones2000/article/details/97682466
     CorssCursorInfo: {

src/packages/pc/views/account/sign/components/sign/index.vue

@@ -9,7 +9,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="银行卡号" prop="BankAccountNo">
-                <el-input name="BankAccountNo" placeholder="银行卡号" :maxlength="30" v-model="formData.BankAccountNo"
+                <el-input type="number" name="BankAccountNo" placeholder="银行卡号" :maxlength="30" v-model="formData.BankAccountNo"
                     :rules="formRules.BankAccountNo" />
             </el-form-item>
             <el-form-item label="名称" prop="AccountName">
@@ -89,14 +89,7 @@ const formRules: FormRules = {
     }],
     BankAccountNo: [{
         required: true,
-        message: '请输入银行卡账号',
-        validator: (rule, value, callback) => {
-            if (validateRules.bankcardno.validate(value)) {
-                callback()
-            } else {
-                callback(new Error(validateRules.bankcardno.message))
-            }
-        }
+        message: '请输入银行卡账号'
     }],
     MobilePhone: [{
         required: true,

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

@@ -88,7 +88,7 @@
                         <Iconfont icon="g-icon-profile">个人信息</Iconfont>
                     </template>
                 </Cell>
-                <!-- <Cell is-link :to="{ name: 'rules-zcxy' }">
+                <Cell is-link :to="{ name: 'rules-zcxy' }">
                     <template #title>
                         <Iconfont icon="g-icon-zcxy">用户注册协议</Iconfont>
                     </template>
@@ -97,7 +97,7 @@
                     <template #title>
                         <Iconfont icon="g-icon-yszc">关于隐私</Iconfont>
                     </template>
-                </Cell> -->
+                </Cell>
                 <Cell is-link :to="{ name: 'rules-fwrx' }">
                     <template #title>
                         <Iconfont icon="g-icon-fwrx">服务热线</Iconfont>