wechat member

src/api/gambleMember.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-export function fetchList(query) {
+export function fetchGambleMemberList(query) {
   return request({
     url: '/gambleMembers',
     method: 'get',
@@ -14,9 +14,25 @@ export function fetchList(query) {
   })
 }
 
+export function fetchWeChatMemberList(data, query) {
+  // TODO check data 帶什麼
+  console.log('data', data)
+  return request({
+    url: `/weChatRooms/${data.room}/weChatUsers`,
+    method: 'get',
+    params: {
+      limit: query.limit,
+      offset: (query.page - 1) * query.limit,
+      name: query.name
+      // chipsSort: query.chipsSort,
+      // updatedSort: query.updatedSort
+    }
+  })
+}
+
 export function chipsDeposit(data) {
   return request({
-    url: `/gambleMembers/${data.id}/deposit`,
+    url: `/gambleMembers/${data.WeChatUser.GambleMember.id}/deposit`,
     method: 'put',
     data: {
       chips: data.depositChips
@@ -26,7 +42,7 @@ export function chipsDeposit(data) {
 
 export function chipsReward(data) {
   return request({
-    url: `/gambleMembers/${data.id}/reward`,
+    url: `/gambleMembers/${data.WeChatUser.GambleMember.id}/reward`,
     method: 'put',
     data: {
       chips: data.rewardChips

src/router/index.js

@@ -62,12 +62,12 @@ export const constantRouterMap = [
         },
         children: [
           {
-            path: '/room/index/gambleMember/index',
-            name: 'GambleMember',
-            component: _import('room/gambleMember/index'),
+            path: '/room/index/wechatMember/index',
+            name: 'WeChatMember',
+            component: _import('room/wechatMember/index'),
             hidden: true,
             meta: {
-              title: '會員管理'
+              title: '微信會員'
               // role: ['dd']
             },
             children: [

src/views/gambleGameBucket/detail/index.vue

@@ -139,7 +139,7 @@
 
 import { mapGetters, mapActions } from 'vuex'
 import { fetchDetails, fetchRoundCount, fetchDealingRecords, fetchMemberRecords } from '@/api/gambleGameBucket'
-import { fetchList } from '@/api/gambleMember'
+import { fetchGambleMemberList } from '@/api/gambleMember'
 import _ from 'lodash'
 import moment from 'moment-timezone'
 
@@ -175,7 +175,7 @@ export default {
     })
     this.SetVisible(2)
     this.getList()
-    fetchList({ page: 1, limit: 9999999999, chipsSort: 'DESC' }).then(response => {
+    fetchGambleMemberList({ page: 1, limit: 9999999999, chipsSort: 'DESC' }).then(response => {
       const { rows } = response.data
       let members = {}
       // TODO refactor

src/views/room/chipsHistory/index.vue

@@ -143,6 +143,7 @@ export default {
     ]),
     getList() {
       this.listLoading = true
+      console.log('wwww',this.member)
       fetchChipsHistory(this.member, this.listQuery).then(response => {
         this.list = response.data
         this.total = response.data.length

src/views/room/gambleMember/index.vue

@@ -127,7 +127,7 @@
 
 import { mapGetters, mapActions } from 'vuex'
 // TODO 需更改抓取此房間人員
-import { fetchList, chipsDeposit, chipsReward, createGambleMember, fetchAgentList, updateBelongAgent } from '@/api/gambleMember'
+import { fetchGambleMemberList, chipsDeposit, chipsReward, createGambleMember, fetchAgentList, updateBelongAgent } from '@/api/gambleMember'
 import waves from '@/directive/waves' // 水波纹指令
 import Multiselect from 'vue-multiselect'// 使用的一个多选框组件，element-ui的select不能满足所有需求
 import 'vue-multiselect/dist/vue-multiselect.min.css'// 多选框组件css

src/views/room/index.vue

@@ -27,7 +27,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" width="350">
         <template slot-scope="scope">
-            <router-link to="/room/index/gambleMember/index">
+            <router-link to="/room/index/wechatMember/index">
               <el-button type="primary" size="mini" icon="el-icon-tickets" @click="handlePage(scope.row)">會員管理</el-button>
             </router-link>       
         </template>
@@ -41,7 +41,7 @@
     </div>
 
   </div>
-    <router-view :member="member"></router-view>
+    <router-view :room="room"></router-view>
   </div>
 </template>
 
@@ -71,7 +71,7 @@ export default {
         name: '',
         chips: '',
       },
-      member: {},
+      room: {},
     }
   },
   created() {
@@ -98,7 +98,7 @@ export default {
     handlePage(row) {
       const temp = Object.assign({}, row) // copy obj
       this.SetVisible(2)
-      this.member = temp
+      this.room = temp
     },
     handleCreate() {
       //TODO 了解wechat 的 room 關聯

src/views/room/wechatMember/index.vue

@@ -16,24 +16,24 @@
       </div>
       <el-table :data="list" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
         style="width: 100%">
-        <el-table-column align="center" label='ID' >
+        <!-- <el-table-column align="center" label='ID' >
           <template slot-scope="scope">
             {{scope.row.id}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="名稱" align="center">
           <template slot-scope="scope">
-            {{scope.row.name}}
+            {{scope.row.WeChatUser.name}}
           </template>
         </el-table-column>
         <el-table-column label="點數" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.chips}}</span>
+            <span>{{scope.row.WeChatUser.GambleMember.chips}}</span>
           </template>
         </el-table-column>
         <el-table-column label="代理商" align="center">
           <template slot-scope="scope">
-            {{!scope.row.GambleAgent ? 'N/A': scope.row.GambleAgent.name}}
+            {{!scope.row.WeChatUser.GambleMember.GambleAgent ? 'N/A': scope.row.WeChatUser.GambleMember.GambleAgent.name}}
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="450">
@@ -60,14 +60,14 @@
         <el-tabs v-model="activeName" @tab-click="handleClick" type="card">
           <el-tab-pane label="上下分" name="deposit">
             <el-form :rules="rules" ref="depositForm" :model="temp" label-position="left" label-width="100px" style='width: 400px; margin-left:50px;'>
-              <el-form-item label="ID" prop="id">
+              <!-- <el-form-item label="ID" prop="id">
                 <el-input v-model="temp.id" :disabled="true"></el-input>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="名稱" prop="name">
-                <el-input v-if="dialogStatus=='deposit'" v-model="temp.name" :disabled="true"></el-input>
+                <el-input v-if="dialogStatus=='deposit'" v-model="temp.WeChatUser.name" :disabled="true"></el-input>
               </el-form-item>
               <el-form-item label="點數" prop="chips">
-                <el-input v-model="temp.chips" :disabled="true"></el-input>
+                <el-input v-model="temp.WeChatUser.GambleMember.chips" :disabled="true"></el-input>
               </el-form-item>
               <el-form-item v-if="dialogStatus=='deposit'" label="上下分" prop="depositChips">
                 <el-input placeholder="請輸入上下分" v-model="temp.depositChips"></el-input>
@@ -76,14 +76,14 @@
           </el-tab-pane>
           <el-tab-pane label="獎懲" name="reward">
             <el-form :rules="rules" ref="rewardForm" :model="temp" label-position="left" label-width="100px" style='width: 400px; margin-left:50px;'>
-              <el-form-item label="ID" prop="id">
+              <!-- <el-form-item label="ID" prop="id">
                 <el-input v-model="temp.id" :disabled="true"></el-input>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="名稱" prop="name">
-                <el-input v-model="temp.name" :disabled="true"></el-input>
+                <el-input v-model="temp.WeChatUser.name" :disabled="true"></el-input>
               </el-form-item>
               <el-form-item label="點數" prop="chips">
-                <el-input  v-model="temp.chips" :disabled="true"></el-input>
+                <el-input  v-model="temp.WeChatUser.GambleMember.chips" :disabled="true"></el-input>
               </el-form-item>
               <el-form-item v-if="dialogStatus=='reward'" label="獎懲" prop="rewardChips">
                 <el-input placeholder="請輸入獎懲點數" v-model="temp.rewardChips"></el-input>
@@ -103,7 +103,7 @@
       <el-dialog title="所屬代理商" :visible.sync="dialogUpdateFormVisible" :before-close="handleDialogClose" center>
         <el-form :rules="rules" :model="temp" ref="updateForm" label-position="left" label-width="100px" style='width: 400px; margin-left:50px;'>
             <el-form-item label="使用者" prop="id">
-                <el-input v-model="temp.name" :disabled="true"></el-input>
+                <el-input v-model="temp.WeChatUser.GambleMember.name" :disabled="true"></el-input>
           </el-form-item>
           <el-form-item label="代理商" prop="name">
             <multiselect v-model="updateFormData" :options="agentLIstOptions" @search-change="getRemoteAgentList" placeholder="代理商搜尋" selectLabel="選擇"
@@ -127,7 +127,7 @@
 
 import { mapGetters, mapActions } from 'vuex'
 // TODO 需更改抓取此房間人員
-import { fetchList, chipsDeposit, chipsReward, createGambleMember, fetchAgentList, updateBelongAgent } from '@/api/gambleMember'
+import { fetchWeChatMemberList, chipsDeposit, chipsReward, createGambleMember, fetchAgentList, updateBelongAgent } from '@/api/gambleMember'
 import waves from '@/directive/waves' // 水波纹指令
 import Multiselect from 'vue-multiselect'// 使用的一个多选框组件，element-ui的select不能满足所有需求
 import 'vue-multiselect/dist/vue-multiselect.min.css'// 多选框组件css
@@ -151,8 +151,11 @@ export default {
       },
       temp: {
         id: '',
-        name: '',
-        chips: '',
+        WeChatUser: {
+            GambleMember: {
+                GambleAgent: {},
+            },
+        },
         depositChips: '',
         rewardChips: '',
       },
@@ -177,6 +180,7 @@ export default {
       agentLIstOptions: [],
     }
   },
+  props: ['room'],
   created() {
     this.SetVisible(2)
     this.getList()
@@ -195,8 +199,7 @@ export default {
     ]),
     getList() {
       this.listLoading = true
-      fetchList(this.listQuery).then(response => {
-        console.log('list',response.data.rows)
+      fetchWeChatMemberList(this.room, this.listQuery).then(response => {
         this.list = response.data.rows
         this.total = response.data.count
         this.listLoading = false
@@ -237,21 +240,25 @@ export default {
     },
     resetTemp() {
       this.temp = {
-        id: undefined,
-        name: '',
-        chips: '',
-        depositChips: ''
+        id: '',
+        WeChatUser: {
+            GambleMember: {
+                GambleAgent: {},
+                depositChips: '',
+                rewardChips: '',
+            },
+        }
       }
     },
     handlePage(row) {
       const temp = Object.assign({}, row) // copy obj
       this.SetVisible(3)
-      this.member = temp
+      this.member = temp.WeChatUser.GambleMember
     },
     handleLog(row) {
       const temp = Object.assign({}, row) // copy obj
       this.SetVisible(3)
-      this.member = temp
+      this.member = temp.WeChatUser.GambleMember
     },
     handleFilter() {
       this.listQuery.page = 1
@@ -307,9 +314,8 @@ export default {
     updateData() {
       this.$refs['updateForm'].validate((valid) => {
         if (valid) {
-          const tempMember = Object.assign({}, this.temp)
+          const tempMember = Object.assign({}, this.temp.WeChatUser.GambleMember)
           const tempAgent = Object.assign({}, this.updateFormData.value)
-          console.log('aaaaa',tempAgent)
           updateBelongAgent(tempMember, tempAgent).then(() => {
             for (const v of this.list) {
               if (v.id === this.temp.id) {