update

android/fxgl.txt

@@ -29,3 +29,6 @@ http://47.116.5.81:8022/PhoneService/GetUpdateInfo
 下载地址：http://47.116.5.81:8023/thj_demo.apk
 App Name: 铁合金掌上行演示版
 
+多元演示
+cn.muchinfo.demo_v1.0.0.apk
+http://103.40.249.126:18280/cfg?key=mtp_20

public/manifest.json

@@ -2,7 +2,7 @@
     "@platforms" : [ "android", "iPhone", "iPad" ],
     "id" : "H5E4A9458",
     /*应用的标识*/
-    "name" : "铁合金掌上行",
+    "name" : "多元演示系统",
     /*应用名称，程序桌面图标名称*/
     "version" : {
         "name" : "1.0.0",

src/packages/mobile/components/modules/echarts-kline/index.less

@@ -1,15 +1,15 @@
 .app-echats-kline {
-    display       : flex;
+    display: flex;
     flex-direction: column;
-    height        : 300px;
+    height: 250px;
 
     &__tip {
         margin: auto;
     }
 
     &__container {
-        flex          : 1;
-        display       : flex;
+        flex: 1;
+        display: flex;
         flex-direction: column;
 
         .app-echarts {
@@ -17,11 +17,11 @@
         }
 
         .legend {
-            display  : flex;
-            color    : #7a8a94;
+            display: flex;
+            color: #7a8a94;
             font-size: 12px;
-            padding  : 4px 4%;
-            margin   : 0;
+            padding: 4px 4%;
+            margin: 0;
 
             &-item {
                 &:not(:first-child) {

src/packages/mobile/components/modules/echarts-kline/index.vue

@@ -8,7 +8,7 @@
         </template>
         <template v-else>
             <div class="app-echats-kline__container">
-                <ul class="legend">
+                <ul class="legend" v-if="false">
                     <li class="legend-item">开: {{ selectedItem.open }}</li>
                     <li class="legend-item">收: {{ selectedItem.close }}</li>
                     <li class="legend-item">高: {{ selectedItem.highest }}</li>

src/packages/mobile/components/modules/echarts-timeline/index.less

@@ -0,0 +1,33 @@
+.app-echats-timeline {
+    display: flex;
+    flex-direction: column;
+    height: 250px;
+
+    &__tip {
+        margin: auto;
+    }
+
+    &__container {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+
+        .app-echarts {
+            flex: 1;
+        }
+
+        .legend {
+            display: flex;
+            color: #7a8a94;
+            font-size: 12px;
+            padding: 4px 4%;
+            margin: 0;
+
+            &-item {
+                &:not(:first-child) {
+                    margin-left: 10px;
+                }
+            }
+        }
+    }
+}

src/packages/mobile/components/modules/echarts-timeline/index.vue

@@ -1,14 +1,14 @@
 <template>
     <div class="app-echats-timeline">
         <template v-if="loading">
-            <div class="app-echats-kline__tip">正在加载...</div>
+            <div class="app-echats-timeline__tip">正在加载...</div>
         </template>
         <template v-else-if="isEmpty">
-            <div class="app-echats-kline__tip">暂无数据</div>
+            <div class="app-echats-timeline__tip">暂无数据</div>
         </template>
         <template v-else>
-            <div class="app-echats-kline__container">
-                <ul class="legend">
+            <div class="app-echats-timeline__container">
+                <ul class="legend" v-if="false">
                     <li class="legend-item">MA5: {{ selectedItem.ma5 }}</li>
                 </ul>
                 <app-echarts :option="options.timeline" v-model:dataIndex="dataIndex" @ready="initOptions" />
@@ -29,4 +29,8 @@ const props = defineProps({
 })
 
 const { loading, dataIndex, isEmpty, options, selectedItem, initOptions } = useTimelineChart(props.goodscode)
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

src/packages/mobile/views/ballot/detail/Index.vue

@@ -92,7 +92,7 @@ const detailBanners = computed(() => {
 const earnest = computed(() => {
     switch (detail.presaledepositalgorithm) {
         case 1:
-            return (detail.presaledepositvalue * 100).toFixed(2)
+            return parsePercent(detail.presaledepositvalue)
         case 2:
             return detail.presaledepositvalue.toFixed(2)
         default:

src/packages/mobile/views/boot/Index.vue

@@ -2,7 +2,7 @@
   <div class="boot">
     <Swipe class="boot__guide" :loop="false" v-if="state.showGuide">
       <SwipeItem>
-        <img src="@mobile/assets/images/boot-1080p.jpg" />
+        <img src="@mobile/assets/images/boot-1080p.png" />
       </SwipeItem>
       <SwipeItem>
         <img src="@mobile/assets/images/guide-1.png" />

src/packages/mobile/views/boot/index.less

@@ -1,6 +1,6 @@
 .boot {
     height: 100vh;
-    background: #fff url('@mobile/assets/images/boot-1080p.jpg') no-repeat center top;
+    background: #fff url('@mobile/assets/images/boot-1080p.png') no-repeat center top;
     background-size: cover;
     overflow: hidden;
 

src/packages/mobile/views/market/detail/Index.vue

@@ -1,7 +1,7 @@
 <template>
     <app-view class="market-detail">
         <template #header>
-            <app-navbar title="商品详情" />
+            <app-navbar :title="quote?.goodsname ?? '商品详情'" />
         </template>
         <div class="market-detail__quote" v-if="quote">
             <ul class="price">
@@ -59,9 +59,12 @@
         <component :is="componentMap.get('echartsTimeline')" v-bind="{ goodscode }" @ready="onReady"
             v-if="active === ChartCycleType.Time" />
         <component :is="componentMap.get('echartsKline')" v-bind="{ goodscode, cycleType: active }" v-else />
-        <AppList :columns="columns" :data-list="dataList">
+        <AppList :columns="columns" :data-list="dataList" style="border-top: 1px solid #eee;">
             <template #TS="{ value }">
-                {{ formatDate(value, 'HH:mm') }}
+                {{ formatDate(value, 'HH:mm:ss') }}
+            </template>
+            <template #PE="{ value }">
+                <span>{{ value }}</span>
             </template>
         </AppList>
     </app-view>

src/packages/mobile/views/market/detail/index.less

@@ -1,6 +1,12 @@
 .market-detail {
     background-color: #fff;
 
+    .van-tabs {
+        &__nav {
+            background-color: #f2f2f2;
+        }
+    }
+
     &__quote {
         padding: .2rem 0;
 

src/packages/mobile/views/presale/detail/Index.vue

@@ -92,7 +92,7 @@ const detailBanners = computed(() => {
 const earnest = computed(() => {
     switch (detail.presaledepositalgorithm) {
         case 1:
-            return (detail.presaledepositvalue * 100).toFixed(2)
+            return parsePercent(detail.presaledepositvalue)
         case 2:
             return detail.presaledepositvalue.toFixed(2)
         default:

src/packages/mobile/views/presale/detail/components/delisting/index.vue

@@ -39,6 +39,7 @@
 import { shallowRef, PropType, onMounted, computed } from 'vue'
 import { Form, Field, Stepper, Button, FieldRule, FormInstance } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
+import { parsePercent } from '@/filters'
 import { useAccountStore } from '@/stores'
 import { useOrder } from '@/business/trade'
 import AppPopup from '@mobile/components/base/popup/index.vue'
@@ -79,7 +80,7 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
 const earnest = computed(() => {
     switch (props.detail.presaledepositalgorithm) {
         case 1:
-            return (props.detail.presaledepositvalue * 100).toFixed(2)
+            return parsePercent(props.detail.presaledepositvalue)
         case 2:
             return props.detail.presaledepositvalue.toFixed(2)
         default:

src/packages/mobile/views/user/login/Index.vue

@@ -10,8 +10,8 @@
           :rules="[{ required: true, message: '请输入密码' }]" autocomplete="off" />
       </CellGroup>
       <div class="button-link">
-        <span @click="navigationTo('UserRegister')">用户注册</span>
-        <span @click="navigationTo('UserForget')">忘记密码</span>
+        <span @click="navigationTo('user-register')">用户注册</span>
+        <span @click="navigationTo('user-forget')">忘记密码</span>
       </div>
       <div class="button-submit">
         <Button native-type="submit" round block>登录</Button>