begmoon 2 роки тому
батько
коміт
7166b4362c
3 змінених файлів з 45 додано та 3 видалено
  1. 7 0
      src/api.js
  2. 29 2
      src/views/data/index.vue
  3. 9 1
      src/views/player/index.vue

+ 7 - 0
src/api.js

@@ -348,6 +348,11 @@ export default {
     getFundInOutList: params => {
         return axios.get(`${baseURL}/api/admin/user/fundinout/list`, { params: params })
     },
+    //计算出入资金 
+    caculateFundInOut: params => {
+        return axios.get(`${baseURL}/api/admin/user/fundinout/caculate`, { params: params })
+    },
+
     // 咨询详情
     getConsultDetail: params => {
         return axios.get(`${baseURL}/api/admin/user/consult/detail`, { params: params })
@@ -404,4 +409,6 @@ export default {
     refundSignupOrder: params => {
         return axios.post(`${baseURL}/api/admin/wxpay/refund`, params)
     },
+
+
 }

+ 29 - 2
src/views/data/index.vue

@@ -169,7 +169,7 @@
                         </el-select>
                 </el-form-item>
                 <el-form-item label="参赛选手" prop="player_id">
-                    <el-input v-if="form.id" v-model="form.user_id" placeholder="" :value="form.username" disabled ></el-input><span v-if="form.id">{{form.username}}</span>
+                    <el-input v-if="form.id" v-model="form.user_id" placeholder="" :value="form.username" disabled ></el-input><span v-if="form.id">{{form.username}}({{form.usercode}})</span>
                     <el-select v-else filterable remote v-model="form.player_id" placeholder="请选择用户代码" reserve-keyword :remote-method="remoteMethod" :loading="loading">
                         <el-option v-for="item in playerList" :key='item.id' :label="item.label" :value="item.id"></el-option>
                     </el-select>
@@ -198,6 +198,14 @@
                         <template slot="append">万元</template>
                     </el-input>
                 </el-form-item>
+                <el-form-item>
+                    <div>
+                    转出: <el-input clearable @clear="getData()" v-model="form.out_fund" placeholder="转出" style="width:100px"></el-input>
+                    转入: <el-input clearable @clear="getData" v-model="form.in_fund" placeholder="转入" style="width:100px;margin:10px"></el-input>
+                    <el-button type="primary" @click="caculateInout">计算</el-button>
+                    </div>
+                    <div>计算结果:{{inout}}</div>
+                </el-form-item>
                 <el-form-item label="开超市" prop="is_markt">
                     <el-switch
                         v-model="form.is_markt">
@@ -297,6 +305,7 @@ export default {
             title:'新增用户',
             open:false,
             open1:false,
+            inout:'',
             rules:{
                 match_id: [
                     { required: true, message: '请选择比赛', trigger: 'change' }
@@ -452,6 +461,14 @@ export default {
                 this.getData()
             })
         },
+
+         // 计算出入资金
+        caculateInout(){
+            this.$api.caculateFundInOut(this.form).then(res=>{
+                this.inout = "初始资金: " + res.data.data.init_fund + " 昨日资金: " + res.data.data.yesterday_fund + " 今日收益: " + res.data.data.today_income + " 总收益: " + res.data.data.total_income
+            })
+        },
+
         addCode(){
              this.form.today_stock.push({code: "", name:"",fund:''})
         },
@@ -471,6 +488,7 @@ export default {
                 this.playerList = [];
             }
         },
+
         /** 提交按钮 */
         submitForm() {
             console.log(this.form)
@@ -525,6 +543,15 @@ export default {
        this.$api.getStockList().then(res=>{
            this.stockList=res.data.data
        })
-    }
+    },
+
+    mounted() {
+        if(this.$route.query.usercode){
+            this.queryParams.username = this.$route.query.usercode;
+        }
+        
+    },
+
+    
 }
 </script>

+ 9 - 1
src/views/player/index.vue

@@ -59,7 +59,12 @@
             </el-row>   
         </el-form>
         <el-table v-loading='loading' :data="list" style="width: 100%;margin-top:10px;" height="50vh">
-                <el-table-column align="center" prop="usercode" label="选手代码"/>
+                <el-table-column align="center" prop="usercode" label="选手代码">
+                <template slot-scope="scope">
+                    <div style="text-decoration:underline" @click="pushData(scope.row.usercode)">{{scope.row.usercode}}</div>
+                </template>
+                </el-table-column>
+
                 <el-table-column align="center"  prop="username" label="选手名称"/>
                 <el-table-column align="center"  prop="nickname" label="微信昵称"/>
                 <el-table-column align="center"  prop="openid" label="微信ID号"/>
@@ -308,6 +313,9 @@ export default {
             })
             
         },
+        pushData(user_code){
+            this.$router.push({path:'/data',query:{usercode:user_code}})
+        },
         /** 提交按钮 */
         submitForm() {
             this.$refs["form"].validate(valid => {