update: update

9be778c6 · chenyu · fc13ce8d · 9be778c6 · 9be778c6 · 9be778c6
Commit 9be778c6 authored Mar 08, 2022 by chenyu
21 changed files
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,6 +29,7 @@ Vue.use(VueClipboard);
 * meta useMenuLimit 被上标记为true的路由，进入时将会与store中允许的菜单路由进行比较，如果不存在将会被重定向
 */
 const router = new Router({
+  base: '/integral-mall/',
  routes: [
    {
      path: '/',

--- a/src/views/activities/flashSale/detail.vue
+++ b/src/views/activities/flashSale/detail.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -16,7 +16,7 @@
        <h3>
          <span>{{ isEdit ? '编辑' : '新建' }}秒杀</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section" v-loading="loading">
        <el-form
          :model="flashSaleForm"
@@ -468,7 +468,7 @@
              </div>
            </div>
          </el-form-item>
-          <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
+          <!-- <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
            <el-form-item class="fix-btn">
              <el-button
                type="primary"
@@ -486,9 +486,8 @@
              >
                保存
              </el-button>
-              <!-- <el-button size="small" @click="goBack">返回</el-button> -->
            </el-form-item>
-          </div>
+          </div> -->
        </el-form>
      </div>
      <goods-select
@@ -499,6 +498,24 @@
      />
      <update-sku-stock v-if="skuStockDialog" :skuStockData="skuStockData" @closeSkuStock="closeSkuStock" />
    </div>
+    <dm-form-bottom>
+      <el-button
+        type="primary"
+        size="small"
+        v-if="!isEdit"
+        @click="submitForm('flashSaleForm')"
+      >
+        确认新建
+      </el-button>
+      <el-button
+        type="primary"
+        size="small"
+        v-else
+        @click="submitForm('flashSaleForm')"
+      >
+        保存
+      </el-button>
+    </dm-form-bottom>
  </div>
 </template>


--- a/src/views/activities/flashSale/list.vue
+++ b/src/views/activities/flashSale/list.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,7 +13,7 @@
        <h3>
          <span>秒杀</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <div class="operate-top">
          <div class="fl">

--- a/src/views/goods/coupon/coupon.vue
+++ b/src/views/goods/coupon/coupon.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,7 +13,7 @@
        <h3>
          <span>优惠券</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <div class="operate-top">
          <div class="fl">

--- a/src/views/goods/coupon/detail.vue
+++ b/src/views/goods/coupon/detail.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -16,7 +16,7 @@
        <h3>
          <span>{{ typeVal }}优惠券</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section" v-loading="submitLoading">
        <el-form
          :model="couponForm"
@@ -477,7 +477,7 @@
            </div>
          </div>

-          <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
+          <!-- <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
            <el-form-item class="fix-btn">
              <el-button
                type="primary"
@@ -491,7 +491,7 @@
                返回
              </el-button>
            </el-form-item>
-          </div>
+          </div> -->
        </el-form>
      </div>
    </div>
@@ -507,6 +507,19 @@
      tableColumnType="checkbox"
      ref="dmcard"
    />
+    <dm-form-bottom>
+      <el-button
+        type="primary"
+        size="small"
+        @click="submitForm('couponForm')"
+        :disabled="isInfo"
+      >
+        保存
+      </el-button>
+      <el-button size="small" @click="goBack">
+        返回
+      </el-button>
+    </dm-form-bottom>
  </div>
 </template>

@@ -1446,10 +1459,6 @@ export default {
 .w-100 {
  width: 100px;
 }
-.section {
-  padding:0 0 24px 0;
-  margin-bottom:80px;
-}

 .section-content h3 {
  height: 55px;

--- a/src/views/goods/gift/detail.vue
+++ b/src/views/goods/gift/detail.vue
@@ -2,20 +2,9 @@
  <div class="mall-section-container">
    <div class="mall-content-section">
      <div class="mall-content-title">
-        <el-breadcrumb separator="/">
-          <el-breadcrumb-item :to="{ path: '' }">
-            <a href="/report/#/memberSummary">首页</a>
-          </el-breadcrumb-item>
-          <el-breadcrumb-item>积分商城</el-breadcrumb-item>
-          <el-breadcrumb-item>商品</el-breadcrumb-item>
-          <el-breadcrumb-item :to="{ path: '/gift' }">
-            礼品
-          </el-breadcrumb-item>
-          <el-breadcrumb-item>{{ typeVal }}{{ giftType === 1 ? '实物' : '虚拟' }}礼品</el-breadcrumb-item>
-        </el-breadcrumb>
-        <h3>
+        <!-- <h3>
          <span>{{ typeVal }}{{ giftType === 1 ? '实物' : '虚拟' }}礼品</span>
-        </h3>
+        </h3> -->
      </div>
      <div class="section" v-loading="submitLoading">
        <el-form
@@ -635,7 +624,7 @@
              <span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;">公众号积分商城不支持此功能，小程序积分商城请升级至V3.0.0及以上版本</span>
            </el-form-item>
          </div>
-          <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
+          <!-- <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
            <el-form-item class="fix-btn">
              <el-button
                type="primary"
@@ -645,12 +634,11 @@
              >
                保存
              </el-button>
-              <!-- <el-button type="primary" @click="submitGoodsForm('giftForm')" size="small" :loading="submitLoading" :disabled="!canEdit">保存</el-button> -->
              <el-button @click="cancelGoodsForm" size="small">
                返回
              </el-button>
            </el-form-item>
-          </div>
+          </div> -->
        </el-form>
      </div>
      <div class="anchor-link">
@@ -698,6 +686,19 @@
      </span>
    </el-dialog>
    <importCoupon :couponModal="importCouponModal" @getSuceessNum="getSuceessNum" />
+    <dm-form-bottom>
+      <el-button
+        type="primary"
+        @click="submitGoodsForm('giftForm')"
+        size="small"
+        :disabled="$route.meta.type=='info'"
+      >
+        保存
+      </el-button>
+      <el-button @click="cancelGoodsForm" size="small">
+        返回
+      </el-button>
+    </dm-form-bottom>
  </div>
 </template>

@@ -753,7 +754,7 @@ export default {
      ladderMemberGradeChange: [],
      getTime: getInputVal.getTime,
      getTime2: getInputVal.getTime2,
-      fixedWidth: document.documentElement.clientWidth - 200,
+      // fixedWidth: document.documentElement.clientWidth - 200,
      projectName: 'integral-mall',
      giftType: '', // 礼品类型 实物是1虚拟是0
      mallProId: '', // 礼品id
@@ -951,7 +952,25 @@ export default {
    this.$nextTick(function () {
      window.addEventListener('scroll', this.onScroll, true);
    });
-    document.documentElement.scrollTop = 0;
+    const mainSection = document.querySelector('.dm-layout-page');
+    mainSection.scrollTop = 0;
+    console.log(mainSection.scrollTop);
+    // const pageWidth = this.$refs.dmLayoutPage.offsetWidth;
+    // const formBottom = getFormButton(this, 'DmFormBottom');
+    // console.log(getFormButton);
+    // formBottom.pageWidth = pageWidth;
+    // function getFormButton (vm, compName) {
+    //   let result = {};
+    //   vm.$children.some(el => {
+    //     if (el.$options && el.$options.name == compName) {
+    //       result = el;
+    //     } else if (Array.isArray(el.$children)) {
+    //       result = getFormButton(el, compName);
+    //     }
+    //     return result.$options && result.$options.name == compName;
+    //   });
+    //   return result;
+    // }
  },
  methods: {
    // 阶梯价定制，判断达摩测试环境与地素环境
@@ -1173,22 +1192,26 @@ export default {
      this.refash = !this.refash;
    },
    onScroll () {
-      const scroll = document.documentElement.scrollTop || document.body.scrollTop;
-      const jump = document.querySelectorAll('.section-content');
-      jump.forEach((item, index) => {
-        if (scroll >= item.offsetTop) {
+      const mainSection = document.querySelector('.dm-layout-page');
+      if (mainSection) {
+        const scroll = mainSection.scrollTop;
+        const jump = mainSection.querySelectorAll('.section-content');
+        jump.forEach((item, index) => {
+          if (scroll >= item.offsetTop) {
          // 滚动到对应的锚记改变样式
-          this.linkIndex = index;
-        }
-      });
+            this.linkIndex = index;
+          }
+        });
+      }
    },
    jump (num) {
+      const mainSection = document.querySelector('.dm-layout-page');
      const index = Number(num);
      this.linkIndex = index;
      // 用 class="d_jump" 添加锚点
-      const jump = document.querySelectorAll('.section-content');
+      const jump = mainSection.querySelectorAll('.section-content');
      const total = jump[index].offsetTop;
-      let distance = document.documentElement.scrollTop || document.body.scrollTop;
+      let distance = mainSection.scrollTop;
      // let distance = 200;
      // 平滑滚动，时长500ms，每10ms一跳，共50跳

@@ -1204,23 +1227,23 @@ export default {
      function smoothDown () {
        if (distance < total) {
          distance += step;
-          document.body.scrollTop = distance;
-          document.documentElement.scrollTop = distance;
+          mainSection.scrollTop = distance;
+          // mainSection.scrollTop = distance;
          setTimeout(smoothDown, 10);
        } else {
-          document.body.scrollTop = total;
-          document.documentElement.scrollTop = total;
+          mainSection.scrollTop = total;
+          // mainSection.scrollTop = total;
        }
      }
      function smoothUp () {
        if (distance > total) {
          distance -= step;
-          document.body.scrollTop = distance;
-          document.documentElement.scrollTop = distance;
+          mainSection.scrollTop = distance;
+          // document.documentElement.scrollTop = distance;
          setTimeout(smoothUp, 10);
        } else {
-          document.body.scrollTop = total;
-          document.documentElement.scrollTop = total;
+          mainSection.scrollTop = total;
+          // document.documentElement.scrollTop = total;
        }
      }
    },
@@ -2389,11 +2412,6 @@ export default {
 .w-100 {
  width: 100px;
 }
-.section {
-  padding:0 0 24px 0;
-  margin-bottom:80px;
-}
- 
 .section-content h3 {
  height: 55px;
  line-height: 55px;

--- a/src/views/goods/gift/gift.vue
+++ b/src/views/goods/gift/gift.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
-        <el-breadcrumb separator="/">
-          <el-breadcrumb-item :to="{ path: '' }">
-            <a href="/report/#/memberSummary">首页</a>
-          </el-breadcrumb-item>
-          <el-breadcrumb-item>积分商城</el-breadcrumb-item>
-          <el-breadcrumb-item>商品</el-breadcrumb-item>
-          <el-breadcrumb-item>礼品</el-breadcrumb-item>
-        </el-breadcrumb>
-        <h3>
-          <span>礼品</span>
-        </h3>
-      </div>
      <div class="section">
        <!-- <div class="page-info">
          <h3><i class="el-icon-info"></i>优惠券已支持主图和图文详情，如需再发布以“微信兑换券”来配送的礼品，请直接前往优惠券中设置</h3>
@@ -229,12 +216,17 @@
                </p>
              </template>
            </el-table-column>
-            <el-table-column prop="sortCost" label="库存" sortable="custom">
+            <el-table-column
+              prop="sortCost"
+              label="库存"
+              width="90"
+              sortable="custom"
+            >
              <template #header>
                库存
                <el-popover
                  trigger="hover"
-                  width="250"
+                  width="260"
                  placement="top"
                  content="该礼品在积分商城所有的库存，包括活动库存，库存分布请点击数字查看"
                >
@@ -291,7 +283,7 @@
              prop="sort"
              label="序号"
              sortable="custom"
-              min-width="140px"
+              min-width="90px"
              :render-header="renderHeader"
            >
              <template slot-scope="scope">

--- a/src/views/goods/gift/info.vue
+++ b/src/views/goods/gift/info.vue
+<!-- 废弃 -->
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">

--- a/src/views/goods/ruleList/info.vue
+++ b/src/views/goods/ruleList/info.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -16,7 +16,7 @@
        <h3>
          <span>{{ breadcrumbTitle }}</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <ruleInfo />
      </div>

--- a/src/views/goods/ruleList/ruleList.vue
+++ b/src/views/goods/ruleList/ruleList.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,7 +13,7 @@
        <h3>
          <span>上架规则</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <div class="search-wrap">
          <div class="table-page-search-wrapper">

--- a/src/views/goods/soldStatistics/statistics.vue
+++ b/src/views/goods/soldStatistics/statistics.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,7 +13,7 @@
        <h3>
          <span>售罄礼品偏好统计</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <div style="margin-bottom:22px">
          <div class="infoTips" style="width:auto;">

--- a/src/views/main.vue
+++ b/src/views/main.vue
 <template>
  <div class="container">
-    <vue-gic-header
-      :projectName="projectName"
-      :collapseFlag="collapseFlag"
-      @collapseTag="collapseTag"
-      @toRouterView="toRouterView"
-    />
-    <div class="mall-content-container">
-      <div class="left-menu">
-        <vue-gic-aside-menu
-          ref="leftmenu"
-          :projectName="projectName"
-          :leftModulesName="leftModulesName"
-          :collapseFlag="collapseFlag"
-          style="display:inline-block;height:100%"
-        />
-      </div>
-      <div class="goods-manege-content" :style="{ marginLeft: widthData }">
-        <div :style="{ minHeight: mallHeight + 'px' }">
-          <router-view />
-        </div>
-        <!-- 右侧页面部分 end-->
-        <!-- <vue-gic-footer></vue-gic-footer> -->
-      </div>
-    </div>
+    <dm-layout projectName="integral-mall">
+      <router-view />
+    </dm-layout>
  </div>
 </template>
 <script>
-import bus from '../assets/eventBus.js';
-import request from '@/service/request.js';
 export default {
  components: {},
  data () {
-    return {
-      mallHeight: document.documentElement.clientHeight - 64,
-      widthData: '200px',
-      collapseFlag: false, // 折叠参数
-      menuRouter: [], // 路由菜单
-      leftMenuRouter: [],
-      leftModulesName: '积分商城',
-      projectName: 'integral-mall',
-    };
+    return {};
  },
  computed: {},
  mounted () {
-    const that = this;
-    bus.$on('widthData', function (widthData) {
-      that.widthData = widthData;
-    });
-    bus.$on('updateLeft', key => {
-      // 刷新左侧菜单
-      that.$refs.leftmenu.handleSelect(key);
-    });
-    this.getRuleMemberFilterClose();
-  },
-  methods: {
-    // 检测是否 关闭人群筛选器
-    getRuleMemberFilterClose () {
-      request.get('/api-integral-mall/get-config').then(res => {
-        const result = res.data.result || {};
-        this.$store.commit('mutations_ruleMemberFilterClose', result.ruleMemberFilterClose);
-      });
-    },
-    // 处理路由跳转
-    toRouterView (val) {
-      const that = this;
-      that.$router.push({
-        path: val.path,
-      });
-    },
-    // 折叠事件
-    collapseTag (val) {
-      const that = this;
-      that.collapseFlag = val;
-      if (that.collapseFlag) {
-        that.widthData = '64px';
-      } else {
-        that.widthData = '200px';
-      }
-    },
+
  },
+  methods: {},
 };
 </script>
 <style scoped>
@@ -87,126 +23,3 @@ export default {
  height: 100%;
  display: flex;
 }
-.goods-manege-content {
-  flex: 1;
-  overflow-x: auto;
-  transition: width 0.5s;
-  -moz-transition: width 0.5s;
-  -webkit-transition: width 0.5s;
-  -o-transition: width 0.5s;
-  min-width: 1200px;
-}
-.mall-content-container {
-  width: 100%;
-  background-color: #f0f2f5;
-  /*height:100%;*/
-  flex: 1;
-  min-width: 1200px;
-  overflow-x: auto;
-  display: flex;
-  overflow-y: auto;
-  margin-top: 64px;
-}
-.left-menu {
-  position: fixed;
-  height: 100%;
-  z-index: 2;
-}
-</style>
-<style>
-.leftBar-wrap .cardmenu-item .el-submenu__title,
-.leftBar-wrap .cardmenu-item .el-menu-item,
-.leftBar-wrap .cardmenu-item .el-submenu .el-menu-item {
-  height: 40px;
-  line-height: 40px;
-}
-
-.leftBar-wrap .el-submenu__title:hover {
-  background-color: #020b21;
-}
-
-.leftBar-wrap .cardmenu-item li.el-menu-item:hover i {
-  /*background-color: #409EFF;*/
-  color: #fff;
-}
-
-.leftBar-wrap .cardmenu-item li.el-menu-item:hover span {
-  /*background-color: #409EFF;*/
-  color: #fff;
-}
-
-.leftBar-wrap .cardmenu-item li.el-submenu:hover i {
-  /*background-color: #409EFF;*/
-  color: #fff;
-}
-
-.leftBar-wrap .cardmenu-item li.el-submenu:hover span {
-  /*background-color: #409EFF;*/
-  color: #fff;
-}
-
-.leftBar-wrap .cardmenu-item li.el-submenu .el-menu-item:hover label {
-  /*background-color: #409EFF;*/
-  color: #fff;
-  cursor: pointer;
-}
-
-.user-form-dialog .el-dialog__body {
-  padding: 30px 20px 0;
-}
-.user-form-dialog .el-dialog__header {
-  padding: 0 20px;
-  height: 54px;
-}
-.pass-form-dialog .el-dialog__body {
-  padding: 30px 20px 0;
-}
-.pass-form-dialog .el-dialog__header {
-  padding: 0 20px;
-  height: 54px;
-}
-
-/* 左侧菜单 */
-.leftBar-wrap .el-menu {
-  background-color: #020b21;
-}
-.leftBar-wrap .cardmenu-item .el-submenu__title,
-.leftBar-wrap .cardmenu-item .el-menu-item,
-.leftBar-wrap .cardmenu-item .el-submenu .el-menu-item {
-  height: 40px;
-  line-height: 40px;
-}
-.leftBar-wrap .el-submenu__title:hover {
-  background-color: #020b21;
-}
-.leftBar-wrap .cardmenu-item li.el-menu-item:hover i {
-  /*background-color: #409EFF;*/
-  color: #fff;
-}
-.leftBar-wrap .cardmenu-item li.el-menu-item:hover span {
-  /*background-color: #409EFF;*/
-  color: #fff;
-}
-.leftBar-wrap .cardmenu-item li.el-submenu:hover i {
-  /*background-color: #409EFF;*/
-  color: #fff;
-}
-.leftBar-wrap .cardmenu-item li.el-submenu:hover span {
-  /*background-color: #409EFF;*/
-  color: #fff;
-}
-.leftBar-wrap .cardmenu-item li.el-submenu .el-menu-item:hover label {
-  /*background-color: #409EFF;*/
-  color: #fff;
-  cursor: pointer;
-}
-.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title i {
-  color: #fff;
-}
-.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title span {
-  color: #fff;
-}
-.el-menu.el-menu--popup .el-menu-item.is-active label {
-  color: #fff;
-}
-</style>
--- a/src/views/order/couponExchange.vue
+++ b/src/views/order/couponExchange.vue
 <template>
-  <div class="mall-section-container">
+  <div>
    <div class="mall-content-section">
-      <div class="mall-content-title" style="border:none">
+      <!-- <div class="mall-content-title" style="border:none">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,9 +13,8 @@
        <h3>
          <span>优惠券兑换</span>
        </h3>
-      </div>
+      </div> -->
      <el-tabs v-model="orderStatus" class="bread-content" @tab-click="handleClick">
-        <div style="height:24px;background:#f0f2f5;" />
        <div>
          <div class="operate-top">
            <div class="fl">
@@ -598,6 +597,10 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+/deep/.el-tabs__header .el-tabs__nav-wrap::after {
+    content: "";
+    height: 1px!important;
+}
 .m-r-10 {
  margin-right: 10px;
 }
@@ -612,8 +615,8 @@ export default {
  background: #fff;
  height: 32px;
  background: #fff;
-  margin: 0 25px;
-  padding: 25px 25px 0 25px;
+  margin: 20px;
+  padding: 0;
  transition: height 0.3s;
  .top-right-btn {
    position: absolute;
@@ -665,8 +668,7 @@ export default {
 }

 .goods-list-content {
-  margin: 0 25px 25px 25px;
-  padding: 22px 24px 24px 24px;
+  padding: 0 20px 20px;
  background: #fff;
 }
 .gift-info {
@@ -699,9 +701,6 @@ export default {
  margin-left: 5px;
  cursor: pointer;
 }
-.pagination-conteiner {
-  padding: 30px 16px 34px 0;
-}
 .drop-list .icon-icon- {
  color: #909399;
  margin-left: 5px;

--- a/src/views/order/giftExchange.vue
+++ b/src/views/order/giftExchange.vue
 <template>
-  <div class="mall-section-container">
+  <div>
    <div class="mall-content-section">
-      <div class="mall-content-title" style="border:none">
+      <!-- <div class="mall-content-title" style="border:none">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,9 +13,8 @@
        <h3>
          <span>礼品兑换</span>
        </h3>
-      </div>
+      </div> -->
      <el-tabs v-model="orderStatus" class="bread-content" @tab-click="handleClick">
-        <div style="height:24px;background:#f0f2f5;" />
        <div>
          <div class="operate-top">
            <div class="left">
@@ -1121,8 +1120,8 @@ export default {
  display: flex;
  justify-content: space-between;
  height: auto;
-  margin: 0 24px;
-  padding: 24px 24px 0;
+  padding: 20px 20px 0;
+  margin-bottom: 20px;
  background: #fff;
  .left {
    display: flex;
@@ -1151,12 +1150,15 @@ export default {
    }
  }
 }
+/deep/.el-tabs__header .el-tabs__nav-wrap::after {
+    content: "";
+    height: 1px!important;
+}
 </style>
 <style scoped>

 .goods-list-content {
-  margin: 0 25px 25px 25px;
-  padding: 22px 24px 24px 24px;
+  padding:0 20px 20px;
  background: #fff;
 }
 .gift-info {
@@ -1188,7 +1190,7 @@ export default {
  cursor: pointer;
 }
 .pagination-conteiner {
-  padding: 30px 16px 34px 0;
+  padding: 20px 0 0;
 }

 .go-link {

--- a/src/views/order/orderDetail.vue
+++ b/src/views/order/orderDetail.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -16,7 +16,7 @@
        <h3>
          <span>订单详情</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <div class="progress-content" v-if="orderStatus > 0">
          <div class="progress-info progress-infoed">
@@ -572,11 +572,11 @@ export default {
 };
 </script>
 <style scoped>
-.section {
+/* .section {
  background: #fff;
  margin: 24px;
  padding: 24px 32px;
-}
+} */
 /* 进度 */
 .progress-content {
  height: 116px;

--- a/src/views/order/refundList.vue
+++ b/src/views/order/refundList.vue
 <template>
-  <div class="mall-section-container">
+  <div>
    <div class="mall-content-section">
-      <div class="mall-content-title" style="border:none">
+      <!-- <div class="mall-content-title" style="border:none">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,9 +13,8 @@
        <h3>
          <span>退款列表</span>
        </h3>
-      </div>
+      </div> -->
      <el-tabs v-model="status" class="bread-content" @tab-click="handleClick">
-        <div style="height:24px;background:#f0f2f5;" />
        <div>
          <div class="operate-top">
            <div class="fl">
@@ -561,6 +560,12 @@ export default {
  },
 };
 </script>
+<style lang="less" scoped>
+/deep/.el-tabs__header .el-tabs__nav-wrap::after {
+    content: "";
+    height: 1px!important;
+}
+</style>
 <style scoped>

 .m-r-10 {
@@ -570,12 +575,11 @@ export default {
  background: #fff;
  height: 32px;
  background: #fff;
-  margin: 0 25px;
-  padding: 25px 25px 0 25px;
+  margin: 20px;
+  padding: 0;
 }
 .goods-list-content {
-  margin: 0 25px 25px 25px;
-  padding: 22px 24px 24px 24px;
+  padding: 0 20px 20px;
  background: #fff;
 }
 .gift-info img {
@@ -605,9 +609,6 @@ export default {
  margin-left: 5px;
  cursor: pointer;
 }
-.pagination-conteiner {
-  padding: 30px 16px 34px 0;
-}
 .w-340 {
  width: 340px;
 }

--- a/src/views/setting/convenSet.vue
+++ b/src/views/setting/convenSet.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,7 +13,7 @@
        <h3>
          <span>常规设置</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <el-form
          :model="form"
@@ -105,7 +105,7 @@
              天，自动确认收货
            </div>
          </el-form-item>
-          <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
+          <!-- <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
            <el-form-item class="fix-btn">
              <el-button
                type="primary"
@@ -117,10 +117,21 @@
                保存
              </el-button>
            </el-form-item>
-          </div>
+          </div> -->
        </el-form>
      </div>
    </div>
+    <dm-form-bottom>
+      <el-button
+        type="primary"
+        @click="handleSubmit('form')"
+        :loading="btnLoading"
+        v-if="$getButtonLimit($buttonCode.convenSetSave)"
+        :limit-code="$buttonCode.convenSetSave"
+      >
+        保存
+      </el-button>
+    </dm-form-bottom>
  </div>
 </template>


--- a/src/views/setting/deliverSet.vue
+++ b/src/views/setting/deliverSet.vue
 <template>
-  <div class="mall-section-container">
+  <div>
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,7 +13,7 @@
        <h3>
          <span>配送设置</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <div style="border-bottom:1px solid #dcdfe6;padding:24px;">
          <div class="header-top" style="display:inline-block;margin-right:30px;padding:12px 0px" v-if="$getButtonLimit($buttonCode.deliverSetSelfTake)">
@@ -39,7 +39,6 @@
            />
          </div>
        </div>
-
        <div v-show="pickStatus" style="padding:24px;">
          <div class="operate-top">
            <div class="fl">
@@ -532,14 +531,6 @@ export default {
 .w-280 {
  width: 280px;
 }
-.section {
-  background: #fff;
-  margin: 24px;
-  padding: 0;
-}
-.header-top {
-  /* margin: 15px 0 22px 0; */
-}
 .header-top span {
  width: 130px;
  display: inline-block;

--- a/src/views/setting/editDeliver.vue
+++ b/src/views/setting/editDeliver.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -16,7 +16,7 @@
        <h3>
          <span>自提点设置</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <el-form
          :model="form"
@@ -253,7 +253,7 @@
              </el-form-item>
            </div>
          </div>
-          <div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
+          <div class="confim-btn">
            <el-form-item class="fix-btn" style="margin-left:32px;">
              <el-button
                type="primary"
@@ -846,11 +846,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.section {
-  background: #fff;
-  margin: 24px;
-  padding: 0 0 24px  0;
-}
 .section-content h3 {
  height: 55px;
  line-height: 55px;

--- a/src/views/setting/recordList.vue
+++ b/src/views/setting/recordList.vue
 <template>
  <div class="mall-section-container">
    <div class="mall-content-section">
-      <div class="mall-content-title">
+      <!-- <div class="mall-content-title">
        <el-breadcrumb separator="/">
          <el-breadcrumb-item :to="{ path: '' }">
            <a href="/report/#/memberSummary">首页</a>
@@ -13,7 +13,7 @@
        <h3>
          <span>库存日志</span>
        </h3>
-      </div>
+      </div> -->
      <div class="section">
        <div>
          <div class="operate-top">

--- a/static/css/common.css
+++ b/static/css/common.css
@@ -227,11 +227,11 @@ input:focus {
 }
  /*页面头部*/
 .mall-section-container{
-  flex:1;
-  /*margin-bottom:40px;*/
+  min-width:1200px;
+  padding:20px;

 }
-.mall-content-section{
+/* .mall-content-section{
    height:100%;
 }
 .mall-content-title{
@@ -263,7 +263,7 @@ input:focus {
  background: #fff;
  margin: 24px;
  padding: 24px;
-}
+} */

 /*编辑按钮*/
 .el-icon-edit{