更新sessionStorage边为localStorage以及添加收获地址和绑定银行卡功能

src/router/index.js

@@ -56,7 +56,7 @@ import CreateEnv from '../views/docker/CreateEnv'
 import DataIndex from '../views/confluence/DataIndex'
 import DataList from '../views/confluence/DataList'
 // 新添加绑定收货地址页面(2021-10-26)
-import BindAddress from '../views/effect/BindAddress'
+import BindAddress from '../views/yxm/BindAddress'
 const originalPush = Router.prototype.push
 Router.prototype.push = function push(location) {
   return originalPush.call(this, location).catch(err => err)
@@ -299,7 +299,7 @@ const router = new Router({
         },
         // 绑定收获地址表页(2021-10-26)
         {
-          path: '/effect/BindAddress',
+          path: '/yxm/bindAddress',
           name: '数据列表',
           component: BindAddress
         }
@@ -310,7 +310,7 @@ const router = new Router({
 // 判断用户是否登陆到系统
 router.beforeEach(function(to, from, next) {
   NProgress.start()
-  var token = window.sessionStorage.getItem('token')
+  var token = window.localStorage.getItem('token')
   if (token !== null) {
     if (to.path === '/login') {
       next('/index/list')
@@ -318,7 +318,7 @@ router.beforeEach(function(to, from, next) {
     } else if (to.path === '/index/list') {
       next()
     } else {
-      var menuList = window.sessionStorage.getItem('menuList')
+      var menuList = window.localStorage.getItem('menuList')
       if (menuList.indexOf(to.path) > -1) {
         next()
       } else {

src/utils/hasPermission.js

@@ -4,7 +4,7 @@ export function hasPermission(permission) {
   permission = permission.trim()
   // let myPermissions = store.getters['user/PermissionList']
   // 从缓存中获取用户权限信息
-  let myPermissions = window.sessionStorage.getItem('permissionList')
+  let myPermissions = window.localStorage.getItem('permissionList')
   // console.log('6666', myPermissions)
   return myPermissions.indexOf(permission) > -1
 }

src/utils/holmesRequest.js

@@ -8,8 +8,7 @@ const service = axios.create({
 // request 拦截器
 service.interceptors.request.use(
   config => {
-    let token = window.sessionStorage.getItem('token')
-    // console.log('666', token)
+    let token = window.localStorage.getItem('token')
     if (token) {
       config.headers.token = token
     }

src/views/Home.vue

@@ -2,7 +2,7 @@
   <el-container class="home">
     <el-header>
       <div class="left">
-        <img src="../assets/image/logo.png" alt @click="gotoMain()"/>
+        <img src="../assets/image/logo.png" alt @click="gotoMain()" />
         <span @click="gotoMain()">测试平台</span>
       </div>
       <div class="right">
@@ -14,7 +14,8 @@
     </el-header>
     <el-container>
       <el-aside width="200px">
-        <el-menu :default-active="activePath" background-color="#525E7D" text-color="#fff" active-text-color="#ffd04b" router>
+        <el-menu :default-active="activePath" background-color="#525E7D" text-color="#fff" active-text-color="#ffd04b"
+          router>
           <el-submenu :index="1+''">
             <template slot="title">
               <i class="el-icon-money"></i>
@@ -114,12 +115,12 @@ export default {
   methods: {
     logout() {
       window.sessionStorage.clear()
+      window.localStorage.clear()
       this.$router.push('/')
     },
     saveNavState(curPath) {
       this.activePath = curPath
-      // window.sessionStorage.setItem('activePath', curPath)
-      window.localStorage.setItem('activePath', curPath)
+      window.sessionStorage.setItem('activePath', curPath)
     },
     gotoMain() {
       if (this.$route.path !== '/main') {
@@ -165,7 +166,7 @@ export default {
 }
 
 .el-aside {
-  background-color: #525E7D;
+  background-color: #525e7d;
   height: 100%;
   .el-menu {
     border-right: none;

src/views/auto/SceneList.vue

@@ -170,7 +170,6 @@ export default {
       executeScene(this.executeScene)
         .then((resp) => {
           this.requestData = resp.data.data
-          console.log('888', this.requestData)
           if (this.requestData.length > 0) {
             this.isShow = true
             this.$message.success('执行成功！')
@@ -192,7 +191,8 @@ export default {
     },
     // 编辑场景用例
     editeSceneCaseFrom(row) {
-      window.sessionStorage.setItem('curScene', JSON.stringify(row))
+      // window.sessionStorage.setItem('curScene', JSON.stringify(row))
+      window.localStorage.setItem('curScene', JSON.stringify(row))
       this.$router.push({ path: 'EditScene' })
       // bus使用
       this.$nextTick(function () {

src/views/docker/DevEnv.vue

@@ -5,7 +5,8 @@
       开发环境列表
     </div>
     <div>
-      <el-table :data="tableData" :header-cell-style="{background:'#F3F4F7',color:'#555'}" size="medium" align="center" style="width: 100%;margin-bottom: 30px;">
+      <el-table :data="tableData" :header-cell-style="{background:'#F3F4F7',color:'#555'}" size="medium" align="center"
+        style="width: 100%;margin-bottom: 30px;">
         <el-table-column :index="indexMethod" label="#" type="index" />
         <el-table-column prop="name" label="名称" width="100">
           <template slot-scope="scope">

src/views/docker/EnvDetail.vue

@@ -398,7 +398,7 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0,0,0,0.7)'
       },
-      nsList: window.sessionStorage.getItem('nsList').split(','),
+      nsList: window.localStorage.getItem('nsList').split(','),
       mqLoadingOptions: {
         text: 'MQ同步中...',
         lock: true,

src/views/effect/DataGenerator.vue

@@ -61,7 +61,6 @@
       <el-table-column label="操作">
         <slot slot-scope="scope">
           <el-button type="primary" icon="el-icon-key" @click="bandingCardData(scope.row)">绑卡</el-button>
-          <el-button type="primary" icon="el-icon-key" @click="bandingAddress(scope.row)">绑定收货地址</el-button>
         </slot>
       </el-table-column>
     </el-table>
@@ -75,10 +74,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="手机号:" prop="phoneNo" style="width:400px">
-          <el-input v-model="bindCardForm.phoneNo"></el-input>
+          <el-input v-model="bindCardForm.phoneNo" maxlength="11" placeholder="请输入手机号"></el-input>
         </el-form-item>
         <el-form-item label="卡 号:" style="width:400px">
-          <el-input v-model="bindCardForm.cardNo" :disabled=true></el-input>
+          <el-input v-model="bindCardForm.cardNo" :disabled=true ></el-input>
         </el-form-item>
         <el-form-item label="银行Code:" style="width:400px">
           <el-input v-model="bindCardForm.bankCode" :disabled=true></el-input>
@@ -89,29 +88,6 @@
         <el-button type="primary" @click="bindCard">确 定</el-button>
       </span>
     </el-dialog>
-
-    <!-- 绑定收获地址 -->
-    <el-dialog title="绑定收货地址" :visible.sync="DialogVisibleAddress" width="40%" @close="closeAddDialog">
-      <el-form ref="bindAddressRef" :rules="rules" :model="bindAddressForm" label-width="90px">
-        <el-form-item label="环境名称:" prop="namespace" style="width:400px">
-          <el-select v-model="bindAddressForm.namespace" placeholder="请选择环境" style="width:310px">
-            <el-option v-for="item in namespaceList" :key="item.name" :label="item.name" :value="item.name">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="版本号:" prop="version" placeholder="请输入版本号" style="width:400px">
-          <el-input v-model="bindAddressForm.version"></el-input>
-        </el-form-item>
-        <el-form-item label="手机号:" prop="phoneNo" placeholder="请输入手机号" style="width:400px">
-          <el-input v-model="bindAddressForm.phoneNo"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="DialogVisibleAdd=false">取 消</el-button>
-        <el-button type="primary" @click="bindAddress">确 定</el-button>
-      </span>
-
-    </el-dialog>
   </div>
 </template>
 
@@ -120,8 +96,7 @@ import {
   getAll,
   getBankList,
   getProvinceList,
-  bindingCard,
-  bindingAddress
+  bindingCard
 } from '@/api/testdata'
 import { getNamespaceList } from '@/api/k8s'
 
@@ -155,19 +130,8 @@ export default {
             message: '手机号不能为空！',
             trigger: 'blur'
           }
-        ],
-        version: [
-          {
-            required: true,
-            message: '版本号不能为空！',
-            trigger: 'blur'
-          }
         ]
-      },
-      bindAddressForm: {
-        namespace: window.sessionStorage.getItem('env')
-      },
-      DialogVisibleAddress: false
+      }
     }
   },
   created() {
@@ -226,11 +190,14 @@ export default {
         if (!valid) {
           return false
         } else {
+          if (this.bindCardForm.phoneNo.length !== 11) {
+            return this.$message.error('手机号长度不对！')
+          }
           bindingCard(this.bindCardForm).then((resp) => {
-            if (resp.data.success === 'true') {
-              this.DialogVisibleAddress = false
-              this.getAll()
-              this.$message.success('绑卡成功！')
+            if (resp.data.businessCode === '0000') {
+              this.$message.success(resp.data.msg)
+              this.DialogVisible = false
+              // this.getAll()
             } else {
               this.$message.error(resp.data.msg)
             }
@@ -240,32 +207,6 @@ export default {
     },
     closeAddDialog() {
       this.$refs.bindCardFormRef.resetFields()
-    },
-    // 绑定收货地址
-    bandingAddress() {
-      this.DialogVisibleAddress = true
-    },
-    // 保存收货地址
-    bindAddress() {
-      var formData = new FormData()
-      formData.set('namespace', this.bindAddressForm.namespace)
-      formData.set('version', this.bindAddressForm.version)
-      formData.set('phoneNo', this.bindAddressForm.phoneNo)
-      this.$refs.bindAddressRef.validate((valid) => {
-        if (!valid) {
-          return false
-        } else {
-          bindingAddress(formData).then((resp) => {
-            if (resp.data.success === true) {
-              this.$message.success('地址绑定成功！')
-              this.getAll()
-              this.DialogVisibleAdd = false
-            } else {
-              this.$message.error(resp.data.msg)
-            }
-          })
-        }
-      })
     }
   }
 }

src/views/layout/leftAside/Aside.vue

@@ -9,7 +9,8 @@
       @click="toggle_collapse"
     >|||</div> -->
     <!-- 左侧菜单栏 -->
-    <el-menu :collapse="getCollapseState" :collapse-transition="false" background-color="#525E7C" text-color="#fff" active-text-color="#3F9EFF" router :default-active="activePath">
+    <el-menu :collapse="getCollapseState" :collapse-transition="false" background-color="#525E7C" text-color="#fff"
+      active-text-color="#3F9EFF" router :default-active="activePath">
       <!-- 一级菜单：w -->
       <el-submenu :index="item.id + ''" v-for="item in nav" :key="item.id">
         <template slot="title">
@@ -18,7 +19,8 @@
         </template>
 
         <!-- 二级菜单 -->
-        <el-menu-item :index="subItem.path" v-for="subItem in item.child" :key="subItem.path" @click="saveNavState(subItem.path)">
+        <el-menu-item :index="subItem.path" v-for="subItem in item.child" :key="subItem.path"
+          @click="saveNavState(subItem.path)">
           <template slot="title">
             <i :class="subItem.icon"></i>
             <span>{{ subItem.title }}</span>
@@ -101,18 +103,18 @@ export default {
         // 判断token失效时，清空缓存，跳转到登陆页面
         if (resp.data.data === false) {
           this.$message.error(resp.data.msg)
-          window.sessionStorage.clear()
+          window.localStorage.clear()
           this.$router.push('/login')
         }
         // 同步赋值mutations
         this.$store.commit('user/SET_USER', resp.data.data)
 
         // 将用户信息存储到session中
-        window.sessionStorage.setItem(
+        window.localStorage.setItem(
           'permissionList',
           resp.data.data.permissionCodeList
         )
-        window.sessionStorage.setItem('menuList', resp.data.data.menuList)
+        window.localStorage.setItem('menuList', resp.data.data.menuList)
         this.menuList = resp.data.data.menuList
         this.getNav()
       })
@@ -120,7 +122,7 @@ export default {
     // 获取namespace列表，该列表决定用户是否展示新增、更新等按钮
     getUserNsList() {
       getNsByRoleId().then((resp) => {
-        window.sessionStorage.setItem('nsList', resp.data.data)
+        window.localStorage.setItem('nsList', resp.data.data)
       })
     }
   },

src/views/layout/leftAside/menu.json

@@ -157,6 +157,12 @@
           "title": "消息发送",
           "icon": "iconfont icon-zhifeiji",
           "path": "/yxm/msg"
+        },
+        {
+          "id": 6,
+          "title": "绑定收获地址",
+          "icon": "iconfont icon-daohang",
+          "path": "/yxm/bindAddress"
         }
       ]
     },
@@ -182,12 +188,6 @@
           "title": "数据生成器",
           "icon": "iconfont icon-yinhang",
           "path": "/effect/testdata"
-        },
-        {
-          "id": 5,
-          "title": "绑定收获地址",
-          "icon": "iconfont icon-yinhang",
-          "path": "/effect/BindAddress"
         }
       ]
     },

src/views/layout/rightMain/AsideTitle.vue

@@ -187,7 +187,7 @@ export default {
      * */
     let _this = this
     window.addEventListener('beforeunload', (e) => {
-      sessionStorage.setItem(
+      localStorage.setItem(
         'titleItem',
         JSON.stringify({
           titleItem: _this.getAsideTitle,
@@ -215,7 +215,7 @@ export default {
   created() {
     this.showBtn()
     // 读取刷新前存储在session域中的数据，然后存入vuex中
-    let loadBeforeRes = JSON.parse(sessionStorage.getItem('titleItem'))
+    let loadBeforeRes = JSON.parse(localStorage.getItem('titleItem'))
     if (loadBeforeRes !== null) {
       if (
         loadBeforeRes.titleItem !== null &&

src/views/layout/rightMain/Header.vue

@@ -76,6 +76,7 @@ export default {
         .then((resp) => {
           this.$store.commit('user/RESET_USER')
           window.sessionStorage.clear()
+          window.localStorage.clear()
           this.$router.push('/')
         })
         .catch((error) => {

src/views/login/Login.vue

@@ -64,7 +64,7 @@ export default {
                 this.$message.error('用户名或密码错误,请重新登陆！')
               } else {
                 // 将token放到Application中
-                window.sessionStorage.setItem('token', resp.data.data.token)
+                window.localStorage.setItem('token', resp.data.data.token)
                 // 设置当前选中的菜单
                 window.sessionStorage.setItem('activePath', '/index/list')
                 this.$router.push('/index/list')

src/views/effect/BindAddress.vue → src/views/yxm/BindAddress.vue

 <template>
-  <div>
+  <div style="margin-left:50px">
     <el-form ref="bindAddressRef" :rules="rules" :model="bindAddressForm" label-width="90px">
       <el-form-item label="环境名称:" prop="namespace" style="width:400px">
         <el-select v-model="bindAddressForm.namespace" placeholder="请选择环境" style="width:310px">
@@ -7,14 +7,14 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="版本号:" prop="phoneNo" placeholder="请输入版本号" style="width:400px">
-        <el-input v-model="bindAddressForm.version"></el-input>
+      <el-form-item label="版本号:" prop="version"  style="width:400px">
+        <el-input v-model="bindAddressForm.version" placeholder="请输入羊小咩版本号"></el-input>
       </el-form-item>
-      <el-form-item label="手机号:" prop="phoneNo" placeholder="请输入手机号" style="width:400px">
-        <el-input v-model="bindAddressForm.phoneNo"></el-input>
+      <el-form-item label="手机号:" prop="phoneNo"  style="width:400px">
+        <el-input v-model="bindAddressForm.phoneNo" maxlength="11" placeholder="请输入手机号"></el-input>
       </el-form-item>
     </el-form>
-    <span slot="footer" class="dialog-footer">
+    <span slot="footer" class="dialog-footer" style="margin-left:180px">
       <el-button type="primary" @click="bindAddress">确 定</el-button>
     </span>
   </div>
@@ -72,10 +72,12 @@ export default {
         if (!valid) {
           return false
         } else {
+          if (this.bindAddressForm.phoneNo.length !== 11) {
+            return this.$message.error('手机号长度不对！')
+          }
           bindingAddress(formData).then((resp) => {
-            if (resp.data.success === 'true') {
-              this.$message.success('地址绑定成功！')
-              this.bindAddressForm.namespace = ''
+            if (resp.data.businessCode === '0000') {
+              this.$message.success(resp.data.msg)
               this.bindAddressForm.version = ''
               this.bindAddressForm.phoneNo = ''
             } else {