diff --git a/src/api/modules/marketing.js b/src/api/modules/marketing.js
index f9a8c08..13a50d5 100644
--- a/src/api/modules/marketing.js
+++ b/src/api/modules/marketing.js
@@ -146,4 +146,12 @@ export const marketing = {
       data,
     });
   },
+  //概况
+  overview: (data) => {
+    return $http.request({
+      url: `/merchant-api/memberUnitUser/overview`,
+      method: "get",
+      params: data,
+    });
+  },
 };
diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index d580fd2..8c203a3 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -92,33 +92,6 @@ export default {
         },
       ],
     },
-    {
-      menuId: getUUID(),
-      parentId: 0,
-      parentName: null,
-      name: "运费管理",
-      url: "",
-      perms: "",
-      type: 0,
-      elIcon: "el-icon-money",
-      orderNum: 0,
-      open: null,
-      list: [
-        {
-          menuId: getUUID(),
-          parentId: 0,
-          parentName: null,
-          name: "运费模板",
-          url: "logistics-fare/logistics-template/index",
-          perms: "",
-          type: 1,
-          elIcon: "el-icon-postcard",
-          orderNum: 0,
-          open: null,
-          list: [],
-        },
-      ],
-    },
     {
       menuId: getUUID(),
       parentId: 0,
@@ -477,6 +450,33 @@ export default {
         },
       ],
     },
+    {
+      menuId: getUUID(),
+      parentId: 0,
+      parentName: null,
+      name: "运费管理",
+      url: "",
+      perms: "",
+      type: 0,
+      elIcon: "el-icon-money",
+      orderNum: 0,
+      open: null,
+      list: [
+        {
+          menuId: getUUID(),
+          parentId: 0,
+          parentName: null,
+          name: "运费模板",
+          url: "logistics-fare/logistics-template/index",
+          perms: "",
+          type: 1,
+          elIcon: "el-icon-postcard",
+          orderNum: 0,
+          open: null,
+          list: [],
+        },
+      ],
+    },
   ],
   code: 0,
   permissions: [],
diff --git a/src/views/common/home.vue b/src/views/common/home.vue
index 743996c..c89f998 100644
--- a/src/views/common/home.vue
+++ b/src/views/common/home.vue
@@ -119,7 +119,7 @@ export default {
       JSON.parse(sessionStorage.getItem("password")) == "123456" &&
       JSON.parse(sessionStorage.getItem("role")) === "ROLE_BRAND_MANAGER"
     ) {
-      this.dialogVisible = false;
+      this.dialogVisible = true;
     }
   },
   methods: {
@@ -128,8 +128,9 @@ export default {
         console.log(valid);
         if (valid) {
           this.$api.mer_admin
-            .simplePassword({
-              password: this.form.password,
+            .changePassword({
+              oldPassword: JSON.parse(sessionStorage.getItem("password")),
+              newPassword: this.form.password,
             })
             .then((res) => {
               this.$api.logout().then(({ data }) => {
diff --git a/src/views/modules/marketing/user/index.vue b/src/views/modules/marketing/user/index.vue
index 9f7d1b8..13a91f5 100644
--- a/src/views/modules/marketing/user/index.vue
+++ b/src/views/modules/marketing/user/index.vue
@@ -92,7 +92,9 @@
             <div class="stat-right">
               <div class="stat-title">用户数量（人）</div>
               <div class="stat-value">
-                <span style="font-size: 20px">99999</span>
+                <span style="font-size: 20px">{{
+                  overviewList.totalCount
+                }}</span>
               </div>
             </div>
           </div>
@@ -101,7 +103,9 @@
             <div class="stat-right">
               <div class="stat-title">今日新增（人）</div>
               <div class="stat-value">
-                <span style="font-size: 20px">234</span>
+                <span style="font-size: 20px">{{
+                  overviewList.todayCount
+                }}</span>
               </div>
             </div>
           </div>
@@ -150,6 +154,7 @@ export default {
       productFilterType: "SALE",
       selectList: [],
       value1: [],
+      overviewList: {},
     };
   },
   created() {
@@ -192,6 +197,11 @@ export default {
         .catch((err) => {
           this.$refs.oTable.complete(false);
         });
+      this.$api.marketing
+        .overview({ ...this.formInline, ...this.form })
+        .then((res) => {
+          this.overviewList = res.data.data;
+        });
     },
     Reset() {
       this.form = {};
@@ -209,7 +219,7 @@ export default {
       }
     },
     async userExport() {
-        let now = new Date();
+      let now = new Date();
       let year = now.getFullYear();
       let month = now.getMonth() + 1;
       let day = now.getDate();
diff --git a/src/views/modules/product/order/index.vue b/src/views/modules/product/order/index.vue
index 49979af..da6f56b 100644
--- a/src/views/modules/product/order/index.vue
+++ b/src/views/modules/product/order/index.vue
@@ -1,5 +1,4 @@
 <template>
-  <div>
     <div style="height: calc(100vh - 200px)">
       <obj-table-plus
         ref="oTable"
@@ -62,15 +61,17 @@
           </div> -->
         </template>
       </obj-table-plus>
+      <!-- 订单详情 -->
+      <viewDetails ref="viewDetails"></viewDetails>
     </div>
-  </div>
 </template>
 
 <script>
-import content from "./content.vue";
+import viewDetails from "./popup/view-details.vue";
+import content from "./popup/content.vue";
 import { mapState } from "vuex";
 export default {
-  components: { content },
+  components: { content,viewDetails },
   data() {
     return {
       activeName: "5",
diff --git a/src/views/modules/product/order/content.vue b/src/views/modules/product/order/popup/content.vue
similarity index 100%
rename from src/views/modules/product/order/content.vue
rename to src/views/modules/product/order/popup/content.vue
diff --git a/src/views/modules/product/order/popup/view-details.vue b/src/views/modules/product/order/popup/view-details.vue
new file mode 100644
index 0000000..6a2df06
--- /dev/null
+++ b/src/views/modules/product/order/popup/view-details.vue
@@ -0,0 +1,81 @@
+<template>
+  <div>
+    <obj-modal
+      ref="modal"
+      labelWidth="150px"
+      :modalCols="modalCols"
+      :modalConfig="modalConfig"
+      :modalData="modalData"
+      :modalHandles="modalHandles"
+    >
+      <template slot="dialog__after">
+        <div class="introduce">
+        </div>
+      </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: "60%",
+      },
+      modalData: {},
+      value1: [],
+      ProductData: {},
+    };
+  },
+  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));
+      }
+      return {
+        add: () => {
+          this.modalConfig.title = "订单详情";
+          this.isAdd = true;
+        },
+        update: () => {
+          this.isAdd = false;
+        },
+      };
+    },
+    init(row) {
+      this.modalData = row;
+    },
+  },
+  computed: {
+    modalCols() {
+      return [];
+    },
+    modalHandles() {
+      return [
+        {
+          label: "取消",
+          handle: () => {
+            this.toggle();
+          },
+        },
+      ];
+    },
+  },
+  asyncComputed: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file