fix bug & presistence

src/store/modules/breadcrumb.js

@@ -36,7 +36,7 @@ const breadcrumb = {
         ...JSON.parse(localStorage.getItem('query_4th'))
       }
     },
-    p_date: [...JSON.parse(localStorage.getItem('date'))]
+    p_date: [...JSON.parse(localStorage.getItem('date')) ? JSON.parse(localStorage.getItem('date')) : false]
   },
   mutations: {
     SET_VISIBLE: (state, layer) => {

src/views/room/chipsHistory/index.vue

@@ -17,7 +17,7 @@
           </div>
       </div>
       <el-table :data="list" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row>
-        <el-table-column :label="member.name" align="center">
+        <el-table-column :label="this.data.thirdLayer.name" align="center">
           <el-table-column label="操作人員" align="center">
             <template slot-scope="scope">
               {{scope.row.admin}}
@@ -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="listQuery.page"
-          :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
+        <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>
       </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: '本週',
@@ -96,51 +96,62 @@ export default {
           }
         }]
       },
-      date: null,
+      date: [],
       dialogFormVisible: false
 
     }
   },
   created() {
+    this.date = this.p_date
     this.SetVisible(3)
     this.getList()
   },
-  props: ['member'],
+  // props: ['member'],
   computed: {
     ...mapGetters([
-      'visible'
+      'visible',
+      'data',
+      'query',
+      'p_date'
     ])
   },
   methods: {
     ...mapActions([
-      'SetVisible'
+      'SetVisible',
+      'SetData',
+      'SetQuery',
+      'SetDate'
     ]),
     getList() {
       this.listLoading = true
-      console.log('wwww',this.member)
-      fetchChipsHistory(this.member, this.listQuery).then(response => {
+      fetchChipsHistory(this.data.thirdLayer, this.query.thirdLayer).then(response => {
         this.list = response.data
         this.total = response.data.length
         this.listLoading = false
       })
     },
     handleFilter() {
-      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()
+      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()}})      
       } else {
-        this.listQuery.startAt = null
-        this.listQuery.endAt = null
+         this.SetQuery({layer:3, query: {page: 1,startAt: null, endAt: null}})  
       }
       this.getList()
     },
     handleSizeChange(val) {
-      this.listQuery.limit = 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.getList()
     },
     handleCurrentChange(val) {
-      this.listQuery.page = 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.getList()
     },
     moment(time) {
@@ -163,6 +174,11 @@ export default {
   },
   destroyed() {
     this.SetVisible(2)
+  },
+  watch: {
+    'date': function(val) {
+     this.SetDate(val)
+    }
   }
 }
 </script>

src/views/room/gameHistory/index.vue

@@ -120,16 +120,16 @@ export default {
         shortcuts: [{
           text: '本週',
           onClick(picker) {
-            const endAt = moment().day(7).hour(11).minute(59).second(59)
-            const startAt = moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
-            picker.$emit('pick', [startAt, endAt])
+            const end = moment().day(7).hour(11).minute(59).second(59)
+            const start = moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
+            picker.$emit('pick', [start, end])
           }
         }, {
           text: '上週',
           onClick(picker) {
-            const endAt = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const end = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
             const startAt = moment().subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
-            picker.$emit('pick', [startAt, endAt])
+            picker.$emit('pick', [start, end])
           }
         }]
       },

src/views/room/wechatMember/index.vue

@@ -259,6 +259,7 @@ export default {
       this.SetData({layer:3, data: temp.WeChatUser.GambleMember})
     },
     handleLog(row) {
+      const temp = Object.assign({}, row) // copy obj      
       this.SetVisible(3)
       this.SetData({layer:3, data: temp.WeChatUser.GambleMember})
     },