From cc7ffefad12b3f49943606fcc3a62d8f78001702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Mon, 19 Dec 2022 15:04:59 +0800
Subject: [PATCH] up

---
 src/views/productService/classifyManage.vue   |   4 +
 .../confinement/addConfinementClub.vue        |   2 +-
 .../productService/productServiceManage.vue   |   2 +-
 src/views/userManage/memberManage.vue         | 415 ++++++++++--------
 4 files changed, 228 insertions(+), 195 deletions(-)

diff --git a/src/views/productService/classifyManage.vue b/src/views/productService/classifyManage.vue
index 5e6465b..2eed299 100644
--- a/src/views/productService/classifyManage.vue
+++ b/src/views/productService/classifyManage.vue
@@ -49,6 +49,10 @@ export default {
         {
           prop:'level',
           label:'排序'
+        },
+        {
+          prop:'id',
+          label:'id'
         }
       ]
     }
diff --git a/src/views/productService/components/confinement/addConfinementClub.vue b/src/views/productService/components/confinement/addConfinementClub.vue
index 917f135..0474d6a 100644
--- a/src/views/productService/components/confinement/addConfinementClub.vue
+++ b/src/views/productService/components/confinement/addConfinementClub.vue
@@ -466,7 +466,7 @@
       async getMerchants() {
         const res = await merchantIndex({
           page: 1,
-          pageSize: 999
+          page_size: 999
         })
         //console.log(res)
         this.merchants = res?.data
diff --git a/src/views/productService/productServiceManage.vue b/src/views/productService/productServiceManage.vue
index b9cb1ae..aed37c1 100644
--- a/src/views/productService/productServiceManage.vue
+++ b/src/views/productService/productServiceManage.vue
@@ -49,7 +49,7 @@
                 </div>
               </template>
             </xy-selectors>
-            <Button type="primary" @click="getProducts">查询</Button>
+            <Button type="primary" @click="searchProducts">查询</Button>
             <Button type="primary" @click="$refs['addProduct'].isShow = true,$refs['addProduct'].type = 'add'" style="margin-left: 10px;">新增</Button>
           </div>
 <!--          <div class="selector">-->
diff --git a/src/views/userManage/memberManage.vue b/src/views/userManage/memberManage.vue
index e2f9067..f82fd07 100644
--- a/src/views/userManage/memberManage.vue
+++ b/src/views/userManage/memberManage.vue
@@ -1,194 +1,223 @@
-<template>
-  <div style="padding: 0 20px">
-    <div ref="lxHeader">
-      <lx-header icon="md-apps" text="会员管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-        <div slot="content"></div>
-        <slot>
-          <div class="selector">
-            <div class="selector-item">
-              <div class="selector-item__label">关键词：</div>
-              <Input v-model="select.keywords" clearable style="width: 200px;" placeholder="关键字搜索" />
-            </div>
-            <div class="selector-item">
-              <div class="selector-item__label">区域：</div>
-              <Select clearable v-model="select.area" style="width: 130px;" placeholder="选择区域搜索">
-                <Option v-for="item in areas" :value="item">{{item}}</Option>
-              </Select>
-            </div>
-            <div class="selector-item">
-              <div class="selector-item__label">建卡医院：</div>
-              <Input clearable v-model="select.hospital" style="width: 200px;" placeholder="建卡医院搜索"/>
-            </div>
-
-            <div class="selector-item">
-              <Button type="primary" @click="getMembers">查询</Button>
-            </div>
-            <div class="selector-item">
-              <Button type="primary" @click="$refs['addMember'].isShow = true,$refs['addMember'].type = 'add'">新增会员</Button>
-            </div>
-            <div class="selector-item">
-              <Button type="primary" @click="exportExel">导出</Button>
-            </div>
-          </div>
-        </slot>
-      </lx-header>
-    </div>
-
-    <xy-table :total="total" @pageSizeChange="pageSizeChange" @pageIndexChange="pageChange" :list="list" :table-item="table" @editor="editorShow" @delete="deleteMember"></xy-table>
-
-    <addMember ref="addMember" @refresh="getMembers"></addMember>
-  </div>
-</template>
-
-<script>
-import {index,destroy} from '@/api/member'
-import {parseTime} from "@/utils"
-import {download} from '@/utils/downloadRequest'
-
-import addMember from './component/addMember'
-import { Message } from 'element-ui'
-export default {
-  components:{
-    addMember
-  },
-  data() {
-    return {
-      select:{
-        pageSize:10,
-        pageIndex:1,
-        keywords:"",
-        area:"",
-        hospital:""
-      },
-      areas:["吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
-
-      total:0,
-      list:[],
-      table:[
-        {
-          prop:'name',
-          label:'姓名',
-          width:180,
-          sortable:false,
-          fixed:'left'
-        },
-        {
-          prop:'phone',
-          label:'电话',
-          width:220
-        },
-        {
-          prop:'due_date',
-          label:'预产期',
-          width: 200
-        },
-        {
-          prop:'area',
-          label:'所属区域',
-          width: 160,
-        },
-        {
-          prop:'address',
-          label:'住址',
-          align:'left',
-          minWidth: 300
-        },
-        {
-          prop:'hospital',
-          label:'建卡医院',
-          width: 200
-        },
-        {
-          prop:'promotion',
-          label:'推广人员',
-          width:140,
-          customFn:(row)=>{
-            return (<Tag color={row.promotion == 1 ? 'success' : 'error'}>{row.promotion == 1 ? '是' : '否'}</Tag>)
-          }
-        },
-        {
-          prop:'created_at',
-          label:'注册日期',
-          width:200,
-          formatter:(cell,data,value)=>{
-            return parseTime(new Date(value),'{y}-{m}-{d}')
-          }
-        }
-      ]
-    }
-  },
-  methods: {
-    pageSizeChange(e){
-
-         this.select.pageSize = e
-      this.doSearch();
-    },
-    doSearch(){
-       this.select.pageIndex = 1
-       this.getMembers()
-    },
-    pageChange(e){
-      this.select.pageIndex = e
-      this.getMembers()
-    },
-
-    async getMembers(){
-      const res = await index({
-        page_size:this.select.pageSize,
-        page:this.select.pageIndex,
-        keyword:this.select.keywords,
-        hospital:this.select.hospital,
-        area:this.select.area
-      })
-      this.total = res.total
-      this.list = res.data
-    },
-
-    editorShow(row){
-      this.$refs['addMember'].id = row.id
-      this.$refs['addMember'].type = 'editor'
-      this.$refs['addMember'].isShow = true
-    },
-    deleteMember(row){
-      destroy({
-        id:row.id
-      }).then(res => {
-        Message({
-          type:'success',
-          message:'删除会员成功'
-        })
-        this.getMembers()
-      })
-    },
-
-    exportExel(){
-      download('/api/admin/member/index','get',{is_export:1},'用户列表.xlsx')
-    }
-  },
-  mounted() {
-    this.getMembers()
-  }
-
-}
-</script>
-
-<style scoped lang="scss">
-.selector{
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  align-content: center;
-  &-item{
-    display: flex;
-    align-items: center;
-    align-content: center;
-
-    margin-top: 6px;
-    margin-right: 10px;
-
-    &__label{
-      word-break: keep-all;
-    }
-  }
-}
+<template>
+  <div style="padding: 0 20px">
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" text="会员管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <div slot="content"></div>
+        <slot>
+          <div class="selector">
+            <div class="selector-item">
+              <div class="selector-item__label">关键词：</div>
+              <Input v-model="select.keywords" clearable style="width: 200px;" placeholder="关键字搜索" />
+            </div>
+            <div class="selector-item">
+              <div class="selector-item__label">区域：</div>
+              <Select clearable v-model="select.area" style="width: 130px;" placeholder="选择区域搜索">
+                <Option v-for="item in areas" :value="item">{{item}}</Option>
+              </Select>
+            </div>
+            <div class="selector-item">
+              <div class="selector-item__label">建卡医院：</div>
+              <Input clearable v-model="select.hospital" style="width: 200px;" placeholder="建卡医院搜索" />
+            </div>
+            <div class="selector-item">
+              <el-checkbox v-model="select.is_phone">存在手机号</el-checkbox>
+            </div>
+
+
+
+
+            <div class="selector-item">
+              <Button type="primary" @click="doSearch">查询</Button>
+            </div>
+            <div class="selector-item">
+              <Button type="primary"
+                @click="$refs['addMember'].isShow = true,$refs['addMember'].type = 'add'">新增会员</Button>
+            </div>
+            <div class="selector-item">
+              <Button type="primary" @click="exportExel">导出</Button>
+            </div>
+          </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table :total="total" @pageSizeChange="pageSizeChange" @pageIndexChange="pageChange" :list="list"
+      :table-item="table" @editor="editorShow" @delete="deleteMember"></xy-table>
+
+    <addMember ref="addMember" @refresh="getMembers"></addMember>
+  </div>
+</template>
+
+<script>
+  import {
+    index,
+    destroy
+  } from '@/api/member'
+  import {
+    parseTime
+  } from "@/utils"
+  import {
+    download
+  } from '@/utils/downloadRequest'
+
+  import addMember from './component/addMember'
+  import {
+    Message
+  } from 'element-ui'
+  export default {
+    components: {
+      addMember
+    },
+    data() {
+      return {
+        select: {
+          pageSize: 10,
+          pageIndex: 1,
+          keywords: "",
+          area: "",
+          hospital: "",
+          is_phone: true
+        },
+        areas: ["吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
+
+        total: 0,
+        list: [],
+        table: [{
+            prop: 'name',
+            label: '姓名',
+            width: 180,
+            sortable: false,
+            fixed: 'left'
+          },
+          {
+            prop: 'phone',
+            label: '电话',
+            width: 220
+          },
+          {
+            prop: 'due_date',
+            label: '预产期',
+            width: 200
+          },
+          {
+            prop: 'area',
+            label: '所属区域',
+            width: 160,
+          },
+          {
+            prop: 'address',
+            label: '住址',
+            align: 'left',
+            minWidth: 300
+          },
+          {
+            prop: 'hospital',
+            label: '建卡医院',
+            width: 200
+          },
+          {
+            prop: 'promotion',
+            label: '推广人员',
+            width: 140,
+            customFn: (row) => {
+              return ( < Tag color = {
+                  row.promotion == 1 ? 'success' : 'error'
+                } > {
+                  row.promotion == 1 ? '是' : '否'
+                } < /Tag>)
+              }
+            },
+            {
+              prop: 'created_at',
+              label: '注册日期',
+              width: 200,
+              formatter: (cell, data, value) => {
+                return parseTime(new Date(value), '{y}-{m}-{d}')
+              }
+            }
+          ]
+        }
+      },
+      methods: {
+          pageSizeChange(e) {
+
+            this.select.pageSize = e
+            this.doSearch();
+          },
+          doSearch() {
+            this.select.pageIndex = 1
+            this.getMembers()
+          },
+          pageChange(e) {
+            this.select.pageIndex = e
+            this.getMembers()
+          },
+
+          async getMembers() {
+            const res = await index({
+              page_size: this.select.pageSize,
+              page: this.select.pageIndex,
+              keyword: this.select.keywords,
+              hospital: this.select.hospital,
+              area: this.select.area,
+              is_phone: this.select.is_phone ? 1 : ""
+            })
+            this.total = res.total
+            this.list = res.data
+          },
+
+          editorShow(row) {
+            this.$refs['addMember'].id = row.id
+            this.$refs['addMember'].type = 'editor'
+            this.$refs['addMember'].isShow = true
+          },
+          deleteMember(row) {
+            destroy({
+              id: row.id
+            }).then(res => {
+              Message({
+                type: 'success',
+                message: '删除会员成功'
+              })
+              this.getMembers()
+            })
+          },
+
+          exportExel() {
+            download('/api/admin/member/index', 'get', {
+              is_export: 1,
+              keyword: this.select.keywords,
+              hospital: this.select.hospital,
+              area: this.select.area,
+              is_phone: this.select.is_phone ? 1 : ""
+            }, '用户列表.xlsx')
+          }
+        },
+        mounted() {
+          this.getMembers()
+        }
+
+    }
+</script>
+
+<style scoped lang="scss">
+  .selector {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    align-content: center;
+
+    &-item {
+      display: flex;
+      align-items: center;
+      align-content: center;
+
+      margin-top: 6px;
+      margin-right: 10px;
+
+      &__label {
+        word-break: keep-all;
+      }
+    }
+  }
 </style>