li.shaoyi 2 år sedan
förälder
incheckning
42989a1234

+ 11 - 23
oem/gstj/config/router.json

@@ -229,7 +229,7 @@
                     {
                         "authType": 1,
                         "sort": 1,
-                        "title": "订单交易",
+                        "title": "交易市场",
                         "code": "market_trade_goods",
                         "url": "goods",
                         "urlType": 1,
@@ -239,36 +239,24 @@
                                 "authType": 2,
                                 "sort": 1,
                                 "title": "订单挂牌",
-                                "code": "market_trade_goods_50101",
+                                "code": "market_trade_goods_50102",
                                 "component": "views/market/trade/goods/list/index.vue"
                             },
                             {
                                 "authType": 2,
                                 "sort": 2,
-                                "title": "中远期挂牌",
-                                "code": "market_trade_goods_50102",
+                                "title": "协议转让",
+                                "code": "market_trade_goods_50101",
                                 "component": "views/market/trade/goods/list/index.vue"
+                            },
+                            {
+                                "authType": 2,
+                                "sort": 3,
+                                "title": "现货挂牌",
+                                "code": "market_trade_spot",
+                                "component": "views/market/trade/spot/index.vue"
                             }
                         ]
-                    },
-                    {
-                        "authType": 1,
-                        "sort": 2,
-                        "title": "预售转让",
-                        "code": "market_trade_presell",
-                        "url": "presell",
-                        "urlType": 1,
-                        "component": "views/market/trade/presell/index.vue",
-                        "hidden": true
-                    },
-                    {
-                        "authType": 1,
-                        "sort": 3,
-                        "title": "仓单交易",
-                        "code": "market_trade_spot",
-                        "url": "spot",
-                        "urlType": 1,
-                        "component": "views/market/trade/spot/index.vue"
                     }
                 ]
             }

+ 2 - 0
src/packages/gstj/router/index.ts

@@ -46,6 +46,7 @@ const routes: Array<RouteRecordRaw> = [
             name: 'home-goods',
             component: () => import('@mobile/views/goods/list/Index.vue'),
             props: {
+              title: '协议转让',
               marketId: 50101
             }
           },
@@ -54,6 +55,7 @@ const routes: Array<RouteRecordRaw> = [
             name: 'home-forward',
             component: () => import('@mobile/views/goods/list/Index.vue'),
             props: {
+              title: '订单挂牌',
               marketId: 50102
             }
           },

+ 7 - 7
src/packages/gstj/views/home/Index.vue

@@ -39,14 +39,8 @@ const tabList: Tabbar[] = [
     activeIcon: 'icon-a-zu753',
   },
   {
-    name: 'home-goods',
-    label: '订单挂牌',
-    icon: 'icon-a-zu821',
-    activeIcon: 'icon-a-zu818',
-  },
-  {
     name: 'home-forward',
-    label: '中远期挂牌',
+    label: '订单挂牌',
     icon: 'icon-a-zu820',
     activeIcon: 'icon-a-zu825',
   },
@@ -57,6 +51,12 @@ const tabList: Tabbar[] = [
     activeIcon: 'icon-a-zu824',
   },
   {
+    name: 'home-goods',
+    label: '协议转让',
+    icon: 'icon-a-zu821',
+    activeIcon: 'icon-a-zu818',
+  },
+  {
     name: 'home-mine',
     label: '我的',
     icon: 'icon-a-zu823',

+ 2 - 1
src/packages/mobile/views/goods/list/Index.vue

@@ -1,7 +1,7 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="订单挂牌" :show-back-button="showBackButton" />
+            <app-navbar :title="title ?? '订单挂牌'" :show-back-button="showBackButton" />
         </template>
         <app-list :columns="columns" :data-list="futuresStore.marketGoodsList" @row-click="rowClick">
             <!-- 商品名称/代码 -->
@@ -74,6 +74,7 @@ import quoteSocket from '@/services/websocket/quote'
 import AppList from '@mobile/components/base/list/index.vue'
 
 const props = defineProps({
+    title: String,
     marketId: {
         type: Number,
         required: true

+ 4 - 0
src/packages/pc/components/layouts/page/index.vue

@@ -31,6 +31,7 @@
     </div>
     <div class="app-page__statusbar">
       <div class="statusbar-left">
+        <span style="font-size: 12px;color: #444f57;padding: 0 5px;">v1.0.{{ version }}</span>
       </div>
       <div class="statusbar-right">
         <ul>
@@ -70,6 +71,9 @@ const loginStore = useLoginStore()
 const isCollapse = ref(globalStore.isMobile)
 const serverTime = ref<Moment>()
 
+const meta = document.getElementsByTagName('meta')
+const version = meta.namedItem('revised')?.content ?? '0'
+
 // 手动给组件添加 name 属性,处理缓存 exclude 无效的问题
 const handleComponent = (component: Record<'type', { name: RouteRecordName | undefined }>, route: RouteRecordNormalized) => {
   if (component) {

+ 1 - 1
src/packages/pc/views/footer/goods/order/clear/index.vue

@@ -58,7 +58,7 @@ const goodsList = computed(() => props.dataList.filter((e, i, arr) => arr.findIn
 const formRules: FormRules = {
     goodsId: [{
         required: true,
-        message: '请选择商品'
+        message: '请选择委托商品'
     }],
     price: [{
         required: true,