优化

src/api/member/coupon/coupon.js

@@ -1,33 +0,0 @@
-import request from '@/utils/request'
-// 超级会员专属优惠券列表
-export function fetchCouponList(params) {
-  return request({
-    url: '/svip/member/couponList',
-    method: 'get',
-    params
-  })
-}
-// 关闭超级会员专属优惠券
-export function fetchCloseCoupon(params) {
-  return request({
-    url: '/svip/member/closeCoupon',
-    method: 'get',
-    params
-  })
-}
-// 开启超级会员专属优惠券
-export function fetchOpenCoupon(params) {
-  return request({
-    url: '/svip/member/openCoupon',
-    method: 'get',
-    params
-  })
-}
-// 删除超级会员专属优惠券
-export function fetchDeleteCoupon(params) {
-  return request({
-    url: '/svip/member/deleteCoupon',
-    method: 'get',
-    params
-  })
-}

src/api/member/coupon/detail.js

@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 获取供应商列表
-export function fetchFindShop(params) {
-  return request({
-    url: '/svip/member/findShopList',
-    method: 'get',
-    params
-  })
-}
-// 获取商品信息列表
-export function fetchProductList(params) {
-  return request({
-    url: '/svip/member/findProductDialogList',
-    method: 'get',
-    params
-  })
-}

src/api/member/manage/manage.js

@@ -1,31 +0,0 @@
-import request from '@/utils/request'
-
-export function fetchMemberList(params) {
-  return request({
-    url: '/svip/member/memberList',
-    method: 'get',
-    params
-  })
-}
-export function fetchClubList(params) {
-  return request({
-    url: '/svip/member/findClubList',
-    method: 'get',
-    params
-  })
-}
-export function saveSvip(params) {
-  return request({
-    url: '/svip/member/saveSvip',
-    method: 'post',
-    params
-  })
-}
-export function findHistory(params) {
-  return request({
-    url: '/svip/member/findHistory',
-    method: 'get',
-    params
-  })
-}
-

src/api/member/meal/meal.js

@@ -1,16 +0,0 @@
-import request from '@/utils/request'
-
-export function fetchFindPackage() {
-  return request({
-    url: '/svip/member/findPackage',
-    method: 'get'
-  })
-}
-
-export function updatePrice(params) {
-  return request({
-    url: '/svip/member/updatePrice',
-    method: 'post',
-    params
-  })
-}

src/api/member/member.js

@@ -0,0 +1,96 @@
+import request from '@/utils/request'
+
+export function fetchFindProductList(params) {
+  return request({
+    url: '/svip/member/findProductList',
+    method: 'get',
+    params
+  })
+}
+// 超级会员专属优惠券列表
+export function fetchCouponList(params) {
+  return request({
+    url: '/svip/member/couponList',
+    method: 'get',
+    params
+  })
+}
+// 关闭超级会员专属优惠券
+export function fetchCloseCoupon(id) {
+  return request({
+    url: '/svip/member/closeCoupon/' + id,
+    method: 'post'
+  })
+}
+// 开启超级会员专属优惠券
+export function fetchOpenCoupon(id) {
+  return request({
+    url: '/svip/member/openCoupon/' + id,
+    method: 'post'
+  })
+}
+// 删除超级会员专属优惠券
+export function fetchDeleteCoupon(id) {
+  return request({
+    url: '/svip/member/deleteCoupon/' + id,
+    method: 'post'
+  })
+}
+// 获取供应商列表
+export function fetchFindShop(params) {
+  return request({
+    url: '/svip/member/findShopList',
+    method: 'get',
+    params
+  })
+}
+// 获取商品信息列表
+export function fetchProductList(params) {
+  return request({
+    url: '/svip/member/findProductDialogList',
+    method: 'get',
+    params
+  })
+}
+export function fetchMemberList(params) {
+  return request({
+    url: '/svip/member/memberList',
+    method: 'get',
+    params
+  })
+}
+export function fetchClubList(params) {
+  return request({
+    url: '/svip/member/findClubList',
+    method: 'get',
+    params
+  })
+}
+export function saveSvip(params) {
+  return request({
+    url: '/svip/member/saveSvip',
+    method: 'post',
+    params
+  })
+}
+export function findHistory(params) {
+  return request({
+    url: '/svip/member/findHistory',
+    method: 'get',
+    params
+  })
+}
+export function fetchFindPackage() {
+  return request({
+    url: '/svip/member/findPackage',
+    method: 'get'
+  })
+}
+
+export function updatePrice(params) {
+  return request({
+    url: '/svip/member/updatePrice',
+    method: 'post',
+    params
+  })
+}

src/api/member/product/product.js

@@ -1,9 +0,0 @@
-import request from '@/utils/request'
-
-export function fetchFindProductList(params) {
-  return request({
-    url: '/svip/member/findProductList',
-    method: 'get',
-    params
-  })
-}

src/router/modules/member.js

@@ -6,35 +6,28 @@ const memberRouter = {
   redirect: '/member/member',
   alwaysShow: true, // will always show the root menu
   name: 'MemberSetting', // name必须和后台配置一致，不然匹配不到
-  meta: { title: '会员管理', icon: 'component' },
+  meta: { title: '超级会员管理', icon: 'component' },
   children: [
     {
       path: 'member',
       component: () => import('@/views/index'),
       redirect: '/member/member/list',
       name: 'MemberManage',
-      meta: { title: '超级会员列表', icon: 'documentation' },
+      meta: { title: '超级会员列表' },
       children: [
         {
           path: 'list',
           hidden: true,
           component: () => import('@/views/member/member/list.vue'),
           name: 'MemberList',
-          meta: { title: '超级会员列表', activeMenu: '/member/member' }
-        },
-        {
-          path: 'edit',
-          hidden: true,
-          component: () => import('@/views/member/member/form.vue'),
-          name: 'MemberEdit',
-          meta: { title: '赠送会员', activeMenu: '/member/member' }
+          meta: { title: '会员列表', activeMenu: '/finance/member' }
         },
         {
           path: 'record-list',
           hidden: true,
           component: () => import('@/views/member/member/record-list.vue'),
-          name: 'MemberRecord',
-          meta: { title: '购买记录', activeMenu: '/member/member/' }
+          name: 'MemberRecordList',
+          meta: { title: '购买记录', activeMenu: '/member/member' }
         }
       ]
     },
@@ -42,22 +35,22 @@ const memberRouter = {
       path: 'coupon',
       component: () => import('@/views/index'),
       redirect: '/member/coupon/list',
-      name: 'MemberManage',
-      meta: { title: '超级会员专属优惠券', icon: 'documentation' },
+      name: 'MemberCoupon',
+      meta: { title: '超级会员专属优惠券' },
       children: [
         {
           path: 'list',
           hidden: true,
           component: () => import('@/views/member/coupon/list.vue'),
-          name: 'MemberCoupon',
-          meta: { title: '超级会员专属优惠券', activeMenu: '/member/coupon' }
+          name: 'MemberCouponList',
+          meta: { title: '优惠券列表', activeMenu: '/member/coupon' }
         },
         {
-          path: 'detail',
+          path: 'edit',
           hidden: true,
-          component: () => import('@/views/member/coupon/detail.vue'),
-          name: 'MemberDetail',
-          meta: { title: '超级会员专属优惠券', activeMenu: '/member/coupon/' }
+          component: () => import('@/views/member/coupon/edit.vue'),
+          name: 'MemberEdit',
+          meta: { title: '编辑优惠券', activeMenu: '/member/coupon' }
         }
       ]
     },
@@ -65,15 +58,15 @@ const memberRouter = {
       path: 'product',
       component: () => import('@/views/index'),
       redirect: '/member/product/list',
-      name: 'MemberManage',
-      meta: { title: '超级会员优惠商品', icon: 'documentation' },
+      name: 'MemberProduct',
+      meta: { title: '超级会员优惠商品' },
       children: [
         {
           path: 'list',
           hidden: true,
           component: () => import('@/views/member/product/list.vue'),
-          name: 'MemberProduct',
-          meta: { title: '超级会员优惠商品', activeMenu: '/member/product' }
+          name: 'MemberProductList',
+          meta: { title: '优惠商品', activeMenu: '/member/product' }
         }
       ]
     },
@@ -81,15 +74,15 @@ const memberRouter = {
       path: 'meal',
       component: () => import('@/views/index'),
       redirect: '/member/meal/list',
-      name: 'MemberManage',
-      meta: { title: '超级会员套餐配置', icon: 'documentation' },
+      name: 'MemberMeal',
+      meta: { title: '超级会员套餐配置' },
       children: [
         {
-          path: 'list',
+          path: 'edit',
           hidden: true,
-          component: () => import('@/views/member/meal/index.vue'),
-          name: 'MemberMeal',
-          meta: { title: '超级会员套餐配置', activeMenu: '/member/meal' }
+          component: () => import('@/views/member/meal/form.vue'),
+          name: 'MemberMealEdit',
+          meta: { title: '套餐配置', activeMenu: '/member/meal' }
         }
       ]
     }

src/views/member/coupon/detail.vue → src/views/member/coupon/edit.vue

@@ -227,7 +227,7 @@
 </template>
 
 <script>
-import { fetchFindShop, fetchProductList } from '@/api/member/coupon/detail'
+import { fetchFindShop, fetchProductList } from '@/api/member/member'
 
 export default {
   name: 'MemberDetail',

src/views/member/coupon/list.vue

@@ -43,15 +43,16 @@
           </div>
         </div>
         <el-table :data="tableData" height="550" border style="width: 100%">
-          <el-table-column label="优惠月份" width="180">
+          <el-table-column label="优惠月份" align="center" width="180">
             <template slot-scope="{ row }">
               {{ row.useTime }} -- {{ row.endTime }}
             </template>
           </el-table-column>
-          <el-table-column prop="coupon" label="优惠券" width="780">
+          <el-table-column prop="coupon" label="优惠券" align="left" width="750">
             <template slot-scope="{ row }">
-              <p v-for="item in row.couponList" :key="item.index">
-                优惠券{{ item.index + 1 }} : <b>{{ item.couponType === 0 ? '活动券' : item.couponType === 1 ? '品类券' : '店铺券' }}</b>
+              <p v-for="(item,index) in row.couponList" :key="index">
+                优惠券
+                {{ index + 1 }} : <b>{{ item.couponType === 0 ? '活动券' : item.couponType === 1 ? '品类券' : '店铺券' }}</b>
                 ￥{{ item.couponAmount }}，满{{ item.touchPrice }}可用
                 {{ item.productType ? item.productType === '1' ? '，全商城商品通用' : '，仅可购买指定商品' : '' }}
                 {{ item.categoryType ? item.categoryType === '1' ? '，仅可购买产品类商品' : '，仅可购买仪器类商品' : '' }}
@@ -59,7 +60,7 @@
               </p>
             </template>
           </el-table-column>
-          <el-table-column prop="status" label="优惠状态">
+          <el-table-column prop="status" label="优惠状态" align="center" width="80">
             <template slot-scope="{ row }">
               <span v-if="row.status === '0'" class="el-span-zero">
                 未生效
@@ -75,12 +76,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="操作">
+          <el-table-column label="操作" align="center">
             <template slot-scope="{ row }">
-              <el-button type="text">编辑</el-button>
-              <el-button type="text" :hidden="row.status !== 2 ? false : true" @click="closeCoupon(row)">关闭</el-button>
-              <el-button type="text" :hidden="row.status === 2 ? false : true" @click="openCoupon(row)">开启</el-button>
-              <el-button type="text" @click="deleteCoupon(row)">删除</el-button>
+              <el-button type="primary" size="mini">编辑</el-button>
+              <el-button type="danger" size="mini" :hidden="row.status !== 2 ? false : true" @click="handleCloseCoupon(row)">关闭</el-button>
+              <el-button type="primary" size="mini" :hidden="row.status === 2 ? false : true" @click="handleOpenCoupon(row)">开启</el-button>
+              <el-button type="danger" size="mini" @click="handleDeleteCoupon(row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -117,17 +118,10 @@
         </div>
       </template>
     </el-tabs>
-    <el-dialog title="提示" :visible.sync="dialogTableVisible" width="50%">
-      <span>{{ msg }}</span>
-      <div slot="footer">
-        <el-button type="primary" @click="renovate()">确定</el-button>
-        <el-button type="primary" @click="dialogTableVisible = false">取消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
-import { fetchCouponList, fetchCloseCoupon, fetchOpenCoupon, fetchDeleteCoupon } from '@/api/member/coupon/coupon'
+import { fetchCouponList, fetchCloseCoupon, fetchOpenCoupon, fetchDeleteCoupon } from '@/api/member/member'
 
 const defaultCoupon = {
   type: '',
@@ -225,38 +219,55 @@ export default {
       this.total = res.data.totalRecord
     },
     // 关闭超级会员专属优惠券
-    async closeCoupon(row) {
-      const res = await fetchCloseCoupon(row.id)
-      this.dialogTableVisible = true
-      if (res.code === 1) {
-        this.msg = '关闭超级会员专属优惠券完成'
-      } else {
-        this.msg = '关闭超级会员专属优惠券失败'
-      }
+    handleCloseCoupon(row) {
+      this.$confirm('是否关闭超级会员专属优惠券？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        fetchCloseCoupon(row.id).then(response => {
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1000
+          })
+          this.getList()
+        })
+      })
     },
     // 开启超级会员专属优惠券
-    async openCoupon(row) {
-      const res = await fetchOpenCoupon(row.id)
-      this.dialogTableVisible = true
-      if (res.code === 1) {
-        this.msg = '开启超级会员专属优惠券完成'
-      } else {
-        this.msg = '开启超级会员专属优惠券失败'
-      }
+    handleOpenCoupon(row) {
+      this.$confirm('是否开启超级会员专属优惠券？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        fetchOpenCoupon(row.id).then(response => {
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1000
+          })
+          this.getList()
+        })
+      })
     },
     // 删除超级会员专属优惠券
-    async deleteCoupon(row) {
-      const res = await fetchDeleteCoupon(row.id)
-      this.dialogTableVisible = true
-      if (res.code === 1) {
-        this.msg = '删除超级会员专属优惠券完成'
-      } else {
-        this.msg = '删除超级会员专属优惠券失败'
-      }
-    },
-    renovate() {
-      this.dialogTableVisible = false
-      this.getlist()
+    handleDeleteCoupon(row) {
+      this.$confirm('是否要删除该优惠券套餐？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        fetchDeleteCoupon(row.id).then(response => {
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1000
+          })
+          this.getList()
+        })
+      })
     },
     handleAdd() {
       // 新增优惠券

src/views/member/meal/index.vue → src/views/member/meal/form.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { fetchFindPackage, updatePrice } from '@/api/member/meal/meal'
+import { fetchFindPackage, updatePrice } from '@/api/member/member'
 
 export default {
   name: 'MemberMeal',

src/views/member/member/list.vue

@@ -85,11 +85,11 @@
             <el-button type="primary" @click="getList">查询</el-button>
           </div>
         </div>
-        <el-table v-loading="isLoading" :data="tableData" height="550" border style="width: 100%">
-          <el-table-column prop="clubName" label="机构名称" width="180" />
-          <el-table-column prop="linkMan" label="联系人" width="180" />
-          <el-table-column prop="mobile" label="手机号" />
-          <el-table-column prop="status" label="会员状态">
+        <el-table v-loading="isLoading" :data="tableData" border style="width: 100%" :height="580">
+          <el-table-column prop="clubName" label="机构名称" align="center" />
+          <el-table-column prop="linkMan" label="联系人" align="center" />
+          <el-table-column prop="mobile" label="手机号" align="center" />
+          <el-table-column prop="status" label="会员状态" align="center" width="180">
             <template slot-scope="{ row }">
               <span v-if="row.status === '1'" class="el-span-status">
                 已生效
@@ -102,9 +102,9 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="75">
+          <el-table-column label="操作" align="center" width="180">
             <template slot-scope="{ row }">
-              <el-button type="text" size="mini" @click="handleTagsList(row)">购买记录</el-button>
+              <el-button type="primary" size="mini" @click="handleTagsList(row)">购买记录</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -120,43 +120,45 @@
         />
       </template>
       <template v-else>
-        <div class="filter-container">
-          <div class="filter-control">
-            <el-form :model="form" label-width="120px">
-              <el-form-item label="机构" :hidden="!hiddenItem">
-                <el-button type="text" size="mini" @click="getclubList()">请选择机构</el-button>
-              </el-form-item>
-              <el-form-item label="机构" :hidden="hiddenItem">
-                <el-table :data="clubData" border>
-                  <el-table-column prop="clubId" label="机构Id" />
-                  <el-table-column prop="name" label="机构名称" width="150px" />
-                  <el-table-column prop="linkMan" label="联系人" />
-                  <el-table-column prop="contractMobile" label="手机号" width="120px" />
-                  <el-table-column label="操作">
-                    <template slot-scope="{ row }">
-                      <el-button type="text" @click="deleteClub(row)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </el-form-item>
-              <el-form-item label="赠送会员">
-                <el-input v-model="form.month" size="mini" style="width: 150px">
-                  <template slot="append">个月</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" size="mini" @click="save()">保存</el-button>
-              </el-form-item>
-            </el-form>
+        <div class="club-container" style="width: 100%;height: 600px;padding-top: 40px;">
+          <div class="filter-container">
+            <div class="filter-control">
+              <el-form :model="form" label-width="120px">
+                <el-form-item label="机构" :hidden="!hiddenItem">
+                  <el-button type="primary" size="mini" icon="el-icon-plus" @click="handleDialogVisible">请选择机构</el-button>
+                </el-form-item>
+                <el-form-item label="机构" :hidden="hiddenItem">
+                  <el-table :data="clubData" border width="1000">
+                    <el-table-column prop="clubId" label="机构ID" align="center" width="120" />
+                    <el-table-column prop="name" label="机构名称" align="center" width="250" />
+                    <el-table-column prop="linkMan" label="联系人" align="center" width="120" />
+                    <el-table-column prop="contractMobile" label="手机号" align="center" width="120" />
+                    <el-table-column label="操作" align="center" width="120">
+                      <template slot-scope="{ row }">
+                        <el-button type="danger" size="mini" @click="deleteClub(row)">删除</el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+                <el-form-item label="赠送会员">
+                  <el-input v-model="form.month" style="width: 150px">
+                    <template slot="append">个月</template>
+                  </el-input>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" @click="save()">保存</el-button>
+                </el-form-item>
+              </el-form>
+            </div>
           </div>
         </div>
       </template>
     </el-tabs>
     <!-- 机构弹框 -->
-    <el-dialog title="选择机构" :visible.sync="dialogTableVisible" width="50%">
+    <el-dialog title="选择机构" :visible.sync="dialogTableVisible" width="1000px">
       <div class="filter-container">
         <div class="filter-control">
-          <span>机构Id:</span>
+          <span>机构ID:</span>
           <el-input
             v-model="clubForm.clubId"
             placeholder="机构Id"
@@ -183,17 +185,17 @@
           <el-button type="primary">搜索</el-button>
         </div>
       </div>
-      <el-table ref="table" :data="clubTableData" height="350px" @select="handleSelect">
+      <el-table ref="table" :data="clubTableData" height="350px" border @select="handleSelect">
         <el-table-column type="selection" width="55" />
-        <el-table-column property="clubId" label="机构Id" width="150" />
-        <el-table-column property="name" label="机构名称" width="150" />
-        <el-table-column property="shortName" label="机构简称" width="200" />
-        <el-table-column property="linkMan" label="联系人" />
-        <el-table-column property="contractMobile" label="手机号" />
+        <el-table-column property="clubId" label="机构Id" align="center" width="150" />
+        <el-table-column property="name" label="机构名称" align="center" width="150" />
+        <el-table-column property="shortName" label="机构简称" align="center" width="200" />
+        <el-table-column property="linkMan" label="联系人" align="center" />
+        <el-table-column property="contractMobile" label="手机号" align="center" />
       </el-table>
       <div slot="footer">
-        <el-button type="primary" @click="pushClub()">确定</el-button>
-        <el-button type="primary" @click="dialogTableVisible = false">取消</el-button>
+        <el-button @click="dialogTableVisible = false">取消</el-button>
+        <el-button type="primary" :disabled="disabled" @click="pushClub()">确定</el-button>
       </div>
       <!-- 页码 -->
       <pagination
@@ -210,7 +212,7 @@
 
 <script>
 
-import { fetchMemberList, fetchClubList, saveSvip } from '@/api/member/manage/manage'
+import { fetchMemberList, fetchClubList, saveSvip } from '@/api/member/member'
 
 const defaultListQuery = {
   clubName: '', // 机构名称
@@ -352,14 +354,16 @@ export default {
         pageNum: 1,
         pageSize: 20
       },
-      // 机构选择
-      radio: 1,
       hiddenItem: true,
       clubTableData: [],
-      // 选择机构
-      rows: [],
-      // 机构数据
-      clubData: []
+      clubRadio: null,
+      rows: [], // 选择机构
+      clubData: []// 机构数据
+    }
+  },
+  computed: {
+    disabled() {
+      return this.clubRadio === null
     }
   },
   created() {
@@ -370,8 +374,9 @@ export default {
     handleSelect(selection, row) {
       this.$refs.table.clearSelection()
       this.$refs.table.toggleRowSelection(row)
+      this.clubRadio = row.clubId
       this.rows = row
-      console.log('row', this.rows)
+      console.log('clubRadio', this.clubRadio)
     },
     // 会员列表数据
     async getList() {
@@ -381,9 +386,13 @@ export default {
       this.total = res.data.totalRecord
       this.isLoading = false
     },
+    handleDialogVisible() {
+      // 宣誓弹窗
+      this.dialogTableVisible = true
+      this.getclubList()
+    },
     // 机构数据
     async getclubList() {
-      this.dialogTableVisible = true
       const res = await fetchClubList(this.clubForm)
       this.clubTableData = res.data.results
       this.clubTotal = res.data.totalRecord
@@ -418,7 +427,10 @@ export default {
 
 </script>
 
-<style>
+<style lang="scss" scoped>
+::v-deep{
+  thead .el-checkbox{display: none !important;}
+}
 .el-span-status {
   color: rgb(16, 230, 8);
 }

src/views/member/member/record-list.vue

@@ -1,11 +1,35 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <div class="filter-control handel_club">
-        <span class="handel_span">机构名称: {{ clubName }}</span>
-        <span class="handel_span">联系人: {{ linkMan }}</span>
-        <span class="handel_span">手机号: {{ mobile }}</span>
-      </div><br>
+      <div class="filter-control">
+        <span>机构名称:</span>
+        <el-input
+          v-model="clubName"
+          placeholder="机构名称"
+          clearable
+          disabled="true"
+        />
+      </div>
+      <div class="filter-control">
+        <span>联系人:</span>
+        <el-input
+          v-model="linkMan"
+          placeholder="联系人"
+          clearable
+          disabled="true"
+        />
+      </div>
+      <div class="filter-control">
+        <span>手机号:</span>
+        <el-input
+          v-model="mobile"
+          placeholder="机构名称"
+          clearable
+          disabled="true"
+        />
+      </div>
+    </div>
+    <div class="filter-container">
       <div class="filter-control">
         <span>购买套餐:</span>
         <el-select v-model="listQuery.packageId" style="width:120px;" clearable @change="getList">
@@ -57,13 +81,13 @@
         <el-button type="primary" @click="getList">查询</el-button>
       </div>
     </div>
-    <el-table v-loading="isLoading" :data="tableData" height="550" border style="width: 100%">
-      <el-table-column label="购买套餐" width="180">
+    <el-table v-loading="isLoading" :data="tableData" border style="width: 100%">
+      <el-table-column label="购买套餐" align="center" width="180">
         <template slot-scope="{ row }">
           {{ row.packageId | packageFilters }}
         </template>
       </el-table-column>
-      <el-table-column label="购买价格" width="180">
+      <el-table-column label="购买价格" align="center" width="180">
         <template slot-scope="{ row }">
           {{ row.packageId | packageFilters }}
         </template>
@@ -76,7 +100,7 @@
           </template>
         </template>
       </el-table-column>
-      <el-table-column label="购买渠道">
+      <el-table-column label="购买渠道" align="center">
         <template slot-scope="{ row }">
           <span v-if="row.payWay === '0'" class="el-span-status">
             未知
@@ -98,7 +122,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="会员状态">
+      <el-table-column label="会员状态" align="center">
         <template slot-scope="{ row }">
           <span v-if="row.status === '1'" class="el-span-status">
             已生效
@@ -111,15 +135,15 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column prop="payTime" label="购买时间" />
-      <el-table-column prop="beginTime" label="生效时间" />
-      <el-table-column prop="endTime" label="到期时间" />
+      <el-table-column prop="payTime" label="购买时间" align="center" />
+      <el-table-column prop="beginTime" label="生效时间" align="center" />
+      <el-table-column prop="endTime" label="到期时间" align="center" />
     </el-table>
   </div>
 </template>
 
 <script>
-import { findHistory } from '@/api/member/manage/manage'
+import { findHistory } from '@/api/member/member'
 
 export default {
   name: 'MemberRecord',
@@ -302,14 +326,5 @@ export default {
 </script>
 
 <style>
-  .handel_span {
-    padding-left: 20px;
-    font-size: 20px;
-  }
-  .handel_club{
-    width: 100%;
-    height: 50px;
-    margin-top: 10px;
-    /* background-color: rgb(187, 183, 183); */
-  }
+
 </style>

src/views/member/product/list.vue

@@ -48,9 +48,9 @@
             <el-button type="primary" @click="getList">添加</el-button>
           </div>
         </div>
-        <el-table v-loading="isLoading" :data="tableData" height="550" border style="width: 100%">
-          <el-table-column prop="productId" label="商品id" />
-          <el-table-column prop="coupon" label="商品图片">
+        <el-table v-loading="isLoading" :data="tableData" border style="width: 100%">
+          <el-table-column prop="productId" label="商品ID" align="center" />
+          <el-table-column prop="coupon" label="商品图片" align="center">
             <template v-if="row.productId" slot-scope="{ row }">
               <el-popover
                 placement="top-start"
@@ -63,21 +63,21 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column prop="productName" label="商品名称" />
-          <el-table-column prop="shopName" label="供应商" width="250px" />
-          <el-table-column prop="price" label="机构价" />
-          <el-table-column prop="discount" label="会员折扣">
+          <el-table-column prop="productName" label="商品名称" align="center" />
+          <el-table-column prop="shopName" label="供应商" align="center" width="250" />
+          <el-table-column prop="price" label="机构价" align="center" />
+          <el-table-column prop="discount" label="会员折扣" align="center">
             <template slot-scope="{ row }">
               {{ row.priceType === 1 ? row.discount+'%' : '---' }} {{ row.priceType === 1 ? '%':'' }}
             </template>
           </el-table-column>
-          <el-table-column prop="discountPrice" label="会员价">
+          <el-table-column prop="discountPrice" label="会员价" align="center">
             <template slot-scope="{ row }">
               ￥{{ row.priceType === 2 ? row.discountPrice : row.price * row.discount * 0.01 }}
             </template>
           </el-table-column>
-          <el-table-column prop="sort" label="排序值" />
-          <el-table-column prop="status" label="优惠状态">
+          <el-table-column prop="sort" label="排序值" align="center" width="50" />
+          <el-table-column prop="status" label="优惠状态" align="center" width="100">
             <template slot-scope="{ row }">
               <span v-if="row.status === 0" class="el-span-zero">
                 已上架
@@ -87,11 +87,11 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="addTime" label="添加时间" width="200px" />
-          <el-table-column label="操作">
+          <el-table-column prop="addTime" label="添加时间" align="center" width="100" />
+          <el-table-column label="操作" align="center" width="180">
             <template>
-              <el-button type="text" size="mini">编辑</el-button>
-              <el-button type="text" size="mini">删除</el-button>
+              <el-button type="primary" size="mini">编辑</el-button>
+              <el-button type="danger" size="mini">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -99,8 +99,8 @@
         <!-- 页码 -->
         <pagination
           :total="total"
-          :page-sizes="[100]"
-          :page-size="100"
+          :page-sizes="[20]"
+          :page-size="20"
           :page.sync="listQuery.pageNum"
           :limit.sync="listQuery.pageSize"
         />
@@ -119,7 +119,7 @@
   </div>
 </template>
 <script>
-import { fetchFindProductList } from '@/api/member/product/product'
+import { fetchFindProductList } from '@/api/member/member'
 export default {
   name: 'MemberProduct',
   data() {