优化管理端商家端冗余以及配置内容。抽出公共主题颜色、站点标题等内容。分离config中api配置，修改商家发布中拖拽以及控制台出错的bug。

2025-12-19 09:25:53 +08:00 · 2021-09-22 15:08:34 +08:00
parent 53cc6f46d1
commit 2037b57a5d
50 changed files with 393 additions and 861 deletions
--- a/manager/src/views/distribution/distributionGoods.vue
+++ b/manager/src/views/distribution/distributionGoods.vue
@@ -74,7 +74,7 @@ export default {
          render: (h, params) => {
            return h("img", {
              attrs: {
-                src: params.row.thumbnail,
+                src: params.row.thumbnail || '',
                alt: "加载图片失败",
              },
              style: {
--- a/manager/src/views/goods/goods-manage/brand.vue
+++ b/manager/src/views/goods/goods-manage/brand.vue
@@ -85,7 +85,7 @@ export default {
          render: (h, params) => {
            return h("img", {
              attrs: {
-                src: params.row.logo,
+                src: params.row.logo || '',
                alt: "加载图片失败",
              },
              style: {
--- a/manager/src/views/home/home.scss
+++ b/manager/src/views/home/home.scss
@@ -90,8 +90,7 @@ h4 {
    color: #ffaa71;
  }
 }
-.count-list {
-}
+

 .flow-list {
  height: 330px;
--- a/manager/src/views/lili-floor-renovation/modelConfig.js
+++ b/manager/src/views/lili-floor-renovation/modelConfig.js
@@ -615,7 +615,7 @@ export const modelData = [{
    icon: 'md-image',
    options: {
      list: [{
-          name: 'LILI生鲜',
+          name: '生鲜',
          describe: "年货带回家 满199减60",
          img: require('@/assets/nav/decorate8.png'),
          url: '',
@@ -624,8 +624,8 @@ export const modelData = [{
          size: '170*170'
        },
        {
-          name: 'LILI众筹',
-          describe: "备孕有孕检测仪",
+          name: '众筹',
+          describe: "年货带回家",
          img: require('@/assets/nav/decorate9.png'),
          url: '',
          fromColor: "#325bb4",
@@ -633,7 +633,7 @@ export const modelData = [{
          size: '170*170'
        },
        {
-          name: 'LILI生鲜',
+          name: '生鲜',
          describe: "年货带回家 满199减60",
          img: require('@/assets/nav/decorate8.png'),
          url: '',
@@ -642,7 +642,7 @@ export const modelData = [{
          size: '170*170'
        },
        {
-          name: 'LILI众筹',
+          name: '众筹',
          describe: "备孕有孕检测仪",
          img: require('@/assets/nav/decorate9.png'),
          url: '',
@@ -651,7 +651,7 @@ export const modelData = [{
          size: '170*170'
        },
        {
-          name: 'LILI生鲜',
+          name: '生鲜',
          describe: "年货带回家 满199减60",
          img: require('@/assets/nav/decorate8.png'),
          url: '',
@@ -660,7 +660,7 @@ export const modelData = [{
          size: '170*170'
        },
        {
-          name: 'LILI众筹',
+          name: '众筹',
          describe: "备孕有孕检测仪",
          img: require('@/assets/nav/decorate9.png'),
          url: '',
--- a/manager/src/views/lili-floor-renovation/modelList/carousel.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel.vue
@@ -22,7 +22,7 @@
        <div class="person-msg">
          <img :src="userInfo.face" v-if="userInfo.face" alt />
          <Avatar icon="ios-person" class="mb_10" v-else size="80" />
-          <div>Hi，{{ userInfo.nickName || "欢迎来到LiLi Shop" | secrecyMobile }}</div>
+          <div>Hi，{{ userInfo.nickName || "欢迎来到管理后台" | secrecyMobile }}</div>
          <div v-if="userInfo.id">
            <Button type="error" shape="circle">会员中心</Button>
          </div>
@@ -263,7 +263,7 @@ export default {
        margin-left: 5px;
      }
      span:nth-child(1) {
-        @include content_color($theme_color);
+        color: $theme_color;
        margin-left: 0;
      }
      span:nth-child(2) {
--- a/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
+++ b/manager/src/views/lili-floor-renovation/modelList/carousel2.vue
@@ -43,7 +43,7 @@
        <div class="person-msg">
          <img :src="userInfo.face" v-if="userInfo.face" alt />
          <Avatar icon="ios-person" class="mb_10" v-else size="80" />
-          <div>Hi，{{ userInfo.nickName || "欢迎来到LiLi Shop" | secrecyMobile }}</div>
+          <div>Hi，{{ userInfo.nickName || "欢迎来到管理后台" | secrecyMobile }}</div>
          <div v-if="userInfo.id">
            <Button type="error" shape="circle">会员中心</Button>
          </div>
@@ -343,7 +343,7 @@ export default {
        margin-left: 5px;
      }
      span:nth-child(1) {
-        @include content_color($theme_color);
+        color: $theme_color;
        margin-left: 0;
      }
      span:nth-child(2) {
--- a/manager/src/views/login.vue
+++ b/manager/src/views/login.vue
@@ -141,15 +141,7 @@ export default {
  align-items: center;
  justify-content: center;

-  .ivu-tabs-nav-container {
-    line-height: 2;
-    font-size: 17px;
-    box-sizing: border-box;
-    white-space: nowrap;
-    overflow: hidden;
-    position: relative;
-    zoom: 1;
-  }
+
  .verify-con {
    position: absolute;
    top: 150px;
@@ -159,37 +151,27 @@ export default {
  .form {
    padding-top: 1vh;

-    .input-verify {
-      width: 67%;
-    }
  }

-  .forget-pass,
-  .other-way {
-    font-size: 14px;
-  }
-
-  .login-btn,
-  .other-login {
-    margin-top: 3vh;
-  }
-
-  .icons {
-    display: flex;
-    align-items: center;
-  }
-
-  .other-icon {
+  .login-btn {
+    background: linear-gradient(135deg, $theme_color 0%, $warning_color 100%);
+    height: 40px;
    cursor: pointer;
-    margin-left: 10px;
+    border-radius: 4px;
    display: flex;
    align-items: center;
-    color: rgba(0, 0, 0, 0.2);
-
-    :hover {
-      color: #2d8cf0;
-    }
+    justify-content: center;
+    font-size: 16px;
+    color: #fff;
+    width: 100%;
+    text-align: center;
+    transition: 0.35s;
  }
+  .login-btn:hover {
+    opacity: .9;
+    border-radius: 10px;
+  }
+
 }
 .flex {
  justify-content: center;
--- a/manager/src/views/main-components/footer.vue
+++ b/manager/src/views/main-components/footer.vue
@@ -1,28 +1,26 @@
 <template>
  <div class="foot">
    <Row type="flex" justify="space-around" class="help">
-      <a class="item" href="https://pickmall.com" target="_blank">{{ $t('help') }}</a>
-      <a class="item" href="https://pickmall.com" target="_blank">{{ $t('privacy') }}</a>
-      <a class="item" href="https://pickmall.com" target="_blank">{{ $t('terms') }}</a>
+      <a class="item" :href="config.website" target="_blank">帮助</a>
+      <a class="item" :href="config.website" target="_blank">隐私</a>
+      <a class="item" :href="config.website" target="_blank">条款</a>
    </Row>
    <Row type="flex" justify="center" class="copyright">
      Copyright © {{year}} - Present
-      <a
-        href="https://pickmall.cn/"
-        target="_blank"
-        style="margin:0 5px;"
-      >lili-shop</a> {{ $t('rights') }}
+      <a :href="config.website" class="href" target="_blank" style="margin:0 5px;">{{config.title}}</a>
    </Row>
  </div>
 </template>

 <script>
+import config from '@/config/index'
 export default {
-
+  name: "footer",
  data() {
    return {
-      year: new Date().getFullYear()
-    }
+      config,
+      year: new Date().getFullYear(), // 年
+    };
  },
 };
 </script>
@@ -46,4 +44,5 @@ export default {
    }
  }
 }
+
 </style>
--- a/manager/src/views/main-components/tags-page-opened.vue
+++ b/manager/src/views/main-components/tags-page-opened.vue
@@ -248,6 +248,6 @@ export default {
  }
 }
 .ivu-tag-primary, .ivu-tag-primary.ivu-tag-dot .ivu-tag-dot-inner{
-  background: red;
+  background: $theme_color;
 }
 </style>
--- a/manager/src/views/my-components/map/index.vue
+++ b/manager/src/views/my-components/map/index.vue
@@ -31,9 +31,11 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import { getRegion } from "@/api/common.js";
+import config from '@/config'
 export default {
  data() {
    return {
+      config,
      showMap: false, // modal显隐
      mapSearch: "", // 地图搜索
      map: null, // 初始化地图
@@ -71,7 +73,7 @@ export default {
    // 初始化地图组件
    init() {
      AMapLoader.load({
-        key: "b440952723253aa9fe483e698057bf7d", // 申请好的Web端开发者Key，首次调用 load 时必填
+        key: this.config.aMapKey, // 申请好的Web端开发者Key，首次调用 load 时必填
        version: "", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
        plugins: [
          "AMap.ToolBar",
--- a/manager/src/views/seller/bill/bill.vue
+++ b/manager/src/views/seller/bill/bill.vue
@@ -20,7 +20,7 @@
        <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
      </Form>
      <Row class="operation padding-row">
-        <Button @click="delAll">批量删除</Button>
+       
      </Row>
      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-selection-change="changeSelect">
      </Table>
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -576,7 +576,7 @@ export default {
    },
    // 点击定位获取店铺地址
    getAddress(item) {
-      this.shopForm.storeCenter = item.position.lat + "," + item.position.lng;
+      this.shopForm.storeCenter = item.position.lng + ',' + item.position.lat;
      this.$set(this.shopForm, "storeAddressPath", item.addr);
      this.$set(this.shopForm, "storeAddressIdPath", item.addrId);
    },
--- a/manager/src/views/sys/oss-manage/ossManage.vue
+++ b/manager/src/views/sys/oss-manage/ossManage.vue
@@ -47,7 +47,7 @@
          <div>
            <Upload
              style="display:inline-block;"
-              :action="baseUrl + '/common/upload/file'"
+              :action="commonUrl + '/common/upload/file'"
              :headers="accessToken"
              :on-success="handleSuccess"
              :on-error="handleError"
@@ -257,6 +257,7 @@ import {
 import DPlayer from "dplayer";
 import config from "@/config";

+import { commonUrl } from "@/libs/axios";
 var dp;
 export default {
  name: "oss-manage",
@@ -268,8 +269,8 @@ export default {
  },
  data() {
    return {
+      commonUrl, // 上传文件路径
      config, // api地址
-      baseUrl: "", // 基础路径
      selectImage: false, //是否是选择
      accessToken: {}, // 上传token鉴权
      loading: false, // 表单加载状态
@@ -342,7 +343,7 @@ export default {
            if (params.row.fileType.includes("image") > 0) {
              return h("img", {
                attrs: {
-                  src: params.row.url,
+                  src: params.row.url || '',
                  alt: "加载图片失败",
                },
                style: {
@@ -813,10 +814,6 @@ export default {
    if(!this.isComponent) { // 是组件的话，初始化不调用接口
      this.init();
    }
-    this.baseUrl =
-      process.env.NODE_ENV === "development"
-        ? this.config.api_dev.common
-        : this.config.api_prod.common;
  },
 
 };