youyawu vor 5 Jahren
Ursprung
Commit
11d813377e

+ 11 - 3
src/components/category.vue

@@ -13,7 +13,10 @@
           @click="() => setCurrIndex(id)"
         >
           <div />
-          {{ title }}
+
+          <span>
+            {{ title }}
+          </span>
           <i class="el-icon-arrow-right"></i>
         </div>
         <div class="menuCon" v-if="subList.length">
@@ -108,7 +111,7 @@ export default class extends Vue {
         flex-grow: 1;
         cursor: pointer;
         padding-right: 1.6rem;
-        text-align: center;
+        // text-align: center;
         &.curr,
         &:hover {
           background: #ffddd3;
@@ -122,7 +125,12 @@ export default class extends Vue {
           height: 1.4rem;
           width: 0.2rem;
           background: #fff;
-          // margin-right: 1.6rem;
+          margin-right: 1.6rem;
+        }
+        span {
+          flex-grow: 1;
+          text-align: left;
+          word-break: break-all;
         }
         // i {
         //   float: right;

+ 5 - 5
src/lang/en.ts

@@ -92,8 +92,8 @@ export default {
       },
       userInfo: {
         username: "You are not signed in",
-        editPassword: "profile",
-        logout: "logOut",
+        editPassword: "update",
+        logout: "Log Out",
         login: "login",
         register: "register"
       }
@@ -131,15 +131,15 @@ export default {
             err2: "The two passwords are inconsistent"
           },
           index: {
-            titles: "My concerns, my needs",
+            titles: "My concerns, My Needs",
             tableIndex: "No.",
             purchaseTitle: "Demand heading",
-            summaryOfNeeds: "outline",
+            summaryOfNeeds: "Outline",
             createTime: "Release time",
             status: "Current state",
             status1: "Concentration of signs",
             status2: "Has ended",
-            option: "operation",
+            option: "Operation",
             revocation: "Revoke",
             public: "Re release",
             companyName: "Name of merchant",

+ 11 - 2
src/layout/components/LangSelect.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dropdown trigger="click" @command="handleSetLanguage">
+  <el-dropdown class="lang" trigger="click" @command="handleSetLanguage">
     <div>{{ language }}</div>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item :disabled="language === '中文'" command="zh">
@@ -30,7 +30,10 @@ export default class extends Vue {
   private handleSetLanguage(lang: string) {
     setLocale(lang);
     setPageTitle(this.$route.meta.title);
-    location.reload(); //因为接口得重新请求
+    if (process.env.NODE_ENV !== "development") {
+      location.reload(); //因为接口得重新请求
+    }
+
     // this.$message({
     //   message: `${this.$i18n.t("SLS")}`,
     //   type: "success"
@@ -38,3 +41,9 @@ export default class extends Vue {
   }
 }
 </script>
+<style lang="scss" scoped>
+.lang {
+  font-size: 1.2rem;
+  color: #333;
+}
+</style>

+ 11 - 4
src/layout/components/header.vue

@@ -49,7 +49,7 @@
     <div v-show="showHeader" class="container  ">
       <div class="logoDiv  ">
         <div class="logoTitle">{{ $t(`title`) }}</div>
-        <div class="searchDiv">
+        <div class="searchDiv" :class="$i18n.locale">
           <el-select class="searchFl" v-model="currTarget">
             <el-option
               :label="$t(`page.layout.header.searchProduct`)"
@@ -208,8 +208,13 @@ export default class extends Vue {
         border: 1px solid #fd5522;
         overflow: hidden;
         vertical-align: middle;
+        white-space: nowrap;
+        &.en {
+          width: 42rem;
+        }
         .searchFl {
-          width: 8rem;
+          width: 15%;
+          // width: 8rem;
           color: #fd5522;
           height: 100%;
         }
@@ -224,13 +229,15 @@ export default class extends Vue {
           color: #fd5522;
         }
         .input-with-select {
-          width: 38.9rem;
+          width: 70%;
+          // width: 38.9rem;
           height: 100%;
         }
         .searchBtn {
           display: inline-block;
           text-align: center;
-          width: 8rem;
+          // width: 8rem;
+          width: 15%;
           height: 100%;
           font-size: 1.6rem;
           background: #fd5522;

+ 4 - 1
src/styles/index.scss

@@ -101,7 +101,10 @@ html {
       border-collapse: collapse;
       border-spacing: 0;
     }
-
+    input,
+    textarea {
+      font-family: "Microsoft YaHei";
+    }
     * {
       padding: 0;
       margin: 0;

+ 1 - 1
src/views/info/add.vue

@@ -11,7 +11,7 @@
           :rules="rules"
           ref="form"
           :model="form"
-          label-width="110px"
+          label-width="150px"
         >
           <el-form-item
             :label="`${$t('page.views.info.add.purchaseTitle')}`"

+ 3 - 2
src/views/info/details/buy.vue

@@ -92,12 +92,13 @@ export default class extends Vue {
     font-size: 1.4rem;
     .tit {
       color: #333;
-      width: 10%;
+      width: 18%;
       float: left;
+      text-align: right;
     }
     .con {
       color: #666;
-      width: 90%;
+      width: 80%;
       float: left;
     }
   }

+ 7 - 5
src/views/info/details/sell.vue

@@ -9,7 +9,7 @@
         <el-col :span="14">
           <div class="title">
             <span class="type">{{
-              $t("page.views.info.sell.purchaseTitle")
+              $t("page.views.info.sell.supplyTitle")
             }}</span>
             <span class="name">{{ noticeSupply.supplyTitle }}</span>
           </div>
@@ -104,14 +104,16 @@ export default class extends Vue {
       font-size: 1.4rem;
       overflow: hidden;
       .tit {
-        width: 7%;
-        float: left;
+        // width: 7%;
+        // float: left;
+        display: inline-block;
         line-height: 2.4rem;
         color: #333;
       }
       .con {
-        width: 93%;
-        float: left;
+        // width: 93%;
+        // float: left;
+        display: inline-block;
         line-height: 2.4rem;
         color: #666;
       }

+ 16 - 3
src/views/mall/index.vue

@@ -25,11 +25,12 @@
         <div class="xiaolei">
           <div
             class="block fl"
+            :class="{ single: subs.length === 1 }"
             v-for="({ title, arr }, index) in subs"
             :key="`subs${index}`"
           >
-            <span>{{ title }}</span>
-            <div class="items fr">
+            <span class="fl">{{ title }}</span>
+            <div class="items fl">
               <div
                 :class="`item fl ${params.typeId === id ? 'curr' : ''}`"
                 v-for="({ id, title: st }, i) in arr"
@@ -276,9 +277,21 @@ export default class extends Vue {
 
           padding-top: 20px;
           box-sizing: border-box;
+          &.single {
+            width: 100%;
+            height: 100%;
+            box-sizing: border-box;
+            > span {
+              width: auto;
+              margin-right: 10px;
+              display: inline-block;
+            }
+            .items {
+              width: 80%;
+            }
+          }
           > span {
             width: 80px;
-            display: inline-block;
           }
           .items {
             width: 250px;

+ 1 - 1
src/views/shops/details/profile.vue

@@ -116,7 +116,7 @@ export default class extends Vue {
 
         &.details {
           width: 60%;
-          padding: 10px 20px;
+          padding: 10px 15px;
           span {
             margin-bottom: 20px;
             display: inline-block;

+ 4 - 9
src/views/shops/enter/index.vue

@@ -27,13 +27,7 @@
         <span class="ml2rem"
           >{{ $t("page.views.shops.enter.index.auditStatus") }}:</span
         >
-        <el-select
-          v-model="status"
-          clearable
-          size="small"
-          :placeholder="`${$t(`pleaseChoose`)}`"
-          style="width:14rem;"
-        >
+        <el-select v-model="status" size="small" style="width:14rem;">
           <el-option
             v-for="{ key, value } in statusList"
             :key="`status${key}`"
@@ -106,10 +100,11 @@
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
 import dict from "@/store/modules/dict";
+import i18n from "@/lang";
 @Component({ name: "shopEnter" })
 export default class extends Vue {
   private companyName = "";
-  private status = "";
+  private status = i18n.t(`pleaseChoose`);
   private params = {};
   private items: any[] | null = [];
   get statusList() {
@@ -121,7 +116,7 @@ export default class extends Vue {
   }
   search() {
     const { companyName, status } = this;
-    this.params = { companyName, status };
+    this.params = { companyName, status: Number(status) | 0 };
   }
   setItems(items: any[]) {
     this.items = items.length ? items : null;