From ca0feaa5428521ca671a2048e3e6c3c65bad27a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 28 May 2021 18:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=AE=A1=E7=90=86=E7=AB=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=91=20https://www.tapd.cn/39598945/prong/stories?=
 =?UTF-8?q?/view/1139598945001000225?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/userDrawer.vue     |  2 +-
 src/components/product/accountSearch.vue | 73 +++++++++++++++---------
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/src/components/common/userDrawer.vue b/src/components/common/userDrawer.vue
index e6f529a..9c089e9 100644
--- a/src/components/common/userDrawer.vue
+++ b/src/components/common/userDrawer.vue
@@ -48,7 +48,7 @@ export default {
     }
   },
   created() {
-    this.getUser();
+    // this.getUser();
   },
   methods: {
     getUser() {
diff --git a/src/components/product/accountSearch.vue b/src/components/product/accountSearch.vue
index 4609b6f..60e11c7 100644
--- a/src/components/product/accountSearch.vue
+++ b/src/components/product/accountSearch.vue
@@ -2,31 +2,30 @@
   <div v-loading="loading">
     <div class="heior_box">
       <el-button size="small" type="primary" icon="el-icon-edit" @click="batchSelectUser">批量修改归属</el-button>      
-      <!-- <el-button size="small" type="primary" icon="el-icon-edit">检测</el-button> -->
-      <!-- <el-button size="small" type="primary" icon="el-icon-edit">老账号认证</el-button> -->
 
       <div class="search-box">
-        <!-- <el-select v-model="searchModel.ProductId" placeholder="选择产品" clearable size="small">
-          <el-option v-for="item in products" :key="item.Name" :label="item.Name" :value="item.Id"></el-option>
-        </el-select>
         <el-select
-          v-model="searchModel.accountTypes"
+          v-model="searchModel.ProductIds"
           multiple
           collapse-tags
-          clearable
-          size="small"
-          placeholder="选择类型"
-        >
-          <el-option v-for="item in types" :key="item.text" :label="item.text" :value="item.value"></el-option>
+          style="width:200px;"
+          size=small
+          placeholder="请选择产品">
+          <el-option
+            v-for="item in products"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
         </el-select>
-        <el-select v-model="searchModel.ExpirdDay" placeholder="选择过期时间" clearable size="small">
+        <el-select v-model="searchModel.ExpirdDay" placeholder="选择过期时间" style="width:100px" clearable size="small">
           <el-option
             v-for="item in expirdtypes"
             :key="item.text"
             :label="item.text"
             :value="item.value"
           ></el-option>
-        </el-select> -->
+        </el-select>
         <el-input v-model="searchModel.keyWord" placeholder="会员/账号" clearable size="small">
           <el-button slot="append" icon="el-icon-search" @click="search"></el-button>
         </el-input>
@@ -122,12 +121,18 @@ export default {
       retData: { TotalCount: 0, Data: [] },
       products: [],
       searchModel: {
-        ExpirdDay: -1,
+        ExpirdDay: -100,
         UserId: 0,
         PageIndex: 1,
-        keyWord: "",
-        ProductId: null,
-        accountTypes: null
+        keyWord: '',
+        ProductIds: [],
+        PackageNames: [],
+        accountTypes: null,
+        pModel: [],
+        Btime: '',
+        Etime: '',
+        Bktime: '',
+        Ektime: ''
       },
       onlineClient:[],      
       currentAccount: {},
@@ -141,11 +146,15 @@ export default {
         { text: "测试", value: 200 }
       ],
       expirdtypes: [
-        { text: "全部", value: -1 },
-        { text: "已过期", value: 0 },
-        { text: "1天过期", value: 1 },
-        { text: "3天过期", value: 3 },
-        { text: "1周过期", value: 7 }
+        { text: '全部', value: -100 },
+        { text: '已过期', value: 0 },
+        { text: '未过期', value: -2 },
+        { text: '1天过期', value: 1 },
+        { text: '3天过期', value: 3 },
+        { text: '1周过期', value: 7 },
+        { text: '已经到期1天内', value: -1 },
+        { text: '已经到期3天内', value: -3 },
+        { text: '已经到期3天以上', value: -4 }
       ],
       typeFormat(row, column, cellValue, index) {
         switch (cellValue) {
@@ -168,6 +177,7 @@ export default {
   },
   created() {
     this.$store.commit("setCurrentNav", "会员管理>>账号查询");  
+    this.getProduct()
   },
   methods: {
     search(){
@@ -181,12 +191,19 @@ export default {
           this.retData = res;
         });
     },
-    getProduct() {
-      this.loading = true;
-      this.$api.get("course/v1/product/page", this.searchModel).then(res => {
-        this.products = res.Data;
-        this.loading = false;
-      });
+    getProduct () {
+      this.loading = true
+      this.$api.get('course/v1/product/page', this.searchModel).then(res => {
+        res.Data.forEach(m => {
+          var product = {
+            label: m.Name,
+            value: m.Id
+          }
+          this.products.push(product)
+        })
+        this.loading = false
+      })
+      this.loading = false
     },
     del(item) {
       var that = this;