321

src/components/common/Cell.vue

@@ -138,7 +138,7 @@
 
 <script lang="ts">
 import Vue from "vue";
-import Clipboard from "clipboard";
+// import Clipboard from "clipboard";
 import { ActionSheet } from "vant";
 
 export default Vue.extend({

src/router/index.ts

@@ -115,6 +115,7 @@ const routes: Array<RouteConfig> = [
         name: 'Login',
         component: () => import("@/view/Auth/Login/index.vue")
       },
+
       // {
       //   path: '/auth/PwdSetting',
       //   name: 'PwdSetting',
@@ -147,8 +148,10 @@ const router = new VueRouter({
 })
 
 router.beforeEach((to, from, next) => {
-  if (to.name === 'Login' && token.getToken() !== null) {
-    next({ name: 'Home' })
+  console.log('to:',to , 'from:',from );
+  
+  if (to.name === 'Login' && token.getToken() != null) {
+    // next({ name: 'Home' })
   } else {
     next()
   }

src/service/Service.ts

@@ -27,16 +27,15 @@ export class Service {
         const post = this.service.post
         const resolveData = async (ret: any) => {
             if (ret.code === 200){
-                console.log(ret);
                 if(ret.data){
                     return ret.data;
                 }
                 return ret
             }else {
+
                 if(ret.code === 401){
-                    Toast.fail('请重新登录')
                     await logoutUser().then(()=>{
-                        router.push('')
+                        router.push({name:'Login'})
                     })
                 }
                 Toast.fail(typeof ret.data === "string" ? ret.data : ret.message)

src/util/userInfoUtils.ts

-import router from '@/router'
+
 const KEY_TOKEN = 'KEY_TOKEN'
 const KEY_USER = 'KEY_USER'
 
@@ -35,7 +35,8 @@ function getUserMsg(): object | null {
     }catch(err){
         console.log(err,'123khi12oi3h12io3oi123io2j13oij12io3');  
     }
-    return userStr ? JSON.parse(userStr) :  router.push({name:'Login'})
+   
+    return  userStr? JSON.parse(userStr) :''
 }
 
 function clearUserMsg(){

src/view/Auth/Login/UserAgreement.vue

 <template>
-  <div class="userAgreement h-full overflow-auto px-5">
-    <img @click="handleClickClose" :src="closeIcon" alt="close" />
-    <div class="text-font-white text-sm" v-for="n in 20" :key="n">
-      这里是协议内容，待产品提供后，开发直接替换上去，这里是协议内容。
+  <div class="flex flex-col w-11/12 mx-auto py-5 text-font-white">
+    <div class="flex justify-between items-center">
+      <div class="w-3/12">
+        <app-icon name="icon-fanhui" @click.native="handleClickClose"></app-icon>
+      </div>
+      <div class='text-center w-6/12' >
+        乐映用户协议
+      </div>
+      <div class="w-3/12"></div>
+    </div>
+    <div class='flex py-6  justify-center'>
+      <img src="@/assets/img/cmp_logo.png" class="h-12" alt="" />
+    </div>
+    <div>
+
     </div>
   </div>
 </template>
@@ -17,8 +28,12 @@ export default Vue.extend({
   data() {
     return {
       closeIcon,
+      
     };
   },
+  components: {
+     'app-icon':()=>import('@/components/common/Icon.vue'),
+  },
   methods: {
     handleClick() {
       console.log(123);