Merge remote-tracking branch 'origin/master'

web/src/views/zshow/zShow/showScheduleForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="添加日程" :visible.sync="show" width="600px">
+  <el-dialog :title="(formState ? '添加':'编辑' )+ '日程'" :visible.sync="show" width="600px">
     <el-form ref="form" :model="form" label-width="90px" :rules="rules">
       <el-form-item label="场次名称" prop="scheduleName">
         <el-input v-model="form.scheduleName" placeholder="请输入场次名称"></el-input>

web/src/views/zshow/zShow/writeOff.vue

@@ -12,13 +12,13 @@
       /></el-col>
     </el-row>
 
-    <el-table :data="memberList">
+    <el-table :data="memberList" :loading="loading">
-      <el-table-column prop="username" label="手机号" />
+      <el-table-column prop="phone" label="手机号" />
       <el-table-column prop="nickname" label="用户名" />
       <el-table-column label="操作">
         <template v-slot="scope">
           <el-button
-            @click="removeItemHandler(scope.$index)"
+            @click="removeItemHandler(scope.row)"
             type="danger"
             icon="el-icon-delete"
             circle
@@ -29,7 +29,7 @@
 
     <div slot="footer" class="dialog-footer">
       <el-button v-loading="loading" type="primary" @click="saveHandler"
-        >保存</el-button
+        >关闭</el-button
       >
       <el-button @click="close">取消</el-button>
     </div>
@@ -42,10 +42,6 @@
  * @description nft
  * @author BboySpider
  */
-import {
-  postZnftverificationauth,
-  getWhiteList,
-} from "@/api/collection/couponCoupons";
 import { fetPage, addObj, delTierObj } from "@/api/zshow/zwriteOff";
 import userSelect from "@/components/UserSelect";
 
@@ -58,12 +54,7 @@ export default {
       form: {},
       show: false,
       loading: false,
-      memberList: [
+      memberList: [],
-        // {
-        //   nickname: 1234566,
-        //   username: "张三",
-        // },
-      ],
     };
   },
 
@@ -76,12 +67,19 @@ export default {
       let form = Object.assign({}, origin);
       this.form = form;
       console.log("form", form);
-      this. getList()
+      this.getList();
     },
     getList() {
-      fetPage(this.form.showId).then((res) => {
+        this.loading = true
+      fetPage({
+        showId: this.form.showId,
+        page: 1,
+        currrnt: 200,
+      }).then((res) => {
         this.memberList = res.data.records;
         console.log(res);
+      }).finally(()=>{
+        this.loading = false;
       });
       this.show = true;
     },
@@ -90,23 +88,7 @@ export default {
       this.show = false;
     },
     saveHandler() {
-      if (this.memberList.length < 1) {
+      this.close();
-        this.$message.warning("请添加用户");
-        return;
-      }
-
-      const data = this.memberList.map((m) => ({
-        categoryId: this.form.id,
-        userId: m.userId,
-      }));
-      console.log("postZnftverificationauth", postZnftverificationauth);
-
-      postZnftverificationauth(data).then((res) => {
-        if (res.code === "success") {
-          this.$message.success(res.msg);
-          this.finish();
-        }
-      });
     },
     finish() {
       this.close();
@@ -120,18 +102,22 @@ export default {
       }).then((res) => {
         if (res.code === "success") {
           this.$message.success("添加用户成功");
-          this.getList()
+          this.getList();
         }
       });
-      // this.memberList.push({
-      //   userId: user.id,
-      //   nickname: user.nickname,
-      //   username: user.username
-      // });
     },
-    removeItemHandler(index) {
+    removeItemHandler(e) {
-      this.memberList.splice(index, 1);
+      this.loading = truel;
-      this.memberList = [...this.memberList];
+      delTierObj(e.authId)
+        .then((res) => {
+          if (res.code === "success") {
+            this.$message.success("删除成功");
+            this.getList();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
 
     tset() {