update

oem/digital/config/appconfig.json

@@ -11,6 +11,5 @@
   "quotationProperties": [
     "holdvolume"
   ],
-  "riskType": 2,
-  "i18nEnabled": false
+  "riskType": 2
 }

oem/snhl/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.snhl.release",
   "appName": "三农互联",
-  "version": "1.0.7",
-  "versionCode": "100007",
+  "version": "1.0.9",
+  "versionCode": "100009",
   "apiUrl": "http://192.168.31.208:8080/cfg?key=test_208",
   "tradeChannel": "ws",
   "modules": [

oem/snhl/manifest.json

@@ -157,7 +157,7 @@
                 "abiFilters" : [ "arm64-v8a" ],
                 "autoSdkPermissions" : false,
                 "minSdkVersion" : 26,
-                "targetSdkVersion" : "",
+                "targetSdkVersion" : 34,
                 "excludePermissions" : [
                     "<uses-permission android:name=\"android.permission.READ_MEDIA_IMAGES\"/>",
                     "<uses-permission android:name=\"android.permission.READ_MEDIA_VIDEO\"/>"
@@ -293,7 +293,7 @@
                 },
                 "androidStyle" : "default",
                 "iosStyle" : "common",
-                "useOriginalMsgbox" : false
+                "useOriginalMsgbox" : true
             },
             "plugins" : {
                 "ad" : {},

public/manifest.json

@@ -155,7 +155,8 @@
                 ],
                 "abiFilters" : [ "arm64-v8a" ],
                 "autoSdkPermissions" : false,
-                "minSdkVersion" : 26
+                "minSdkVersion" : 26,
+                "targetSdkVersion" : 34
             },
             /*使用Native.js调用原生安卓API需要使用到的系统权限*/
             "orientation" : [ "portrait-primary" ],

src/constants/order.ts

@@ -551,6 +551,15 @@ export function getOperateTypeSearchList() {
 }
 
 /**
+ * 获取操作类型查询名称
+ * @returns 
+ */
+export function getOperateTypeSearchName(value: number) {
+    const enums = getOperateTypeSearchList()
+    return getEnumTypeName(enums, value)
+}
+
+/**
  * 获取过户申请状态列表
  * @returns 
  */

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

@@ -16,8 +16,8 @@
     --color-secondary: #04c786;
     --color-info: #999;
     --color-border: #eee;
-    --color-up: #ff3333;
-    --color-down: #0baf1f;
+    --color-up: #0baf1f;
+    --color-down: #ff3333;
 
     /* 导航栏 */
     --navbar-height: 44px;
@@ -40,7 +40,7 @@
     --van-button-primary-border-color: var(--van-button-primary-background);
 
     /* Vant-Checkbox */
-    --van-checkbox-checked-icon-color: #DD364A !important;
+    --van-checkbox-checked-icon-color: var(--color-primary);
 
     /* Vant-Tabs */
     --van-tabs-bottom-bar-color: var(--color-primary);

src/packages/digital/views/contract/components/statement/history/index.vue

@@ -0,0 +1,68 @@
+<template>
+    <app-pull-refresh ref="pullRefreshRef" class="g-detail-list" v-model:loading="loading" v-model:pageIndex="pageIndex"
+        :page-count="pageCount" @refresh="onRefresh">
+        <dl v-for="(item, index) in dataList" :key="index">
+            <dd>
+                <span class="text-small">{{ t('banksign.capital.amount') }}</span>
+                <span :class="item.amount > 0 ? 'g-price-up' : 'g-price-down'">
+                    <b>{{ (item.amount > 0 ? '+' : '') + item.amount }}</b>
+                </span>
+            </dd>
+            <dd>
+                <span class="text-small">{{ t('banksign.capital.operatetypename') }}</span>
+                <span>{{ getOperateTypeSearchName(item.operatetype) }}</span>
+            </dd>
+            <dd>
+                <span class="text-small">{{ t('banksign.capital.createtime') }}</span>
+                <span>{{ formatDate(item.createtime) }}</span>
+            </dd>
+        </dl>
+    </app-pull-refresh>
+</template>
+
+<script lang="ts" setup>
+import { PropType, shallowRef } from 'vue'
+import { formatDate } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { getOperateTypeSearchName } from '@/constants/order'
+import { queryHisAmountLog } from '@/services/api/bank'
+import { i18n } from '@/stores'
+import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
+
+const props = defineProps({
+    params: {
+        type: Object as PropType<Partial<Model.HisAmountLogReq>>,
+        required: true
+    }
+})
+
+const { t } = i18n.global
+const pullRefreshRef = shallowRef()
+const dataList = shallowRef<Model.HisAmountLogRsp[]>([])
+
+const { loading, pageIndex, pageCount, run } = useRequest(queryHisAmountLog, {
+    manual: true,
+    defaultParams: {
+        pagesize: 20,
+    },
+    onSuccess: (res) => {
+        if (pageIndex.value === 1) {
+            dataList.value = []
+        }
+        dataList.value.push(...res.data)
+    }
+})
+
+const onRefresh = () => {
+    if (props.params.startDate || props.params.endDate) {
+        run(props.params)
+    }
+}
+
+// 暴露组件属性给父组件调用
+defineExpose({
+    refresh: () => {
+        pullRefreshRef.value?.refresh()
+    }
+})
+</script>

src/packages/digital/views/contract/components/statement/index.vue

@@ -1,187 +1,53 @@
 <template>
-    <!-- <CellGroup>
-        <Field name="operateType" :label="$t('banksign.fundstype')" is-link>
-            <template #input>
-                <app-select v-model="operatetype" :placeholder="$t('banksign.pleasechoicefundstype')" :options="operateTypeSearchList" :optionProps="{ label: 'label', value: 'value' }" @confirm="onConfirm"/>
-            </template>
-        </Field>
-    </CellGroup> -->
-    <table cellspacing="0" cellpadding="0">
-        <tbody>
-            <tr>
-                <td>
-                    <app-select v-model="dateType" :options="options" />
-                </td>
-            </tr>
-            <tr v-if="dateType != 0">
-                <td>
-                    <app-calendar :default-date="[currentDate]" @confirm="onCalendarConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
-                </td>
-            </tr>
-        </tbody>
-    </table>
-    <app-pull-refresh v-if="dateType === 0" ref="pullRefreshRef" class="bank-statement" v-model:loading="loading" v-model:error="error" v-model:pageIndex="pageIndex"
-        :page-count="pageCount" @refresh="run">
-        <app-list class="bank-statement__table" :columns="columns" :data-list="dataList">
-            <template #createtime="{ value }">
-                <span>{{ formatDate(value, 'YYYY-MM-DD') }}</span>
-                <span>{{ formatDate(value, 'HH:mm:ss') }}</span>
-            </template>
-             <!-- 操作类型 -->
-            <template #operatetypename="{ row }">
-                {{ operatetypename(row) }}
-            </template>
-        </app-list>
-    </app-pull-refresh>
-    <app-pull-refresh v-else ref="pullRefreshRef" class="bank-statement" v-model:loading="hisLoading" v-model:error="error" v-model:pageIndex="hisPageIndex"
-        :page-count="hisPageCount" @refresh="onRefresh">
-        <app-list class="bank-statement__table" :columns="columns" :data-list="hisDataList">
-            <template #createtime="{ value }">
-                <span>{{ formatDate(value, 'YYYY-MM-DD') }}</span>
-                <span>{{ formatDate(value, 'HH:mm:ss') }}</span>
-            </template>
-             <!-- 操作类型 -->
-            <template #operatetypename="{ row }">
-                {{ operatetypename(row) }}
-            </template>
-        </app-list>
-    </app-pull-refresh>
+    <div class="g-detail-table">
+        <table cellspacing="0" cellpadding="0">
+            <tbody>
+                <tr>
+                    <td>
+                        <Checkbox v-model="checked">历史</Checkbox>
+                    </td>
+                    <td>
+                        <app-date-picker v-model="dateValue" @confirm="onRefresh()" v-if="checked" />
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <statement-history ref="historyRef" :params="historyParams" v-if="checked" />
+        <statement-list :params="listParams" v-else />
+    </div>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef } from 'vue'
-// import { CellGroup, Field } from 'vant'
-import { formatDate } from '@/filters'
-import { useRequest } from '@/hooks/request'
-import { queryAmountLog, queryHisAmountLog } from '@/services/api/bank'
-import { i18n } from '@/stores'
-import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
-import AppList from '@mobile/components/base/list/index.vue'
-import { getOperateTypeSearchList } from '@/constants/order'
-import AppSelect from '@mobile/components/base/select/index.vue'
-import AppCalendar from '@mobile/components/base/calendar/index.vue'
-
-const { global: { t } } = i18n
-const dataList = shallowRef<Model.AmountLogRsp[]>([])
-const hisDataList = shallowRef<Model.HisAmountLogRsp[]>([])
-const error = shallowRef(false)
-/// 资金类型
-// const operatetype = shallowRef(0)
-const pullRefreshRef = shallowRef()
-
-const dateType = shallowRef(0)
-const currentDate = shallowRef(new Date())
-const options = shallowRef([
-    { label: '当前', value: 0 },
-    { label: '历史', value: 1 }
-])
-
-/// 查询数据
-const operateTypeSearchList = [{
-    label: t('common.all'),
-    value: 0
-}].concat(getOperateTypeSearchList())
-
-const operatetypename = ((row: Model.AmountLogRsp) => {
-    switch (i18n.global.locale) {
-        case "zh-CN":
-            return row.operatetypename
-        case "zh-TW":
-            return row.operatetypename_tw
-        case "en-US":
-            return row.operatetypenameen
-        case "vi":
-            return row.operatetypenamevi
-        default:
-            return row.operatetypenameth
-    }
+import { shallowRef, reactive, defineAsyncComponent } from 'vue'
+import { Checkbox } from 'vant'
+import AppDatePicker from '@mobile/components/base/datepicker/index.vue'
+
+const props = defineProps({
+    accountid: {
+        type: Number,
+        required: true
+    },
 })
 
-const columns: Model.TableColumn[] = [
-    { field: 'createtime', label: t('banksign.capital.createtime') },
-    { field: 'operatetypename', label: t('banksign.capital.operatetypename') },
-    { field: 'amount', label: t('banksign.capital.amount') },
-]
+const StatementList = defineAsyncComponent(() => import('./list/index.vue')) // 当前
+const StatementHistory = defineAsyncComponent(() => import('./history/index.vue')) // 历史
 
-const { loading, pageIndex, pageCount, run } = useRequest(queryAmountLog, {
-    defaultParams: {
-        pagesize: 20,
-        pageflag: 1,
-    },
-    onSuccess: (res) => {
-        if (pageIndex.value === 1) {
-            dataList.value = res.data
-            return
-        } 
-        dataList.value.push(...res.data)
-    },
-    onError: () => {
-        error.value = true
-    }
-})
+const historyRef = shallowRef()
+const checked = shallowRef(false)
+const dateValue = shallowRef([])
 
-const { loading: hisLoading, pageIndex: hisPageIndex, pageCount: hisPageCount, run: runHis } = useRequest(queryHisAmountLog, {
-    defaultParams: {
-        pagesize: 20,
-    },
-    onSuccess: (res) => {
-        if (pageIndex.value === 1) {
-            hisDataList.value = []
-        }
-        hisDataList.value.push(...res.data)
-    },
-    onError: () => {
-        error.value = true
-    }
+const listParams = reactive<Partial<Model.AmountLogReq>>({
+    accountID: props.accountid.toString()
 })
 
-// 选中资金类型
-const onConfirm = (value: number) => {
-    pageIndex.value = 1
-    run({
-        operateType: value === 0 ? undefined : value.toString()
-    })
-}
-
-// 选择日期
-const onCalendarConfirm = (value: Date) => {
-    currentDate.value = value
-    pageIndex.value = 1
-    const dateString = currentDate.value.toISOString()
-    const dateValue = formatDate(dateString, 'YYYYMMDD')
-    runHis({
-        startDate: dateValue,
-        endDate: dateValue,
-    })
-}
+const historyParams = reactive<Partial<Model.HisAmountLogReq>>({
+    accountID: props.accountid.toString()
+})
 
 const onRefresh = () => {
-    const dateString = currentDate.value.toISOString()
-    const dateValue = formatDate(dateString, 'YYYYMMDD')
-    runHis({
-        startDate: dateValue,
-        endDate: dateValue,
-    })
-}
-</script>
-
-<style lang="less">
-.bank-statement {
-    padding-top: 10px;
-
-    &__table {
-        td.app-list__column {
-            &:first-child {
-                span:last-child {
-                    color: #999;
-                    font-size: 12px;
-                }
-            }
-
-            &:not(:first-child) {
-                font-size: 16px;
-            }
-        }
-    }
+    const date = dateValue.value.join('')
+    historyParams.startDate = date
+    historyParams.endDate = date
+    historyRef.value?.refresh()
 }
-</style>
+</script>

src/packages/digital/views/contract/components/statement/list/index.vue

@@ -0,0 +1,67 @@
+<template>
+    <app-pull-refresh ref="pullRefreshRef" class="g-detail-list" v-model:loading="loading" v-model:pageIndex="pageIndex"
+        :page-count="pageCount" @refresh="onRefresh">
+        <dl v-for="(item, index) in dataList" :key="index">
+            <dd>
+                <span class="text-small">{{ t('banksign.capital.amount') }}</span>
+                <span :class="item.amount > 0 ? 'g-price-up' : 'g-price-down'">
+                    <b>{{ (item.amount > 0 ? '+' : '') + item.amount }}</b>
+                </span>
+            </dd>
+            <dd>
+                <span class="text-small">{{ t('banksign.capital.operatetypename') }}</span>
+                <span>{{ getOperateTypeSearchName(item.operatetype) }}</span>
+            </dd>
+            <dd>
+                <span class="text-small">{{ t('banksign.capital.createtime') }}</span>
+                <span>{{ formatDate(item.createtime) }}</span>
+            </dd>
+        </dl>
+    </app-pull-refresh>
+</template>
+
+<script lang="ts" setup>
+import { PropType, shallowRef } from 'vue'
+import { formatDate } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { getOperateTypeSearchName } from '@/constants/order'
+import { queryAmountLog } from '@/services/api/bank'
+import { i18n } from '@/stores'
+import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
+
+const props = defineProps({
+    params: {
+        type: Object as PropType<Partial<Model.AmountLogReq>>,
+        required: true
+    }
+})
+
+const { t } = i18n.global
+const pullRefreshRef = shallowRef()
+const dataList = shallowRef<Model.AmountLogRsp[]>([])
+
+const { loading, pageIndex, pageCount, run } = useRequest(queryAmountLog, {
+    manual: true,
+    defaultParams: {
+        pagesize: 20,
+        pageflag: 1,
+    },
+    onSuccess: (res) => {
+        if (pageIndex.value === 1) {
+            dataList.value = []
+        }
+        dataList.value.push(...res.data)
+    }
+})
+
+const onRefresh = () => {
+    run(props.params)
+}
+
+// 暴露组件属性给父组件调用
+defineExpose({
+    refresh: () => {
+        pullRefreshRef.value?.refresh()
+    }
+})
+</script>

src/packages/digital/views/contract/detail/index.vue

@@ -49,7 +49,7 @@
                 <contract-position />
             </Tab>
             <Tab title="资金明细">
-                <contract-statement />
+                <contract-statement v-bind="{ accountid }" />
             </Tab>
         </Tabs>
         <ActionSheet v-model:show="showSheet" title="请选择">

src/packages/digital/views/spot/components/order/index.vue

@@ -1,6 +1,5 @@
 <template>
-    <app-pull-refresh ref="pullRefreshRef" class="g-detail-table" v-model:loading="loading"
-        v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+    <div class="g-detail-table">
         <table cellspacing="0" cellpadding="0" v-if="showDatePicker">
             <tbody>
                 <tr>
@@ -10,57 +9,60 @@
                 </tr>
             </tbody>
         </table>
-        <table cellspacing="0" cellpadding="0" v-for="(item, index) in tableList" :key="index">
-            <thead>
-                <tr>
-                    <th>
-                        <span>{{ item.goodsname }}</span>
-                        <time class="text-small">{{ formatDate(item.ordertime) }}</time>
-                    </th>
-                    <th>
-                        <span class="g-price-down">{{ getBuyOrSellName(item.buyorsell) }}</span>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td>
-                        <span class="text-small">委托单号</span>
-                        <span>{{ item.orderid }}</span>
-                    </td>
-                    <td>
-                        <span class="text-small">委托状态</span>
-                        <span>{{ getOrderStatusName(item.orderstatus) }}</span>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <span class="text-small">委托价格({{ item.quotecurrencycode }})</span>
-                        <span>{{ item.orderprice }}</span>
-                    </td>
-                    <td>
-                        <span class="text-small">委托数量({{ item.basecurrencycode }})</span>
-                        <span>{{ item.ordervolume }}</span>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2">
-                        <span class="text-small">委托金额({{ item.quotecurrencycode }})</span>
-                        <span>{{ item.ordervalue }}</span>
-                    </td>
-                </tr>
-            </tbody>
-            <tfoot>
-                <tr>
-                    <td colspan="2">
-                        <Button size="small" @click="cancelOrder(item)">撤销</Button>
-                    </td>
-                </tr>
-            </tfoot>
-        </table>
-        <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)"
-            @closed="closeComponent" v-if="componentId" />
-    </app-pull-refresh>
+        <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:pageIndex="pageIndex"
+            :page-count="pageCount" @refresh="onRefresh">
+            <table cellspacing="0" cellpadding="0" v-for="(item, index) in tableList" :key="index">
+                <thead>
+                    <tr>
+                        <th>
+                            <span>{{ item.goodsname }}</span>
+                            <time class="text-small">{{ formatDate(item.ordertime) }}</time>
+                        </th>
+                        <th>
+                            <span class="g-price-down">{{ getBuyOrSellName(item.buyorsell) }}</span>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>
+                            <span class="text-small">委托单号</span>
+                            <span>{{ item.orderid }}</span>
+                        </td>
+                        <td>
+                            <span class="text-small">委托状态</span>
+                            <span>{{ getOrderStatusName(item.orderstatus) }}</span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <span class="text-small">委托价格({{ item.quotecurrencycode }})</span>
+                            <span>{{ item.orderprice }}</span>
+                        </td>
+                        <td>
+                            <span class="text-small">委托数量({{ item.basecurrencycode }})</span>
+                            <span>{{ item.ordervolume }}</span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="2">
+                            <span class="text-small">委托金额({{ item.quotecurrencycode }})</span>
+                            <span>{{ item.ordervalue }}</span>
+                        </td>
+                    </tr>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td colspan="2">
+                            <Button size="small" @click="cancelOrder(item)">撤销</Button>
+                        </td>
+                    </tr>
+                </tfoot>
+            </table>
+            <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)"
+                @closed="closeComponent" v-if="componentId" />
+        </app-pull-refresh>
+    </div>
 </template>
 
 <script lang="ts" setup>

src/packages/digital/views/spot/components/statement/index.vue

@@ -1,6 +1,5 @@
 <template>
-    <app-pull-refresh ref="pullRefreshRef" class="g-detail-table g-detail-list" v-model:loading="loading"
-        v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+    <div class="g-detail-table">
         <table cellspacing="0" cellpadding="0">
             <tbody>
                 <tr>
@@ -10,27 +9,31 @@
                 </tr>
             </tbody>
         </table>
-        <dl v-for="(item, index) in dataList" :key="index">
-            <dt>
-                <span>{{ item.tradedate }}</span>
-            </dt>
-            <dd>
-                <span class="text-small">业务类型</span>
-                <span>{{ getDigitalBusinessCodeName(item.digitalbusinesscode) }}</span>
-            </dd>
-            <dd>
-                <span class="text-small">操作类型</span>
-                <span>{{ getDigitalOperateTypeName(item.digitaloperatetype) }}</span>
-            </dd>
-            <dd>
-                <span class="text-small">金额</span>
-                <span>
-                    {{ (item.changevalue > 0 ? '+' : '') + item.changevalue }} {{
-                        getDigitalCurrencyName(item.currencyid) }}
-                </span>
-            </dd>
-        </dl>
-    </app-pull-refresh>
+        <app-pull-refresh ref="pullRefreshRef" class="g-detail-list" v-model:loading="loading" v-model:pageIndex="pageIndex"
+            :page-count="pageCount" @refresh="onRefresh">
+            <dl v-for="(item, index) in dataList" :key="index">
+                <dd>
+                    <span class="text-small">金额</span>
+                    <span :class="item.changevalue > 0 ? 'g-price-up' : 'g-price-down'">
+                        {{ (item.changevalue > 0 ? '+' : '') + item.changevalue }} {{
+                            getDigitalCurrencyName(item.currencyid) }}
+                    </span>
+                </dd>
+                <dd>
+                    <span class="text-small">业务类型</span>
+                    <span>{{ getDigitalBusinessCodeName(item.digitalbusinesscode) }}</span>
+                </dd>
+                <dd>
+                    <span class="text-small">操作类型</span>
+                    <span>{{ getDigitalOperateTypeName(item.digitaloperatetype) }}</span>
+                </dd>
+                <dd>
+                    <span class="text-small">日期</span>
+                    <span>{{ item.tradedate }}</span>
+                </dd>
+            </dl>
+        </app-pull-refresh>
+    </div>
 </template>
 
 <script lang="ts" setup>

src/packages/digital/views/spot/components/trade/index.vue

@@ -1,6 +1,5 @@
 <template>
-    <app-pull-refresh ref="pullRefreshRef" class="g-detail-table" v-model:loading="loading"
-        v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+    <div class="g-detail-table">
         <table cellspacing="0" cellpadding="0" v-if="showDatePicker">
             <tbody>
                 <tr>
@@ -10,48 +9,51 @@
                 </tr>
             </tbody>
         </table>
-        <table cellspacing="0" cellpadding="0" v-for="(item, index) in tableList" :key="index">
-            <thead>
-                <tr>
-                    <th>
-                        <span>{{ item.goodsname }}</span>
-                        <time class="text-small">{{ item.tradetime }}</time>
-                    </th>
-                    <th>
-                        <span class="g-price-down">{{ getBuyOrSellName(item.buyorsell) }}</span>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td>
-                        <span class="text-small">成交单号</span>
-                        <span>{{ item.tradeid }}</span>
-                    </td>
-                    <td>
-                        <span class="text-small">手续费({{ item.basecurrencycode }})</span>
-                        <span>{{ item.tradecharge }}</span>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <span class="text-small">成交价格({{ item.quotecurrencycode }})</span>
-                        <span>{{ item.tradeprice }}</span>
-                    </td>
-                    <td>
-                        <span class="text-small">成交数量({{ item.quotecurrencycode }})</span>
-                        <span>{{ item.tradevolume }}</span>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2">
-                        <span class="text-small">成交金额({{ item.quotecurrencycode }})</span>
-                        <span>{{ item.tradevalue }}</span>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </app-pull-refresh>
+        <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading"
+            v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+            <table cellspacing="0" cellpadding="0" v-for="(item, index) in tableList" :key="index">
+                <thead>
+                    <tr>
+                        <th>
+                            <span>{{ item.goodsname }}</span>
+                            <time class="text-small">{{ item.tradetime }}</time>
+                        </th>
+                        <th>
+                            <span class="g-price-down">{{ getBuyOrSellName(item.buyorsell) }}</span>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>
+                            <span class="text-small">成交单号</span>
+                            <span>{{ item.tradeid }}</span>
+                        </td>
+                        <td>
+                            <span class="text-small">手续费({{ item.basecurrencycode }})</span>
+                            <span>{{ item.tradecharge }}</span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <span class="text-small">成交价格({{ item.quotecurrencycode }})</span>
+                            <span>{{ item.tradeprice }}</span>
+                        </td>
+                        <td>
+                            <span class="text-small">成交数量({{ item.quotecurrencycode }})</span>
+                            <span>{{ item.tradevolume }}</span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="2">
+                            <span class="text-small">成交金额({{ item.quotecurrencycode }})</span>
+                            <span>{{ item.tradevalue }}</span>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </app-pull-refresh>
+    </div>
 </template>
 
 <script lang="ts" setup>

src/packages/digital/views/wallet/components/record/index.vue

@@ -1,7 +1,6 @@
 <!-- 钱包-记录 -->
 <template>
-    <app-pull-refresh ref="pullRefreshRef" class="g-detail-table" v-model:loading="loading"
-        v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="onRefresh">
+    <div class="g-detail-table">
         <table cellspacing="0" cellpadding="0">
             <tbody>
                 <tr>
@@ -11,44 +10,48 @@
                 </tr>
             </tbody>
         </table>
-        <table cellspacing="0" cellpadding="0" v-for="(item, index) in dataList" :key="index">
-            <thead>
-                <tr>
-                    <th colspan="2">
-                        <span>充值(USDT)</span>
-                        <time class="text-small">{{ formatDate(item.applytime) }}</time>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td>
-                        <span class="text-small">申请单号</span>
-                        <span>{{ item.applyid }}</span>
-                    </td>
-                    <td>
-                        <span class="text-small">申请状态</span>
-                        <span>{{ getBankApplyStatusName(item.applystatus) }}</span>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <span class="text-small">申请金额(USDT)</span>
-                        <span>{{ item.applyamount }}</span>
-                    </td>
-                    <td>
-                        <span class="text-small">手续费(USDT)</span>
-                        <span>{{ item.charge }}</span>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </app-pull-refresh>
+        <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:pageIndex="pageIndex"
+            :page-count="pageCount" @refresh="onRefresh">
+            <table cellspacing="0" cellpadding="0" v-for="(item, index) in dataList" :key="index">
+                <thead>
+                    <tr>
+                        <th colspan="2">
+                            <span>充值(USDT)</span>
+                            <time class="text-small">{{ formatDate(item.applytime) }}</time>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>
+                            <span class="text-small">申请单号</span>
+                            <span>{{ item.applyid }}</span>
+                        </td>
+                        <td>
+                            <span class="text-small">申请状态</span>
+                            <span>{{ getBankApplyStatusName(item.applystatus) }}</span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <span class="text-small">申请金额({{ getDigitalCurrencyName(item.currencyid) }})</span>
+                            <span>{{ item.applyamount }}</span>
+                        </td>
+                        <td>
+                            <span class="text-small">手续费({{ getDigitalCurrencyName(item.currencyid) }})</span>
+                            <span>{{ item.charge }}</span>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </app-pull-refresh>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef, PropType } from 'vue'
 import { formatDate } from '@/filters'
+import { getDigitalCurrencyName } from '@/constants/order'
 import { getBankApplyStatusName } from '@/constants/bank'
 import { useRequest } from '@/hooks/request'
 import { queryTaaccountDigitalChangeApplys } from '@/services/api/digital'

src/packages/mobile/components/base/datepicker/index.less

@@ -1,6 +1,6 @@
 .app-datepicker {
     &__placeholder {
-        display: flex;
+        display: inline-flex;
         align-items: center;
         color: #666;
 

src/packages/mobile/components/base/pull-refresh/index.less

@@ -1,5 +1,5 @@
 .app-pull-refresh {
-    height: 100%;
-    min-height: 1px;
-    overflow-y: auto;
+    // height: 100%;
+    // min-height: 1px;
+    // overflow-y: auto;
 }

src/services/api/bank/index.ts

@@ -128,6 +128,7 @@ export function DigitalAccountTransferApply(config: RequestConfig<Partial<Proto.
         },
         requestCode: 'DigitalAccountTransferApplyReq',
         responseCode: 'DigitalAccountTransferApplyRsp',
+        marketId: 19
     })
 }
 

src/services/api/digital/index.ts

@@ -100,6 +100,7 @@ export function digitalAccountActivate(config: RequestConfig<Partial<Proto.Digit
             ...config.data
         },
         requestCode: 'DigitalAccountActivateReq',
-        responseCode: 'DigitalAccountActivateRsp'
+        responseCode: 'DigitalAccountActivateRsp',
+        marketId: 19
     })
 }