修改bug

src/config/request.js

@@ -41,8 +41,8 @@ function errorState(status, data) {
             message: '您的用户权限已被禁用，请联系管理员!',
             onClose: () => {
                 //这个时候点击确定后清除用户信息
-                localStorage.removeItem('backToken')
-                localStorage.removeItem('userId')
+                sessionStorage.removeItem('backToken')
+                sessionStorage.removeItem('userId')
                 router.push({
                     path: '/',
                     query: {
@@ -58,8 +58,8 @@ function errorState(status, data) {
                 message: '您的登录过期，将重新登录!',
                 onClose: () => {
                     //清除用户信息
-                    localStorage.removeItem('backToken')
-                    localStorage.removeItem('userId')
+                    sessionStorage.removeItem('backToken')
+                    sessionStorage.removeItem('userId')
                     router.push({
                         path: '/',
                         query: {
@@ -99,9 +99,9 @@ const httpServer = (opts, data, file, timeout) => {
     let authToken = "";
     if (opts.authType && opts.authType != "") {
         if (opts.authType === "back") {
-            authToken =localStorage.getItem('token') || "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsInVzZXJfaWQiOiIxIiwiaXNzIjoiSUFUQSIsImV4cCI6MTYxNjY2NTkzOCwiaWF0IjoxNjE2NjUxNTM4fQ._nqZq0LMwkurIBKJtfX-imXLCxQSNwJ-ueGZ8iwW-0oAW880gY7PjNEfroYYQZ91v0u5yQb73Alzvy6EIp6GGg"
+            authToken =sessionStorage.getItem('token') || "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZG1pbiIsInVzZXJfaWQiOiIxIiwiaXNzIjoiSUFUQSIsImV4cCI6MTYxNjY2NTkzOCwiaWF0IjoxNjE2NjUxNTM4fQ._nqZq0LMwkurIBKJtfX-imXLCxQSNwJ-ueGZ8iwW-0oAW880gY7PjNEfroYYQZ91v0u5yQb73Alzvy6EIp6GGg"
         } else if (opts.authType === "front") {
-            authToken = localStorage.getItem("token");
+            authToken = sessionStorage.getItem("token");
         }
         httpDefaultOpts.headers["Authorization"] = authToken
     }

src/router/index.js

@@ -86,7 +86,7 @@ const router = new VueRouter({
 })
 const whiteList =['/login','/success','/screen']
 router.beforeEach((to, from, next) => {
-  let user = localStorage.getItem("token");
+  let user = sessionStorage.getItem("token");
   if (!user && !whiteList.includes(to.path)) {  // 通过vuex state获取当前的token是否存在
     next({
       path: '/login',

src/views/login.vue

@@ -57,8 +57,8 @@ export default {
           if (res.data.resultCode === "200") {
             let data = res.data;
             const isOpt = data.user.type;
-            localStorage.setItem("token", data.token);
-            localStorage.setItem("userInfo", JSON.stringify(data.user));
+            sessionStorage.setItem("token", data.token);
+            sessionStorage.setItem("userInfo", JSON.stringify(data.user));
             if (isOpt == "4") {
               this.$router.push("/opt");
             }else if (isOpt == "2") {

src/views/user/admin.vue

@@ -27,7 +27,7 @@ export default {
   data() {
     return {
       list: [],
-      currentUserId: JSON.parse(localStorage.getItem("userInfo")).id,
+      currentUserId: JSON.parse(sessionStorage.getItem("userInfo")).id,
     };
   },
   mounted() {
@@ -40,7 +40,7 @@ export default {
       let param = {
         _index: 1,
         _size: 10,
-        type: JSON.parse(localStorage.getItem("userInfo")).type,
+        type: JSON.parse(sessionStorage.getItem("userInfo")).type,
       };
       vm.$https(
         {

src/views/user/components/adminInfo.vue

 <template>
   <div class="admin-detail-content">
     <Header title="管理员详情" />
-    <van-form ref='form'>
+    <van-form validate-first ref='form' @submit="onSubmit">
       <div class="input-box">
         <van-field
           label="管理员姓名"
@@ -27,10 +27,6 @@
           v-model="form.telephone"
           placeholder="请输入固定电话"
           input-align="right"
-          :rules="[
-              { required: true, message: '请填写您的固定电话！' },
-              { pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/, message: '固定电话格式错误！'}
-            ]"
         />
         <van-field
           label="微信"
@@ -38,11 +34,6 @@
           v-model="form.weChat"
           placeholder="请输入微信"
           input-align="right"
-          :rules="[
-              { required: true, message: '请填写您的微信号！' },
-              { pattern: /^[a-zA-Z][a-zA-Z0-9_-]{5,19}$/, message: '微信号格式错误！'}
-            ]"
-          
         />
         <van-field
           label="邮箱"
@@ -50,24 +41,23 @@
           v-model="form.email"
           placeholder="请输入邮箱"
           input-align="right"
-          :rules="[
-              { required: true, message: '请填写您的邮箱！' },
-              { pattern: /^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/, message: '邮箱格式错误！'}
-            ]"
         />
       </div>
       <div class="admin-detail-button" v-if="!disabled">
-        <van-button type="default" plain @click="onCancel">取消</van-button>
-        <van-button type="default" @click="onSubmit">提交</van-button>
+        <van-button type="default" plain native-type="button" @click="onCancel">取消</van-button>
+        <van-button type="default" native-type="submit">提交</van-button>
       </div>
       <div class="admin-detail-button cancel" v-if="disabled">
-        <van-button type="default" @click="onCancel">返回</van-button>
+        <van-button type="default" native-type="button" @click="onCancel">返回</van-button>
       </div>
     </van-form>
   </div>
 </template>
 
 <script>
+// { pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/, message: '固定电话格式错误！'}
+// { pattern: /^[a-zA-Z][a-zA-Z0-9_-]{5,19}$/, message: '微信号格式错误！'}
+// { pattern: /^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/, message: '邮箱格式错误！'}
 import Header from "@/components/Header/index.vue";
 export default {
   components: { Header },
@@ -147,6 +137,7 @@ export default {
         .catch(function (err) {
           console.log(err);
         });
+      
     },
   },
 };

src/views/user/components/commitTab.vue

@@ -81,10 +81,9 @@
           <div class="uplaod-video" style="min-height: 60px">
             <van-uploader
               :max-count="3"
-              :max-size="500 * 1024"
-              @oversize="onOversize"
               v-model="fileList"
               accept="video/*"
+              :before-read="beforeVideo"
               :after-read="uploadVideo"
               :before-delete="deleteVideo"
               multiple
@@ -155,8 +154,8 @@ export default {
   data() {
     return {
       form: {
-        username: JSON.parse(localStorage.getItem("userInfo")).orgName,
-        organId: JSON.parse(localStorage.getItem("userInfo")).orgId,
+        username: JSON.parse(sessionStorage.getItem("userInfo")).orgName,
+        organId: JSON.parse(sessionStorage.getItem("userInfo")).orgId,
         images: [], // 文件地址
         videos: [], // 文件地址
       },
@@ -200,9 +199,25 @@ export default {
       this.form.boardId = this.boardList[index].id;
       this.showBoard = false;
     },
-    onOversize(file) {
-      console.log(file);
-      this.$toast("文件大小不能超过 500kb");
+    beforeVideo(file) {
+      this.timeOutVideo = false
+      let _URL = window.URL || window.webkitURL;
+      let videoUrl = _URL.createObjectURL(file);
+      let audioElement = new Audio(videoUrl);
+      audioElement.addEventListener("loadedmetadata", () => {
+        let duration = audioElement.duration; //时长为秒，小数，182.36
+        if (duration > 21) {
+          this.timeOutVideo = true
+          this.fileList.forEach((item,index)=>{
+            if(item.file.lastModified===file.lastModified){
+              this.fileList.splice(index,1)
+            }
+          })
+          this.$toast.fail("上传视频时长不能超过20秒");
+          return false;
+        }
+      }); 
+      return true
     },
     // 打开日历
     onDisplay() {
@@ -342,10 +357,13 @@ export default {
       )
         .then((res) => {
           if(res.data.resultCode==='200'){
-            res.data.data.fileList.forEach(item=>{
-              this.form.videos.push(item.fileUrl);
-              this.videoIds.push(item.id);
-            })
+            if(!this.timeOutVideo){
+              res.data.data.fileList.forEach(item=>{
+                this.form.videos.push(item.fileUrl);
+                this.videoIds.push(item.id);
+              })
+            }
+            
           }else{
             this.$toast(res.data.message)
           }
@@ -463,8 +481,15 @@ export default {
     }
   }
   .commit-page-button {
+    position: fixed;
+    bottom: 50px;
+    left: 0;
+    right: 0;
     padding: 0 40px;
+    background-color: #fff;
     box-sizing: border-box;
+    padding-top: 10px;
+    padding-bottom: 10px;
     width: 100%;
     .van-button--normal {
       background: #a4151d;

src/views/user/components/contentTab.vue

@@ -32,7 +32,7 @@
                   <van-button
                     @click="optFn(item)"
                     square
-                    :text="active ? '启用' : '删除'"
+                    :text="active ? '启用' : '禁用'"
                     type="danger"
                     :class="{
                       'delete-button': active === 0,

src/views/user/components/historyTab.vue

@@ -95,7 +95,7 @@ export default {
       let param = {
         _index:this.pageNum,
         _size:this.pageSize,
-        orgId: JSON.parse(localStorage.getItem("userInfo")).orgId
+        orgId: JSON.parse(sessionStorage.getItem("userInfo")).orgId
       };
       vm.$https(
         {

src/views/user/editPsd.vue

@@ -53,7 +53,7 @@ export default {
   data() {
     return {
       form: {
-        username: JSON.parse(localStorage.getItem("userInfo")).userName,
+        username: JSON.parse(sessionStorage.getItem("userInfo")).userName,
       },
     };
   },
@@ -63,7 +63,7 @@ export default {
   methods: {
     onCancle() {
       this.form = {
-        username: JSON.parse(localStorage.getItem("userInfo")).userName,
+        username: JSON.parse(sessionStorage.getItem("userInfo")).userName,
       };
     },
     // 提交数据
@@ -87,8 +87,8 @@ export default {
       )
         .then((res) => {
           if (res.data.resultCode === "200") {
-            localStorage.removeItem("token");
-            localStorage.removeItem("userInfo");
+            sessionStorage.removeItem("token");
+            sessionStorage.removeItem("userInfo");
             this.$router.replace({
               path: "/success",
               query: {

src/views/user/learn.vue

@@ -48,7 +48,7 @@ export default {
       let param = {
         _index: this.pageNum,
         _size: this.pageSize,
-        type: JSON.parse(localStorage.getItem("userInfo")).type,
+        type: JSON.parse(sessionStorage.getItem("userInfo")).type,
       };
       vm.$https(
         {