更新

src/views/adminCenter/basicInfo/index.vue

@@ -9,7 +9,7 @@
               <el-input v-model="form.adminuser" placeholder="请输入用户名"></el-input>
             </el-form-item>
             <el-form-item label="手机号" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入用户名" disabled></el-input>
+              <el-input v-model="form.phone" placeholder="请输入手机号" disabled></el-input>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="submitForm('form')">保存</el-button>
@@ -47,7 +47,7 @@ export default {
     ...authUser({ authUserFetch: 'fetch', authUserUpdate: 'update' }),
     async searchInfo() {
       if (this.user.uid) {
-        let res = await this.dockQuery(this.user.uid);
+        let res = await this.dockQuery({ uid: this.user.uid });
         if (this.$checkRes(res)) {
           for (const val of res.data) {
             this.$set(this, `form`, val);

src/views/adminCenter/dockInfo/parts/dockEdit.vue

@@ -68,6 +68,7 @@ import upload from '@/components/upload.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: place } = createNamespacedHelpers('place');
 const { mapActions: dock } = createNamespacedHelpers('dock');
+const { mapActions: authUser } = createNamespacedHelpers('authUser');
 export default {
   name: 'dockEdit',
   props: {
@@ -90,6 +91,7 @@ export default {
   methods: {
     ...place({ palcequery: 'query', transactiondtetle: 'delete' }),
     ...dock(['query', 'delete', 'update', 'fetch']),
+    ...authUser({ authUserFetch: 'fetch', authUserUpdate: 'update' }),
     async searchInfo() {
       if (this.dockid) {
         let res = await this.fetch(this.dockid);
@@ -102,11 +104,17 @@ export default {
     async onSubmit() {
       let res = await this.update(this.form);
       if (this.$checkRes(res)) {
-        this.$message({
-          message: '修改信息成功',
-          type: 'success',
-        });
-        this.back();
+        let data = {};
+        data.id = this.user.uid;
+        data.name = this.form.adminuser;
+        let arr = await this.authUserUpdate(data);
+        if (this.$checkRes(arr)) {
+          this.$message({
+            message: '修改信息成功',
+            type: 'success',
+          });
+          this.back();
+        }
       }
     },
     // 返回

src/views/adminCenter/dockInfo/parts/dockVip.vue

@@ -17,10 +17,10 @@
           <el-input v-model="form.name" autocomplete="off" placeholder="请输入用户名"></el-input>
         </el-form-item>
         <el-form-item label="手机号" :label-width="formLabelWidth">
-          <el-input v-model="form.phone" autocomplete="off" maxlength="11" placeholder="请输入手机号"></el-input>
+          <el-input v-model="form.phone" autocomplete="off" maxlength="11" placeholder="请输入手机号" :disabled="disabled"></el-input>
         </el-form-item>
         <el-form-item label="密码" :label-width="formLabelWidth">
-          <el-input v-model="form.passwd" autocomplete="off" placeholder="请输入密码" show-password></el-input>
+          <el-input v-model="form.passwd" autocomplete="off" placeholder="请输入密码" show-password :disabled="disabled"></el-input>
         </el-form-item>
         <el-form-item label="单位名称" :label-width="formLabelWidth">
           <el-input v-model="form.company" autocomplete="off" placeholder="请输入单位名称"></el-input>
@@ -33,7 +33,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align:center;">
-        <el-button type="primary" @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="restFormBtn">取 消</el-button>
         <el-button type="success" @click="onSubmit">保 存</el-button>
       </div>
     </el-dialog>
@@ -80,6 +80,7 @@ export default {
       dialogVisible: false,
       form: {},
       formLabelWidth: '100px',
+      disabled: false,
     };
   },
   created() {
@@ -87,7 +88,7 @@ export default {
   },
   methods: {
     ...apply(['query', 'delete', 'update']),
-    ...dock({ dockFetch: 'fetch', dockUpdate: 'update' }),
+    ...dock({ dockFetch: 'fetch', dockUpdate: 'update', dockupdateVip: 'updateVip', createvipuser: 'createvipuser' }),
     ...authUser({ authUserQuery: 'query', authUserCreate: 'create', authUserUpdate: 'update' }),
     async search() {
       if (this.dockid) {
@@ -101,15 +102,28 @@ export default {
     // 添加
     add() {
       this.dialogVisible = true;
+      this.disabled = false;
     },
     // 保存
     async onSubmit() {
-      if (this.form._id) {
-        console.log(this.form);
-        // const res = await this.dockUpdate(this.form);
-        // if (this.$checkRes(res)) {
-        //   let data = {};
-        // }
+      if (this.form.id) {
+        const res = await this.authUserUpdate(this.form);
+        if (this.$checkRes(res)) {
+          let data = {
+            vipname: this.form.name,
+            vipphone: this.form.phone,
+            company: this.form.company,
+            email: this.form.email,
+            content: this.form.content,
+            role: this.form.role,
+            uid: this.form.id,
+            id: this.dockid,
+          };
+          const arr = await this.dockupdateVip(data);
+          if (this.$checkRes(arr)) {
+            console.log(arr);
+          }
+        }
       } else {
         const authUserList = await this.authUserQuery();
         let r = authUserList.data.some(f => f.phone == this.form.phone);
@@ -122,35 +136,48 @@ export default {
           this.form.role = '9';
           const res = await this.authUserCreate(this.form);
           if (this.$checkRes(res)) {
-            let vipuser = [
-              {
-                vipname: this.form.name,
-                vipphone: this.form.phone,
-                company: this.form.company,
-                email: this.form.email,
-                content: this.form.content,
-                role: this.form.role,
-                uid: res.data.id,
-              },
-            ];
-            let data = {};
-            data.id = this.dockid;
-            data.vipuser = vipuser;
-            const arr = await this.dockUpdate(data);
-            console.log(arr);
+            let data = {
+              vipname: this.form.name,
+              vipphone: this.form.phone,
+              company: this.form.company,
+              email: this.form.email,
+              content: this.form.content,
+              role: this.form.role,
+              uid: res.data.id,
+              id: this.dockid,
+            };
+            const arr = await this.createvipuser(data);
+            if (this.$checkRes(arr)) {
+              this.dialogVisible = false;
+              this.back();
+            }
           }
         }
       }
     },
     // 关闭
     handleClose(done) {
+      this.form = {};
       done();
     },
+    // 取消
+    restFormBtn() {
+      this.form = {};
+      this.dialogVisible = false;
+    },
     // 修改
     toEdit({ data }) {
       this.dialogVisible = true;
-      this.$set(this, `form`, data);
-      console.log(data);
+      let newDate = {};
+      newDate.name = data.vipname;
+      newDate.phone = data.vipphone;
+      newDate.passwd = data.passwd;
+      newDate.company = data.company;
+      newDate.email = data.email;
+      newDate.content = data.content;
+      newDate.id = data.uid;
+      this.disabled = true;
+      this.$set(this, `form`, newDate);
     },
     // 刪除
     // toDelete({ data }) {

src/views/userCenter/eventInfo/part/transList.vue

@@ -61,11 +61,14 @@ export default {
     // 列表
     async searchInfo({ skip = 0, limit = 6, ...info } = {}) {
       let market_userid = this.user.uid;
+      let userid = this.user.uid;
       skip = this.skip;
       const res = await this.transactionList({ skip, limit, market_userid, status: 2, ...info });
+      const arr = await this.transactionList({ skip, limit, userid, status: 2, ...info });
+      var newData = res.data.concat(arr.data);
       if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
-        this.$set(this, `total`, res.total);
+        this.$set(this, `list`, newData);
+        this.$set(this, `total`, newData.length);
       }
     },
     // 分页

src/views/vipCenter/basicInfo/index.vue

@@ -6,7 +6,7 @@
         <el-col :span="24" class="info">
           <el-form :model="form" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <el-form-item label="用户名" prop="adminuser">
-              <el-input v-model="form.adminuser" placeholder="请输入用户名"></el-input>
+              <el-input v-model="form.name" placeholder="请输入用户名"></el-input>
             </el-form-item>
             <el-form-item label="手机号" prop="phone">
               <el-input v-model="form.phone" placeholder="请输入用户名" disabled></el-input>
@@ -34,8 +34,8 @@ export default {
     return {
       form: {},
       rules: {
-        adminuser: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
-        phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+        adminuser: [{ required: false, message: '请输入用户名', trigger: 'blur' }],
+        phone: [{ required: false, message: '请输入手机号', trigger: 'blur' }],
       },
     };
   },
@@ -47,33 +47,40 @@ export default {
     ...authUser({ authUserFetch: 'fetch', authUserUpdate: 'update' }),
     async searchInfo() {
       if (this.user.uid) {
-        let res = await this.dockQuery(this.user.uid);
-        if (this.$checkRes(res)) {
-          for (const val of res.data) {
-            this.$set(this, `form`, val);
-          }
-        }
+        let data = {
+          name: this.user.name,
+          phone: this.user.phone,
+        };
+        this.$set(this, `form`, data);
       }
     },
     async submitForm() {
-      let res = await this.dockUpdate(this.form);
+      this.form.id = this.user.uid;
+      let res = await this.authUserUpdate(this.form);
       if (this.$checkRes(res)) {
-        let data = {};
-        data.id = this.user.uid;
-        data.name = this.form.adminuser;
-        let arr = await this.authUserUpdate(data);
-        if (this.$checkRes(arr)) {
-          this.$message({
-            message: '修改信息成功',
-            type: 'success',
-          });
-        } else {
-          this.$message({
-            message: '修改信息失败',
-            type: 'error',
-          });
-        }
+        this.$message({
+          message: '修改信息成功',
+          type: 'success',
+        });
       }
+      // let res = await this.dockUpdate(this.form);
+      // if (this.$checkRes(res)) {
+      //   let data = {};
+      //   data.id = this.user.uid;
+      //   data.name = this.form.adminuser;
+      //   let arr = await this.authUserUpdate(data);
+      //   if (this.$checkRes(arr)) {
+      //     this.$message({
+      //       message: '修改信息成功',
+      //       type: 'success',
+      //     });
+      //   } else {
+      //     this.$message({
+      //       message: '修改信息失败',
+      //       type: 'error',
+      //     });
+      //   }
+      // }
       this.searchInfo();
     },
     resetForm() {