dct 5 月之前
父節點
當前提交
45ab66ef9d

+ 0 - 1
src/assets/css/index.css

@@ -2168,7 +2168,6 @@
   text-overflow: ellipsis;
   vertical-align: middle;
   position: relative;
-  text-align: left
 }
 
 .el-table th div, .el-table th>.cell {

+ 1 - 1
src/components/Breadcrumb/index.vue

@@ -40,7 +40,7 @@ export default {
       let matched = this.$route.matched.filter(item => item.name)
       const first = matched[0]
       if (first && first.name !== 'dashboard') {
-        matched = [{path: '/dashboard', redirect: 'noredirect', meta: { title: '首页' }}].concat(matched)
+        matched = [{path: '/systemSetting/project', redirect: 'noredirect', meta: { title: '首页' }}].concat(matched)
       }
       this.levelList = matched
     }

+ 14 - 14
src/router/index.js

@@ -73,20 +73,20 @@ export default new Router({
 
 // permissionName 与后台获取的权限菜单列表相对应
 let routerMap = [
-  {
-    path: '/index',
-    component: Layout,
-    name: 'Dashboard',
-    hidden: true,
-    children: [
-      {
-        path: 'dashboard',
-        name: 'dashboard',
-        component: () => import('@/views/dashboard/index'),
-        meta: { title: '仪表盘', permissionName: 'home_page_query' }
-      }
-    ]
-  },
+  // {
+  //   path: '/index',
+  //   component: Layout,
+  //   name: 'Dashboard',
+  //   hidden: true,
+  //   children: [
+  //     {
+  //       path: 'dashboard',
+  //       name: 'dashboard',
+  //       component: () => import('@/views/dashboard/index'),
+  //       meta: { title: '仪表盘', permissionName: 'home_page_query' }
+  //     }
+  //   ]
+  // },
   {
     path: '/systemSetting',
     component: Layout,

+ 9 - 0
src/styles/element-ui.scss

@@ -111,6 +111,15 @@
   tr th:first-child .cell {
     padding-left: 24px;
   }
+
+  .el-table__row {
+    &.is-center {
+      text-align: center;
+    }
+    &.is-right {
+      text-align: right;
+    }
+  }
 }
 
 

+ 1 - 5
src/views/401.vue

@@ -13,10 +13,6 @@
         <h2>你没有权限去该页面</h2>
         <h6>如有不满请联系你领导</h6>
         <ul class="list-unstyled">
-          <li>或者你可以去:</li>
-          <li class="link-type">
-            <router-link to="/dashboard">回首页</router-link>
-          </li>
           <li class="link-type"><a href="https://www.taobao.com/">随便看看</a></li>
           <li><a
             @click.prevent="dialogVisible=true"
@@ -56,7 +52,7 @@ export default {
   methods: {
     back () {
       if (this.$route.query.noGoBack) {
-        this.$router.push({ path: '/dashboard' })
+        this.$router.push({ path: '/systemSetting/project' })
       } else {
         this.$router.go(-1)
       }

+ 1 - 1
src/views/layout/components/TagsView.vue

@@ -101,7 +101,7 @@ export default {
           } else {
             let canPushHome = this.$store.state.user.permissionList.includes('home_page_query')
             if (canPushHome) {
-              this.$router.push({name: 'dashboard'})
+              this.$router.push({name: 'systemSetting'})
             } else {
               this.$router.push({name: 'errorPages'})
             }

+ 3 - 2
src/views/systemSetting/file.vue

@@ -47,12 +47,13 @@
       </div>
     </div>
     <div class="tableBox">
-      <div class="block-title">
+      <!-- <div class="block-title">
         文件列表
-      </div>
+      </div> -->
 
       <el-table
         v-loading="loading"
+        row-class-name="is-center"
         :data="tableData">
         <el-table-column
           prop="name"

+ 3 - 2
src/views/systemSetting/order.vue

@@ -84,12 +84,13 @@
       </div>
     </div>
     <div class="tableBox">
-      <div class="block-title">
+      <!-- <div class="block-title">
         公共订单列表
-      </div>
+      </div> -->
 
       <el-table
         v-loading="loading"
+        row-class-name="is-center"
         :data="tableData">
         <el-table-column
           prop="createTime"

+ 12 - 15
src/views/systemSetting/otaSource.vue

@@ -33,12 +33,13 @@
       </div>
     </div>
     <div class="tableBox">
-      <div class="block-title">
+      <!-- <div class="block-title">
         分销商列表
-      </div>
+      </div> -->
 
       <el-table
         v-loading="loading"
+        row-class-name="is-center"
         :data="tableData">
         <el-table-column
           prop="createTime"
@@ -48,17 +49,17 @@
         <el-table-column
           prop="id"
           label="项目ID"
-          width="200">
+          min-width="200">
         </el-table-column>
         <el-table-column
           prop="otaSourceName"
           label="分销商名称"
-          width="140">
+          min-width="140">
         </el-table-column>
         <el-table-column
           prop="otaSourceCode"
           label="分销商编码"
-          width="140">
+          min-width="140">
         </el-table-column>
         <el-table-column
           prop="type"
@@ -79,7 +80,7 @@
           show-overflow-tooltip
           prop="otaSourceDesc"
           label="分销商描述"
-          width="180">
+          min-width="180">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -91,25 +92,25 @@
           show-overflow-tooltip
           prop="createCallbackUrl"
           label="下单回调地址"
-          width="200">
+          min-width="200">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="checkCallbackUrl"
           label="核销回调地址"
-          width="200">
+          min-width="200">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="cancelCallbackUrl"
           label="退单回调地址"
-          width="200">
+          min-width="200">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="param"
           label="分销商参数"
-          width="180">
+          min-width="180">
         </el-table-column>
         <el-table-column
           fixed="right"
@@ -198,11 +199,7 @@ export default {
   },
   methods: {
     copyInfo (row) {
-      const info = `
-        合作方ID: ${row.id}
-        合作方密钥: ${row.otaSourceSecret}
-        请求地址: ${window.location.origin}
-      `
+      const info = `合作方ID: ${row.id}\n合作方密钥: ${row.otaSourceSecret}\n请求地址: ${window.location.origin}`
       this.copyTextToClipboard(info)
     },
     showDialog (type, item) {

+ 3 - 2
src/views/systemSetting/product.vue

@@ -57,12 +57,13 @@
       </div>
     </div>
     <div class="tableBox">
-      <div class="block-title">
+      <!-- <div class="block-title">
         分销产品列表
-      </div>
+      </div> -->
 
       <el-table
         v-loading="loading"
+        row-class-name="is-center"
         :data="tableData">
         <el-table-column
           prop="createTime"

+ 3 - 2
src/views/systemSetting/project.vue

@@ -23,12 +23,13 @@
       </div>
     </div>
     <div class="tableBox">
-      <div class="block-title">
+      <!-- <div class="block-title">
         项目列表
-      </div>
+      </div> -->
 
       <el-table
         v-loading="loading"
+        row-class-name="is-center"
         :data="tableData">
         <el-table-column
           prop="projectIndex"