From d1a0fc01f03f1d8ecd2ac1a20ff651f9f446e39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 7 Jan 2025 18:02:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E6=9E=90=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/datacenter/customer-analysis/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/modules/datacenter/customer-analysis/index.vue b/src/views/modules/datacenter/customer-analysis/index.vue
index 553192b..0d9d0a8 100644
--- a/src/views/modules/datacenter/customer-analysis/index.vue
+++ b/src/views/modules/datacenter/customer-analysis/index.vue
@@ -11,7 +11,6 @@
             <el-option
               v-for="item in [
                 { value: '1', label: '日' },
-                { value: '2', label: '周' },
                 { value: '3', label: '月' },
                 { value: '4', label: '年' },
               ]"

From 4db5bd6e02778c0cfd1408c1872490977f4eb31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Mon, 13 Jan 2025 18:05:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/accountNumber.js              |  36 ++++
 src/router/full-routers.js                    |  13 ++
 src/utils/index.js                            |   5 +-
 .../accountNumber/index.vue                   | 174 ++++++++++++++++++
 .../accountNumber/popup/add-or-update.vue     | 151 +++++++++++++++
 5 files changed, 378 insertions(+), 1 deletion(-)
 create mode 100644 src/api/modules/accountNumber.js
 create mode 100644 src/views/modules/operation-management/accountNumber/index.vue
 create mode 100644 src/views/modules/operation-management/accountNumber/popup/add-or-update.vue

diff --git a/src/api/modules/accountNumber.js b/src/api/modules/accountNumber.js
new file mode 100644
index 0000000..7582da7
--- /dev/null
+++ b/src/api/modules/accountNumber.js
@@ -0,0 +1,36 @@
+import $http from "@/utils/httpRequest.js";
+//账号管理
+export const accountNumber = {
+  //账号列表
+  accountPage: (data) => {
+    return $http.request({
+      url: `/merchant-api/unify/account/page`,
+      method: "get",
+      params: data,
+    });
+  },
+  //添加账号
+  addAccount: (data) => {
+    return $http.request({
+      url: `/merchant-api/unify/account/add`,
+      method: "post",
+      data: data,
+    });
+  },
+  //编辑账号
+  updateAccount: (data) => {
+    return $http.request({
+      url: `/merchant-api/unify/account/update`,
+      method: "post",
+      data: data,
+    });
+  },
+  //删除账号
+  deleteAccount: (data) => {
+    return $http.request({
+      url: `/merchant-api/unify/account/delete`,
+      method: "post",
+      data: data,
+    });
+  },
+};
diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index c33b6ae..23e8475 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -130,6 +130,19 @@ export default {
           open: null,
           list: [],
         },
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: "账号管理",
+          url: "operation-management/accountNumber/index",
+          perms: "",
+          type: 1,
+          elIcon: "el-icon-menu",
+          orderNum: 0,
+          open: null,
+          list: [],
+        },
         {
           menuId: getUUID(),
           parentId: 0,
diff --git a/src/utils/index.js b/src/utils/index.js
index b6b4ed7..ea77797 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -169,7 +169,8 @@ export function getMenu(role) {
       "ogistics-fare",
       "logistics-fare/logistics-template/index",
       "bank-card/index",
-      "operation-management/total-order/index"
+      "operation-management/total-order/index",
+      "operation-management/accountNumber/index",
     ];
   } else if (role == "ROLE_BRAND_MANAGER") {
     return [
@@ -185,6 +186,7 @@ export function getMenu(role) {
       "brand/config/index",
       "local-course/resources",
       "wallet/index",
+      "operation-management/accountNumber/index",
     ];
   } else if (role == "ROLE_AGENT") {
     return [
@@ -198,6 +200,7 @@ export function getMenu(role) {
       "datacenter/order-analysis/index",
       "local-course/resources",
       "wallet/index",
+      "operation-management/accountNumber/index",
     ];
   }
 }
diff --git a/src/views/modules/operation-management/accountNumber/index.vue b/src/views/modules/operation-management/accountNumber/index.vue
new file mode 100644
index 0000000..23eda99
--- /dev/null
+++ b/src/views/modules/operation-management/accountNumber/index.vue
@@ -0,0 +1,174 @@
+<template>
+  <div style="height: calc(100vh - 200px)">
+    <obj-table-plus
+      ref="oTable"
+      style="height: 100%"
+      :tableCols="tableCols"
+      :tableProp="tableProp"
+      @query="queryList"
+      v-model="dataList"
+      :tableEvent="tableEvent"
+    >
+      <template slot="tableTop">
+        <el-form :inline="true" :model="formInline" class="demo-form-inline">
+          <el-form-item label="姓名">
+            <el-input
+              v-model="formInline.username"
+              placeholder="姓名搜索"
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="$refs.oTable.reload()"
+              >查询</el-button
+            >
+            <el-button type="primary">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <div class="mb-2">
+          <el-button type="primary" @click="addAccount">添加</el-button>
+        </div>
+      </template>
+    </obj-table-plus>
+    <!-- 编辑编辑账号 -->
+    <addOrUpdate
+      ref="addOrUpdate"
+      @queryList="$refs.oTable.reload()"
+    ></addOrUpdate>
+  </div>
+</template>
+
+<script>
+import addOrUpdate from "./popup/add-or-update.vue";
+export default {
+  components: { addOrUpdate },
+  data() {
+    return {
+      dataList: [],
+      formInline: {
+        name: "",
+      },
+      tableProp: {
+        "auto-resize": true,
+        border: true,
+        height: "auto",
+        "row-id": "id",
+        "show-overflow": false,
+      },
+      productFilterType: "SALE",
+      selectList: [],
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.$refs.oTable.reload();
+    });
+  },
+  methods: {
+    queryList(pageNo, pageSize) {
+      this.$api.accountNumber
+        .accountPage({
+          pageNumber: pageNo,
+          pageSize: pageSize,
+          ownerId: JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+            : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+        })
+        .then((res) => {
+          console.log(res);
+          this.$refs.oTable.complete(
+            res.data.data.data,
+            Number(res.data.data.total)
+          );
+        })
+        .catch((err) => {
+          this.$refs.oTable.complete(false);
+        });
+    },
+    addAccount() {
+      console.log("添加账号");
+      this.$refs.addOrUpdate.toggle().add();
+    },
+  },
+  computed: {
+    tableCols() {
+      return [
+        { type: "checkbox", width: "60px", fixed: "left" },
+        // { type: "seq", width: "60px", align: "center", title: "序号" },
+        {
+          title: "姓名",
+          align: "center",
+          field: "username",
+        },
+        {
+          title: "账号",
+          align: "center",
+          field: "mobile",
+        },
+        {
+          title: "加入时间",
+          align: "center",
+          field: "createTime",
+        },
+        {
+          title: "操作",
+          fixed: "right",
+          type: "jsx",
+          align: "center",
+          width: "240px",
+          render: (row) => {
+            let edit = () => {
+              this.$refs.addOrUpdate.toggle(row).update();
+            };
+            let deleteBanner = () => {
+              this.$api.accountNumber
+                .deleteAccount({ id: row.row.id })
+                .then((res) => {
+                  console.log(res);
+                  this.$refs.oTable.reload();
+                });
+            };
+            let onCancel = () => {};
+            return (
+              <div>
+                <el-button
+                  style="margin-right:20px"
+                  size="mini"
+                  type="primary"
+                  onClick={edit}
+                >
+                  编辑
+                </el-button>
+                <el-popconfirm
+                  onConfirm={deleteBanner}
+                  onCancel={onCancel}
+                  confirm-button-text="确定"
+                  cancel-button-text="取消"
+                  icon="el-icon-info"
+                  icon-color="red"
+                  title="确定删除吗？"
+                >
+                  <el-button size="mini" type="danger" slot="reference">
+                    删除
+                  </el-button>
+                </el-popconfirm>
+              </div>
+            );
+          },
+        },
+      ];
+    },
+    tableEvent() {
+      return {
+        "checkbox-all": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+        "checkbox-change": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/modules/operation-management/accountNumber/popup/add-or-update.vue b/src/views/modules/operation-management/accountNumber/popup/add-or-update.vue
new file mode 100644
index 0000000..53d6321
--- /dev/null
+++ b/src/views/modules/operation-management/accountNumber/popup/add-or-update.vue
@@ -0,0 +1,151 @@
+<template>
+  <div>
+    <obj-modal
+      ref="modal"
+      labelWidth="150px"
+      :modalCols="modalCols"
+      :modalConfig="modalConfig"
+      :modalData="modalData"
+      :modalHandles="modalHandles"
+    >
+      <template slot="dialog__after"> </template>
+    </obj-modal>
+  </div>
+</template>
+<script>
+import { debounce, cloneDeep } from "lodash";
+import { Divider } from "element-ui";
+export default {
+  components: {},
+  data() {
+    return {
+      isAdd: true,
+      //表格属性
+      modalConfig: {
+        title: "添加账号",
+        show: false,
+        width: "700px",
+      },
+      modalData: {},
+      settingId: "",
+      form: {},
+    };
+  },
+  watch: {
+    "modalConfig.show"(newVal) {
+      if (!newVal) {
+        //关闭弹窗清空校验
+        setTimeout(() => {
+          this.$refs.modal.resetFields();
+        });
+      }
+    },
+  },
+  methods: {
+    queryTableData(pageNo, pageSize) {},
+    toggle(e) {
+      if (this.modalConfig.show == false) {
+        this.modalConfig.show = true;
+      } else {
+        this.modalConfig.show = false;
+      }
+      if (e) {
+        this.init(cloneDeep(e.row));
+      }
+      return {
+        add: () => {
+          this.modalData = {};
+          this.modalConfig.title = "添加账号";
+          this.isAdd = true;
+        },
+        update: () => {
+          this.modalConfig.title = "编辑账号";
+          this.isAdd = false;
+        },
+      };
+    },
+    init(row) {
+      this.modalData = row;
+    },
+  },
+  computed: {
+    modalCols() {
+      return [
+        {
+          label: "姓名",
+          prop: "username",
+          type: "Input",
+          required: true,
+          rules: {
+            required: true,
+            message: "请输入姓名",
+            trigger: "blur",
+          },
+        },
+        {
+          label: "账号",
+          prop: "mobile",
+          type: "Input",
+          required: true,
+          rules: {
+            required: true,
+            message: "请输入角色编码",
+            trigger: "blur",
+          },
+        },
+        {
+          label: "密码",
+          prop: "password",
+          type: "Input",
+          required: true,
+          rules: {
+            required: true,
+            message: "请输入权限字段",
+            trigger: "blur",
+          },
+        },
+      ];
+    },
+    modalHandles() {
+      return [
+        {
+          label: "取消",
+          handle: () => {
+            this.toggle();
+          },
+        },
+        {
+          label: "确认",
+          type: "primary",
+          submit: true,
+          handle: () => {
+            console.log(this.modalData);
+            if (this.isAdd) {
+              this.$api.accountNumber
+                .addAccount({
+                  ...this.modalData,
+                  ownerId: JSON.parse(sessionStorage.getItem("userInfo"))
+                    .managerId
+                    ? JSON.parse(sessionStorage.getItem("userInfo")).managerId
+                    : JSON.parse(sessionStorage.getItem("userInfo")).merchantId,
+                })
+                .then((res) => {
+                  this.toggle();
+                  this.$emit("queryList");
+                });
+            } else {
+              this.$api.mer_admin.noticeUpdate(this.modalData).then((res) => {
+                this.toggle();
+                this.$emit("queryList");
+              });
+            }
+          },
+        },
+      ];
+    },
+  },
+  asyncComputed: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file

From bc5bb0414f142af7e1e820528a7078d345840f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Tue, 14 Jan 2025 18:12:32 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=93=81=E7=89=8C=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E5=92=8C=E5=B8=82=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/agent.js                      |  22 +-
 src/router/full-routers.js                    |  52 +++-
 src/utils/index.js                            |  10 +-
 .../brand-order/index.vue                     |  15 ++
 .../brand-store/index.vue                     | 222 ++++++++++++++++
 .../brand-store/popup/view-details.vue        | 243 ++++++++++++++++++
 .../market-list/index.vue                     | 220 ++++++++++++++++
 7 files changed, 765 insertions(+), 19 deletions(-)
 create mode 100644 src/views/modules/operation-management/brand-order/index.vue
 create mode 100644 src/views/modules/operation-management/brand-store/index.vue
 create mode 100644 src/views/modules/operation-management/brand-store/popup/view-details.vue
 create mode 100644 src/views/modules/operation-management/market-list/index.vue

diff --git a/src/api/modules/agent.js b/src/api/modules/agent.js
index 1420080..f5c6edd 100644
--- a/src/api/modules/agent.js
+++ b/src/api/modules/agent.js
@@ -1,7 +1,7 @@
 import $http from "@/utils/httpRequest.js";
-//代理商
+//代理商和品牌
 export const agent = {
-  //商铺列表
+  //代理商商铺列表
   agentShopPage: (data) => {
     return $http.request({
       url: `/merchant-api/agent/shop/page`,
@@ -9,7 +9,7 @@ export const agent = {
       params: data,
     });
   },
-  //市场列表
+  //代理商市场列表
   agentMarketPage: (data) => {
     return $http.request({
       url: `/merchant-api/agent/market/page`,
@@ -17,4 +17,20 @@ export const agent = {
       params: data,
     });
   },
+  //品牌商铺列表
+  brandStorePage: (data) => {
+    return $http.request({
+      url: `/merchant-api/brand/shop/page`,
+      method: "get",
+      params: data,
+    });
+  },
+  //品牌市场列表
+  brandMarketPage: (data) => {
+    return $http.request({
+      url: `/merchant-api/brand/market/page`,
+      method: "get",
+      params: data,
+    });
+  },
 };
diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index 23e8475..d1b81b3 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -38,6 +38,19 @@ export default {
       orderNum: 0,
       open: null,
       list: [
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: "市场列表",
+          url: "operation-management/market-list/index",
+          perms: "",
+          type: 1,
+          elIcon: "el-icon-shopping-cart-full",
+          orderNum: 0,
+          open: null,
+          list: [],
+        },
         {
           menuId: getUUID(),
           parentId: 0,
@@ -51,6 +64,19 @@ export default {
           open: null,
           list: [],
         },
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: "品牌店铺",
+          url: "operation-management/brand-store/index",
+          perms: "",
+          type: 1,
+          elIcon: "el-icon-shopping-cart-full",
+          orderNum: 0,
+          open: null,
+          list: [],
+        },
         {
           menuId: getUUID(),
           parentId: 0,
@@ -104,6 +130,19 @@ export default {
           open: null,
           list: [],
         },
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: "订单管理",
+          url: "operation-management/brand-order/index",
+          perms: "",
+          type: 1,
+          elIcon: "el-icon-menu",
+          orderNum: 0,
+          open: null,
+          list: [],
+        },
         {
           menuId: getUUID(),
           parentId: 0,
@@ -435,19 +474,6 @@ export default {
           open: null,
           list: [],
         },
-        {
-          menuId: getUUID(),
-          parentId: 0,
-          parentName: null,
-          name: "市场列表",
-          url: "agent/market-list/index",
-          perms: "",
-          type: 1,
-          elIcon: "el-icon-shopping-cart-full",
-          orderNum: 0,
-          open: null,
-          list: [],
-        },
         {
           menuId: getUUID(),
           parentId: 0,
diff --git a/src/utils/index.js b/src/utils/index.js
index ea77797..b254852 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -175,8 +175,10 @@ export function getMenu(role) {
   } else if (role == "ROLE_BRAND_MANAGER") {
     return [
       "operation-management",
-      "operation-management/shop-list/index",
-      "operation-management/order/index",
+      // "operation-management/shop-list/index",
+      "operation-management/brand-store/index",
+      // "operation-management/order/index",
+      "operation-management/brand-order/index",
       "operation-management/role/index",
       "datacenter",
       "datacenter/customer-analysis/index",
@@ -192,7 +194,9 @@ export function getMenu(role) {
     return [
       "operation-management",
       "operation-management/shop-list/index",
-      "operation-management/order/index",
+      "operation-management/market-list/index",
+      // "operation-management/order/index",
+      "operation-management/brand-order/index",
       "operation-management/role/index",
       "datacenter",
       "datacenter/customer-analysis/index",
diff --git a/src/views/modules/operation-management/brand-order/index.vue b/src/views/modules/operation-management/brand-order/index.vue
new file mode 100644
index 0000000..661fef6
--- /dev/null
+++ b/src/views/modules/operation-management/brand-order/index.vue
@@ -0,0 +1,15 @@
+<template>
+  <div>
+    品牌订单
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/modules/operation-management/brand-store/index.vue b/src/views/modules/operation-management/brand-store/index.vue
new file mode 100644
index 0000000..e6bf69c
--- /dev/null
+++ b/src/views/modules/operation-management/brand-store/index.vue
@@ -0,0 +1,222 @@
+<template>
+  <div style="height: calc(100vh - 200px)">
+    <obj-table-plus
+      ref="oTable"
+      style="height: 100%"
+      :tableCols="tableCols"
+      :tableProp="tableProp"
+      @query="queryList"
+      v-model="dataList"
+      :tableEvent="tableEvent"
+      :enableAutoQuery="false"
+    >
+      <template slot="tableTop">
+        <el-form :inline="true" :model="formInline" class="demo-form-inline">
+          <el-form-item label="摊铺名称">
+            <el-input
+              v-model="formInline.name"
+              placeholder="摊铺名称搜索"
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="$refs.oTable.reload()"
+              >查询</el-button
+            >
+            <el-button type="primary" @click="Reset">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <div class="mb-2"></div>
+      </template>
+    </obj-table-plus>
+    <!-- 查看详情 -->
+    <viewDetails ref="viewDetails"></viewDetails>
+  </div>
+</template>
+
+<script>
+import viewDetails from "./popup/view-details.vue";
+import { mapState } from "vuex";
+export default {
+  components: { viewDetails },
+  data() {
+    return {
+      dataList: [],
+      formInline: {
+        name: "",
+      },
+      tableProp: {
+        "auto-resize": true,
+        border: true,
+        height: "auto",
+        "row-id": "id",
+        "show-overflow": false,
+      },
+      productFilterType: "SALE",
+      selectList: [],
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.$refs.oTable.reload();
+    });
+  },
+  methods: {
+    Reset() {
+      this.formInline = {
+        name: "",
+      };
+      this.$refs.oTable.reload();
+    },
+    queryList(pageNo, pageSize) {
+      this.$api.agent
+        .brandStorePage({
+          pageNumber: pageNo,
+          pageSize: pageSize,
+          brandId: JSON.parse(sessionStorage.getItem("userInfo")).brandId,
+        })
+        .then((res) => {
+          console.log(res);
+          this.$refs.oTable.complete(
+            res.data.data.content,
+            Number(res.data.data.totalElements)
+          );
+        })
+        .catch((err) => {
+          this.$refs.oTable.complete(false);
+        });
+    },
+  },
+  computed: {
+    tableCols() {
+      return [
+        { type: "checkbox", width: "60px", fixed: "left" },
+        // { type: "seq", width: "60px", align: "center", title: "序号" },
+        {
+          title: "摊位名称",
+          align: "center",
+          field: "name",
+        },
+        {
+          title: "菜市场名称",
+          align: "center",
+          field: "marketName",
+        },
+        {
+          title: "地址",
+          align: "center",
+          field: "address",
+        },
+        {
+          title: "经纬度",
+          align: "center",
+          field: "category",
+          type: "jsx",
+          render: ({ row }) => {
+            return (
+              <span>
+                经度：{row.longitude}; 维度：{row.latitude}
+              </span>
+            );
+          },
+        },
+        {
+          title: "营业执照",
+          align: "center",
+          field: "couponType",
+          type: "jsx",
+          render: ({ row }) => {
+            return (
+              <el-image
+                preview-src-list={[row.license]}
+                src={row.license}
+              ></el-image>
+            );
+          },
+        },
+        {
+          title: "评分",
+          align: "center",
+          field: "score",
+        },
+        {
+          title: "收藏数量",
+          align: "center",
+          field: "collectCount",
+        },
+        {
+          title: "点赞数量",
+          align: "center",
+          field: "likeItCount",
+        },
+        {
+          title: "平台结算比例",
+          align: "center",
+          field: "platformSettleRatio",
+        },
+        {
+          title: "代理商结算比例",
+          align: "center",
+          field: "agentSettleRatio",
+        },
+        {
+          title: "加入时间",
+          align: "center",
+          field: "createTime",
+        },
+        {
+          title: "状态",
+          align: "center",
+          field: "status",
+          type: "jsx",
+          width: "120px",
+          render: ({ row }) => {
+            if (row.status == 1) {
+              return <span>开</span>;
+            } else {
+              return <span>关</span>;
+            }
+          },
+        },
+        {
+          title: "操作",
+          fixed: "right",
+          type: "jsx",
+          align: "center",
+          width: "140px",
+          render: (row) => {
+            let edit = () => {
+              this.$refs.viewDetails.toggle(row).update();
+            };
+            return (
+              <div>
+                <el-button size="mini" type="primary" onClick={edit}>
+                  详情
+                </el-button>
+              </div>
+            );
+          },
+        },
+      ];
+    },
+    tableEvent() {
+      return {
+        "checkbox-all": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+        "checkbox-change": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+      };
+    },
+    ...mapState("userData", [
+      "isMerchant",
+      "marketList",
+      "storeList",
+      "marketId",
+      "shopId",
+    ]),
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/modules/operation-management/brand-store/popup/view-details.vue b/src/views/modules/operation-management/brand-store/popup/view-details.vue
new file mode 100644
index 0000000..fe8a681
--- /dev/null
+++ b/src/views/modules/operation-management/brand-store/popup/view-details.vue
@@ -0,0 +1,243 @@
+<template>
+  <div>
+    <obj-modal
+      ref="modal"
+      labelWidth="150px"
+      :modalConfig="modalConfig"
+      :modalData="modalData"
+      :modalHandles="modalHandles"
+    >
+      <div slot="dialog__content">
+        <el-form
+          :model="ruleForm"
+          ref="ruleForm"
+          label-width="150px"
+          class="demo-ruleForm"
+        >
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="摊位名称：">
+                <span>{{ ruleForm.name }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="所在菜市场：">
+                <span>{{ ruleForm.marketName }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="状态：">
+                <span>{{ ruleForm.status == 0 ? "禁用" : "启用" }}</span>
+              </el-form-item></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="地址：">
+                <span>{{ ruleForm.address }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="经度：">
+                <span>{{ ruleForm.longitude }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="纬度：">
+                <span>{{ ruleForm.latitude }}</span>
+              </el-form-item></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="营业执照：">
+                <el-image
+                  style="width: 100px; height: 100px"
+                  :src="ruleForm?.license"
+                  :preview-src-list="[ruleForm.license]"
+                >
+                </el-image> </el-form-item
+            ></el-col>
+            <el-col :span="8">
+              <el-form-item label="身份证人像面：">
+                <el-image
+                  style="width: 100px; height: 100px"
+                  :src="ruleForm.idCardFace"
+                  :preview-src-list="[ruleForm.idCardFace]"
+                >
+                </el-image> </el-form-item
+            ></el-col>
+            <el-col :span="8">
+              <el-form-item label="身份证国徽面：">
+                <el-image
+                  style="width: 100px; height: 100px"
+                  :src="ruleForm.idCardBadge"
+                  :preview-src-list="[ruleForm.idCardBadge]"
+                >
+                </el-image> </el-form-item
+            ></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="店铺照片：">
+                <el-image
+                  style="width: 100px; height: 100px"
+                  :src="ruleForm.imgs?.split(';')[0]"
+                  :preview-src-list="ruleForm.imgs?.split(';')"
+                >
+                </el-image> </el-form-item
+            ></el-col>
+            <el-col :span="8">
+              <el-form-item label="是否自动营业：">
+                <span>{{ ruleForm.isAutoBusiness ? "是" : "否" }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="联系电话：">
+                <span>{{ ruleForm.contactPhone }}</span>
+              </el-form-item></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="经营状态：">
+                <span>{{
+                  ruleForm.businessStatus == 0 ? "休息" : "经营中"
+                }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="评分：">
+                <span>{{ ruleForm.score }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="收藏数量：">
+                <span>{{ ruleForm.collectCount }}</span>
+              </el-form-item></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="点赞数量：">
+                <span>{{ ruleForm.likeItCount }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="加入时间：">
+                <span>{{ ruleForm.createTime }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <!-- <el-form-item label="下单时间：">
+                <span>{{ ruleForm.createTime }}</span>
+              </el-form-item> -->
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 选择商品 -->
+    </obj-modal>
+  </div>
+</template>
+<script>
+import { debounce, cloneDeep } from "lodash";
+export default {
+  components: {},
+  props: {},
+  data() {
+    return {
+      isAdd: true,
+      //表格属性
+      modalConfig: {
+        title: "订单详情",
+        show: false,
+        width: "1200px",
+        fullscreen: true,
+      },
+      modalData: {},
+      ruleForm: {},
+      tableData: [],
+    };
+  },
+  watch: {
+    // "modalConfig.show"(newVal) {
+    //   if (newVal) {
+    //     //关闭弹窗清空校验
+    //     setTimeout(() => {
+    //       this.$refs.ruleForm.resetFields();
+    //     });
+    //   }
+    // },
+  },
+  methods: {
+    queryTableData(pageNo, pageSize) {},
+    toggle(e) {
+      if (this.modalConfig.show == false) {
+        this.modalConfig.show = true;
+      } else {
+        this.modalConfig.show = false;
+      }
+      if (e) {
+        this.init(cloneDeep(e.row));
+      }
+      return {
+        add: () => {
+          this.modalConfig.title = "店铺详情";
+          this.isAdd = true;
+        },
+        update: () => {
+          this.modalConfig.title = "店铺详情";
+          this.isAdd = false;
+        },
+      };
+    },
+    init(row) {
+      console.log(row);
+      this.ruleForm = row;
+    },
+    handleSelectionChange(e) {
+      console.log(e);
+    },
+    getRefundStatus(val) {
+      if (val == 0) {
+        return "正常";
+      } else if (val == 1) {
+        return "退款中";
+      } else if (val == 2) {
+        return "完全退款";
+      } else if (val == 3) {
+        return "部分退款";
+      } else if (val == 4) {
+        return "拒绝用户退款";
+      } else if (val == -1) {
+        return "退款失败";
+      } else if (val == -2) {
+        return "用户申请退款中";
+      }
+    },
+  },
+  computed: {
+    modalHandles() {
+      return [
+        {
+          label: "关闭",
+          handle: () => {
+            this.toggle();
+          },
+        },
+        // {
+        //   label: "确认",
+        //   type: "primary",
+        //   // submit: true,
+        //   handle: () => {
+        //   },
+        // },
+      ];
+    },
+  },
+  asyncComputed: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/modules/operation-management/market-list/index.vue b/src/views/modules/operation-management/market-list/index.vue
new file mode 100644
index 0000000..61aae70
--- /dev/null
+++ b/src/views/modules/operation-management/market-list/index.vue
@@ -0,0 +1,220 @@
+<template>
+  <div style="height: calc(100vh - 200px)">
+    <obj-table-plus
+      ref="oTable"
+      style="height: 100%"
+      :tableCols="tableCols"
+      :tableProp="tableProp"
+      @query="queryList"
+      v-model="dataList"
+      :tableEvent="tableEvent"
+      :enableAutoQuery="false"
+    >
+      <template slot="tableTop">
+        <el-form :inline="true" :model="formInline" class="demo-form-inline">
+          <el-form-item label="菜市场名称">
+            <el-input
+              v-model="formInline.marketName"
+              placeholder="菜市场名称搜索"
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="$refs.oTable.reload()"
+              >查询</el-button
+            >
+            <el-button type="primary" @click="Reset">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <div class="mb-2"></div>
+      </template>
+    </obj-table-plus>
+  </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  components: {},
+  data() {
+    return {
+      dataList: [],
+      formInline: {
+        name: "",
+      },
+      tableProp: {
+        "auto-resize": true,
+        border: true,
+        height: "auto",
+        "row-id": "id",
+        "show-overflow": false,
+      },
+      productFilterType: "SALE",
+      selectList: [],
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.$refs.oTable.reload();
+    });
+  },
+  methods: {
+    Reset() {
+      this.formInline = {
+        name: "",
+      };
+      this.$refs.oTable.reload();
+    },
+    queryList(pageNo, pageSize) {
+      this.$api.agent
+        .agentMarketPage({
+          pageNumber: pageNo,
+          pageSize: pageSize,
+          ...this.formInline,
+        })
+        .then((res) => {
+          console.log(res);
+          this.$refs.oTable.complete(
+            res.data.data.content,
+            Number(res.data.data.totalElements)
+          );
+        })
+        .catch((err) => {
+          this.$refs.oTable.complete(false);
+        });
+    },
+  },
+  computed: {
+    tableCols() {
+      return [
+        { type: "checkbox", width: "60px", fixed: "left" },
+        // { type: "seq", width: "60px", align: "center", title: "序号" },
+        {
+          title: "菜市场名称",
+          align: "center",
+          field: "name",
+        },
+        {
+          title: "地址",
+          align: "center",
+          field: "address",
+        },
+        {
+          title: "经纬度",
+          align: "center",
+          field: "category",
+          type: "jsx",
+          render: ({ row }) => {
+            return (
+              <span>
+                经度：{row.longitude}; 维度：{row.latitude}
+              </span>
+            );
+          },
+        },
+        {
+          title: "营业执照",
+          align: "center",
+          field: "couponType",
+          type: "jsx",
+          render: ({ row }) => {
+            return (
+              <el-image
+                preview-src-list={[row.license]}
+                src={row.license}
+              ></el-image>
+            );
+          },
+        },
+        {
+          title: "评分",
+          align: "center",
+          field: "score",
+        },
+        {
+          title: "收藏数量",
+          align: "center",
+          field: "collectCount",
+        },
+        {
+          title: "点赞数量",
+          align: "center",
+          field: "likeItCount",
+        },
+        {
+          title: "平台结算比例",
+          align: "center",
+          field: "platformSettleRatio",
+        },
+        {
+          title: "代理商结算比例",
+          align: "center",
+          field: "agentSettleRatio",
+        },
+        {
+          title: "加入时间",
+          align: "center",
+          field: "createTime",
+        },
+        {
+          title: "状态",
+          align: "center",
+          field: "status",
+          type: "jsx",
+          width: "120px",
+          render: ({ row }) => {
+            let changeState = () => {};
+            return (
+              <el-switch
+                onchange={changeState}
+                v-model={row.status}
+                active-text="开"
+                inactive-text="关"
+                active-value={1}
+                inactive-value={0}
+              ></el-switch>
+            );
+          },
+        },
+        {
+          title: "操作",
+          fixed: "right",
+          type: "jsx",
+          align: "center",
+          width: "140px",
+          render: (row) => {
+            let edit = () => {
+              //   this.$refs.viewDetails.toggle(row).update();
+            };
+            return (
+              <div>
+                <el-button size="mini" type="primary" onClick={edit}>
+                  详情
+                </el-button>
+              </div>
+            );
+          },
+        },
+      ];
+    },
+    tableEvent() {
+      return {
+        "checkbox-all": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+        "checkbox-change": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+      };
+    },
+    ...mapState("userData", [
+      "isMerchant",
+      "marketList",
+      "storeList",
+      "marketId",
+      "shopId",
+    ]),
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file

From cd9454dae14c104fd0ab658a5051ceb94fa80280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Wed, 15 Jan 2025 17:26:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E5=92=8C?=
 =?UTF-8?q?=E5=93=81=E7=89=8C=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/mer_admin.js                  |  16 +
 src/router/full-routers.js                    |  13 +
 src/utils/index.js                            |   1 +
 .../brand-market/index.vue                    | 217 +++++++++
 .../brand-market/popup/view-details.vue       | 199 ++++++++
 .../brand-order/index.vue                     | 429 +++++++++++++++++-
 6 files changed, 870 insertions(+), 5 deletions(-)
 create mode 100644 src/views/modules/operation-management/brand-market/index.vue
 create mode 100644 src/views/modules/operation-management/brand-market/popup/view-details.vue

diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index 0f6f260..26dfc84 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -276,4 +276,20 @@ export const mer_admin = {
   sortnotice: (data) => {
     return $http.post(`/admin-api/notice/update/sort`, data);
   },
+  //品牌和分销商的订单
+  distributorOrBrandOrderPage: (data) => {
+    return $http.request({
+      method: "get",
+      url: `/merchant-api/backend/order/page`,
+      params: data,
+    });
+  },
+  //订单概述
+  orderOverview: (data) => {
+    return $http.request({
+      method: "get",
+      url: `/merchant-api/backend/order/overview`,
+      params: data,
+    });
+  },
 };
diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index d1b81b3..bc15d8e 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -77,6 +77,19 @@ export default {
           open: null,
           list: [],
         },
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: "品牌市场",
+          url: "operation-management/brand-market/index",
+          perms: "",
+          type: 1,
+          elIcon: "el-icon-shopping-cart-full",
+          orderNum: 0,
+          open: null,
+          list: [],
+        },
         {
           menuId: getUUID(),
           parentId: 0,
diff --git a/src/utils/index.js b/src/utils/index.js
index b254852..674a891 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -176,6 +176,7 @@ export function getMenu(role) {
     return [
       "operation-management",
       // "operation-management/shop-list/index",
+      "operation-management/brand-market/index",
       "operation-management/brand-store/index",
       // "operation-management/order/index",
       "operation-management/brand-order/index",
diff --git a/src/views/modules/operation-management/brand-market/index.vue b/src/views/modules/operation-management/brand-market/index.vue
new file mode 100644
index 0000000..8c9347b
--- /dev/null
+++ b/src/views/modules/operation-management/brand-market/index.vue
@@ -0,0 +1,217 @@
+<template>
+  <div style="height: calc(100vh - 200px)">
+    <obj-table-plus
+      ref="oTable"
+      style="height: 100%"
+      :tableCols="tableCols"
+      :tableProp="tableProp"
+      @query="queryList"
+      v-model="dataList"
+      :tableEvent="tableEvent"
+      :enableAutoQuery="false"
+    >
+      <template slot="tableTop">
+        <el-form :inline="true" :model="formInline" class="demo-form-inline">
+          <el-form-item label="菜市场名称">
+            <el-input
+              v-model="formInline.marketName"
+              placeholder="菜市场名称搜索"
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="$refs.oTable.reload()"
+              >查询</el-button
+            >
+            <el-button type="primary" @click="Reset">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <div class="mb-2"></div>
+      </template>
+    </obj-table-plus>
+    <!-- 菜市场详情 -->
+    <viewDetails ref="viewDetails"></viewDetails>
+  </div>
+</template>
+
+<script>
+import viewDetails from "./popup/view-details.vue";
+import { mapState } from "vuex";
+export default {
+  components: { viewDetails },
+  data() {
+    return {
+      dataList: [],
+      formInline: {
+        name: "",
+      },
+      tableProp: {
+        "auto-resize": true,
+        border: true,
+        height: "auto",
+        "row-id": "id",
+        "show-overflow": false,
+      },
+      productFilterType: "SALE",
+      selectList: [],
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.$refs.oTable.reload();
+    });
+  },
+  methods: {
+    Reset() {
+      this.formInline = {
+        name: "",
+      };
+      this.$refs.oTable.reload();
+    },
+    queryList(pageNo, pageSize) {
+      this.$api.agent
+        .brandMarketPage({
+          pageNumber: pageNo,
+          pageSize: pageSize,
+          brandId: JSON.parse(sessionStorage.getItem("userInfo")).brandId,
+        })
+        .then((res) => {
+          console.log(res);
+          this.$refs.oTable.complete(
+            res.data.data.content,
+            Number(res.data.data.totalElements)
+          );
+        })
+        .catch((err) => {
+          this.$refs.oTable.complete(false);
+        });
+    },
+  },
+  computed: {
+    tableCols() {
+      return [
+        { type: "checkbox", width: "60px", fixed: "left" },
+        // { type: "seq", width: "60px", align: "center", title: "序号" },
+        {
+          title: "菜市场名称",
+          align: "center",
+          field: "name",
+        },
+        {
+          title: "地址",
+          align: "center",
+          field: "address",
+        },
+        {
+          title: "经纬度",
+          align: "center",
+          field: "category",
+          type: "jsx",
+          render: ({ row }) => {
+            return (
+              <span>
+                经度：{row.longitude}; 维度：{row.latitude}
+              </span>
+            );
+          },
+        },
+        // {
+        //   title: "营业执照",
+        //   align: "center",
+        //   field: "couponType",
+        //   type: "jsx",
+        //   render: ({ row }) => {
+        //     return (
+        //       <el-image
+        //         preview-src-list={[row.license]}
+        //         src={row.license}
+        //       ></el-image>
+        //     );
+        //   },
+        // },
+        // {
+        //   title: "评分",
+        //   align: "center",
+        //   field: "score",
+        // },
+        // {
+        //   title: "收藏数量",
+        //   align: "center",
+        //   field: "collectCount",
+        // },
+        // {
+        //   title: "点赞数量",
+        //   align: "center",
+        //   field: "likeItCount",
+        // },
+        // {
+        //   title: "平台结算比例",
+        //   align: "center",
+        //   field: "platformSettleRatio",
+        // },
+        // {
+        //   title: "代理商结算比例",
+        //   align: "center",
+        //   field: "agentSettleRatio",
+        // },
+        {
+          title: "加入时间",
+          align: "center",
+          field: "createTime",
+        },
+        {
+          title: "状态",
+          align: "center",
+          field: "status",
+          type: "jsx",
+          width: "120px",
+          render: ({ row }) => {
+            if (row.status == 1) {
+              return <span>开</span>;
+            } else {
+              return <span>关</span>;
+            }
+          },
+        },
+        {
+          title: "操作",
+          fixed: "right",
+          type: "jsx",
+          align: "center",
+          width: "140px",
+          render: (row) => {
+            let edit = () => {
+              this.$refs.viewDetails.toggle(row).update();
+            };
+            return (
+              <div>
+                <el-button size="mini" type="primary" onClick={edit}>
+                  详情
+                </el-button>
+              </div>
+            );
+          },
+        },
+      ];
+    },
+    tableEvent() {
+      return {
+        "checkbox-all": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+        "checkbox-change": ({ records, reserves }) => {
+          this.selectList = [...records, ...reserves];
+        },
+      };
+    },
+    ...mapState("userData", [
+      "isMerchant",
+      "marketList",
+      "storeList",
+      "marketId",
+      "shopId",
+    ]),
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/modules/operation-management/brand-market/popup/view-details.vue b/src/views/modules/operation-management/brand-market/popup/view-details.vue
new file mode 100644
index 0000000..c357cf7
--- /dev/null
+++ b/src/views/modules/operation-management/brand-market/popup/view-details.vue
@@ -0,0 +1,199 @@
+<template>
+  <div>
+    <obj-modal
+      ref="modal"
+      labelWidth="150px"
+      :modalConfig="modalConfig"
+      :modalData="modalData"
+      :modalHandles="modalHandles"
+    >
+      <div slot="dialog__content">
+        <el-form
+          :model="ruleForm"
+          ref="ruleForm"
+          label-width="150px"
+          class="demo-ruleForm"
+        >
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="菜市场名称：">
+                <span>{{ ruleForm.name }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="经营模式：">
+                <span>{{
+                  ruleForm.manageMode == 0 ? "平台" : "个体经营者"
+                }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="状态：">
+                <span>{{ ruleForm.status == 0 ? "禁用" : "启用" }}</span>
+              </el-form-item></el-col
+            >
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="地址：">
+                <span
+                  >{{ ruleForm.provinceName }}{{ ruleForm.ruleForm
+                  }}{{ ruleForm.areaName }}{{ ruleForm.address }}</span
+                >
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="经度：">
+                <span>{{ ruleForm.longitude }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="纬度：">
+                <span>{{ ruleForm.latitude }}</span>
+              </el-form-item></el-col
+            >
+          </el-row>
+          <!-- <el-row v-if="ruleForm.manageMode == 1">
+            <el-col :span="8">
+              <el-form-item label="经营者名称：">
+                <span>{{ ruleForm.operatorName }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="经营者账号：">
+                <span>{{ ruleForm.operatorPhone }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+             </el-col>
+          </el-row> -->
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="背景图片：">
+                <el-image
+                  style="width: 100px; height: 100px"
+                  :src="ruleForm.background?.split(';')[0]"
+                  :preview-src-list="ruleForm.background?.split(';')"
+                >
+                </el-image> </el-form-item
+            ></el-col>
+            <el-col :span="8">
+              <el-form-item label="是否开启第三方骑手配送：">
+                <span>{{ ruleForm.isThirdPartyDelivery ? "是" : "否" }}</span>
+              </el-form-item></el-col
+            >
+            <el-col :span="8">
+              <el-form-item label="营业状态：">
+                <span>{{
+                  ruleForm.businessStatus == 0 ? "休息" : "经营中"
+                }}</span>
+              </el-form-item></el-col
+            >
+          </el-row>
+        </el-form>
+      </div>
+      <!-- 选择商品 -->
+    </obj-modal>
+  </div>
+</template>
+<script>
+import { debounce, cloneDeep } from "lodash";
+export default {
+  components: {},
+  props: {},
+  data() {
+    return {
+      isAdd: true,
+      //表格属性
+      modalConfig: {
+        title: "订单详情",
+        show: false,
+        width: "1200px",
+        fullscreen: true,
+      },
+      modalData: {},
+      ruleForm: {},
+      tableData: [],
+    };
+  },
+  watch: {
+    // "modalConfig.show"(newVal) {
+    //   if (newVal) {
+    //     //关闭弹窗清空校验
+    //     setTimeout(() => {
+    //       this.$refs.ruleForm.resetFields();
+    //     });
+    //   }
+    // },
+  },
+  methods: {
+    queryTableData(pageNo, pageSize) {},
+    toggle(e) {
+      if (this.modalConfig.show == false) {
+        this.modalConfig.show = true;
+      } else {
+        this.modalConfig.show = false;
+      }
+      if (e) {
+        this.init(cloneDeep(e.row));
+      }
+      return {
+        add: () => {
+          this.modalConfig.title = "店铺详情";
+          this.isAdd = true;
+        },
+        update: () => {
+          this.modalConfig.title = "店铺详情";
+          this.isAdd = false;
+        },
+      };
+    },
+    init(row) {
+      console.log(row);
+      this.ruleForm = row;
+    },
+    handleSelectionChange(e) {
+      console.log(e);
+    },
+    getRefundStatus(val) {
+      if (val == 0) {
+        return "正常";
+      } else if (val == 1) {
+        return "退款中";
+      } else if (val == 2) {
+        return "完全退款";
+      } else if (val == 3) {
+        return "部分退款";
+      } else if (val == 4) {
+        return "拒绝用户退款";
+      } else if (val == -1) {
+        return "退款失败";
+      } else if (val == -2) {
+        return "用户申请退款中";
+      }
+    },
+  },
+  computed: {
+    modalHandles() {
+      return [
+        {
+          label: "关闭",
+          handle: () => {
+            this.toggle();
+          },
+        },
+        // {
+        //   label: "确认",
+        //   type: "primary",
+        //   // submit: true,
+        //   handle: () => {
+        //   },
+        // },
+      ];
+    },
+  },
+  asyncComputed: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/modules/operation-management/brand-order/index.vue b/src/views/modules/operation-management/brand-order/index.vue
index 661fef6..06e6764 100644
--- a/src/views/modules/operation-management/brand-order/index.vue
+++ b/src/views/modules/operation-management/brand-order/index.vue
@@ -1,15 +1,434 @@
 <template>
-  <div>
-    品牌订单
+  <div style="height: calc(100vh - 180px)">
+    <el-form :inline="true" :model="form" class="demo-form-inline">
+      <el-form-item label="收货人姓名">
+        <el-input v-model="form.name" placeholder="收货人姓名搜索"></el-input>
+      </el-form-item>
+      <el-form-item label="订单编号">
+        <el-input v-model="form.orderNo" placeholder="订单编号"></el-input>
+      </el-form-item>
+      <el-form-item label="订单时间">
+        <el-date-picker
+          value-format="yyyy-MM-dd HH:mm:ss"
+          @change="changeTime"
+          v-model="time"
+          type="datetimerange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList">查询</el-button>
+        <el-button type="primary" @click="Reset">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="stat-list">
+      <div class="stat-item">
+        <i
+          class="el-icon-s-order"
+          style="font-size: 22px; margin-right: 8px"
+        ></i>
+        <div class="stat-right">
+          <div class="stat-title">订单数量（笔）</div>
+          <div class="stat-value">
+            <span style="font-size: 20px">{{ overviewList.totalCount }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="stat-item">
+        <i
+          class="el-icon-s-goods"
+          style="font-size: 22px; margin-right: 8px"
+        ></i>
+        <div class="stat-right">
+          <div class="stat-title">订单金额（元）</div>
+          <div class="stat-value">
+            <span style="font-size: 20px">{{ overviewList.totalMoney }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="stat-item">
+        <i
+          class="el-icon-s-marketing"
+          style="font-size: 22px; margin-right: 8px"
+        ></i>
+        <div class="stat-right">
+          <div class="stat-title">退款金额</div>
+          <div class="stat-value">
+            <span style="font-size: 20px">{{
+              overviewList.totalRefundMoney
+            }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="stat-item">
+        <i
+          class="el-icon-s-order"
+          style="font-size: 22px; margin-right: 8px"
+        ></i>
+        <div class="stat-right">
+          <div class="stat-title">订单完成率</div>
+          <div style="font-size: 20px" class="stat-value">
+            {{ overviewList.completeRate }}%
+          </div>
+        </div>
+      </div>
+      <div v-if="!isBrand" class="stat-item">
+        <i
+          class="el-icon-s-order"
+          style="font-size: 22px; margin-right: 8px"
+        ></i>
+        <div class="stat-right">
+          <div class="stat-title">代理商抽成(元)</div>
+          <div style="font-size: 20px" class="stat-value">
+            {{
+              overviewList.agentCommission ? overviewList.agentCommission : 0
+            }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="全部订单" name="全部订单"></el-tab-pane>
+      <el-tab-pane label="待支付" name="待支付"></el-tab-pane>
+      <el-tab-pane label="待接单" name="待接单"></el-tab-pane>
+      <el-tab-pane label="待备货" name="待备货"></el-tab-pane>
+      <el-tab-pane label="待取货" name="待取货"></el-tab-pane>
+      <el-tab-pane label="已取货" name="已取货"></el-tab-pane>
+      <el-tab-pane label="配送中" name="配送中"></el-tab-pane>
+      <el-tab-pane label="已配送" name="已配送"></el-tab-pane>
+      <el-tab-pane label="完成" name="完成"></el-tab-pane>
+      <el-tab-pane label="未支付订单取消" name="未支付订单取消"></el-tab-pane>
+      <el-tab-pane label="用户申请退款中" name="用户申请退款中"></el-tab-pane>
+      <el-tab-pane label="用户申请已退款" name="用户申请已退款"></el-tab-pane>
+      <el-tab-pane label="商家取消订单" name="商家取消订单"></el-tab-pane>
+      <el-tab-pane label="平台取消订单" name="平台取消订单"></el-tab-pane>
+    </el-tabs>
+    <el-table :data="tableData" height="70%" border style="width: 100%">
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <div style="padding-left: 20px" m="4">
+            <el-table :data="props.row.shopOrderResults" :border="true">
+              <el-table-column type="expand">
+                <template slot-scope="props">
+                  <div style="padding-left: 20px" m="4">
+                    <el-table
+                      :data="props.row.productOrderResults"
+                      :border="true"
+                    >
+                      <el-table-column type="index" width="50" label="序号">
+                      </el-table-column>
+                      <el-table-column label="商品名称" prop="productName" />
+                      <el-table-column label="商品数量" prop="productCount" />
+                      <el-table-column label="商品原价" prop="originPrice" />
+                      <el-table-column label="商品终价" prop="finalPrice" />
+                      <el-table-column
+                        label="商品订单金额"
+                        prop="productOrderMoney"
+                      />
+                      <el-table-column label="商品图片" prop="productImg">
+                        <template #default="scope">
+                          <el-image
+                            style="width: 60px; height: 60px"
+                            :src="scope.row.productImg"
+                            :zoom-rate="1.2"
+                            :max-scale="7"
+                            :min-scale="0.2"
+                            :preview-src-list="[scope.row.productImg]"
+                            :initial-index="4"
+                            :preview-teleported="true"
+                            fit="cover"
+                          />
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column type="index" width="50" label="序号">
+              </el-table-column>
+              <el-table-column label="订单编号" prop="unitOrderNo" />
+              <el-table-column label="店铺名称" prop="shopName" />
+            </el-table>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column type="index" width="50" label="序号"> </el-table-column>
+      <el-table-column label="总订单号" prop="orderNo" />
+      <el-table-column label="下单时间" prop="createTime" />
+      <el-table-column label="收货人姓名" prop="receiverName" />
+      <el-table-column label="收货人电话" prop="receiverPhone" />
+      <el-table-column label="收货人地址" prop="poi">
+        <template #default="scope">
+          {{ scope.row.poi }} {{ scope.row.detail }}
+        </template>
+      </el-table-column>
+      <el-table-column label="市场订单金额" prop="unitOrderMoney" />
+      <el-table-column label="市场订单商品金额" prop="productMoney" />
+      <el-table-column label="市场订单配送费" prop="deliveryMoney" />
+      <el-table-column label="调度费" prop="dispatchMoney" />
+      <el-table-column label="包装费" prop="packageMoney" />
+      <el-table-column label="订单支付状态" prop="payStatus">
+        <template slot-scope="scope">
+          {{ filterStatus(scope.row.payStatus) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="订单业务状态" prop="status">
+        <template slot-scope="scope">
+          {{ filterUnitStatus(scope.row.status) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="订单退款状态" prop="refundStatus">
+        <template slot-scope="scope">
+          {{ filterUnitRefundStatus(scope.row.refundStatus) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="订单结算状态" prop="settleStatus">
+        <template slot-scope="scope">
+          {{ scope.row.settleStatus == 0 ? "未结算" : "已结算" }}
+        </template>
+      </el-table-column>
+      <el-table-column label="市场编号" prop="settleStatus" />
+      <el-table-column label="市场名称" prop="marketName" />
+      <el-table-column label="申请退款原因" prop="refundReason" />
+    </el-table>
+    <!-- 分页 -->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="formInline.pageNumber"
+        :page-sizes="[10, 20, 30, 50]"
+        :page-size="formInline.pageSize"
+        :total="total"
+        background
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
   </div>
 </template>
 
 <script>
 export default {
+  data() {
+    return {
+      activeName: "全部订单",
+      formInline: {
+        pageNumber: 1,
+        pageSize: 10,
+        brandId: "",
+        agentId: "",
+      },
+      form: {
+        name: "",
+        orderNo: "",
+        startTime: "",
+        endTime: "",
+      },
+      total: 0,
+      state: "",
+      tableData: [],
+      time: "",
+      overviewList: {},
+      isBrand: false,
+    };
+  },
+  created() {
+    if (
+      JSON.parse(sessionStorage.getItem("userInfo")).role ===
+      "ROLE_BRAND_MANAGER"
+    ) {
+      this.formInline.brandId = JSON.parse(
+        sessionStorage.getItem("userInfo")
+      ).brandId;
+      this.isBrand = true;
+    } else {
+      this.formInline.brandId = JSON.parse(
+        sessionStorage.getItem("userInfo")
+      ).agentId;
+      this.isBrand = false;
+    }
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.$api.mer_admin
+        .distributorOrBrandOrderPage({
+          ...this.formInline,
+          state: this.state,
+          ...this.form,
+        })
+        .then((res) => {
+          console.log(res);
+          this.tableData = res.data.data.data;
+          this.total = Number(res.data.data.total);
+        });
+      this.$api.mer_admin
+        .orderOverview({ ...this.formInline, ...this.form })
+        .then()
+        .then((res) => {
+          this.overviewList = res.data.data;
+          console.log(res);
+        });
+    },
+    Reset() {
+      this.form = {
+        name: "",
+        orderNo: "",
+        startTime: "",
+        endTime: "",
+      };
+      this.getList();
+    },
+    handleClick(activeName) {
+      switch (activeName.label) {
+        case "全部订单":
+          this.state = "";
+          break;
+        case "待支付":
+          this.state = 0;
+          break;
+        case "待接单":
+          this.state = 1;
+          break;
+        case "待备货":
+          this.state = 2;
+          break;
+        case "待取货":
+          this.state = 3;
+          break;
+        case "已取货":
+          this.state = 4;
+          break;
+        case "配送中":
+          this.state = 5;
+          break;
+        case "已配送":
+          this.state = 6;
+          break;
+        case "完成":
+          this.state = 8;
+          break;
+        case "未支付订单取消":
+          this.state = -1;
+          break;
+        case "用户申请退款中":
+          this.state = -2;
+          break;
+        case "用户申请已退款":
+          this.state = -3;
+          break;
+        case "商家取消订单":
+          this.state = -4;
+          break;
+        case "平台取消订单":
+          this.state = -5;
+          break;
+      }
 
-}
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.formInline.pageSize = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.formInline.pageNumber = val;
+      this.getList();
+    },
+    filterStatus(val) {
+      if (val === 0) {
+        return "待支付";
+      } else if (val == 1) {
+        return "已支付";
+      } else if (val == -1) {
+        return "已取消";
+      } else if (val == -2) {
+        return "已退款";
+      } else if (val == -3) {
+        return "部分退款";
+      }
+    },
+    filterUnitStatus(val) {
+      if (val === 0) {
+        return "待支付";
+      } else if (val == 1) {
+        return "待接单";
+      } else if (val == 2) {
+        return "待备货";
+      } else if (val == 3) {
+        return "待取货";
+      } else if (val == 4) {
+        return "已取货";
+      } else if (val == 5) {
+        return "配送中";
+      } else if (val == 6) {
+        return "已配送";
+      } else if (val == 8) {
+        return "完成";
+      } else if (val == -1) {
+        return "未支付订单取消";
+      } else if (val == -2) {
+        return "用户申请退款中";
+      } else if (val == -3) {
+        return "用户申请已退款";
+      } else if (val == -4) {
+        return "商家取消订单";
+      } else if (val == -5) {
+        return "平台取消订单";
+      }
+    },
+    filterUnitRefundStatus(val) {
+      if (val === 0) {
+        return "正常";
+      } else if (val == 1) {
+        return "退款中";
+      } else if (val == 2) {
+        return "完全退款";
+      } else if (val == 3) {
+        return "部分退款";
+      } else if (val == 4) {
+        return "拒绝用户退款";
+      } else if (val == -1) {
+        return "退款失败";
+      } else if (val == -2) {
+        return "用户申请退款中";
+      }
+    },
+    changeTime(e) {
+      if (e) {
+        this.form.startTime = e[0];
+        this.form.endTime = e[1];
+      } else {
+        this.form.startTime = "";
+        this.form.endTime = "";
+      }
+    },
+  },
+};
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.stat-list {
+  display: flex;
+  align-items: center;
+  /* justify-content: space-between; */
+  // flex-wrap: wrap;
+  margin-bottom: 10px;
+  padding: 10px;
+  border: 1px solid #ccc;
+}
+.stat-item {
+  width: 20%;
+  margin: 20px 20px;
+  display: flex;
+  align-items: center;
+}
+.stat-right {
+  font-size: 18px;
+}
+.stat-title {
+  margin-bottom: 5px;
+}
 </style>
\ No newline at end of file