li.shaoyi 1 年之前
父節點
當前提交
1535afa843
共有 31 個文件被更改,包括 193 次插入112 次删除
  1. 2 2
      oem/qxst/config/appconfig.json
  2. 2 1
      oem/sbyj/config/appconfig.json
  3. 3 2
      public/config/appconfig.json
  4. 5 0
      src/business/login/index.ts
  5. 4 1
      src/packages/gcszt/assets/themes/global/global.less
  6. 10 9
      src/packages/gcszt/main.ts
  7. 4 1
      src/packages/gstj/assets/themes/global/global.less
  8. 10 9
      src/packages/gstj/main.ts
  9. 3 0
      src/packages/mobile/assets/themes/global/global.less
  10. 1 1
      src/packages/mobile/components/layouts/block/index.less
  11. 8 3
      src/packages/mobile/components/layouts/login/index.vue
  12. 1 1
      src/packages/mobile/views/order/list/components/goodstrade/detail/Index.vue
  13. 13 0
      src/packages/mobile/views/user/password/Index.vue
  14. 1 0
      src/packages/pc/components/layouts/header/components/modify/index.vue
  15. 30 16
      src/packages/pc/views/auth/login/index.vue
  16. 3 0
      src/packages/qdhs/assets/themes/global/global.less
  17. 10 9
      src/packages/qdhs/main.ts
  18. 4 1
      src/packages/qxst/assets/themes/global/global.less
  19. 10 9
      src/packages/qxst/main.ts
  20. 4 1
      src/packages/sbyj/assets/themes/global/global.less
  21. 10 9
      src/packages/sbyj/main.ts
  22. 1 1
      src/packages/sbyj/views/home/main/index.less
  23. 8 4
      src/packages/sbyj/views/user/login/Index.vue
  24. 1 1
      src/packages/sbyj/views/user/login/index.less
  25. 4 1
      src/packages/tc/assets/themes/global/global.less
  26. 10 9
      src/packages/tc/main.ts
  27. 4 1
      src/packages/tjmd/assets/themes/global/global.less
  28. 10 9
      src/packages/tjmd/main.ts
  29. 4 1
      src/packages/zrwyt/assets/themes/global/global.less
  30. 10 9
      src/packages/zrwyt/main.ts
  31. 3 1
      src/stores/modules/global.ts

+ 2 - 2
oem/qxst/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.qxst",
   "appName": "贵州茶交数字化中心",
-  "version": "1.0.28",
-  "versionCode": "100028",
+  "version": "1.0.29",
+  "versionCode": "100029",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

+ 2 - 1
oem/sbyj/config/appconfig.json

@@ -11,5 +11,6 @@
   ],
   "quotationPropertys": [
     "holdvolume"
-  ]
+  ],
+  "forcedPasswordChange": true
 }

+ 3 - 2
public/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "多元世纪",
   "version": "1.0.5",
   "versionCode": "10005",
-  "apiUrl": "http://192.168.31.205:8080/cfg?key=test_205",
+  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [
     "register",
@@ -12,5 +12,6 @@
   "quotationPropertys": [
     "totalvolume",
     "holdvolume"
-  ]
+  ],
+  "forcedPasswordChange": true
 }

+ 5 - 0
src/business/login/index.ts

@@ -60,6 +60,7 @@ export function useLogin(persist = false) {
     // 用户登录
     const userLogin = async (autoLogin = false) => {
         try {
+            let forcedPasswordChange = false
             logining.value = true
             await loadBaseData()
 
@@ -107,8 +108,11 @@ export function useLogin(persist = false) {
                     LoginType: 0,
                     ClientType: payload.clientType,
                     Version: '2.0.0.1',
+                    EnvironmentInfo: '2.0.0.1',
                     DeviceID: ''
                 })
+                // 首次登录是否强制修改密码
+                forcedPasswordChange = globalStore.getSystemInfo('forcedPasswordChange') && res.HasUpdatedPwd === 0
                 // 更新登录信息
                 loginStore.setLoginInfo({
                     expiresAt: 0,
@@ -127,6 +131,7 @@ export function useLogin(persist = false) {
             localStorage.setItem('app_loginId', formData.userName) // 记住登录ID
             await loadUserData()
             eventBus.$emit('LoginNotify') // 登录成功通知
+            return forcedPasswordChange
         } catch (err) {
             // 登录失败断开所有链路
             stopCheckToken()

+ 4 - 1
src/packages/gcszt/assets/themes/global/global.less

@@ -131,6 +131,8 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
+        height: 100%;
+
         .g-icon {
             width: 18px;
             height: 18px;
@@ -138,7 +140,8 @@
         }
 
         &__label {
-            margin-left: 12px;
+            font-size: 13px;
+            margin-left: 12px
         }
     }
 }

+ 10 - 9
src/packages/gcszt/main.ts

@@ -6,11 +6,12 @@ import router from './router'
 import directives from '@/directives' // 自定义指令集
 //import 'default-passive-events'
 import '@/utils/h5plus' // 加载html5+
+import 'hqchart/src/jscommon/umychart.resource/font/iconfont.css'
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
 import './assets/themes/style.less' // 主题样式
-import { timerInterceptor } from '@/utils/timer'
-import { useGlobalStore } from '@/stores'
+// import { timerInterceptor } from '@/utils/timer'
+// import { useGlobalStore } from '@/stores'
 // import Vconsole from 'vconsole'
 // new Vconsole()
 
@@ -21,10 +22,10 @@ app.use(layouts)
 app.mount('#app')
 
 // 等待 html 加载完成
-document.addEventListener('DOMContentLoaded', () => {
-    const { screenAdapter } = useGlobalStore()
-    // 适配客户端
-    screenAdapter(true)
-    // 监听窗口大小变化
-    window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
-}, false)
+// document.addEventListener('DOMContentLoaded', () => {
+//     const { screenAdapter } = useGlobalStore()
+//     // 适配客户端
+//     screenAdapter(true)
+//     // 监听窗口大小变化
+//     window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
+// }, false)

+ 4 - 1
src/packages/gstj/assets/themes/global/global.less

@@ -131,6 +131,8 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
+        height: 100%;
+
         .g-icon {
             width: 18px;
             height: 18px;
@@ -138,7 +140,8 @@
         }
 
         &__label {
-            margin-left: 12px;
+            font-size: 13px;
+            margin-left: 12px
         }
     }
 }

+ 10 - 9
src/packages/gstj/main.ts

@@ -6,11 +6,12 @@ import router from './router'
 import directives from '@/directives' // 自定义指令集
 //import 'default-passive-events'
 import '@/utils/h5plus' // 加载html5+
+import 'hqchart/src/jscommon/umychart.resource/font/iconfont.css'
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
 import './assets/themes/style.less' // 主题样式
-import { timerInterceptor } from '@/utils/timer'
-import { useGlobalStore } from '@/stores'
+// import { timerInterceptor } from '@/utils/timer'
+// import { useGlobalStore } from '@/stores'
 // import Vconsole from 'vconsole'
 // new Vconsole()
 
@@ -21,10 +22,10 @@ app.use(layouts)
 app.mount('#app')
 
 // 等待 html 加载完成
-document.addEventListener('DOMContentLoaded', () => {
-    const { screenAdapter } = useGlobalStore()
-    // 适配客户端
-    screenAdapter(true)
-    // 监听窗口大小变化
-    window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
-}, false)
+// document.addEventListener('DOMContentLoaded', () => {
+//     const { screenAdapter } = useGlobalStore()
+//     // 适配客户端
+//     screenAdapter(true)
+//     // 监听窗口大小变化
+//     window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
+// }, false)

+ 3 - 0
src/packages/mobile/assets/themes/global/global.less

@@ -131,6 +131,8 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
+        height: 100%;
+
         .g-icon {
             width: 18px;
             height: 18px;
@@ -138,6 +140,7 @@
         }
 
         &__label {
+            font-size: 13px;
             margin-left: 12px
         }
     }

+ 1 - 1
src/packages/mobile/components/layouts/block/index.less

@@ -8,7 +8,7 @@
 
     &__wrapper {
         background-color: #fff;
-        border-radius: 5px;
+        border-radius: 8px;
         overflow: hidden;
     }
 

+ 8 - 3
src/packages/mobile/components/layouts/login/index.vue

@@ -63,7 +63,7 @@ defineProps({
 })
 
 const globalStore = useGlobalStore()
-const { routerTo } = useNavigation()
+const { setGlobalUrlParams, routerTo } = useNavigation()
 const { formData, userLogin } = useLogin()
 const checked = shallowRef(false) // 是否同意协议管理
 const showSliderVerify = shallowRef(true) // 验证滑块组件重载
@@ -97,9 +97,14 @@ const formSubmit = () => {
   if (sliderVerifyStatus.value) {
     if (checked.value) {
       fullloading((hideLoading) => {
-        userLogin().then(() => {
+        userLogin().then((forcedPasswordChange) => {
           hideLoading()
-          routerTo('report', true)
+          if (forcedPasswordChange) {
+            setGlobalUrlParams({ forcedPasswordChange })
+            routerTo('user-password', true)
+          } else {
+            routerTo('report', true)
+          }
         }).catch((err) => {
           showSliderVerify.value = false
           sliderVerifyStatus.value = false

+ 1 - 1
src/packages/mobile/views/order/list/components/goodstrade/detail/Index.vue

@@ -14,7 +14,7 @@
                     <Cell title="成交价格" :value="formatDecimal(selectedRow.tradeprice)" />
                     <Cell title="手续费" :value="formatDecimal(selectedRow.charge)" />
                     <Cell title="平仓损益" :value="formatDecimal(selectedRow.closepl)" />
-                    <Cell title="成交对手" :value="tmMatchAccountID(selectedRow.matchaccountid)" />
+                    <!-- <Cell title="成交对手" :value="tmMatchAccountID(selectedRow.matchaccountid)" /> -->
                     <Cell title="成交时间" :value="formatDate(selectedRow.tradetime)" />
                     <Cell title="成交单号" :value="selectedRow.tradeid" />
                 </CellGroup>

+ 13 - 0
src/packages/mobile/views/user/password/Index.vue

@@ -23,12 +23,17 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { onBeforeRouteLeave } from 'vue-router'
 import { CellGroup, Button, Field, Form, FormInstance, FieldRule, showFailToast } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
+import { useNavigation } from '@mobile/router/navigation'
 import { validateRules } from '@/constants/regex'
 import { useAccountPassword } from '@/business/user'
+import { useLogin } from '@/business/login'
 import eventBus from '@/services/bus'
 
+const { getGlobalUrlParams } = useNavigation()
+const { userLogout } = useLogin()
 const { formData, formSubmit } = useAccountPassword(1)
 const formRef = shallowRef<FormInstance>()
 const confirmpassword = shallowRef('')
@@ -73,4 +78,12 @@ const onSubmit = () => {
         })
     })
 }
+
+onBeforeRouteLeave((to, from, next) => {
+    const params = getGlobalUrlParams()
+    if(params.forcedPasswordChange){
+        userLogout()
+    }
+    next()
+})
 </script>

+ 1 - 0
src/packages/pc/components/layouts/header/components/modify/index.vue

@@ -76,6 +76,7 @@ const onSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
             formSubmit().then(() => {
+                onCancel(true)
                 eventBus.$emit('LogoutNotify', '密码修改成功,请重新登录。')
             }).catch((err) => {
                 ElMessage.error('提交失败:' + err)

+ 30 - 16
src/packages/pc/views/auth/login/index.vue

@@ -40,6 +40,7 @@
         </span>
       </template>
     </el-dialog>
+    <PasswordMidify v-if="showPasswordMidify" @closed="onClosed" />
   </sign-layout>
 </template>
 
@@ -54,9 +55,10 @@ import service from '@/services'
 import SignLayout from '../components/layout/index.vue'
 import Forget from "../forget/index.vue"
 import AppQrcode from '@/components/base/qrcode/index.vue'
+import PasswordMidify from '@pc/components/layouts/header/components/modify/index.vue' // 待优化
 import SliderVerify from '@/components/base/slider-verify/index.vue' // 临时调用,待优化
 
-const { formData, userLogin } = useLogin()
+const { formData, userLogin, userLogout } = useLogin()
 const route = useRoute()
 const router = useRouter()
 const globalStore = useGlobalStore()
@@ -68,6 +70,7 @@ const islogin = shallowRef(true)
 const isRegister = shallowRef(false)
 const qrContent = shallowRef('')
 const rloading = shallowRef(false)
+const showPasswordMidify = shallowRef(false) // 显示修改密码
 const showSliderVerify = shallowRef(true) // 验证滑块组件重载
 const sliderVerifyStatus = shallowRef(false) // 滑块验证状态
 
@@ -99,29 +102,40 @@ const slide = (vfcStatu: { statu: string }) => {
   }
 }
 
+const onClosed = () => {
+  userLogout()
+  showPasswordMidify.value = false
+}
+
 const formSubmit = () => {
+  const reset = () => {
+    loading.value = false
+    showSliderVerify.value = false
+    sliderVerifyStatus.value = false
+    formData.password = ''
+    setTimeout(() => {
+      showSliderVerify.value = true
+    }, 0)
+  }
   formRef.value?.validate(async (valid) => {
     if (valid && sliderVerifyStatus.value) {
       try {
-        loading.value = true
-        await userLogin()
-        await menuStore.getUserMenuList()
-        const redirect = route.query.redirect
-        if (redirect) {
-          router.replace(redirect.toString())
+        const forcedPasswordChange = await userLogin()
+        if (forcedPasswordChange) {
+          reset()
+          showPasswordMidify.value = true
         } else {
-          router.replace('/')
+          await menuStore.getUserMenuList()
+          const redirect = route.query.redirect
+          if (redirect) {
+            router.replace(redirect.toString())
+          } else {
+            router.replace('/')
+          }
         }
       } catch (err) {
-        loading.value = false
-        showSliderVerify.value = false
-        sliderVerifyStatus.value = false
-        formData.password = ''
+        reset()
         ElMessage.error('登录失败:' + err as string)
-
-        setTimeout(() => {
-          showSliderVerify.value = true
-        }, 0)
       }
     }
   })

+ 3 - 0
src/packages/qdhs/assets/themes/global/global.less

@@ -131,6 +131,8 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
+        height: 100%;
+
         .g-icon {
             width: 18px;
             height: 18px;
@@ -138,6 +140,7 @@
         }
 
         &__label {
+            font-size: 13px;
             margin-left: 12px
         }
     }

+ 10 - 9
src/packages/qdhs/main.ts

@@ -6,11 +6,12 @@ import router from './router'
 import directives from '@/directives' // 自定义指令集
 //import 'default-passive-events'
 import '@/utils/h5plus' // 加载html5+
+import 'hqchart/src/jscommon/umychart.resource/font/iconfont.css'
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
 import './assets/themes/style.less' // 主题样式
-import { timerInterceptor } from '@/utils/timer'
-import { useGlobalStore } from '@/stores'
+// import { timerInterceptor } from '@/utils/timer'
+// import { useGlobalStore } from '@/stores'
 // import Vconsole from 'vconsole'
 // new Vconsole()
 
@@ -21,10 +22,10 @@ app.use(layouts)
 app.mount('#app')
 
 // 等待 html 加载完成
-document.addEventListener('DOMContentLoaded', () => {
-    const { screenAdapter } = useGlobalStore()
-    // 适配客户端
-    screenAdapter(true)
-    // 监听窗口大小变化
-    window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
-}, false)
+// document.addEventListener('DOMContentLoaded', () => {
+//     const { screenAdapter } = useGlobalStore()
+//     // 适配客户端
+//     screenAdapter(true)
+//     // 监听窗口大小变化
+//     window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
+// }, false)

+ 4 - 1
src/packages/qxst/assets/themes/global/global.less

@@ -131,6 +131,8 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
+        height: 100%;
+
         .g-icon {
             width: 18px;
             height: 18px;
@@ -138,7 +140,8 @@
         }
 
         &__label {
-            margin-left: 12px;
+            font-size: 13px;
+            margin-left: 12px
         }
     }
 }

+ 10 - 9
src/packages/qxst/main.ts

@@ -6,11 +6,12 @@ import router from './router'
 import directives from '@/directives' // 自定义指令集
 //import 'default-passive-events'
 import '@/utils/h5plus' // 加载html5+
+import 'hqchart/src/jscommon/umychart.resource/font/iconfont.css'
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
 import './assets/themes/style.less' // 主题样式
-import { timerInterceptor } from '@/utils/timer'
-import { useGlobalStore } from '@/stores'
+// import { timerInterceptor } from '@/utils/timer'
+// import { useGlobalStore } from '@/stores'
 // import Vconsole from 'vconsole'
 // new Vconsole()
 
@@ -21,10 +22,10 @@ app.use(layouts)
 app.mount('#app')
 
 // 等待 html 加载完成
-document.addEventListener('DOMContentLoaded', () => {
-    const { screenAdapter } = useGlobalStore()
-    // 适配客户端
-    screenAdapter(true)
-    // 监听窗口大小变化
-    window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
-}, false)
+// document.addEventListener('DOMContentLoaded', () => {
+//     const { screenAdapter } = useGlobalStore()
+//     // 适配客户端
+//     screenAdapter(true)
+//     // 监听窗口大小变化
+//     window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
+// }, false)

+ 4 - 1
src/packages/sbyj/assets/themes/global/global.less

@@ -131,6 +131,8 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
+        height: 100%;
+
         .g-icon {
             width: 18px;
             height: 18px;
@@ -138,7 +140,8 @@
         }
 
         &__label {
-            margin-left: 12px;
+            font-size: 13px;
+            margin-left: 12px
         }
     }
 }

+ 10 - 9
src/packages/sbyj/main.ts

@@ -6,11 +6,12 @@ import router from './router'
 import directives from '@/directives' // 自定义指令集
 //import 'default-passive-events'
 import '@/utils/h5plus' // 加载html5+
+import 'hqchart/src/jscommon/umychart.resource/font/iconfont.css'
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
 import './assets/themes/style.less' // 主题样式
-import { timerInterceptor } from '@/utils/timer'
-import { useGlobalStore } from '@/stores'
+// import { timerInterceptor } from '@/utils/timer'
+// import { useGlobalStore } from '@/stores'
 // import Vconsole from 'vconsole'
 // new Vconsole()
 
@@ -21,10 +22,10 @@ app.use(layouts)
 app.mount('#app')
 
 // 等待 html 加载完成
-document.addEventListener('DOMContentLoaded', () => {
-    const { screenAdapter } = useGlobalStore()
-    // 适配客户端
-    screenAdapter(true)
-    // 监听窗口大小变化
-    window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
-}, false)
+// document.addEventListener('DOMContentLoaded', () => {
+//     const { screenAdapter } = useGlobalStore()
+//     // 适配客户端
+//     screenAdapter(true)
+//     // 监听窗口大小变化
+//     window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
+// }, false)

+ 1 - 1
src/packages/sbyj/views/home/main/index.less

@@ -10,7 +10,7 @@
         &::before {
             content: '';
             width: 140%;
-            height: 15px;
+            height: 150px;
             position: absolute;
             left: -20%;
             top: 0;

+ 8 - 4
src/packages/sbyj/views/user/login/Index.vue

@@ -50,7 +50,7 @@ import service from '@/services'
 import plus from '@/utils/h5plus'
 import SliderVerify from '@/components/base/slider-verify/index.vue' // 临时调用,待优化
 
-const { routerBack, routerTo } = useNavigation()
+const { routerBack, setGlobalUrlParams, routerTo } = useNavigation()
 const { formData, userLogin } = useLogin()
 const formRef = shallowRef<FormInstance>()
 const checked = shallowRef(false) // 是否同意协议管理
@@ -85,10 +85,14 @@ const formSubmit = () => {
   if (sliderVerifyStatus.value) {
     if (checked.value) {
       fullloading((hideLoading) => {
-        userLogin().then(() => {
+        userLogin().then((forcedPasswordChange) => {
           hideLoading()
-          routerBack()
-          showSuccessToast('登录成功')
+          if (forcedPasswordChange) {
+            setGlobalUrlParams({ forcedPasswordChange })
+            routerTo('user-password', true)
+          } else {
+            routerBack()
+          }
         }).catch((err) => {
           showSliderVerify.value = false
           sliderVerifyStatus.value = false

+ 1 - 1
src/packages/sbyj/views/user/login/index.less

@@ -19,7 +19,7 @@
         position: relative;
         z-index: 0;
         text-align: center;
-        padding: 5px 0;
+        padding: 50px 0;
 
         img {
             height: 24px;

+ 4 - 1
src/packages/tc/assets/themes/global/global.less

@@ -131,6 +131,8 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
+        height: 100%;
+
         .g-icon {
             width: 18px;
             height: 18px;
@@ -138,7 +140,8 @@
         }
 
         &__label {
-            margin-left: 12px;
+            font-size: 13px;
+            margin-left: 12px
         }
     }
 }

+ 10 - 9
src/packages/tc/main.ts

@@ -6,11 +6,12 @@ import router from './router'
 import directives from '@/directives' // 自定义指令集
 //import 'default-passive-events'
 import '@/utils/h5plus' // 加载html5+
+import 'hqchart/src/jscommon/umychart.resource/font/iconfont.css'
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
 import './assets/themes/style.less' // 主题样式
-import { timerInterceptor } from '@/utils/timer'
-import { useGlobalStore } from '@/stores'
+// import { timerInterceptor } from '@/utils/timer'
+// import { useGlobalStore } from '@/stores'
 // import Vconsole from 'vconsole'
 // new Vconsole()
 
@@ -21,10 +22,10 @@ app.use(layouts)
 app.mount('#app')
 
 // 等待 html 加载完成
-document.addEventListener('DOMContentLoaded', () => {
-    const { screenAdapter } = useGlobalStore()
-    // 适配客户端
-    screenAdapter(true)
-    // 监听窗口大小变化
-    window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
-}, false)
+// document.addEventListener('DOMContentLoaded', () => {
+//     const { screenAdapter } = useGlobalStore()
+//     // 适配客户端
+//     screenAdapter(true)
+//     // 监听窗口大小变化
+//     window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
+// }, false)

+ 4 - 1
src/packages/tjmd/assets/themes/global/global.less

@@ -131,6 +131,8 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
+        height: 100%;
+
         .g-icon {
             width: 18px;
             height: 18px;
@@ -138,7 +140,8 @@
         }
 
         &__label {
-            margin-left: 12px;
+            font-size: 13px;
+            margin-left: 12px
         }
     }
 }

+ 10 - 9
src/packages/tjmd/main.ts

@@ -6,11 +6,12 @@ import router from './router'
 import directives from '@/directives' // 自定义指令集
 //import 'default-passive-events'
 import '@/utils/h5plus' // 加载html5+
+import 'hqchart/src/jscommon/umychart.resource/font/iconfont.css'
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
 import './assets/themes/style.less' // 主题样式
-import { timerInterceptor } from '@/utils/timer'
-import { useGlobalStore } from '@/stores'
+// import { timerInterceptor } from '@/utils/timer'
+// import { useGlobalStore } from '@/stores'
 // import Vconsole from 'vconsole'
 // new Vconsole()
 
@@ -21,10 +22,10 @@ app.use(layouts)
 app.mount('#app')
 
 // 等待 html 加载完成
-document.addEventListener('DOMContentLoaded', () => {
-    const { screenAdapter } = useGlobalStore()
-    // 适配客户端
-    screenAdapter(true)
-    // 监听窗口大小变化
-    window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
-}, false)
+// document.addEventListener('DOMContentLoaded', () => {
+//     const { screenAdapter } = useGlobalStore()
+//     // 适配客户端
+//     screenAdapter(true)
+//     // 监听窗口大小变化
+//     window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
+// }, false)

+ 4 - 1
src/packages/zrwyt/assets/themes/global/global.less

@@ -131,6 +131,8 @@
 /* 导航列表 */
 .g-navmenu {
     .app-iconfont {
+        height: 100%;
+
         .g-icon {
             width: 18px;
             height: 18px;
@@ -138,7 +140,8 @@
         }
 
         &__label {
-            margin-left: 12px;
+            font-size: 13px;
+            margin-left: 12px
         }
     }
 }

+ 10 - 9
src/packages/zrwyt/main.ts

@@ -6,11 +6,12 @@ import router from './router'
 import directives from '@/directives' // 自定义指令集
 //import 'default-passive-events'
 import '@/utils/h5plus' // 加载html5+
+import 'hqchart/src/jscommon/umychart.resource/font/iconfont.css'
 import layouts from '@mobile/components/layouts' // 全局布局组件
 import 'vant/lib/index.css'
 import './assets/themes/style.less' // 主题样式
-import { timerInterceptor } from '@/utils/timer'
-import { useGlobalStore } from '@/stores'
+// import { timerInterceptor } from '@/utils/timer'
+// import { useGlobalStore } from '@/stores'
 // import Vconsole from 'vconsole'
 // new Vconsole()
 
@@ -21,10 +22,10 @@ app.use(layouts)
 app.mount('#app')
 
 // 等待 html 加载完成
-document.addEventListener('DOMContentLoaded', () => {
-    const { screenAdapter } = useGlobalStore()
-    // 适配客户端
-    screenAdapter(true)
-    // 监听窗口大小变化
-    window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
-}, false)
+// document.addEventListener('DOMContentLoaded', () => {
+//     const { screenAdapter } = useGlobalStore()
+//     // 适配客户端
+//     screenAdapter(true)
+//     // 监听窗口大小变化
+//     window.addEventListener('resize', timerInterceptor.setDebounce(() => screenAdapter(true)))
+// }, false)

+ 3 - 1
src/stores/modules/global.ts

@@ -13,6 +13,7 @@ export interface SystemInfo {
     tradeChannel: 'http' | 'ws'; // 交易通道
     modules: ('register' | 'delivery')[]; // 应用包含的模块
     quotationPropertys: (keyof Model.QuoteDayRsp)[]; // 盘面可显示的属性
+    forcedPasswordChange: boolean; // 首次登录是否强制修改密码
 }
 
 export const useGlobalStore = defineStore(() => {
@@ -31,7 +32,8 @@ export const useGlobalStore = defineStore(() => {
             apiUrl: 'http://localhost',
             tradeChannel: 'ws',
             modules: [],
-            quotationPropertys: []
+            quotationPropertys: [],
+            forcedPasswordChange: false
         }
     })