Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/wanzb_admin

src/views/data/index.vue

@@ -148,9 +148,9 @@
                 <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="editComment(scope.row.id)" size="mini" type="primary">点评</el-button>
-                        <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="editComment(scope.row)" size="mini" type="primary">点评</el-button>
+                        <el-button @click="edit(scope.row)" size="mini" type="warning">编辑</el-button>
+                        <el-button @click="del(scope.row)" size="mini" type="danger">删除</el-button>
                     </template>
                 </el-table-column>
         </el-table>
@@ -368,11 +368,11 @@ export default {
                 this.download_loading = false;
             })
         },
-        del(id) {
+        del(row) {
         this.$confirm("确定删除吗?", "提示", {
             type: "warning",
         }).then(() => {
-            this.$api.delRecord({ id: id }).then((res) => {
+            this.$api.delRecord({ id: row.id,match_id:row.match_id }).then((res) => {
             this.$message({
                 message: "删除成功",
                 type: "success",
@@ -396,16 +396,16 @@ export default {
                 this.loading = false;
             })
         },
-        edit(id){
+        edit(row){
             this.title = "编辑数据"
-            this.$api.getRecordInfo({id:id}).then(res=>{
+            this.$api.getRecordInfo({id:row.id,match_id:row.match_id}).then(res=>{
                 this.form = res.data.data
                 this.open = true
             })
         },
-        editComment(id){
+        editComment(row){
             this.title = "顽主点评"
-            this.$api.getRecordInfo({id:id}).then(res=>{
+            this.$api.getRecordInfo({id:row.id,match_id:row.match_id}).then(res=>{
                 this.form1 = res.data.data
                 this.open1 = true
             })

src/views/match/index.vue

@@ -132,6 +132,17 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="交作业开始时间" prop="post_start_time">
+          <el-date-picker
+            v-model="form.post_start_time"
+            type="date"
+            placeholder="选择日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            size="mini"
+          >
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="选手价格" prop="player_price">
           <el-input
             clearable

vue.config.js

@@ -3,9 +3,9 @@ module.exports = {
         proxy: {
             '/api': {
                 // target:'http://39.107.246.59:81',
-                target: 'https://api.hunanwanzhu.com',
+                // target: 'https://api.hunanwanzhu.com',
                 // target:'http://caos.tederen.com',
-                // target: 'https://wx.scxjc.club',
+                target: 'https://wx.scxjc.club',
                 changeOrigin: true,
             }
         }