update

app/package.json

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

oem/qxst/config/appconfig.json

@@ -1,7 +1,7 @@
 {
   "appName": "贵茶数字化",
-  "version": "1.0.20",
-  "versionCode": "100020",
+  "version": "1.0.22",
+  "versionCode": "100022",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "http",
   "modules": [

src/components/base/tabs/index.less

@@ -1,5 +1,5 @@
 .app-tabs {
-    display       : flex;
+    display: flex;
     flex-direction: column;
 
     &--top,
@@ -18,17 +18,19 @@
     }
 
     &--right {
-        flex-direction : row;
-        flex-flow      : row-reverse;
+        flex-direction: row;
+        flex-flow: row-reverse;
         justify-content: left;
     }
 
     &__navbar {
-        display        : flex;
-        align-items    : center;
-        justify-content: space-between;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
 
         .tabs {
+            margin-right: auto;
+
             &-item {
                 white-space: nowrap;
             }
@@ -36,10 +38,10 @@
     }
 
     &__container {
-        position      : relative;
-        flex          : 1;
-        overflow-y    : auto;
-        display       : flex;
+        position: relative;
+        flex: 1;
+        overflow-y: auto;
+        display: flex;
         flex-direction: column;
     }
 }

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

@@ -126,7 +126,7 @@ import { queryBankAccountSign } from '@/services/api/bank'
 import { queryUserAccount } from '@/services/api/account'
 import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
 import eventBus from '@/services/bus'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 
 const { router, routerTo } = useNavigation()
 const loginStore = useLoginStore()

src/packages/mobile/components/base/tabbar/index.vue

@@ -28,7 +28,7 @@
 import { PropType, computed } from 'vue'
 import { Tabbar } from './types'
 import { useGlobalStore } from '@/stores'
-import AppIconfont from '@mobile/components/base/iconfont/index.vue'
+import AppIconfont from '@/components/base/iconfont/index.vue'
 
 const emit = defineEmits(['click'])
 

src/packages/mobile/views/home/main/Index.vue

@@ -72,7 +72,7 @@ import { queryImageConfigs } from "@/services/api/common";
 import { queryNewTitles } from "@/services/api/news";
 import { useLoginStore, useGlobalStore } from '@/stores'
 import Banner from '@mobile/components/base/banner/index.vue'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 //import HQChart from '@mobile/components/modules/chart/index.vue'
 
 const globalStore = useGlobalStore()

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

@@ -126,7 +126,7 @@ import { queryBankAccountSign } from '@/services/api/bank'
 import { queryUserAccount } from '@/services/api/account'
 import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
 import eventBus from '@/services/bus'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 
 const { router, routerTo } = useNavigation()
 const loginStore = useLoginStore()

src/packages/mobile/views/mine/setting/Index.vue

@@ -22,5 +22,5 @@
 
 <script lang="ts" setup>
 import { Cell, CellGroup } from 'vant'
-import AppIconfont from '@mobile/components/base/iconfont/index.vue'
+import AppIconfont from '@/components/base/iconfont/index.vue'
 </script>

src/packages/mobile/views/order/position/components/goods/close/Index.vue

@@ -13,7 +13,7 @@
                     <Cell title="持仓数量" :value="selectedRow.curpositionqty" />
                     <Cell title="冻结数量" :value="selectedRow.frozenqty" />
                     <Cell title="可用数量" :value="selectedRow.enableqty" />
-                    <Cell title="持仓均价" :value="formatDecimal(selectedRow.averageprice)" />
+                    <Cell title="持仓均价" :value="selectedRow.averageprice" />
                     <Cell title="参考损益">
                         <template #value>
                             <span :class="selectedRow.closeplColor">{{ formatDecimal(selectedRow.closepl) }}</span>

src/packages/mobile/views/order/position/components/goods/detail/Index.vue

@@ -1,6 +1,6 @@
 <!-- 我的持仓-订单明细 -->
 <template>
-     <app-modal direction="right" height="100%" v-model:show="showModal" >
+    <app-modal direction="right" height="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="订单明细" @back="closed" />
@@ -41,10 +41,6 @@
                                     <span>持仓金额</span>
                                     <span>{{ formatDecimal(item.holderamount) }}</span>
                                 </li>
-                                <li>
-                                    <span>成交单号</span>
-                                    <span>{{ item.tradeid }}</span>
-                                </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar" v-if="item.holderqty">
@@ -53,10 +49,10 @@
                     </div>
                 </div>
             </app-pull-refresh>
-            <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
-                    v-if="componentId" />
+            <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)"
+                @closed="closeComponent" v-if="componentId" />
         </app-view>
-    </app-modal> 
+    </app-modal>
 </template>
 
 <script lang="ts" setup>

src/packages/mobile/views/order/position/components/goods/detail/components/transfer/Index.vue

@@ -23,22 +23,23 @@
                 </CellGroup>
                 <CellGroup title="转让信息" inset>
                     <Cell title="当前价" :value="handleNumberValue(quote?.last)" />
+                    <Cell title="转让数量" :value="formData.OrderQty" />
                     <Field name="OrderPrice" :rules="formRules.OrderPrice" label="转让价格">
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
                                 :decimal-length="selectedRow.decimalplace" :step="priceStep" :auto-fixed="false" />
                         </template>
                     </Field>
-                    <Field name="OrderQty" :rules="formRules.OrderQty" label="转让数量">
+                    <!-- <Field name="OrderQty" :rules="formRules.OrderQty" label="转让数量">
                         <template #input>
                             <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :min="0"
                                 :max="maxQty" :auto-fixed="false" integer />
                         </template>
-                    </Field>
+                    </Field> -->
                 </CellGroup>
             </Form>
             <template #footer>
-                <Button block square type="danger" @click="formRef?.submit">转让</Button>
+                <Button block square type="danger" :disabled="!formData.OrderQty" @click="formRef?.submit">转让</Button>
             </template>
         </app-view>
     </app-modal>

src/packages/mobile/views/order/position/components/goods/list/Index.vue

@@ -21,7 +21,7 @@
                         </li>
                         <li>
                             <span>持仓均价</span>
-                            <span>{{ handleNumberValue(formatDecimal(item.averageprice)) }}</span>
+                            <span>{{ handleNumberValue(item.averageprice) }}</span>
                         </li>
                         <li>
                             <span>冻结数量</span>

src/packages/pc/components/layouts/footer/index.less

@@ -32,7 +32,7 @@
         }
     }
 
-    &__center {
+    &__right {
         flex: 1;
         overflow: hidden;
 
@@ -41,12 +41,4 @@
             background-color: #181e22;
         }
     }
-
-    &__right {
-        border-left: 1px solid #363f45;
-
-        &:empty {
-            display: none;
-        }
-    }
 }

src/packages/pc/components/layouts/footer/index.vue

@@ -32,18 +32,19 @@
                 </tbody>
             </table>
         </div>
-        <div class="app-footer__center">
-            <app-auth-component code="bottom">
-                <el-select placeholder="请选择资金账户" :disabled="loading" v-model="currentAccountId" @change="getAccountList"
-                    v-if="false">
-                    <el-option :label="item.accountid" :value="item.accountid" v-for="(item, index) in accountList"
-                        :key="index" />
-                </el-select>
-            </app-auth-component>
-        </div>
         <div class="app-footer__right">
-            <component :is="GoodsListing" v-if="globalStore.showGoodsListing" />
-            <component :is="TransferListing" v-if="globalStore.showTransferListing" />
+            <app-auth-component code="bottom" @tab-change="(index) => emit('tabChange', index)">
+                <template #navbar>
+                    <el-select placeholder="请选择资金账户" :disabled="loading" v-model="currentAccountId" @change="getAccountList"
+                        v-if="false">
+                        <el-option :label="item.accountid" :value="item.accountid" v-for="(item, index) in accountList"
+                            :key="index" />
+                    </el-select>
+                    <slot></slot>
+                </template>
+                <component :is="GoodsListing" v-if="globalStore.showGoodsListing" />
+                <component :is="TransferListing" v-if="globalStore.showTransferListing" />
+            </app-auth-component>
         </div>
     </div>
 </template>
@@ -56,6 +57,7 @@ import AppAuthComponent from '@pc/components/modules/auth-component/index.vue'
 const GoodsListing = defineAsyncComponent(() => import('@pc/views/market/trade/goods/list/listing/index.vue')) // 订单挂牌
 const TransferListing = defineAsyncComponent(() => import('@pc/views/market/trade/presell/transfer/listing/index.vue')) // 转让挂牌
 
+const emit = defineEmits(['tabChange'])
 const globalStore = useGlobalStore()
 const { accountList, currentAccount, currentAccountId, loading, getAccountList } = useAccountStore()
 </script>

src/packages/pc/components/layouts/header/index.less

@@ -25,28 +25,7 @@
             align-items: center;
             gap: 20px;
 
-            [class^='g-icon'] {
-                cursor: pointer;
-
-                &:before {
-                    font-size: 22px;
-                }
-            }
-
-            .g-icon {
-                &--notice::before {
-                    content: var(--icon-notice);
-                }
-
-                &--minimize::before {
-                    content: var(--icon-minimize);
-                }
-
-                &--maximize::before {
-                    content: var(--icon-maximize);
-                }
-            }
-
+            .g-icon,
             .el-icon {
                 font-size: 22px;
                 cursor: pointer;

src/packages/pc/components/layouts/header/index.vue

@@ -8,12 +8,12 @@
             <slot name="right"></slot>
             <div class="iconbar">
                 <el-badge type="danger" :is-dot="noticeStore.unreadList.length > 0">
-                    <app-icon icon="g-icon--notice" @click="openComponent('notice')" />
+                    <app-icon icon="g-icon-notice" @click="openComponent('notice')" />
                 </el-badge>
                 <app-icon icon="Tickets" @click="openComponent('report')" />
                 <app-icon icon="Setting" @click="openComponent('setting')" />
-                <span class="g-icon--minimize" @click="exitFullSreen" v-if="fullScreen"></span>
-                <span class="g-icon--maximize" @click="setFullSreen" v-else></span>
+                <app-icon icon="g-icon-minimize" @click="exitFullSreen" v-if="fullScreen" />
+                <app-icon icon="g-icon-maximize" @click="setFullSreen" v-else />
             </div>
             <el-dropdown class="user-dropdown" trigger="click">
                 <span class="user-dropdown__link">
@@ -80,9 +80,11 @@ const exitFullSreen = () => {
 
 onMounted(() => {
     const reportAgree = localData.getValue('reportAgree')
-    const userReportAgree = reportAgree.find((e) => e.loginId === loginStore.loginId)
+    const agreeIndex = reportAgree.findIndex((e) => e.loginId === loginStore.loginId)
     /// 如果未同意 或者跨天
-    if (!userReportAgree || diffDays(userReportAgree.agreedTime) > 0) {
+    if (!reportAgree[agreeIndex] || diffDays(reportAgree[agreeIndex].agreedTime) > 0) {
+        reportAgree.splice(agreeIndex, 1)
+        localData.setValue('reportAgree', reportAgree)
         openComponent('report')
     }
     // 监听全屏变化

src/packages/pc/components/layouts/page/index.less

@@ -58,10 +58,6 @@
         }
     }
 
-    &__footer{
-        height: 330px;
-    }
-
     &__wrapper {
         flex: 1;
         display: flex;

src/packages/pc/components/layouts/page/index.vue

@@ -9,7 +9,7 @@
         </template> -->
       </app-header>
     </div>
-    <div class="app-page__wrapper">
+    <div class="app-page__wrapper" :style="bodyStyles">
       <div class="app-page__sidebar">
         <app-sidebar v-model:collapse="isCollapse" />
       </div>
@@ -26,10 +26,18 @@
         </div>
       </div>
     </div>
-    <div class="app-page__footer">
-      <!-- <div style="height: 4px;background-color:coral;"></div> -->
-      <app-footer />
-    </div>
+    <app-footer class="app-page__footer" :style="footerStyles" @tab-change="onTabChange">
+      <div style="display: flex;align-items: center; font-size: 16px; gap: 20px;justify-content: flex-end;padding: 0 20px;color: #fff;">
+        <span @click="minimize" style="cursor: pointer;">
+          <AppIcon icon="ArrowUp" v-if="footerWinType === -1" />
+          <AppIcon icon="ArrowDown" v-else />
+        </span>
+        <span @click="maximize" style="cursor: pointer;">
+          <AppIcon icon="g-icon-minimize2" v-if="footerWinType === 1" />
+          <AppIcon icon="g-icon-maximize2" v-else />
+        </span>
+      </div>
+    </app-footer>
     <div class="app-page__statusbar">
       <div class="statusbar-left">
         <span style="font-size: 12px;color: #444f57;padding: 0 5px;">v1.0.{{ version }}</span>
@@ -55,18 +63,80 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref, onMounted, onUnmounted, computed } from 'vue'
 import { RouteRecordNormalized, RouteRecordName } from 'vue-router'
 import { timerTask } from '@/utils/timer'
 import { getServerTime } from '@/services/api/common'
 import { useGlobalStore, useLoginStore } from '@/stores'
 import eventBus from '@/services/bus'
 import moment, { Moment } from 'moment'
+import AppIcon from '@pc/components/base/icon/index.vue'
 import AppHeader from '../header/index.vue'
 import AppFooter from '../footer/index.vue'
 import AppNavbar from '../navbar/index.vue'
 import AppSidebar from '../sidebar/index.vue'
 
+
+const footerWinType = ref(0) // -1最小化，0默认，1最大化
+
+const bodyStyles = computed(() => {
+  if (footerWinType.value === 1) {
+    return {
+      flex: 0,
+      overflow: 'hidden'
+    }
+  }
+  return {
+    flex: 1,
+  }
+})
+
+const footerStyles = computed(() => {
+  switch (footerWinType.value) {
+    case 1: {
+      return {
+        flex: 1,
+        height: 'auto'
+      }
+    }
+    case -1: {
+      return {
+        height: '36px',
+        overflow: 'hidden'
+      }
+    }
+    default: {
+      return {
+        height: '360px'
+      }
+    }
+  }
+})
+
+const minimize = () => {
+  if (footerWinType.value === -1) {
+    footerWinType.value = 0
+  } else {
+    footerWinType.value = -1
+  }
+}
+
+const maximize = () => {
+  if (footerWinType.value === 1) {
+    footerWinType.value = 0
+  } else {
+    footerWinType.value = 1
+  }
+}
+
+const onTabChange = () => {
+  if (footerWinType.value === -1) {
+    footerWinType.value = 0
+  }
+}
+
+
+
 const globalStore = useGlobalStore()
 const loginStore = useLoginStore()
 const fullLoading = ref(false)

src/packages/pc/components/modules/auth-component/index.less

@@ -0,0 +1,11 @@
+.app-component {
+    &__container {
+        display: flex;
+        height: 100%;
+    }
+
+    &__main {
+        flex: 1;
+        overflow-y: auto;
+    }
+}

src/packages/pc/components/modules/auth-component/index.vue

@@ -1,11 +1,16 @@
 <!-- 动态组件 -->
 <template>
-    <app-tabs class="app-tabs--primary" :data-list="dataList" v-model:data-index="dataIndex" prop-label="title"
-        @change="onTabChange">
+    <app-tabs class="app-component app-tabs--primary" :data-list="dataList" v-model:data-index="dataIndex"
+        prop-label="title" @change="onTabChange">
         <template #navbar>
-            <slot></slot>
+            <slot name="navbar"></slot>
         </template>
-        <component :is="componentMap.get(componentId)" :code="componentId" v-bind="options" v-if="componentId" />
+        <div class="app-component__container">
+            <div class="app-component__main">
+                <component :is="componentMap.get(componentId)" :code="componentId" v-bind="options" v-if="componentId" />
+            </div>
+            <slot></slot>
+        </div>
     </app-tabs>
 </template>
 
@@ -29,6 +34,7 @@ const props = defineProps({
     },
 })
 
+const emit = defineEmits(['tabChange'])
 const { componentMap, getAuthComponents } = useMenu(props.code)
 const { onChange } = useAttrs()
 const dataList = shallowRef<Model.UserRoutes[]>([]) // 数据列表
@@ -42,6 +48,7 @@ const onTabChange = (index: number, { code }: Model.UserRoutes) => {
     } else {
         dataIndex.value = index
     }
+    emit('tabChange', index)
 }
 
 onMounted(() => {
@@ -58,4 +65,8 @@ onMounted(() => {
         dataIndex.value = tabIndex
     }
 })
-</script>
+</script>
+
+<style lang="less">
+@import './index.less';
+</style>

src/packages/pc/views/footer/goods/detail/components/transfer/index.vue

@@ -36,7 +36,7 @@
         </el-form>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">取消</el-button>
-            <el-button type="primary" @click="onCloseSumit">提交</el-button>
+            <el-button type="primary" :disabled="!formData.OrderQty" @click="onCloseSumit">提交</el-button>
         </template>
     </app-drawer>
 </template>
@@ -48,7 +48,7 @@ import { useOrder } from '@/business/trade'
 import { formatDecimal, handlePriceColor, handleRequestBigNumber } from '@/filters'
 import { getBuyOrSellName, BuyOrSell } from '@/constants/order'
 import { useFuturesStore, usePositionStore } from '@/stores'
-import { EBuildType, EDelistingType, EListingSelectType, EOrderOperateType, EPriceMode, EValidType } from '@/constants/client'
+import { EBuildType, EDelistingType, EListingSelectType, EPriceMode, EValidType } from '@/constants/client'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
 const props = defineProps({
@@ -127,7 +127,7 @@ const onCloseSumit = () => {
             formData.DelistingType = EDelistingType.DELISTINGTYPE_PRICE
             formData.BuildType = EBuildType.BUILDTYPE_CLOSE
             formData.TimevalidType = EValidType.VALIDTYPE_DR
-            formData.OperateType = EOrderOperateType.ORDEROPERATETYPE_NORMAL
+            formData.OperateType = 24
             formData.RelatedID = handleRequestBigNumber(tradeid)
 
             formSubmit().then(() => {

src/packages/pc/views/market/trade/goods/list/listing/index.less

@@ -6,6 +6,7 @@
     &__forex {
         width: 200px;
         padding: 5px 10px;
+        border-left: 1px solid #363f45;
 
         .app-quote-forex {
             height: 100%;

src/packages/pc/views/market/trade/presell/transfer/listing/index.less

@@ -6,6 +6,7 @@
     &__forex {
         width: 200px;
         padding: 5px 10px;
+        border-left: 1px solid #363f45;
 
         .app-quote-forex {
             height: 100%;

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

@@ -123,7 +123,7 @@ import { queryBankAccountSign } from '@/services/api/bank'
 import { queryUserAccount } from '@/services/api/account'
 import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
 import eventBus from '@/services/bus'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 
 const { router, routerTo } = useNavigation()
 const loginStore = useLoginStore()

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

@@ -120,7 +120,7 @@ import { queryBankAccountSign } from '@/services/api/bank'
 import { queryUserAccount } from '@/services/api/account'
 import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
 import eventBus from '@/services/bus'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 
 const { router, routerTo } = useNavigation()
 const loginStore = useLoginStore()

src/packages/sbyj/views/home/main/index.vue

@@ -43,7 +43,7 @@ import { formatDate } from "@/filters";
 import { useNavigation } from '@mobile/router/navigation';
 import { queryImageConfigs, getJ10News } from "@/services/api/common";
 import Banner from '@mobile/components/base/banner/index.vue'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 
 const { routerTo } = useNavigation();
 const refreshing = shallowRef(false); // 是否处于加载中状态

src/packages/sbyj/views/mine/index.vue

@@ -120,7 +120,7 @@ import { queryBankAccountSign } from '@/services/api/bank'
 import { queryUserAccount } from '@/services/api/account'
 import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
 import eventBus from '@/services/bus'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 
 const { router, routerTo } = useNavigation()
 const loginStore = useLoginStore()

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

@@ -126,7 +126,7 @@ import { queryBankAccountSign } from '@/services/api/bank'
 import { queryUserAccount } from '@/services/api/account'
 import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
 import eventBus from '@/services/bus'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 
 const { router, routerTo } = useNavigation()
 const loginStore = useLoginStore()

src/packages/zrwyt/views/home/main/Index.vue

@@ -46,7 +46,7 @@ import { queryImageConfigs } from "@/services/api/common";
 import { queryNewTitles } from "@/services/api/news";
 import { useLoginStore, useGlobalStore } from '@/stores'
 import Banner from '@mobile/components/base/banner/index.vue'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 
 const globalStore = useGlobalStore()
 const loginStore = useLoginStore();

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

@@ -126,7 +126,7 @@ import { queryBankAccountSign } from '@/services/api/bank'
 import { queryUserAccount } from '@/services/api/account'
 import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
 import eventBus from '@/services/bus'
-import Iconfont from '@mobile/components/base/iconfont/index.vue'
+import Iconfont from '@/components/base/iconfont/index.vue'
 
 const { router, routerTo } = useNavigation()
 const loginStore = useLoginStore()

src/utils/h5plus/index.ts

@@ -38,7 +38,7 @@ export default new (class {
      */
     private systemInfo: SystemInfo = {
         os: 'Web', // 客户端操作系统
-        version: '1.0', // 客户端版本号
+        version: '1.0.0', // 客户端版本号
         versionCode: '100000', // 客户端版本代码
         statusBarHeight: 0, // 状态栏高度
     }