remove rome presistence

src/views/room/chipsHistory/index.vue

@@ -47,8 +47,8 @@
       </el-table>
 
       <div v-show="!listLoading" class="pagination-container">
-        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="query.thirdLayer.page"
-          :page-sizes="[10,20,30, 50]" :page-size="query.thirdLayer.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
+        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.page"
+          :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
         </el-pagination>
       </div>
     </div>
@@ -73,12 +73,12 @@ export default {
       dialogList: null,
       total: null,
       listLoading: true,
-      // listQuery: {
-      //   page: 1,
-      //   limit: 20,
-      //   startAt: null,
-      //   endAt: null
-      // },
+      listQuery: {
+        page: 1,
+        limit: 20,
+        startAt: null,
+        endAt: null
+      },
       pickerOptions: {
         shortcuts: [{
           text: '本週',
@@ -102,7 +102,7 @@ export default {
     }
   },
   created() {
-    this.date = this.p_date
+    // this.date = this.p_date
     this.SetVisible(3)
     this.getList()
   },
@@ -111,47 +111,42 @@ export default {
     ...mapGetters([
       'visible',
       'data',
-      'query',
-      'p_date'
+      // 'query',
+      // 'p_date'
     ])
   },
   methods: {
     ...mapActions([
       'SetVisible',
       'SetData',
-      'SetQuery',
-      'SetDate'
+      // 'SetQuery',
+      // 'SetDate'
     ]),
     getList() {
       this.listLoading = true
-      fetchChipsHistory(this.data.thirdLayer, this.query.thirdLayer).then(response => {
+      fetchChipsHistory(this.data.thirdLayer, this.listQuery).then(response => {
         this.list = response.data
         this.total = response.data.length
         this.listLoading = false
       })
     },
     handleFilter() {
-      if (this.p_date) {
-        this.SetQuery({layer:3, query: {page: 1,startAt: moment.utc(this.p_date[0]).format(), endAt: moment.utc(this.p_date[1]).format()}})      
+      this.listQuery.page = 1 
+      if (this.date) { 
+        this.listQuery.startAt = moment.utc(this.date[0]).format() 
+        this.listQuery.endAt = moment.utc(this.date[1]).format()  
       } else {
-         this.SetQuery({layer:3, query: {page: 1,startAt: null, endAt: null}})  
+        this.listQuery.startAt = null 
+        this.listQuery.endAt = null 
       }
       this.getList()
     },
     handleSizeChange(val) {
-      if (this.p_date) {
-        this.SetQuery({layer:3, query: {limit: val, startAt: moment.utc(this.p_date[0]).format(), endAt: moment.utc(this.p_date[1]).format()}})      
-      } else {
-         this.SetQuery({layer:3, query: {limit: val,startAt: null, endAt: null}})  
-      }
+      this.listQuery.limit = val 
       this.getList()
     },
     handleCurrentChange(val) {
-      if (this.p_date) {
-        this.SetQuery({layer:3, query: {page: val, startAt: moment.utc(this.p_date[0]).format(), endAt: moment.utc(this.p_date[1]).format()}})      
-      } else {
-         this.SetQuery({layer:3, query: {page: val,startAt: null, endAt: null}})  
-      }
+      this.listQuery.page = val
       this.getList()
     },
     moment(time) {
@@ -175,10 +170,10 @@ export default {
   destroyed() {
     this.SetVisible(2)
   },
-  watch: {
-    'date': function(val) {
-     this.SetDate(val)
-    }
-  }
+  // watch: {
+  //   'date': function(val) {
+  //    this.SetDate(val)
+  //   }
+  // }
 }
 </script>

src/views/room/gameHistory/index.vue

@@ -53,8 +53,8 @@
       </el-table>
 
       <div v-show="!listLoading" class="pagination-container">
-        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="query.thirdLayer.page"
-          :page-sizes="[10,20,30, 50]" :page-size="query.thirdLayer.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
+        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.page"
+          :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
         </el-pagination>
       </div>
 
@@ -116,6 +116,12 @@ export default {
       dialogList: null,
       total: null,
       listLoading: true,
+      listQuery: { 
+        page: 1, 
+        limit: 20, 
+        startAt: null, 
+        endAt: null 
+      }, 
       pickerOptions: {
         shortcuts: [{
           text: '本週',
@@ -133,7 +139,7 @@ export default {
           }
         }]
       },
-      date: [],
+      date: null,
       dialogFormVisible: false
 
     }
@@ -147,21 +153,21 @@ export default {
     ...mapGetters([
       'visible',
       'data',
-      'query',
-      'p_date'
+      // 'query',
+      // 'p_date'
     ])
   },
   methods: {
     ...mapActions([
       'SetVisible',
       'SetData',
-      'SetQuery',
-      'SetDate'
+      // 'SetQuery',
+      // 'SetDate'
     ]),
     getList() {
       this.listLoading = true
       this.list = []
-      fetchGameHistory(this.data.thirdLayer, this.query.thirdLayer).then(response => {
+      fetchGameHistory(this.data.thirdLayer, this.listQuery).then(response => {
         this.chipLogList = response.data
         this.chipLogList.map((item) => {
           this.list.push({
@@ -174,7 +180,7 @@ export default {
         })
         this.listLoading = false
       })
-      fetchChipsHistory(this.data.thirdLayer, this.query.thirdLayer).then(response => {
+      fetchChipsHistory(this.data.thirdLayer, this.listQuery).then(response => {
         this.gameRecordList = response.data
         this.gameRecordList.map((item) => {
           if(item.type === config.const.GambleMemberChipsLog.type.deposit) item.type =  '上 / 下 分';
@@ -211,27 +217,22 @@ export default {
       console.log('Game detail')
     },
     handleFilter() {
-      if (this.p_date) {
-        this.SetQuery({layer:3, query: {page: 1,startAt: moment.utc(this.p_date[0]).format(), endAt: moment.utc(this.p_date[1]).format()}})      
+      this.listQuery.page = 1 
+      if (this.date) { 
+        this.listQuery.startAt = moment.utc(this.date[0]).format() 
+        this.listQuery.endAt = moment.utc(this.date[1]).format()  
       } else {
-         this.SetQuery({layer:3, query: {page: 1,startAt: null, endAt: null}})  
+        this.listQuery.startAt = null 
+        this.listQuery.endAt = null 
       }
       this.getList()
     },
     handleSizeChange(val) {
-      if (this.p_date) {
-        this.SetQuery({layer:3, query: {limit: val, startAt: moment.utc(this.p_date[0]).format(), endAt: moment.utc(this.p_date[1]).format()}})      
-      } else {
-         this.SetQuery({layer:3, query: {limit: val,startAt: null, endAt: null}})  
-      }
+      this.listQuery.limit = val
       this.getList()
     },
     handleCurrentChange(val) {
-      if (this.p_date) {
-        this.SetQuery({layer:3, query: {page: val, startAt: moment.utc(this.p_date[0]).format(), endAt: moment.utc(this.p_date[1]).format()}})      
-      } else {
-         this.SetQuery({layer:3, query: {page: val,startAt: null, endAt: null}})  
-      }
+      this.listQuery.page = val
       this.getList()
     },
     moment(time) {
@@ -264,10 +265,10 @@ export default {
     this.SetVisible(2)
   },
   // time 持久化
-  watch: {
-    'date': function(val) {
-     this.SetDate(val)
-    }
-  }
+  // watch: {
+  //   'date': function(val) {
+  //    this.SetDate(val)
+  //   }
+  // }
 }
 </script>

src/views/room/index.vue

@@ -3,7 +3,7 @@
 <div class="app-container calendar-list-container">
   <div  v-show="visible.firstLayer">
     <div class="app-container">
-      <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="房間名" v-model="query.firstLayer.name">
+      <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="房間名" v-model="listQuery.name">
       </el-input>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">搜尋</el-button>
       <el-button class="filter-item" @click="handleCreate" type="primary" icon="el-icon-edit">創建</el-button>
@@ -38,8 +38,8 @@
     </el-table>
 
     <div v-show="!listLoading" class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="query.firstLayer.page"
-        :page-sizes="[10,20,30, 50]" :page-size="query.firstLayer.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.page"
+        :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>
 
@@ -80,6 +80,10 @@ export default {
       temp: {
         name: '',
       },
+      listQuery: { 
+        page: 1, 
+        limit: 20, 
+      }, 
       rules: {
         name: [{ type: 'string', required: true, message: '必填', trigger: 'change' }]
       },
@@ -93,7 +97,7 @@ export default {
   computed: {
     ...mapGetters([
       'visible',
-      'query',
+      // 'query',
       'data'
     ])
   },
@@ -101,11 +105,11 @@ export default {
     ...mapActions([
       'SetVisible',
       'SetData',
-      'SetQuery'
+      // 'SetQuery'
     ]),
     getList() {
       this.listLoading = true
-      fetchWechatRooms(this.query.firstLayer).then(response => {
+      fetchWechatRooms(this.listQuery).then(response => {
         this.list = response.data
         this.total = response.data.length
         this.listLoading = false
@@ -148,15 +152,15 @@ export default {
       })
     },
     handleFilter() {
-      this.SetQuery({layer:1, query: {page: 1, name: this.query.firstLayer.name}})
+      this.listQuery.page = 1
       this.getList()
     },
     handleSizeChange(val) {
-      this.SetQuery({layer:1, query: {limit: val, name: this.query.firstLayer.name}})      
+      this.listQuery.limit = val 
       this.getList()
     },
     handleCurrentChange(val) {
-      this.SetQuery({layer:1, query: {page: val, name: this.query.firstLayer.name}})      
+      this.listQuery.page = val
       this.getList()
     },
     handleDialogClose() {

src/views/room/wechatGameMaster/index.vue

@@ -3,7 +3,7 @@
 <div class="app-container calendar-list-container">
   <div  v-show="visible.secondLayer">
     <div class="app-container">
-      <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="名稱" v-model="query.secondLayer.name">
+      <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="名稱" v-model="listQuery.name">
       </el-input>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">搜尋</el-button>
       <el-button class="filter-item" @click="handleCreate" type="primary" icon="el-icon-edit">創建</el-button>
@@ -108,18 +108,18 @@ export default {
     ...mapGetters([
       'visible',
       'data',
-      'query'
+      // 'query'
     ])
   },
   methods: {
     ...mapActions([
       'SetVisible',
       'SetData',
-      'SetQuery'
+      // 'SetQuery'
     ]),
     getList() {
       this.listLoading = true
-      fetchWechatGameMaster(this.data.secondLayer, this.query.secondLayer).then(response => {
+      fetchWechatGameMaster(this.data.secondLayer, this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = response.data.count
         this.listLoading = false
@@ -158,15 +158,15 @@ export default {
       })
     },
     handleFilter() {
-      this.SetQuery({layer:2, query: {page: 1, name: this.query.secondLayer.name}})
+      this.listQuery.page = 1 
       this.getList()
     },
     handleSizeChange(val) {
-      this.SetQuery({layer:2, query: {limit: val, name: this.query.secondLayer.name}})   
+      this.listQuery.limit = val
       this.getList()
     },
     handleCurrentChange(val) {
-      this.SetQuery({layer:2, query: {page: val, name: this.query.secondLayer.name}})    
+      this.listQuery.page = val 
       this.getList()
     },
     handleDialogClose() {

src/views/room/wechatMember/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container calendar-list-container">
     <div  v-show="visible.secondLayer">
       <div class="app-container">
-        <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="名稱" v-model="query.secondLayer.name">
+        <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="名稱" v-model="listQuery.name">
         </el-input>
         <!-- <el-select clearable @change='handleFilter' style="width: 120px" class="filter-item" v-model="listQuery.chipsSort" placeholder="點數">
           <el-option v-for="item in chipsSortOptions" :key="item.label" :label="item.label" :value="item.key">
@@ -52,8 +52,8 @@
       </el-table>
 
       <div v-show="!listLoading" class="pagination-container">
-        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="query.secondLayer.page"
-          :page-sizes="[10,20,30, 50]" :page-size="query.secondLayer.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
+        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.page"
+          :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
         </el-pagination>
       </div>
 
@@ -145,6 +145,13 @@ export default {
       list: null,
       total: null,
       listLoading: true,
+      listQuery: { 
+        page: 1, 
+        limit: 20, 
+        name: '', 
+        chipsSort: '', 
+        updatedSort: '' 
+      }, 
       temp: {
         id: '',
         WeChatUser: {
@@ -184,18 +191,18 @@ export default {
     ...mapGetters([
       'visible',
       'data',
-      'query'
+      // 'query'
     ])
   },
   methods: {
     ...mapActions([
       'SetVisible',
       'SetData',
-      'SetQuery'
+      // 'SetQuery'
     ]),
     getList() {
       this.listLoading = true
-      fetchWeChatMemberList(this.data.secondLayer, this.query.secondLayer).then(response => {
+      fetchWeChatMemberList(this.data.secondLayer, this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = response.data.count
         this.listLoading = false
@@ -257,15 +264,15 @@ export default {
       this.SetData({layer:3, data: temp.WeChatUser.GambleMember})
     },
     handleFilter() {
-      this.SetQuery({layer:2, query: {page: 1, name: this.query.secondLayer.name}})
+      this.listQuery.page = 1
       this.getList()
     },
     handleSizeChange(val) {
-      this.SetQuery({layer:2, query: {limit: val, name: this.query.secondLayer.name}})   
+      this.listQuery.limit = val 
       this.getList()
     },
     handleCurrentChange(val) {
-      this.SetQuery({layer:2, query: {page: val, name: this.query.secondLayer.name}})    
+      this.listQuery.page = val
       this.getList()
     },
     handleClick(tab, event) {