src/lang/index.ts

@@ -29,8 +29,8 @@ const getLocale = () => {
   if (cookieLanguage) {
     return cookieLanguage;
   }
-
-  const language = navigator.language.toLowerCase();
+  const ieLang = (navigator as any).browserLanguage as string;
+  const language = (navigator.language || ieLang).toLowerCase();
   const locales = Object.keys(messages);
   for (const locale of locales) {
     if (language.indexOf(locale) > -1) {

src/lang/zh.ts

@@ -34,6 +34,9 @@ export default {
       cancelGz: "是否取消关注?",
       revocation: "是否撤销该需求?",
       logout: "是否退出登陆?"
+    },
+    error: {
+      imgUpload: "只能上传png或jpg格式"
     }
   },
   route: {

src/layout/components/header.vue

@@ -67,6 +67,7 @@
             "
             v-model="searchVal"
             class="input-with-select"
+            @keyup.native.enter="search"
           >
             <i slot="prefix" class="el-input__icon el-icon-search"></i>
           </el-input>

src/layout/index.vue

@@ -2,7 +2,7 @@
   <div class="layout">
     <y-header @reload="reload" />
     <keep-alive exclude="shopEnterAdd,infoList,shopEnter" v-if="showView">
-      <router-view class="main" />
+      <router-view />
     </keep-alive>
     <y-footer />
   </div>
@@ -30,9 +30,5 @@ export default class extends Vue {
 <style lang="scss" scoped>
 .layout {
   height: 100%;
-  .main {
-    // min-height: calc(100% - 250px);
-    overflow: hidden;
-  }
 }
 </style>

src/types/global.d.ts

@@ -40,7 +40,7 @@ interface ILogin {
   loginAccount: string;
   loginPassword: string;
   validateCode: string;
-  autoLogin: boolean;
+  autoLogin?: boolean;
 }
 
 interface IMenu {

src/views/account/findPassword.vue

@@ -11,7 +11,7 @@
     </div>
     <div class="bg">
       <div class="container  ">
-        <img src="@assets/loginbg.png" />
+        <img :src="require(`@assets/loginbg_${$i18n.locale}.png`)" />
         <div class="loginDiv">
           <div class="x-title">
             {{ $t("page.views.account.findPassword.title") }}

src/views/account/login.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="bg">
       <div class="container  ">
-        <img src="@assets/loginbg.png" />
+        <img :src="require(`@assets/loginbg_${$i18n.locale}.png`)" />
         <div class="loginDiv">
           <div class="x-title">{{ $t("page.views.account.login.title") }}</div>
           <el-form :model="form" :rules="rules" class="form" ref="form">
@@ -127,7 +127,7 @@ export default class extends Vue {
   async submit() {
     const token = await user.setToken(this.form);
     if (!token) return this.setVerifyImg();
-    this.$message.success(`${this.$i18n.t("message.login")}`);
+    this.$message.success(`${this.$i18n.t("message.success.login")}`);
     (this.$refs.form as ElForm).resetFields();
     this.$router.push("/user");
   }

src/views/account/register.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="bg">
       <div class="container  ">
-        <img src="@assets/loginbg.png" />
+        <img :src="require(`@assets/loginbg_${$i18n.locale}.png`)" />
         <div class="loginDiv">
           <div class="x-title">
             {{ $t("page.views.account.register.title") }}
@@ -65,9 +65,13 @@
               >
             </el-form-item>
 
-            <el-button class="loginBtn" @click="validate">{{
-              $t("form.register")
-            }}</el-button>
+            <el-button
+              :disabled="!form.check"
+              :class="{ disabled: !form.check }"
+              class="loginBtn"
+              @click="validate"
+              >{{ $t("form.register") }}</el-button
+            >
           </el-form>
         </div>
       </div>
@@ -83,11 +87,11 @@ import i18n from "@/lang";
 @Component
 export default class extends Vue {
   private verifyImg = "";
-  private form: ILogin = {
+  private form: IAny = {
     loginAccount: "",
     loginPassword: "",
     validateCode: "",
-    autoLogin: false
+    check: false
   };
   private rules = {
     loginAccount: [
@@ -149,7 +153,11 @@ export default class extends Vue {
       {
         validator: (rule: any, value: boolean, callback: any) =>
           callback(
-            value ? undefined : new Error(`${i18n.t("form.validateCheck")}`)
+            value
+              ? undefined
+              : new Error(
+                  `${i18n.t("page.views.account.register.validateCheck")}`
+                )
           ),
         trigger: "blur"
       }
@@ -244,6 +252,11 @@ export default class extends Vue {
             background: #fd5522;
             color: #fff;
             border-color: #fd5522;
+            &.disabled {
+              background: #f5f5f5;
+              border-color: #f5f5f5;
+              color: #666;
+            }
           }
         }
       }

src/views/mall/index.vue

@@ -115,7 +115,11 @@
             item: { id, name, companyId, price, cover, companyName }
           }"
         >
-          <router-link :to="`/shop/${companyId}/${id}`" class="product">
+          <router-link
+            :to="`/shop/${companyId}/${id}`"
+            class="product"
+            :title="name"
+          >
             <div class="img">
               <img :src="`${$basePath}${cover}`" />
             </div>
@@ -415,10 +419,16 @@ export default class extends Vue {
           font-size: 14px;
           color: rgb(51, 51, 51);
           margin-bottom: 10px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
         .shop {
           font-size: 12px;
           color: rgb(102, 102, 102);
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
       }
     }

src/views/news/details.vue

@@ -7,7 +7,9 @@
         </div>
         <div class="deptDiv">
           <span
-            >{{ $t("page.views.news.details.time") }}：{{ detailObj.createTime }}</span
+            >{{ $t("page.views.news.details.time") }}：{{
+              detailObj.createTime
+            }}</span
           >
         </div>
         <div class="desCon" v-html="detailObj.noticeContent"></div>

src/views/shops/details/index.vue

@@ -11,7 +11,7 @@
           <img src="@assets/guanzhu-2.png" />
           <span class="gz">{{
             $t("page.views.shops.details.index.alreadyConcerned")
-        }}</span>
+          }}</span>
         </div>
         <div v-else @click="gz">
           <img src="@assets/guanzhu.png" />

src/views/shops/enter/add.vue

@@ -118,7 +118,15 @@
         >
           <el-input v-model="address"></el-input>
         </el-form-item>
-        <el-form-item class="formItem" :label="`${$t(`pleaseChoose`)}${$t(`page.views.shops.enter.add.longitude`)}${$t(`page.views.shops.enter.add.latitude`)}`" prop="jwd">
+        <el-form-item
+          class="formItem"
+          :label="
+            `${$t(`pleaseChoose`)}${$t(
+              `page.views.shops.enter.add.longitude`
+            )}${$t(`page.views.shops.enter.add.latitude`)}`
+          "
+          prop="jwd"
+        >
           <div class="longLatDiv">
             <span>{{ $t("page.views.shops.enter.add.longitude") }}</span>
             <el-input class="input" v-model="form.longitude"></el-input>
@@ -186,6 +194,7 @@
           <el-upload
             list-type="picture-card"
             :action="`${$basePath}/common/upload`"
+            :before-upload="beforeUpload"
             :on-preview="preview"
             :on-remove="remove"
             :on-success="
@@ -209,6 +218,7 @@
             :class="{ uploadHide: form.defaultImgUrl }"
             list-type="picture-card"
             :action="`${$basePath}/common/upload`"
+            :before-upload="beforeUpload"
             :on-preview="preview"
             :on-remove="remove"
             :on-success="
@@ -227,6 +237,7 @@
           <el-upload
             list-type="picture-card"
             :action="`${$basePath}/common/upload`"
+            :before-upload="beforeUpload"
             :on-preview="preview"
             :on-remove="remove"
             :on-success="
@@ -590,6 +601,12 @@ export default class extends Vue {
     this.showImgSrc = url;
     this.showImg = true;
   }
+
+  beforeUpload(file: any) {
+    if (/image\/(png|jpg)$/.test(file.type)) return true;
+    this.$message.error(`${this.$i18n.t("message.error.imgUpload")}`);
+    return false;
+  }
 }
 </script>
 <style scoped lang="scss">

src/views/shops/enter/index.vue

@@ -7,17 +7,26 @@
       }}</router-link>
     </div>
     <div class="container">
-      <div class="partTitle"><span class="orangeLine"></span>{{$t("page.views.shops.enter.index.title2")}}</div>
+      <div class="partTitle">
+        <span class="orangeLine"></span
+        >{{ $t("page.views.shops.enter.index.title2") }}
+      </div>
       <div class="cxtj">
         <span>{{ $t("page.views.shops.enter.add.companyName") }}：</span>
         <el-input
           v-model="companyName"
           clearable
           size="small"
-          :placeholder="`${$t(`inputPlaceholder`)}${$t(`page.views.shops.enter.add.companyName`)}`"
+          :placeholder="
+            `${$t(`inputPlaceholder`)}${$t(
+              `page.views.shops.enter.add.companyName`
+            )}`
+          "
           style="width:38rem;"
         ></el-input>
-        <span class="ml2rem">{{ $t("page.views.shops.enter.add.auditStatus") }}：</span>
+        <span class="ml2rem"
+          >{{ $t("page.views.shops.enter.add.auditStatus") }}：</span
+        >
         <el-select
           v-model="status"
           clearable
@@ -32,9 +41,9 @@
             :value="value"
           ></el-option>
         </el-select>
-        <el-button class="searchBtn" size="small" @click="search"
-          >{{ $t("page.views.shops.enter.index.search") }}</el-button
-        >
+        <el-button class="searchBtn" size="small" @click="search">{{
+          $t("page.views.shops.enter.index.search")
+        }}</el-button>
       </div>
       <el-table
         :empty-text="`${$t(`loading`)}`"
@@ -43,24 +52,43 @@
         v-if="items"
         :data="items"
       >
-        <el-table-column type="index" :label="`${$t(`page.views.shops.enter.index.serialNumber`)}`" width="50"></el-table-column>
-        <el-table-column prop="companyName" :label="`${$t(`page.views.shops.enter.add.companyName`)}`"></el-table-column>
+        <el-table-column
+          type="index"
+          :label="`${$t(`page.views.shops.enter.index.serialNumber`)}`"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="companyName"
+          :label="`${$t(`page.views.shops.enter.add.companyName`)}`"
+        ></el-table-column>
         <el-table-column
           prop="detailAddress"
           :label="`${$t(`page.views.shops.enter.add.detailAddress`)}`"
         ></el-table-column>
-        <el-table-column prop="createTime" :label="`${$t(`page.views.shops.enter.index.applyDate`)}`"></el-table-column>
-        <el-table-column prop="address" :label="`${$t(`page.views.shops.enter.index.auditStatus`)}`">
+        <el-table-column
+          prop="createTime"
+          :label="`${$t(`page.views.shops.enter.index.applyDate`)}`"
+        ></el-table-column>
+        <el-table-column
+          prop="address"
+          :label="`${$t(`page.views.shops.enter.index.auditStatus`)}`"
+        >
           <template slot-scope="{ row: { status } }">
             {{ getStatusText(status) }}
           </template>
         </el-table-column>
-        <el-table-column prop="address" :label="`${$t(`page.views.shops.enter.index.auditDate`)}`">
+        <el-table-column
+          prop="address"
+          :label="`${$t(`page.views.shops.enter.index.auditDate`)}`"
+        >
           <template slot-scope="{ row: { companyExamine } }">
             {{ companyExamine && companyExamine.examineDate }}
           </template>
         </el-table-column>
-        <el-table-column prop="address" :label="`${$t(`page.views.shops.enter.index.rejectReason`)}`">
+        <el-table-column
+          prop="address"
+          :label="`${$t(`page.views.shops.enter.index.rejectReason`)}`"
+        >
           <template slot-scope="{ row: { companyExamine } }">
             {{ companyExamine && companyExamine.rejectReason }}
           </template>

src/views/shops/index.vue

@@ -23,7 +23,9 @@
           <div class="details fl">
             <div class="name">{{ companyName }}</div>
             <div class="desc">
-              {{ $t("page.views.shops.index.primaryBusiness") }}:{{ primaryBusiness }}
+              {{ $t("page.views.shops.index.primaryBusiness") }}:{{
+                primaryBusiness
+              }}
             </div>
             <div class="total">
               {{ $t("page.views.shops.index.total") }}{{ goodsCount