导航修改

src/layout/components/Sidebar/components/SidebarLogo.vue

@@ -3,7 +3,22 @@
     <transition name="el-fade-in-linear" mode="out-in">
       <router-link :key="+collapse" class="wh-full flex-center" to="/">
         <img :src="userStore.userInfo.logo" class="w20px h20px" />
-        <span v-if="!collapse" class="title">{{ userStore.userInfo.shopName }}</span>
+        <!-- <span v-if="!collapse" class="title">{{ userStore.userInfo.shopName }}</span> -->
+        <el-dropdown trigger="click">
+          <span class="el-dropdown-link">
+            <span v-if="!collapse" class="title">{{ userStore.userInfo.shopName }}</span>
+            <el-icon class="el-icon--right">
+              <arrow-down />
+            </el-icon>
+          </span>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item>门店 1</el-dropdown-item>
+              <el-dropdown-item>门店 2</el-dropdown-item>
+              <el-dropdown-item>门店 3</el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
       </router-link>
     </transition>
   </div>
@@ -30,7 +45,8 @@ defineProps({
   background-color: $sidebar-logo-background;
 
   .title {
-    flex-shrink: 0; /* 防止容器在空间不足时缩小 */
+    flex-shrink: 0;
+    /* 防止容器在空间不足时缩小 */
     margin-left: 10px;
     font-size: 16px;
     color: #5a5e66;

src/router/index.ts

@@ -63,38 +63,6 @@ export const constantRoutes: RouteRecordRaw[] = [
           keepAlive: true,
         },
       },
-      {
-        path: "credit",
-        name: "",
-        component: () => import("@/views/data/credit/index.vue"),
-        meta: {
-          title: "挂账管理",
-          affix: false,
-          keepAlive: true,
-
-        },
-      },
-      {
-        path: "credit-detail",
-        name: "",
-        component: () => import("@/views/data/credit/detail.vue"),
-        meta: {
-          title: "挂账明细",
-          affix: false,
-          keepAlive: true,
-          hidden: true
-        },
-      },
-      {
-        path: "work",
-        name: "",
-        component: () => import("@/views/data/work.vue"),
-        meta: {
-          title: "交班记录",
-          affix: false,
-          keepAlive: true,
-        },
-      },
       {
         path: "401",
         component: () => import("@/views/error/401.vue"),
@@ -473,7 +441,6 @@ export const constantRoutes: RouteRecordRaw[] = [
 
   //     /**列表end */
 
-
   //   ],
   // },
   // {

src/views/shop/list/index.vue

@@ -3,33 +3,16 @@
     <div class="head-container">
       <el-row :gutter="20">
         <el-col :span="3">
-          <el-input
+          <el-input v-model="state.query.name" clearable placeholder="请输入店铺名称" style="width: 100%" class="filter-item"
-            v-model="state.query.name"
+            @keyup.enter="getTableData" />
-            clearable
-            placeholder="请输入店铺名称"
-            style="width: 100%"
-            class="filter-item"
-            @keyup.enter="getTableData"
-          />
         </el-col>
         <el-col :span="3">
-          <el-input
+          <el-input v-model="state.query.account" clearable placeholder="请输入商户号" style="width: 100%" class="filter-item"
-            v-model="state.query.account"
+            @keyup.enter="getTableData" />
-            clearable
-            placeholder="请输入商户号"
-            style="width: 100%"
-            class="filter-item"
-            @keyup.enter="getTableData"
-          />
         </el-col>
         <el-col :span="3">
           <el-select v-model="state.query.status" placeholder="请选择店铺状态" style="width: 100%">
-            <el-option
+            <el-option v-for="item in state.status" :key="item.type" :label="item.label" :value="item.type" />
-              :label="item.label"
-              :value="item.type"
-              v-for="item in state.status"
-              :key="item.type"
-            />
           </el-select>
         </el-col>
         <el-col :span="6">
@@ -42,33 +25,31 @@
       <el-button type="primary" icon="plus" @click="addShopShow">添加店铺</el-button>
     </div>
     <div class="head-container">
-      <el-table :data="state.tableData.list" v-loading="state.tableData.loading">
+      <el-table v-loading="state.tableData.loading" :data="state.tableData.list">
         <el-table-column label="店铺信息" width="200">
           <template v-slot="scope">
             <div class="shop_info">
-              <el-image
+              <el-image :src="scope.row.logo"
-                :src="scope.row.logo"
+                style="width: 50px; height: 50px; border-radius: 4px; background-color: #efefef">
-                style="width: 50px; height: 50px; border-radius: 4px; background-color: #efefef"
-              >
                 <template #error>
                   <div class="img_error">
-                    <i class="icon el-icon-document-delete"></i>
+                    <i class="icon el-icon-document-delete" />
                   </div>
                 </template>
               </el-image>
               <div class="info">
                 <span>{{ scope.row.shopName }}</span>
                 <div class="tag_wrap">
-                  <el-tag type="info" effect="dark" v-if="scope.row.profiles == 'no'">
+                  <el-tag v-if="scope.row.profiles == 'no'" type="info" effect="dark">
                     未激活
                   </el-tag>
-                  <el-tag type="warning" effect="dark" v-if="scope.row.profiles == 'probation'">
+                  <el-tag v-if="scope.row.profiles == 'probation'" type="warning" effect="dark">
                     试用
                   </el-tag>
-                  <el-tag type="success" effect="dark" v-if="scope.row.profiles == 'release'">
+                  <el-tag v-if="scope.row.profiles == 'release'" type="success" effect="dark">
                     正式
                   </el-tag>
-                  <el-tag type="primary" effect="dark" v-if="scope.row.isWxMaIndependent">
+                  <el-tag v-if="scope.row.isWxMaIndependent" type="primary" effect="dark">
                     独立小程序
                   </el-tag>
                 </div>
@@ -76,23 +57,24 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="registerType" label="类型">
+        <el-table-column prop="registerType" label="经营模式">
           <template v-slot="scope">
             <span v-if="scope.row.registerType == 'before'">快餐版</span>
             <span v-if="scope.row.registerType == 'after'">餐饮版</span>
           </template>
         </el-table-column>
-        <el-table-column prop="address" label="商户号"></el-table-column>
+        <el-table-column prop="address" label="商户号" />
-        <el-table-column prop="lowPrice" label="来源"></el-table-column>
+        <el-table-column prop="status" label="店铺类型">
-        <el-table-column prop="lowPrice" label="认证状态">-</el-table-column>
+          <template v-slot="scope">
+            <div>
+              <span>{{ scope.row.shopName }}</span>
+              <div>(主店：)</div>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="status" label="店铺状态">
           <template v-slot="scope">
-            <el-switch
+            <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled />
-              v-model="scope.row.status"
-              :active-value="1"
-              :inactive-value="0"
-              disabled
-            ></el-switch>
           </template>
         </el-table-column>
         <el-table-column prop="createdAt" label="到期时间">
@@ -106,17 +88,23 @@
         <el-table-column label="操作" width="200">
           <template v-slot="scope">
             <el-link @click="addShopShow(scope.row)">
-              <el-icon><Edit /></el-icon>
+              <el-icon>
+                <Edit />
+              </el-icon>
               编辑
             </el-link>
             <el-link @click="activateCodeShow(scope.row)">
-              <el-icon><Edit /></el-icon>
+              <el-icon>
+                <Edit />
+              </el-icon>
               激活
             </el-link>
             <el-dropdown @command="dropdownClick($event, scope.row)">
               <el-link>
                 更多
-                <el-icon><ArrowDown /></el-icon>
+                <el-icon>
+                  <ArrowDown />
+                </el-icon>
               </el-link>
 
               <template #dropdown>
@@ -136,14 +124,9 @@
       </el-table>
     </div>
     <div class="head-container">
-      <el-pagination
+      <el-pagination v-model:current-page="state.tableData.page" v-model:page-size="state.tableData.size"
-        :total="state.tableData.total"
+        :total="state.tableData.total" :page-sizes="[10, 20, 30, 50, 100]"
-        v-model:current-page="state.tableData.page"
+        layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
-        v-model:page-size="state.tableData.size"
-        :page-sizes="[10, 20, 30, 50, 100]"
-        @current-change="paginationChange"
-        layout="total, sizes , prev, pager ,next, jumper "
-      ></el-pagination>
     </div>
     <addShop ref="refAddShop" @success="getTableData" />
     <detailModal ref="refDetailModal" />
@@ -217,7 +200,7 @@ function dropdownClick(e, row) {
         });
         getTableData();
       })
-      .catch(() => {});
+      .catch(() => { });
     return;
   }
 }
@@ -257,6 +240,7 @@ async function getTableData() {
 .head-container {
   margin-bottom: 20px;
 }
+
 .shop_info {
   display: flex;
 
@@ -265,8 +249,9 @@ async function getTableData() {
     padding-left: 4px;
   }
 }
+
 .el-link {
   min-height: 23px;
   margin: 0 5px;
 }
-</style>
+</style>