feat: ✨ 新增多标签Tab页内嵌模式

2023-07-06 11:44:15 +08:00 · 2023-07-06 11:44:15 +08:00 · 6b697f9ecd
parent 3c83179579
commit 6b697f9ecd
38 changed files with 255 additions and 136 deletions
--- a/manager/src/views/seller/bill/bill-detail.vue
+++ b/manager/src/views/seller/bill/bill-detail.vue
@ -516,7 +516,6 @@ export default {
          this.refundTotal = res.result.total;

          this.$set(this, "refund", res.result.records);
-          console.log();
        }
      });
      this.refundTotal = this.refund.length;
--- a/seller/src/api/common.js
+++ b/seller/src/api/common.js
@ -22,7 +22,6 @@ export function getBaseSite() {

 // 上传文件
 export const upLoadFileMethods = (bold) => {
-  console.log(bold)
  return uploadFileRequest(uploadFile, bold);
 };

--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@ -1,3 +1,4 @@
+
 module.exports = {
  title: "lilishop", //配置显示在浏览器标签的title
  /**
@ -11,10 +12,12 @@ module.exports = {
  website: "https://www.pickmall.cn", //官网地址
  enableCDN: true, //生产环境 是否启用cdn加载 vue等js
  port: 10002, //端口
-  inputMaxLength:'140', //全局输入框默认最大输入长度字
+  inputMaxLength: "140", //全局输入框默认最大输入长度字
  /**
   * 如需更换主题请修改此处以及theme.less中修改
   */
-  mainColor:"#ff5c58", //主题色
-
+  mainColor: "#ff5c58", //主题色
+  setting: {
+    isUseTabsRouter: true, //多标签Tab页模式
+  },
 };
--- a/seller/src/config/setting.json
+++ b/seller/src/config/setting.json
@ -0,0 +1,6 @@
+{
+  "setting": {
+    "isUseTabsRouter": true,
+    "showFooter": false
+  }
+}
--- a/seller/src/main.js
+++ b/seller/src/main.js
@ -94,6 +94,13 @@ Array.prototype.remove = function (from, to) {
 Object.keys(filters).forEach(key => {
  Vue.filter(key, filters[key]);
 });
+
+
+
+
+
+
+
 /* eslint-disable no-new */
 new Vue({
  el: "#app",
--- a/seller/src/store/index.js
+++ b/seller/src/store/index.js
@ -2,6 +2,7 @@ import Vue from 'vue';
 import Vuex from 'vuex';

 import app from './modules/app';
+import setting from './modules/setting';
 import user from './modules/user';
 import dict from './modules/dict';

@ -21,6 +22,7 @@ const store = new Vuex.Store({
    modules: {
        app,
        user,
+        setting,
        dict
    }
 });
--- a/seller/src/store/modules/setting.js
+++ b/seller/src/store/modules/setting.js
@ -0,0 +1,15 @@
+const { setting } = require("@/config");
+
+const localSetting = window.localStorage.getItem('setting')
+const settingData = {
+  state: {
+    setting:localSetting ? JSON.parse(localSetting) : setting,
+  },
+  mutations: {
+    updateSetting(state, data) {
+      state.setting = data;
+    },
+  },
+};
+
+export default settingData;
--- a/seller/src/utils/filters.js
+++ b/seller/src/utils/filters.js
@ -32,6 +32,21 @@ export function enCode(v1) {
  return v1;
 }

+import {router} from "@/router/index";
+/**
+ * 自定义跳转
+ */
+export function customRouterPush(push){
+  const setting = window.localStorage.getItem('setting');
+  if(setting.isUseTabsRouter){
+    router.push(push)
+  }
+  else{
+    let url = router.resolve(push);
+    window.open(url.href, '_blank');
+  }
+}
+

 /**
 * 订单来源
--- a/seller/src/views/ForgetPassword.vue
+++ b/seller/src/views/ForgetPassword.vue
@ -186,7 +186,6 @@ export default {

          apiLogin.forgetAndModify(params).then(res => {
            this.loading1 = false;
-            console.log(res);
            if (res.success) {
              this.$Message.success('修改密码成功');
              this.$router.push('login');
--- a/seller/src/views/Main.vue
+++ b/seller/src/views/Main.vue
@ -6,20 +6,20 @@
  <div class="main">
    <div class="sidebar-menu-con menu-bar">
      <div class="logo-con">
-        <!-- <img src="../assets/logo.png" key="max-logo" /> -->
        <img :src="storeSideLogo" key="max-logo" />
      </div>
      <shrinkable-menu></shrinkable-menu>
    </div>
    <!-- 顶部标题栏主体 -->
-    <div class="main-header-con">
+    <div class="main-header-con" :style="{ height: setting.isUseTabsRouter ? '100px' : '60px' }">
      <div class="main-header">
        <div
-          :class="{
-            'header-avator-con': navType != 4,
-            'header-avator-con nav4': navType == 4,
-          }"
+          class="header-avator-con"
        >
+          <!-- 左侧栏 -->
+          <div>
+
+          </div>
          <!-- 用户头像 -->
          <div class="user-dropdown-menu-con">
            <Row
@ -28,15 +28,22 @@
              align="middle"
              class="user-dropdown-innercon"
            >
+              <ul class="nav-list">
+                <li class="nav-item " @click="handleClickSetting">
+                  <Tooltip content="设置">
+                    <Icon size="16" type="md-settings" />
+                  </Tooltip>
+                </li>
+              </ul>
              <Dropdown
                transfer
                trigger="hover"
                @on-click="handleClickUserDropdown"
              >
                <div class="dropList">
-                  <span class="main-user-name">{{ userInfo.storeName }}</span>
-                  <Icon type="md-arrow-dropdown" />
+
                  <Avatar
+                    icon="ios-person"
                    :src="userInfo.storeLogo"
                    style="background: #fff; margin-left: 10px"
                  ></Avatar>
@ -51,11 +58,11 @@
        </div>
      </div>
      <!-- 已打开的页面标签 -->
-      <div class="tags-con">
+      <div class="tags-con" v-if="setting.isUseTabsRouter">
        <tags-page-opened :pageTagsList="pageTagsList"></tags-page-opened>
      </div>
    </div>
-    <div class="single-page-con">
+    <div class="single-page-con" :style="{ 'top': setting.isUseTabsRouter ? '100px' : '60px', height: setting.isUseTabsRouter ? 'calc(100% - 110px)' : 'calc(100% - 70px)' }">
      <div class="single-page">
        <!-- <keep-alive :include="cachePage"> -->
        <!-- </keep-alive> -->
@ -67,6 +74,8 @@
    </div>
    <!-- 全局加载动画 -->
    <circleLoading class="loading-position" v-show="loading" />
+    <!-- 右侧抽屉配置 -->
+    <configDrawer ref="config"/>
  </div>
 </template>

@ -74,25 +83,34 @@
 import shrinkableMenu from "./main-components/shrinkable-menu/shrinkable-menu.vue";
 import tagsPageOpened from "./main-components/tags-page-opened.vue";
 import circleLoading from "@/views/my-components/lili/circle-loading.vue";
+import configDrawer from "@/views/main-components/config-drawer.vue";
+
 import Cookies from "js-cookie";
 import util from "@/libs/util.js";
 import { logout } from "@/api/index";
-
+const config = require("@/config/index.js");
 export default {
  components: {
    shrinkableMenu,
    tagsPageOpened,
-    circleLoading
+    circleLoading,
+    configDrawer
  },
  data() {
    return {
+      config,
      sliceNum: 5, // 展示nav数量
      userInfo: {}, // 用户信息
-      navType: 1, // nav类型
+
      storeSideLogo: "", //logo图片
    };
  },
  computed: {
+    setting(){
+      let data = this.$store.state.setting
+
+      return data.setting
+    },
    loading() {
      return this.$store.state.app.loading;
    },
@ -110,6 +128,9 @@ export default {
    },
  },
  methods: {
+    handleClickSetting() {
+      this.$refs.config.open();
+    },
    // 初始化方法
    init() {
      // 菜单
@ -119,14 +140,14 @@ export default {
      }
      this.storeSideLogo = localStorage.getItem("sellerlogoImg");
      window.document.title = localStorage.getItem("sellersiteName");
-        //动态获取icon
-          let link =
-            document.querySelector("link[rel*='icon']") ||
-            document.createElement("link");
-          link.type = "image/x-icon";
-          link.href = localStorage.getItem("sellerIconImg");
-          link.rel = "shortcut icon";
-          document.getElementsByTagName("head")[0].appendChild(link);
+      //动态获取icon
+      let link =
+        document.querySelector("link[rel*='icon']") ||
+        document.createElement("link");
+      link.type = "image/x-icon";
+      link.href = localStorage.getItem("sellerIconImg");
+      link.rel = "shortcut icon";
+      document.getElementsByTagName("head")[0].appendChild(link);

      let userInfo = JSON.parse(Cookies.get("userInfoSeller"));
      this.userInfo = userInfo;
--- a/seller/src/views/distribution/distributionOrder.vue
+++ b/seller/src/views/distribution/distributionOrder.vue
@ -144,7 +144,6 @@ export default {
          endTime / 1000
        );
      }
-      console.log(this.searchForm);
      // 带多条件搜索参数获取表单数据 请自行修改接口
      getDistributionOrder(this.searchForm).then((res) => {
        this.loading = false;
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@ -563,7 +563,6 @@ export default {
    async exportGoods(){
      downLoadGoods()
        .then((res) => {
-          console.log(res)
          const blob = new Blob([res], {
            type: "application/vnd.ms-excel;charset=utf-8",
          });
--- a/seller/src/views/lili-dialog/link-dialog.vue
+++ b/seller/src/views/lili-dialog/link-dialog.vue
@ -41,7 +41,6 @@ export default {
  },
  mounted() {
    this.$nextTick(() => {
-      console.log( this.$refs["lili-component"])
      this.$refs["lili-component"][0].type = "single"; //商品页面设置成为单选
    });

--- a/seller/src/views/login.vue
+++ b/seller/src/views/login.vue
@ -144,7 +144,6 @@ export default {
          // location.reload();
          // this.$router.go(0);

-          console.log("Huoqu ");
          this.setStore("saveLogin", this.saveLogin);
          if (this.saveLogin) {
            // 保存7天
@ -296,6 +295,6 @@ export default {
    opacity: 0.9;
    border-radius: 10px;
  }
-  
+
 }
 </style>
--- a/seller/src/views/main-components/config-drawer.vue
+++ b/seller/src/views/main-components/config-drawer.vue
@ -0,0 +1,78 @@
+<template>
+  <div>
+    <Drawer width="300px" title="页面配置"  v-model="drawer">
+      <!-- 内容 -->
+      <h3>
+        内容设置
+      </h3>
+      <div class="config-item flex flex-a-c flex-j-sb">
+        <div>
+          <Tooltip theme="light" placement="bottom-end" max-width="100" content="关闭之后部分页面点击'查看''详情'等按钮将跳到新页面展示" >
+            <div>
+              多标签Tab页内嵌模式
+            </div>
+          </Tooltip>
+        </div>
+        <i-switch v-model="setting.isUseTabsRouter"></i-switch>
+      </div>
+    </Drawer>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "configDrawer",
+  data() {
+    return {
+      drawer: false,
+
+    };
+  },
+  computed: {
+    ...mapState({
+      setting: state => {
+        return state.setting.setting
+      }
+    })
+  },
+  watch: {
+    setting: {
+      handler(val) {
+        this.setStore('setting', val)
+        this.$store.commit('updateSetting', val);
+      },
+      deep: true
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    open() {
+      this.drawer = true
+    },
+    close() {
+      this.drawer = false
+    },
+    toggle() {
+      this.drawer != this.drawer
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+* {
+  color: #333 !important;
+}
+
+h3 {
+  margin: 10px 0 20px 0;
+}
+
+.config-item {
+  cursor: pointer;
+  margin-bottom: 20px;
+  justify-content: space-between;
+}
+</style>
--- a/seller/src/views/main.scss
+++ b/seller/src/views/main.scss
@ -145,9 +145,9 @@
    .header-avator-con {
      display: flex;
      align-items: center;
-      position: absolute;
-      right: 0;
-      top: 0;
+
+      padding: 0 30px;
+      justify-content: space-between;
      height: 100%;


@ -188,32 +188,6 @@
        align-items: center;
      }

-      .user-dropdown {
-        &-menu-con {
-
-          .main-user-name {
-            font-size: 14px;
-            display: inline-block;
-            cursor: pointer;
-            margin-right: 5px;
-            width: 200px;
-            overflow: hidden;
-            word-wrap: normal;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-
-            vertical-align: middle;
-            overflow: hidden;
-
-            text-align: right;
-          }
-        }
-
-        &-innercon {
-          height: 100%;
-          padding-right: 14px;
-        }
-      }

      .full-screen-btn-con {
        display: inline-block;
@ -317,3 +291,23 @@
  z-index: 100;
  top: 1px;
 }
+.nav-item {
+  cursor: pointer;
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  border: 1px solid #ededed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 10px;
+}
+.footer-page-on{
+
+  width: 100%;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 999;
+}
--- a/seller/src/views/order/after-order/orderComplaint.vue
+++ b/seller/src/views/order/after-order/orderComplaint.vue
@ -237,10 +237,10 @@
      //投诉详情
      detail(v) {
        let id = v.id;
-        this.$router.push({
+        this.$options.filters.customRouterPush({
          name: "order-complaint-detail",
          query: { id: id },
-        });
+        })
      },
    },
    mounted() {
--- a/seller/src/views/order/after-order/returnGoodsOrder.vue
+++ b/seller/src/views/order/after-order/returnGoodsOrder.vue
@ -270,10 +270,10 @@
      // 退货订单详情
      detail(v) {
        let sn = v.sn;
-        this.$router.push({
+        this.$options.filters.customRouterPush({
          name: "return-goods-order-detail",
          query: { sn: sn },
-        });
+        })

      },
    },
--- a/seller/src/views/order/after-order/returnMoneyOrder.vue
+++ b/seller/src/views/order/after-order/returnMoneyOrder.vue
@ -264,10 +264,10 @@
      // 退款订单详情
      detail(v) {
        let sn = v.sn;
-        this.$router.push({
+        this.$options.filters.customRouterPush({
          name: "return-goods-order-detail",
          query: { sn: sn },
-        });
+        })

      },
    },
--- a/seller/src/views/order/order/exportOrderDeliver.vue
+++ b/seller/src/views/order/order/exportOrderDeliver.vue
@ -81,7 +81,6 @@ export default {
    // 点击选择步骤
    handleCheckStep(val) {
      if (val.title.search("3") == -1) {
-        console.warn(val);
        this.stepList.map((item) => {
          item.checked = false;
        });
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@ -228,7 +228,7 @@
            <span class="label">修改金额：</span>
            <span class="txt theme_color">¥{{ orderInfo.order.priceDetailDTO.updatePrice | unitPrice }}</span>
          </li>
-          <!-- <li v-if="showPrices"  v-for="(item,index) in typeList" :key="index" > 
+          <!-- <li v-if="showPrices"  v-for="(item,index) in typeList" :key="index" >
            <hr style="border:1px dashed black;">
              <span class="label" v-if="index == 1 && typeList.length > 1" style="font-size:10px !important;"><a  @click="gotoHomes" style="display: inline-block;border-bottom: 1px dashed;color:black;width:80px;">{{item.promotionName}}：</a></span>
              <span class="txt" style="border-bottom: 1px dashed;font-size:10px !important;" v-if="index == 1 &&  typeList.length > 1">¥{{ item.discountPrice | unitPrice }}</span>
@ -744,9 +744,9 @@ export default {
          }
        }
      }
-      console.log(this.typeList)
+
      if (this.typeList.length >= 3) {
-        console.log(123123)
+
        this.getContentPrice()
      }
    },
@ -849,7 +849,7 @@ export default {
            const blob = new Blob([res], {
              type: "application/pdf;charset=utf-8",
            });
-            console.log("出发blob");
+
            //对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
            //IE10以上支持blob但是依然不支持download
            if ("download" in document.createElement("a")) {
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@ -401,10 +401,11 @@ export default {
    // 查看订单详情
    detail(v) {
      let sn = v.sn;
-      this.$router.push({
+      this.$options.filters.customRouterPush({
        name: "order-detail",
        query: { sn: sn },
-      });
+      })
+
    },
  },
  mounted() {
--- a/seller/src/views/order/order/virtualOrderList.vue
+++ b/seller/src/views/order/order/virtualOrderList.vue
@ -252,10 +252,10 @@ export default {
    // 跳转详情
    detail(v) {
      let sn = v.sn;
-      this.$router.push({
+      this.$options.filters.customRouterPush({
        name: "order-detail",
        query: { sn: sn },
-      });
+      })
    },
  },
  mounted() {
--- a/seller/src/views/promotion/coupon/coupon-receive.vue
+++ b/seller/src/views/promotion/coupon/coupon-receive.vue
@ -266,7 +266,7 @@ export default {
      getCouponReceiveList(this.searchForm).then((res) => {
        this.loading = false;
        if (res.success) {
-          console.log(res);
+
          this.data = res.result.records;
          this.total = res.result.total;
        }
--- a/seller/src/views/promotion/full-discount/full-discount-add.vue
+++ b/seller/src/views/promotion/full-discount/full-discount-add.vue
@ -252,7 +252,7 @@ export default {
    getDetail () {
      // 获取活动详情
      getFullDiscountById(this.id).then((res) => {
-        console.log(res);
+
        let data = res.result;
        if (data.scopeType === "ALL") {
          data.promotionGoodsList = [];
--- a/seller/src/views/promotion/pintuan/pintuan.vue
+++ b/seller/src/views/promotion/pintuan/pintuan.vue
@ -246,7 +246,8 @@ export default {
    },
    // 管理拼团商品
    manage(v, status) {
-      this.$router.push({ name: "pintuan-goods", query: { id: v.id, status: status } });
+      this.$options.filters.customRouterPush({name: "pintuan-goods", query: { id: v.id, status: status }}  )
+
    },
    // 手动开启拼团活动
    open(v) {
--- a/seller/src/views/shop/bill/storeBill.vue
+++ b/seller/src/views/shop/bill/storeBill.vue
@ -207,11 +207,10 @@
      // 跳转结算详情
      detail(v) {
        let id = v.id;
-        this.$router.push({
+        this.$options.filters.customRouterPush({
          name: "bill-detail",
          query: { id: id },
-        });
-
+        })
      },
    },
    mounted () {
--- a/seller/src/views/shop/ship/logistics.vue
+++ b/seller/src/views/shop/ship/logistics.vue
@ -221,12 +221,12 @@ export default {
  methods: {
    //获取状态
    getfaceSheetFlag(e) {
-      console.log(e);
+
      if (e === true) {
-        console.log("打开");
+
        this.onpenText = true;
      } else {
-        console.log("关闭");
+
        this.onpenText = false;
      }
    },
--- a/seller/src/views/shop/ship/shipTemplate.vue
+++ b/seller/src/views/shop/ship/shipTemplate.vue
@ -261,7 +261,7 @@ export default {
      this.form = item;

      let top = document.documentElement.scrollTop || document.body.scrollTop;
-      // 实现滚动效果 
+      // 实现滚动效果
      const timeTop = setInterval(() => {
        document.body.scrollTop = document.documentElement.scrollTop = top -= 50;
        if (top <= 0) {
@ -305,7 +305,6 @@ export default {
     * 选择地址回调
     */
    handleSelect(v) {
-      console.log(v);
      let area = "";
      let areaId = "";
      if (v != "") {
--- a/seller/src/views/shop/system/clerk/clerkManage.vue
+++ b/seller/src/views/shop/system/clerk/clerkManage.vue
@ -451,9 +451,9 @@ export default {
    },
    checkClerks() {
      this.open = this.form.mobile.length;
-      console.log(this.open)
+
      if(this.open == 11 ){
-        this.checkClerk();  
+        this.checkClerk();
      }
      if(this.open < 11){
        this.checkAgainClerk()
@ -576,7 +576,7 @@ export default {
            ids += e.id + ",";
          });
          ids = ids.substring(0, ids.length - 1);
-          console.warn(ids)
+
          resetPassword(ids).then(res => {
            this.$Modal.remove();
            if (res.success) {
@ -590,7 +590,7 @@ export default {
    },
    updateSubmit(){
      this.submitLoading = true;
-      console.warn(this.editForm)
+
      editOtherUser(this.editForm.id,this.editForm).then(res => {
        this.submitLoading = false;
        if (res.success) {
@ -606,7 +606,6 @@ export default {
        if (valid) {
          // 添加用户 避免编辑后传入id
          const params = JSON.parse(JSON.stringify(this.form))
-          console.warn(params)
          delete params.id;
          delete params.status;
          if (this.newMember) {
@ -655,9 +654,9 @@ export default {
    },
    // 编辑用户
    edit(v) {
-      console.warn(v)
+
      getClerk(v.id).then(res => {
-        console.warn(res)
+
        this.mobile = res.result.mobile
        this.clerkName = res.result.clerkName
        this.editForm.isSuper = 0
--- a/seller/src/views/shop/system/department/storeDepartmentManage.vue
+++ b/seller/src/views/shop/system/department/storeDepartmentManage.vue
@ -201,7 +201,7 @@ export default {
      loadDepartment(item.id).then((res) => {
        this.loadingEdit = false;
        if (res.success) {
-          console.log(res.result);
+
          callback(res.result);
        }
      });
@ -303,7 +303,7 @@ export default {
            editDepartment(this.form.id, this.form),
            updateDepartmentRole(this.form.id, roleWay)
          ]).then((res) => {
-            console.warn(res)
+
            this.submitLoading = false;
            if (res[0].success) {
              this.$Message.success("编辑成功");
@ -359,7 +359,7 @@ export default {
    },
    // 选中回调
    changeSelect(v) {
-      console.log(v);
+
      this.selectCount = v.length;
      this.selectList = v;
    },
--- a/seller/src/views/shop/system/role/storeRoleManage.vue
+++ b/seller/src/views/shop/system/role/storeRoleManage.vue
@ -586,7 +586,7 @@ export default {
      let selectedNodes = this.$refs.tree.getCheckedAndIndeterminateNodes();
      let way = [];
      selectedNodes.forEach((e) => {
-        console.log(e)
+
        let perm = {
          title: e.title,
          isSuper: e.isSuper ? e.isSuper = 1 : e.isSuper = 0 || 0,
@ -597,7 +597,7 @@ export default {
        this.$set(this,'saveRoleWay',way)

      });
-      console.log(this.saveRoleWay)
+
    },

    /**保存权限 */
--- a/seller/src/views/shop/wap/index.vue
+++ b/seller/src/views/shop/wap/index.vue
@ -136,7 +136,7 @@ export default {
      this.$nextTick(() => {
        this.decorateData = "";

-        console.log(this.contentData.list.length);
+
        // 如果当前楼层不为一
        if (this.contentData.list.length > 1) {
          // 如果当前最底层 给下一层赋值
@ -156,13 +156,13 @@ export default {

    // 点击楼层装修
    handleComponent(val, index) {
-      console.warn(val)
+
      this.selected = index;
      this.$set(this, "decorateData", val);
    },
    // 右侧栏回调
    handleDrawer(val) {
-    
+
      let newIndex = this.selected;

      this.decorateData = "";
--- a/seller/src/views/shop/wap/navbar.vue
+++ b/seller/src/views/shop/wap/navbar.vue
@ -145,7 +145,6 @@ export default {
            this.saveDialog = false;
            this.$Message.error("修改失败，请稍后重试");
          }
-          console.log(res);
        })
        .catch((error) => {});
    },
@ -176,7 +175,6 @@ export default {
            this.saveDialog = false;
            this.$Message.error("保存失败，请稍后重试");
          }
-          console.log(res);
        })
        .catch((error) => {});
    },
--- a/seller/src/views/shop/wap/wapList.vue
+++ b/seller/src/views/shop/wap/wapList.vue
@ -118,7 +118,6 @@ export default {
          }
        });
        this.list = res.result.records;
-        console.log(this.list);
        this.total = res.result.total;
      });
    },
--- a/seller/src/views/statistics/goods.vue
+++ b/seller/src/views/statistics/goods.vue
@ -1,10 +1,10 @@
 <template>
  <div>
-    <Affix :offset-top="100">
+
      <Card class="card fixed-bottom">
        <affixTime :closeShop="true" @selected="clickBreadcrumb"/>
      </Card>
-    </Affix>
+
    <Card class="card">

      <Tabs @on-click="handleClickType">
@ -23,10 +23,12 @@
 import affixTime from "@/views/lili-components/affix-time";
 import * as API_Goods from "@/api/goods";
 import Cookies from "js-cookie";
+
 export default {
  components: { affixTime },
  data() {
    return {
+      setting:"",
      params: { // 请求参数
        searchType: "LAST_SEVEN",
        year: "",
@ -53,6 +55,9 @@ export default {
      ],
      data: [], // 表格数据
    };
+  },
+  computed:{
+
  },
  methods: {
    // tab切换
@ -83,29 +88,11 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.page-col {
-  text-align: right;
-  margin: 10px 0;
+.fixed-bottom{
+  position:sticky;
+  z-index: 999;
+  top: 0;
 }
-
-.order-col {
-  display: flex;
-
-  > div {
-    margin-right: 8px;
-    padding: 16px;
-    font-size: 15px;
-  }
-}
-
-.order-list {
-  display: flex;
-}
-
-.tips {
-  margin: 0 8px;
-}
-
 .card {
  margin-bottom: 10px;
 }
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@ -1,13 +1,9 @@
 <template>

  <div class="wrapper">
-    <Affix :offset-top="100">
      <Card class="card fixed-bottom">
-
        <affixTime @selected="clickBreadcrumb" />
-
      </Card>
-    </Affix>

    <Card class="card">
      <div>
@ -430,7 +426,6 @@ export default {
  watch: {
    refundParams: {
      handler() {
-        console.log(this.refundIndex);
        if (this.refundIndex == 1) {
          this.getOrderRefundList();
        } else {
@ -570,6 +565,11 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.fixed-bottom{
+  position:sticky;
+  z-index: 999;
+  top: 0;
+}
 .active {
  color: $theme_color;
  position: relative;
--- a/seller/src/views/statistics/traffic.vue
+++ b/seller/src/views/statistics/traffic.vue
@ -1,10 +1,8 @@
 <template>
  <div>
-    <Affix :offset-top="100">
      <Card class="card fixed-bottom">
        <affixTime @selected="clickBreadcrumb" />
      </Card>
-    </Affix>
    <Card class="card">
      <div>
        <h4>流量概况</h4>
@ -218,6 +216,11 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.fixed-bottom{
+  position:sticky;
+  z-index: 999;
+  top: 0;
+}
 .table {
  margin-top: 10px;
 }