update

oem/qdhs/manifest.json

@@ -5,7 +5,7 @@
     "name" : "青岛海商",
     /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.0.0",
+        "name" : "1.0.2",
         /*应用版本名称*/
         "code" : 100000
     },

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

@@ -10,7 +10,7 @@
                 <el-badge type="danger" :is-dot="noticeStore.unreadList.length > 0">
                     <app-icon icon="g-icon--notice" @click="openComponent('notice')" />
                 </el-badge>
-                <app-icon icon="Tickets" @click="openComponent('report')" />
+                <!-- <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>
@@ -80,7 +80,7 @@ const exitFullSreen = () => {
 onMounted(() => {
     /// 如果未同意 或者跨天
     if (!localData.getValue('isReportAgree') || diffDays(localData.getValue('reportTime')) > 0) {
-        openComponent('report')
+        //openComponent('report')
     }
     // 监听全屏变化
     window.addEventListener('fullscreenchange', () => {

src/packages/pc/router/index.ts

@@ -73,7 +73,7 @@ router.beforeEach((to, from, next) => {
             }
         }
     } else {
-        if (to.name === 'boot') {
+        if (to.name === 'boot' || to.name === 'login') {
             next()
         } else {
             next({

src/packages/pc/views/auth/login/index.vue

@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item>
         <div class="text-link">
-          <span @click="click" v-if="service.getSystemInfo('shwoRegister')">立即注册</span>
+          <span @click="isRegister = true" v-if="shwoRegister">立即注册</span>
           <span @click="islogin = false">忘记密码？</span>
         </div>
       </el-form-item>
@@ -59,10 +59,11 @@ const router = useRouter()
 const menuStore = useMenuStore()
 const formRef = shallowRef<FormInstance>()
 const loading = shallowRef(false)
+const shwoRegister = shallowRef(false)
 const islogin = shallowRef(true)
 const isRegister = shallowRef(false)
 const qrContent = shallowRef('')
-const rloading = shallowRef(false)
+const rloading = shallowRef(true)
 
 const formRules: FormRules = {
   userName: [
@@ -73,16 +74,6 @@ const formRules: FormRules = {
   ]
 }
 
-const click = () => {
-  isRegister.value = true
-  rloading.value = true
-  service.onReady().then((res) => {
-    qrContent.value = res.mobileOpenUrl
-  }).finally(() => {
-    rloading.value = false
-  })
-}
-
 const formSubmit = () => {
   formRef.value?.validate(async (valid) => {
     if (valid) {
@@ -104,6 +95,13 @@ const formSubmit = () => {
     }
   })
 }
+
+service.onReady().then(() => {
+  shwoRegister.value = service.getSystemInfo('shwoRegister')
+  qrContent.value = service.getConfig('mobileOpenUrl')
+}).finally(() => {
+  rloading.value = false
+})
 </script>
 
 <style lang="less" scoped>