youyawu 5 jaren geleden
bovenliggende
commit
fb91edca84
6 gewijzigde bestanden met toevoegingen van 14 en 9 verwijderingen
  1. 3 0
      src/components/category.vue
  2. 1 1
      src/lang/en.ts
  3. 1 1
      src/lang/zh.ts
  4. 3 1
      src/styles/index.scss
  5. 3 4
      src/views/account/user/index.vue
  6. 3 2
      src/views/shops/enter/index.vue

+ 3 - 0
src/components/category.vue

@@ -84,6 +84,8 @@ export default class extends Vue {
     display: flex;
     flex-flow: column nowrap;
     li.menuli {
+      display: flex;
+      flex-direction: column;
       flex-grow: 1;
       // height: 5.6rem;
       // line-height: 5.6rem;
@@ -103,6 +105,7 @@ export default class extends Vue {
         justify-content: space-between;
         align-items: center;
         height: 100%;
+        flex-grow: 1;
         cursor: pointer;
         padding-right: 1.6rem;
         &.curr,

+ 1 - 1
src/lang/en.ts

@@ -324,7 +324,7 @@ export default {
             title2: "Enterprise certification publicity",
             auditStatus: "Audit status",
             auditDate: "Audit date",
-            rejectReason: "Reason for rejection",
+            rejectReason: "Remarks",
             search: "search",
             serialNumber: "Serial number",
             applyDate: "Date of application"

+ 1 - 1
src/lang/zh.ts

@@ -325,7 +325,7 @@ export default {
             title2: "企业认证公示",
             auditStatus: "审核状态",
             auditDate: "审核日期",
-            rejectReason: "驳回理由",
+            rejectReason: "备注",
             search: "查询",
             serialNumber: "序号",
             applyDate: "申请日期"

+ 3 - 1
src/styles/index.scss

@@ -25,7 +25,9 @@ html {
       font-size: 1.4rem;
       overflow: hidden;
     }
-
+    .oHidden {
+      overflow: hidden;
+    }
     .noneData {
       padding-top: 4rem;
       text-align: center;

+ 3 - 4
src/views/account/user/index.vue

@@ -5,7 +5,7 @@
         <el-breadcrumb-item to="/">{{ $t(`route.home`) }}</el-breadcrumb-item>
         <el-breadcrumb-item>{{ $t(`route.user`) }}</el-breadcrumb-item>
       </el-breadcrumb>
-      <el-row :gutter="20">
+      <el-row :gutter="20" class="oHidden">
         <el-col :span="6">
           <user-info />
         </el-col>
@@ -130,9 +130,8 @@ export default class extends Vue {
       params: null,
       items: []
     }));
-  @Watch("index", { immediate: true })
-  indexChange(index: string) {
-    this.currIndex = Number(index) || 0;
+  activated() {
+    this.currIndex = Number(this.index) || 0;
     this.reload();
   }
   @Watch("currIndex")

+ 3 - 2
src/views/shops/enter/index.vue

@@ -25,7 +25,7 @@
           style="width:38rem;"
         ></el-input>
         <span class="ml2rem"
-          >{{ $t("page.views.shops.enter.add.auditStatus") }}:</span
+          >{{ $t("page.views.shops.enter.index.auditStatus") }}:</span
         >
         <el-select
           v-model="status"
@@ -55,7 +55,6 @@
         <el-table-column
           type="index"
           :label="`${$t(`page.views.shops.enter.index.serialNumber`)}`"
-          width="50"
         ></el-table-column>
         <el-table-column
           prop="companyName"
@@ -72,6 +71,7 @@
         <el-table-column
           prop="address"
           :label="`${$t(`page.views.shops.enter.index.auditStatus`)}`"
+          width="120px"
         >
           <template slot-scope="{ row: { status } }">
             {{ getStatusText(status) }}
@@ -80,6 +80,7 @@
         <el-table-column
           prop="address"
           :label="`${$t(`page.views.shops.enter.index.auditDate`)}`"
+          width="120px"
         >
           <template slot-scope="{ row: { companyExamine } }">
             {{ companyExamine && companyExamine.examineDate }}