Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-web/src/router/index.js

@@ -53,6 +53,11 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/error/401'], resolve),
     hidden: true
   },
+  {
+    path: '/bigWindow',
+    component: (resolve) => require(['@/views/bigWindow'], resolve),
+    hidden: true
+  },
   {
     path: '',
     component: Layout,

gassafetyprogress-web/src/views/bigWindow/index.vue

+<!--
+ * @Author: your name
+ * @Date: 2022-01-07 13:36:55
+ * @LastEditTime: 2022-01-07 14:32:07
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /gassafetyprogress-web/src/views/bigWindow/index.vue
+-->
+<template>
+  <div >
+    <div>big window</div>
+    <button class="go" @click="goIndex">go index</button>
+  </div>
+</template>
+
+<script>
+export default {
+  methods:{
+    goIndex(){
+      this.$router.push('/index')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.go{
+cursor: pointer;
+}
+</style>>
+

gassafetyprogress-web/src/views/index.vue

@@ -33,7 +33,6 @@
             云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
           </h4>
         </blockquote>
-
         <hr />
       </el-col>
     </el-row>

gassafetyprogress-web/src/views/login.vue

@@ -88,6 +88,7 @@ export default {
     $route: {
       handler: function(route) {
         this.redirect = route.query && route.query.redirect;
+
       },
       immediate: true
     }
@@ -127,7 +128,7 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            this.$router.push({ path: "/bigWindow" || "/" }).catch(()=>{});
           }).catch(() => {
             this.loading = false;
             this.getCode();