From 6c6b89f5129527ee58e860bd9393b42f1273b12a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 18 Nov 2021 17:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96buyer=E7=AB=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E5=AE=8C=E5=96=84=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/footer/Footer.vue               |  4 ++--
 .../components/indexDecorate/modelList/Carousel.vue  |  4 ++--
 .../components/indexDecorate/modelList/Carousel2.vue |  4 ++--
 buyer/src/components/map/index.vue                   |  4 ++--
 buyer/src/config/index.js                            | 12 ++----------
 buyer/src/main.js                                    |  3 ++-
 buyer/src/pages/ForgetPassword.vue                   |  4 ++--
 buyer/src/pages/Login.vue                            |  6 +++---
 buyer/src/pages/SignUp.vue                           |  4 ++--
 buyer/vue.config.js                                  |  2 ++
 .../src/views/lili-floor-renovation/modelForm.vue    |  2 --
 .../views/lili-floor-renovation/modelFormItem.vue    |  2 --
 12 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/buyer/src/components/footer/Footer.vue b/buyer/src/components/footer/Footer.vue
index d39875bf..3714f189 100644
--- a/buyer/src/components/footer/Footer.vue
+++ b/buyer/src/components/footer/Footer.vue
@@ -68,12 +68,12 @@
 </template>
 
 <script>
-import config from '@/config'
+
 export default {
   name: "Footer",
   data() {
     return {
-      config,
+      config:require('@/config'),
       guideArr: [
         // 导航链接
         ["购物指南", "购物流程", "会员介绍", "生活旅行", "常见问题"],
diff --git a/buyer/src/components/indexDecorate/modelList/Carousel.vue b/buyer/src/components/indexDecorate/modelList/Carousel.vue
index bea6e5c5..a0af8f71 100644
--- a/buyer/src/components/indexDecorate/modelList/Carousel.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import config from '@/config'
+
 import {articleList} from '@/api/common.js'
 import storage from '@/plugins/storage';
 export default {
@@ -57,7 +57,7 @@ export default {
   props: ['data'],
   data () {
     return {
-      config,
+      config:require('@/config'),
       userInfo: {}, // 用户信息
       articleList: [], // 常见问题
       params: { // 请求常见问题参数
diff --git a/buyer/src/components/indexDecorate/modelList/Carousel2.vue b/buyer/src/components/indexDecorate/modelList/Carousel2.vue
index cf983e4e..d9710003 100644
--- a/buyer/src/components/indexDecorate/modelList/Carousel2.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel2.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import config from '@/config'
+
 import {articleList} from '@/api/common.js'
 import storage from '@/plugins/storage';
 export default {
@@ -65,7 +65,7 @@ export default {
   props: ['data'],
   data () {
     return {
-      config,
+      config:require('@/config'),
       userInfo: {}, // 用户信息
       articleList: [], // 常见问题
       params: { // 请求常见问题参数
diff --git a/buyer/src/components/map/index.vue b/buyer/src/components/map/index.vue
index 13365bd6..f8023b2f 100644
--- a/buyer/src/components/map/index.vue
+++ b/buyer/src/components/map/index.vue
@@ -31,7 +31,7 @@
 <script>
 import AMapLoader from '@amap/amap-jsapi-loader';
 import { handleRegion } from '@/api/address.js';
-import config from '@/config'
+
 export default {
   name: 'map',
   props: {
@@ -42,7 +42,7 @@ export default {
   },
   data () {
     return {
-      config,
+      config:require('@/config'),
       showMap: false, // 展示地图
       mapSearch: '', // 地图搜索
       map: null, // 初始化地图
diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index f471d3bd..c4ec7c50 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -1,4 +1,4 @@
-export default {
+module.exports = {
   /**
    * @description 配置显示在浏览器标签的title、底部信息、部分信息展示的值
    */
@@ -30,13 +30,5 @@ export default {
    * @description 高德web端申请的api key
    */
   aMapKey: "b440952723253aa9fe483e698057bf7d",
-  /**
-   * @description 需要加载的插件
-   */
-  plugin: {
-    "error-store": {
-      showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
-      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
-    }
-  }
+ 
 };
diff --git a/buyer/src/main.js b/buyer/src/main.js
index 023a43b9..cafbb7ef 100644
--- a/buyer/src/main.js
+++ b/buyer/src/main.js
@@ -10,6 +10,7 @@ import storage from '@/plugins/storage';
 // 全局引入封装组件
 import {InstallAll} from '@/components/global.js';
 
+let title = require('@/config').title
 Vue.use(ViewUI);
 Vue.use(InstallAll);
 Vue.config.productionTip = false;
@@ -20,7 +21,7 @@ Object.keys(filters).forEach(key => {
 
 router.beforeEach((to, from, next) => {
   ViewUI.LoadingBar.start();
-  window.document.title = to.meta.title === undefined ? 'lili shop' : to.meta.title
+  window.document.title = to.meta.title === undefined ? title : to.meta.title
   next();
 });
 
diff --git a/buyer/src/pages/ForgetPassword.vue b/buyer/src/pages/ForgetPassword.vue
index d82e458c..99ba0154 100644
--- a/buyer/src/pages/ForgetPassword.vue
+++ b/buyer/src/pages/ForgetPassword.vue
@@ -108,7 +108,7 @@
 </template>
 
 <script>
-import config from '@/config'
+
 import * as RegExp from '@/plugins/RegExp.js';
 import { md5 } from '@/plugins/md5.js';
 import * as apiLogin from '@/api/login.js';
@@ -119,7 +119,7 @@ export default {
   components: { Verify },
   data () {
     return {
-      config,
+      config:require('@/config'),
       loading: false, // 加载状态
       loading1: false, // 第二步加载状态
       formFirst: { // 手机验证码表单
diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue
index cc83f68f..1bcfc85e 100644
--- a/buyer/src/pages/Login.vue
+++ b/buyer/src/pages/Login.vue
@@ -96,14 +96,14 @@
       <Row type="flex" justify="center" class="copyright">
         Copyright © {{year}} - Present
         <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">{{config.title}}</a>
-        版权所有
+        版权所有 
       </Row>
     </div>
   </div>
 </template>
 
 <script>
-import config from '@/config'
+
 import * as RegExp from "@/plugins/RegExp.js";
 import { md5 } from "@/plugins/md5.js";
 import * as apiLogin from "@/api/login.js";
@@ -119,7 +119,7 @@ export default {
   },
   data() {
     return {
-      config,
+      config:require('@/config'),
       type: true, // true 账号登录  false 验证码登录
       formData: {
         // 登录表单
diff --git a/buyer/src/pages/SignUp.vue b/buyer/src/pages/SignUp.vue
index 82b87d99..ae5c3fa5 100644
--- a/buyer/src/pages/SignUp.vue
+++ b/buyer/src/pages/SignUp.vue
@@ -97,7 +97,7 @@
 </template>
 
 <script>
-import config from '@/config'
+
 import * as RegExp from '@/plugins/RegExp.js';
 import { md5 } from '@/plugins/md5.js';
 import * as apiLogin from '@/api/login.js';
@@ -108,7 +108,7 @@ export default {
   components: { Verify },
   data () {
     return {
-      config,
+      config:require('@/config'),
       year: new Date().getFullYear(),
       formRegist: {
         // 注册表单
diff --git a/buyer/vue.config.js b/buyer/vue.config.js
index c7590950..a886ad78 100644
--- a/buyer/vue.config.js
+++ b/buyer/vue.config.js
@@ -4,6 +4,7 @@ const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 const resolve = dir => {
   return path.join(__dirname, dir);
 };
+const configs = require('./src/config')
 /**
  * 在项目开发的时候将生产环境以及开发环境进行判断
  * 将生产环境中的路径用cdn来进行优化处理
@@ -128,6 +129,7 @@ module.exports = {
     config.resolve.alias.set("@", resolve("src"));
     config.plugin("html").tap(args => {
       args[0].cdn = cdn;
+      args[0].title = configs.title;
       return args;
     });
   }
diff --git a/manager/src/views/lili-floor-renovation/modelForm.vue b/manager/src/views/lili-floor-renovation/modelForm.vue
index 40da5323..f2c65e68 100644
--- a/manager/src/views/lili-floor-renovation/modelForm.vue
+++ b/manager/src/views/lili-floor-renovation/modelForm.vue
@@ -88,8 +88,6 @@
             width="800"
             :z-index="100"
             :mask-closable="false"
-            
-          
             >
             <!-- 分类tab栏 -->
             <div class="modal-tab-bar">
diff --git a/manager/src/views/lili-floor-renovation/modelFormItem.vue b/manager/src/views/lili-floor-renovation/modelFormItem.vue
index 121e514a..b87d747f 100644
--- a/manager/src/views/lili-floor-renovation/modelFormItem.vue
+++ b/manager/src/views/lili-floor-renovation/modelFormItem.vue
@@ -148,8 +148,6 @@
       width="800"
       :z-index="100"
       :mask-closable="false"
-      
-      
     >
       <div class="modal-top-advert">
         <div>