|  | @@ -31,6 +31,16 @@
 | 
	
		
			
			| 31 | 31 |                <span :style="moneyColor(scope.row.all)">{{scope.row.all}}</span>
 | 
	
		
			
			| 32 | 32 |              </template>
 | 
	
		
			
			| 33 | 33 |          </el-table-column>
 | 
	
		
			
			|  | 34 | +        <el-table-column label="抽水%" align="center">
 | 
	
		
			
			|  | 35 | +          <template slot-scope="scope">
 | 
	
		
			
			|  | 36 | +            {{scope.row.feeRatio2}}
 | 
	
		
			
			|  | 37 | +          </template>
 | 
	
		
			
			|  | 38 | +        </el-table-column>    
 | 
	
		
			
			|  | 39 | +        <el-table-column label="代理商上繳金額" prop="all" align="center">
 | 
	
		
			
			|  | 40 | +            <template slot-scope="scope">
 | 
	
		
			
			|  | 41 | +              <span :style="moneyColor(scope.row.all2)">{{scope.row.all2}}</span>
 | 
	
		
			
			|  | 42 | +            </template>
 | 
	
		
			
			|  | 43 | +        </el-table-column>
 | 
	
		
			
			| 34 | 44 |          <el-table-column label="上繳工作室金額70%" prop="all70" align="center">
 | 
	
		
			
			| 35 | 45 |            <template slot-scope="scope">
 | 
	
		
			
			| 36 | 46 |              <span :style="moneyColor(scope.row.all70)">{{scope.row.all70}}</span>
 | 
	
	
		
			
			|  | @@ -61,9 +71,12 @@
 | 
	
		
			
			| 61 | 71 |            <el-form-item label="名稱" prop="name">
 | 
	
		
			
			| 62 | 72 |              <el-input v-model="createFormData.name"></el-input>
 | 
	
		
			
			| 63 | 73 |            </el-form-item>
 | 
	
		
			
			| 64 |  | -          <el-form-item label="抽水 %" prop="feeRatio">
 | 
	
		
			
			|  | 74 | +          <el-form-item label="抽水 % (代理商內)" prop="feeRatio">
 | 
	
		
			
			| 65 | 75 |              <el-input v-model="createFormData.feeRatio"></el-input>
 | 
	
		
			
			| 66 | 76 |            </el-form-item>
 | 
	
		
			
			|  | 77 | +          <el-form-item label="抽水 % (只在列表顯示)" prop="feeRatio2">
 | 
	
		
			
			|  | 78 | +            <el-input v-model="createFormData.feeRatio2"></el-input>
 | 
	
		
			
			|  | 79 | +          </el-form-item>
 | 
	
		
			
			| 67 | 80 |          </el-form>          
 | 
	
		
			
			| 68 | 81 |          <div slot="footer" class="dialog-footer">
 | 
	
		
			
			| 69 | 82 |            <el-button @click="handleDialogClose">取 消</el-button>
 | 
	
	
		
			
			|  | @@ -114,6 +127,7 @@ export default {
 | 
	
		
			
			| 114 | 127 |        createFormData: {
 | 
	
		
			
			| 115 | 128 |          name: '',
 | 
	
		
			
			| 116 | 129 |          feeRatio: '',
 | 
	
		
			
			|  | 130 | +        feeRatio2: '',
 | 
	
		
			
			| 117 | 131 |        }
 | 
	
		
			
			| 118 | 132 |      }
 | 
	
		
			
			| 119 | 133 |    },
 | 
	
	
		
			
			|  | @@ -137,13 +151,12 @@ export default {
 | 
	
		
			
			| 137 | 151 |        fetchList(this.listQuery).then(async response => {
 | 
	
		
			
			| 138 | 152 |  
 | 
	
		
			
			| 139 | 153 |          // response.data.rows.map(agent => {
 | 
	
		
			
			| 140 |  | -          console.log('eeeee', response.data.rows)
 | 
	
		
			
			| 141 | 154 |          for(const agent of response.data.rows) {
 | 
	
		
			
			| 142 | 155 |            let combine = []
 | 
	
		
			
			| 143 | 156 |            this.list = []   
 | 
	
		
			
			| 144 | 157 |            if(this.visible.firstLayer === true) {
 | 
	
		
			
			| 145 | 158 |              fetchGroupAll(agent, this.listQuery).then(response => {
 | 
	
		
			
			| 146 |  | -              console.log('response' , response.data.all)
 | 
	
		
			
			|  | 159 | +              console.log('response' , response.data)
 | 
	
		
			
			| 147 | 160 |                this.list.push({
 | 
	
		
			
			| 148 | 161 |                  // id: agent.GambleMember.id,
 | 
	
		
			
			| 149 | 162 |                  // GambleMember: {
 | 
	
	
		
			
			|  | @@ -154,12 +167,15 @@ export default {
 | 
	
		
			
			| 154 | 167 |                  name: agent.GambleMember.name.slice(19),
 | 
	
		
			
			| 155 | 168 |                  createdAt: agent.GambleMember.createdAt,
 | 
	
		
			
			| 156 | 169 |                  feeRatio: response.data.feeRatio,
 | 
	
		
			
			|  | 170 | +                feeRatio2: response.data.feeRatio2,
 | 
	
		
			
			| 157 | 171 |                  all: response.data.all,
 | 
	
		
			
			|  | 172 | +                all2: response.data.all2,
 | 
	
		
			
			| 158 | 173 |                  all70: response.data.all70,
 | 
	
		
			
			| 159 | 174 |                  fredPunishment: response.data.fredPunishment
 | 
	
		
			
			| 160 | 175 |                })
 | 
	
		
			
			| 161 | 176 |              })
 | 
	
		
			
			| 162 | 177 |            }
 | 
	
		
			
			|  | 178 | +          
 | 
	
		
			
			| 163 | 179 |            // fetchMemberList(agent, this.listQuery).then(response => {
 | 
	
		
			
			| 164 | 180 |            //   response.data.rows.map(member => {
 | 
	
		
			
			| 165 | 181 |            //     let row = {
 |