fix conflict

src/api.js

@@ -268,14 +268,6 @@ export default {
     getSignupList: params => {
         return axios.get(`${baseURL}/api/admin/signup/list`, { params: params })
     },
-    // 股票评论
-    getStockCommentsList: params => {
-        return axios.get(`${baseURL}/api/admin/stock/comments/list`, { params: params })
-    },
-    // 作业评论
-    getRecordCommentsList: params => {
-        return axios.get(`${baseURL}/api/admin/record/comments/list`, { params: params })
-    },
     // 顽主咨询
     getWanzhuConsultList: params => {
         return axios.get(`${baseURL}/api/admin/consult/list`, { params: params })
@@ -284,4 +276,24 @@ export default {
     getWanzhuConsultDetail: params => {
         return axios.get(`${baseURL}/api/admin/consult`, { params: params })
     },
+    // 回复顽主咨询
+    replyConsult: params => {
+        return axios.post(`${baseURL}/api/admin/consult/reply`, params)
+    },
+    // 删除咨询
+    delConsult: params => {
+        return axios.delete(`${baseURL}/api/admin/consult`, { params: params });
+    },
+    // 订单详情
+    getSignupOrderDetail: params => {
+        return axios.get(`${baseURL}/api/admin/signup`, { params: params })
+    },
+    // 修改订单
+    editSignupOrder: params => {
+        return axios.put(`${baseURL}/api/admin/signup`, params)
+    },
+    // 删除订单
+    delSignupOrder: params => {
+        return axios.delete(`${baseURL}/api/admin/signup`, { params: params });
+    },
 }

src/views/comments/consult.vue

@@ -33,34 +33,16 @@
         </el-form>
         <el-table :data="list" height='55vh' style="width: 100%;margin-top:10px;" v-loading='loading'>
                 <el-table-column prop="user_name" label="选手名称"/>
-                <el-table-column prop="user_phone" label="手机号"/>
-                <el-table-column prop="match_name" label="报名赛事"/>
-                <el-table-column prop="signup_type" label="报名类型">
+                <el-table-column prop="content" label="咨询内容"/>
+                <el-table-column prop="reply_content" label="回复内容">
                     <template slot-scope="scope">
-                        <span v-if="scope.row.signup_type==2" style="color:red;">选手</span>
-                        <span v-else>游客</span>
+                        <p v-for="item,index in scope.row.reply_list" :key="index">{{item.reply_content}}</p>
                     </template>
                 </el-table-column>
-                <el-table-column prop="total_fee" label="报名费用"/>
-                <el-table-column prop="order_status" label="订单状态" width="150">
-                    <template slot-scope="scope">
-                        <!-- <span v-if="scope.row.order_status==1" style="color:#67c23a;">已支付</span> -->
-                        <el-button v-if="scope.row.order_status==1" type="success" size="mini">已支付</el-button>
-                        <span v-else>未支付</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="pay_status" label="支付状态" width="150">
-                    <template slot-scope="scope">
-                        <!-- <span v-if="scope.row.pay_status==1" class="color:green;">已支付</span> -->
-                        <el-button v-if="scope.row.order_status==1" type="success" size="mini">已支付</el-button>
-                        <span v-else>未支付</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="pay_time" label="支付时间" width="160" show-overflow-tooltip />
-                <el-table-column prop="ctime" label="下单时间" width="160"/>
+                <el-table-column prop="ctime" label="咨询时间" width="160"/>
                 <el-table-column prop="date" label="操作" fixed="right" width="220">
                     <template slot-scope="scope">
-                        <el-button @click="edit(scope.row.id)" size="mini" type="warning">编辑</el-button>
+                        <el-button @click="edit(scope.row.id)" size="mini" type="primary">回复</el-button>
                         <el-button @click="del(scope.row.id)" size="mini" type="danger">删除</el-button>
                     </template>
                 </el-table-column>
@@ -74,75 +56,13 @@
         />
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                <el-form-item label="赛事名称" prop="match_id">
-                        <el-select v-model="form.match_id" placeholder="请选择比赛">
-                            <el-option v-for="item in matchList" :key='item.id' :label="item.name" :value="item.id"></el-option>
-                        </el-select>
-                </el-form-item>
-                <el-form-item label="参赛选手" prop="player_id">
-                    <el-select filterable v-model="form.player_id" placeholder="请选择用户代码">
-                        <el-option v-for="item in playerList" :key='item.id' :label="item.label" :value="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="持仓日期" prop="stock_date">
-                        <el-date-picker
-                        v-model="form.stock_date"
-                        type="date" style="width:100%"
-                        placeholder="选择日期"
-                        format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                </el-form-item>
-                <el-form-item label="今日资产" prop="today_fund">
-                    <el-input clearable v-model="form.today_fund" placeholder="请输入今日资产" type="number">
-                        <template slot="append">万元</template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item v-if="form.id" label="昨日资产" prop="yesterday_fund">
-                    <el-input clearable v-model="form.yesterday_fund" placeholder="请输入昨日资产" type="number">
-                        <template slot="append">万元</template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item v-if="form.id" label="初始资产" prop="init_fund">
-                    <el-input clearable v-model="form.init_fund" placeholder="请输入初始资产" type="number">
-                        <template slot="append">万元</template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="开超市" prop="is_markt">
-                    <el-switch
-                        v-model="form.is_markt">
-                    </el-switch>
-                </el-form-item>
-                <el-form-item label="股票名称" prop="today_stock">
-                    <div v-for="(item,index) in form.today_stock" :key='index' style="margin-bottom:5px;">
-                        <!-- <el-select  filterable v-model="item.name" placeholder="请选择股票" style="width:48%;display:inline-block">
-                            <el-option v-for="item in stockList" :key='item.id' :label="item.label" :value="item.label"></el-option>
-                        </el-select> -->
-                        <el-input style="width:48%;display:inline-block" v-model="item.name" placeholder="请输入股票名称" :disabled="form.is_markt==true"></el-input>
-                        &nbsp;<el-input style="width:39%" clearable v-model="item.fund" placeholder="资金" :disabled="form.is_markt==true">
-                            <template slot="append">万元</template>
-                        </el-input>
-                        <i @click="form.today_stock.splice(index,1)" style="margin-top:5px;" class="el-icon-circle-close del"></i>
-                    </div>
-                    <el-button @click="addCode" type="primary" size="small" plain>新增股票</el-button>
-                </el-form-item>
-                <el-form-item label="股票截图" prop="today_stock_img">
-                    <div class="imgs" v-for="(item,index) in form.today_stock_img" :key='index'>
-                        <img  width="150" :src="item" alt="">
-                        <i @click="form.today_stock_img.splice(index,1)" class="el-icon-circle-close del"></i>
-                    </div>
-                    <el-upload
-                        class="upload-demo"
-                        :show-file-list	='false'
-                        :on-success="handleSuccess"
-                        action="/api/admin/uploadfile">
-                        <el-button size="small" type="primary" plain>上传股票截图</el-button>
-                    </el-upload>
+                <el-form-item label="回复内容" prop="reply_content">
+                        <el-input v-model="form.reply_content" placeholder="" type="textarea" rows="10"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="open=false">取 消</el-button>
+                <el-button type="primary" @click="submitForm" size="mini">确 定</el-button>
+                <el-button @click="open=false" size="mini">取 消</el-button>
             </div>
         </el-dialog>
         <!-- 点评 -->
@@ -263,7 +183,7 @@ export default {
         this.$confirm("确定删除吗?", "提示", {
             type: "warning",
         }).then(() => {
-            this.$api.delRecord({ id: id }).then((res) => {
+            this.$api.delConsult({ id: id }).then((res) => {
             this.$message({
                 message: "删除成功",
                 type: "success",
@@ -281,15 +201,15 @@ export default {
         },
         getData(){
             this.loading = true;
-            this.$api.getSignupList(this.queryParams).then(res=>{
+            this.$api.getWanzhuConsultList(this.queryParams).then(res=>{
                 this.list=res.data.data.list
                 this.total = res.data.data.total;
                 this.loading = false;
             })
         },
         edit(id){
-            this.title = "编辑数据"
-            this.$api.getRecordInfo({id:id}).then(res=>{
+            this.title = "回复"
+            this.$api.getWanzhuConsultDetail({id:id}).then(res=>{
                 this.form = res.data.data
                 this.open = true
             })
@@ -334,17 +254,8 @@ export default {
             console.log(this.form)
             this.$refs["form"].validate(valid => {
                 if (valid) {
-                // if(this.form.today_stock.length<=0){
-                //     this.msgError('请添加股票');
-                //     return
-                // }else{
-                //     if((!this.form.today_stock[0].name || !this.form.today_stock[0].fund) && !this.form.is_markt){
-                //         this.msgError('请选择股票并输入资金额');
-                //         return
-                //     }
-                // }
-                if (this.form.id != null) {
-                    this.$api.editRecord(this.form).then(response => {
+                    this.form.pid = this.form.id;
+                    this.$api.replyConsult(this.form).then(response => {
                         if(response.data.code != 0){
                             this.msgError(response.data.message);
                             return
@@ -353,17 +264,6 @@ export default {
                         this.open = false;
                         this.getData();
                     });
-                } else {
-                    this.$api.addRecord(this.form).then(response => {
-                        if(response.data.code != 0){
-                            this.msgError(response.data.message);
-                            return
-                        }
-                        this.msgSuccess("新增成功");
-                        this.open = false;
-                        this.getData();
-                    });
-                }
         }
       });
     },

src/views/match/group.vue

@@ -6,7 +6,7 @@
             <el-row>
                 <el-col :span="6">
                     <el-form-item label="赛事名称">
-                        <el-select v-model="queryParams.match_id" placeholder="请选择比赛" size="mini">
+                        <el-select v-model="queryParams.match_id" placeholder="请选择比赛" size="mini" @change="getData()">
                             <el-option v-for="item in matchList" :key='item.id' :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
@@ -170,7 +170,11 @@ export default {
     },
     },
     created(){
-       this.getData() 
+        this.$api.getMatchList().then(res=>{
+            this.matchList=res.data.data
+            this.queryParams.match_id = this.matchList[0].id;
+            this.getData() 
+        })
     }
 }
 </script>

src/views/match/index.vue

@@ -49,6 +49,8 @@
       <el-table-column align="center" prop="groups" label="比赛分组" />
       <el-table-column align="center" prop="start_time" label="开始时间" />
       <el-table-column align="center" prop="end_time" label="结束时间" />
+      <el-table-column align="center" prop="player_price" label="选手价格" />
+      <el-table-column align="center" prop="viewer_price" label="游客价格" />
       <el-table-column align="center" prop="date" label="操作">
         <template slot-scope="scope">
           <el-button @click="edit(scope.row)" size="mini" type="warning"
@@ -98,6 +100,20 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="选手价格" prop="player_price">
+          <el-input
+            clearable
+            v-model="form.player_price"
+            placeholder="请输入选手报名价格"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="游客价格" prop="viewer_price">
+          <el-input
+            clearable
+            v-model="form.viewer_price"
+            placeholder="请输入游客报名价格"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="报单日历" prop="calendar">
           <full-calendar
             :events="monthData"
@@ -149,6 +165,12 @@ export default {
         end_time: [
           { required: true, message: "请输入结束时间", trigger: "blur" },
         ],
+        player_price: [
+          { required: true, message: "请输入选手报名价格", trigger: "blur" },
+        ],
+        viewer_price: [
+          { required: true, message: "请输入游客报名价格", trigger: "blur" },
+        ],
       },
       matchList: [],
       groupList: [],

src/views/signup/index.vue

@@ -73,16 +73,17 @@
                 <el-table-column prop="pay_status" label="支付状态" width="150">
                     <template slot-scope="scope">
                         <!-- <span v-if="scope.row.pay_status==1" class="color:green;">已支付</span> -->
-                        <el-button v-if="scope.row.order_status==1" type="success" size="mini">已支付</el-button>
+                        <el-button v-if="scope.row.pay_status==1" type="success" size="mini">已支付</el-button>
                         <span v-else>未支付</span>
                     </template>
                 </el-table-column>
                 <el-table-column prop="pay_time" label="支付时间" width="160" show-overflow-tooltip />
                 <el-table-column prop="ctime" label="下单时间" width="160"/>
+                <el-table-column prop="remark" label="备注" width="160"/>
                 <el-table-column prop="date" label="操作" fixed="right" width="220">
                     <template slot-scope="scope">
                         <el-button @click="edit(scope.row.id)" size="mini" type="warning">编辑</el-button>
-                        <el-button @click="del(scope.row.id)" size="mini" type="danger">删除</el-button>
+                        <el-button @click="del(scope.row.id)" size="mini" type="danger" :disabled="scope.row.pay_status==1">删除</el-button>
                     </template>
                 </el-table-column>
         </el-table>
@@ -96,70 +97,37 @@
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-form-item label="赛事名称" prop="match_id">
-                        <el-select v-model="form.match_id" placeholder="请选择比赛">
+                        <el-select v-model="form.match_id" placeholder="请选择比赛" disabled>
                             <el-option v-for="item in matchList" :key='item.id' :label="item.name" :value="item.id"></el-option>
                         </el-select>
                 </el-form-item>
-                <el-form-item label="参赛选手" prop="player_id">
-                    <el-select filterable v-model="form.player_id" placeholder="请选择用户代码">
-                        <el-option v-for="item in playerList" :key='item.id' :label="item.label" :value="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="持仓日期" prop="stock_date">
-                        <el-date-picker
-                        v-model="form.stock_date"
-                        type="date" style="width:100%"
-                        placeholder="选择日期"
-                        format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd">
-                        </el-date-picker>
-                </el-form-item>
-                <el-form-item label="今日资产" prop="today_fund">
-                    <el-input clearable v-model="form.today_fund" placeholder="请输入今日资产" type="number">
-                        <template slot="append">万元</template>
-                    </el-input>
+                <el-form-item label="选手名称" prop="player_id">
+                    <el-input v-model="form.user_name" disabled placeholder=""></el-input>
                 </el-form-item>
-                <el-form-item v-if="form.id" label="昨日资产" prop="yesterday_fund">
-                    <el-input clearable v-model="form.yesterday_fund" placeholder="请输入昨日资产" type="number">
-                        <template slot="append">万元</template>
-                    </el-input>
+                <el-form-item label="报名类型" prop="match_id">
+                        <el-select v-model="form.signup_type" placeholder="请选择比赛" disabled>
+                            <el-option v-for="item in signupTypeList" :key='item.id' :label="item.name" :value="item.id"></el-option>
+                        </el-select>
                 </el-form-item>
-                <el-form-item v-if="form.id" label="初始资产" prop="init_fund">
-                    <el-input clearable v-model="form.init_fund" placeholder="请输入初始资产" type="number">
-                        <template slot="append">万元</template>
-                    </el-input>
+                <el-form-item label="报名费用" prop="total_fee">
+                    <el-input v-model="form.total_fee" disabled placeholder=""></el-input>
                 </el-form-item>
-                <el-form-item label="开超市" prop="is_markt">
-                    <el-switch
-                        v-model="form.is_markt">
-                    </el-switch>
+                <el-form-item label="支付状态" prop="match_id">
+                        <el-select v-model="form.pay_status" placeholder="请选择" disabled>
+                            <el-option v-for="item in orderStatusList" :key='item.id' :label="item.name" :value="item.id"></el-option>
+                        </el-select>
                 </el-form-item>
-                <el-form-item label="股票名称" prop="today_stock">
-                    <div v-for="(item,index) in form.today_stock" :key='index' style="margin-bottom:5px;">
-                        <!-- <el-select  filterable v-model="item.name" placeholder="请选择股票" style="width:48%;display:inline-block">
-                            <el-option v-for="item in stockList" :key='item.id' :label="item.label" :value="item.label"></el-option>
-                        </el-select> -->
-                        <el-input style="width:48%;display:inline-block" v-model="item.name" placeholder="请输入股票名称" :disabled="form.is_markt==true"></el-input>
-                        &nbsp;<el-input style="width:39%" clearable v-model="item.fund" placeholder="资金" :disabled="form.is_markt==true">
-                            <template slot="append">万元</template>
-                        </el-input>
-                        <i @click="form.today_stock.splice(index,1)" style="margin-top:5px;" class="el-icon-circle-close del"></i>
-                    </div>
-                    <el-button @click="addCode" type="primary" size="small" plain>新增股票</el-button>
+                <el-form-item label="订单状态" prop="match_id">
+                        <el-select v-model="form.order_status" placeholder="请选择">
+                            <el-option v-for="item in orderStatusList" :key='item.id' :label="item.name" :value="item.id"></el-option>
+                        </el-select>
                 </el-form-item>
-                <el-form-item label="股票截图" prop="today_stock_img">
-                    <div class="imgs" v-for="(item,index) in form.today_stock_img" :key='index'>
-                        <img  width="150" :src="item" alt="">
-                        <i @click="form.today_stock_img.splice(index,1)" class="el-icon-circle-close del"></i>
-                    </div>
-                    <el-upload
-                        class="upload-demo"
-                        :show-file-list	='false'
-                        :on-success="handleSuccess"
-                        action="/api/admin/uploadfile">
-                        <el-button size="small" type="primary" plain>上传股票截图</el-button>
-                    </el-upload>
+                <el-form-item label="备注" prop="match_id">
+                        <el-input v-model="form.remark" placeholder="" type="textarea"></el-input>
                 </el-form-item>
+
+
+
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -230,11 +198,12 @@ export default {
             ],
             orderStatusList:[
                 {id:0,name:"未支付"},
-                {id:1,name:"已支付"}
+                {id:1,name:"已支付"},
+                {id:-1,name:"已退款"}
             ],
             signupTypeList:[
-                {id:1,name:"选手"},
-                {id:2,name:"游客"}
+                {id:1,name:"游客"},
+                {id:2,name:"选手"},
             ]
         }
     },
@@ -284,7 +253,7 @@ export default {
         this.$confirm("确定删除吗?", "提示", {
             type: "warning",
         }).then(() => {
-            this.$api.delRecord({ id: id }).then((res) => {
+            this.$api.delSignupOrder({ id: id }).then((res) => {
             this.$message({
                 message: "删除成功",
                 type: "success",
@@ -309,8 +278,8 @@ export default {
             })
         },
         edit(id){
-            this.title = "编辑数据"
-            this.$api.getRecordInfo({id:id}).then(res=>{
+            this.title = "订单详情"
+            this.$api.getSignupOrderDetail({id:id}).then(res=>{
                 this.form = res.data.data
                 this.open = true
             })
@@ -355,17 +324,8 @@ export default {
             console.log(this.form)
             this.$refs["form"].validate(valid => {
                 if (valid) {
-                // if(this.form.today_stock.length<=0){
-                //     this.msgError('请添加股票');
-                //     return
-                // }else{
-                //     if((!this.form.today_stock[0].name || !this.form.today_stock[0].fund) && !this.form.is_markt){
-                //         this.msgError('请选择股票并输入资金额');
-                //         return
-                //     }
-                // }
                 if (this.form.id != null) {
-                    this.$api.editRecord(this.form).then(response => {
+                    this.$api.editSignupOrder(this.form).then(response => {
                         if(response.data.code != 0){
                             this.msgError(response.data.message);
                             return
@@ -374,16 +334,6 @@ export default {
                         this.open = false;
                         this.getData();
                     });
-                } else {
-                    this.$api.addRecord(this.form).then(response => {
-                        if(response.data.code != 0){
-                            this.msgError(response.data.message);
-                            return
-                        }
-                        this.msgSuccess("新增成功");
-                        this.open = false;
-                        this.getData();
-                    });
                 }
         }
       });