From d9f4a5c622cbf6e05fa62d454ca07e149e4b49e9 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Fri, 29 Oct 2021 16:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Pay/Pay.vue | 56 ++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 35 deletions(-)

diff --git a/src/views/Pay/Pay.vue b/src/views/Pay/Pay.vue
index ee75ab0..576d5f5 100644
--- a/src/views/Pay/Pay.vue
+++ b/src/views/Pay/Pay.vue
@@ -55,7 +55,7 @@
 
 <script>
 import { mapState, mapMutations } from 'vuex';
-import { toPay, uploadImg } from '@/config/api';
+import { toPay, uploadImg, getUserInfo } from '@/config/api';
 
 function getBase64(file) {
   return new Promise((resolve, reject) => {
@@ -70,7 +70,7 @@ export default {
   data() {
     return {
       timer: null,
-      player_id: '',
+      playerId: '',
       fileId: '',
       previewVisible: false,
       previewImage: '',
@@ -92,22 +92,14 @@ export default {
       if (this.projectId) {
         clearInterval(this.timer);
         await this.setParams();
-
-        // 自动移动到目标位置
-        // document.querySelector('#scrollTo').scrollIntoView({
-        //   behavior: 'smooth', // 平滑过渡
-        //   block: 'start', // 上边框与视窗顶部平齐。默认值
-        // });
       }
     }, 300);
   },
 
   methods: {
-    // ...mapMutations('home', ['setStartTime', 'setEndTime', 'setMemberIdList']),
-
     async setParams() {
       const { projectId, roleId } = this;
-      const params = { param: { projectId, roleId } };
+      const params = { param: { projectId } };
       await this.getUserInfo(params);
     },
 
@@ -120,7 +112,7 @@ export default {
         const res = await getUserInfo(params);
         const { code, msg, data } = res.data;
         if (code === 200 && data) {
-          this.player_id = data.id;
+          this.playerId = data.id;
         } else {
           this.$message.error(msg || '获取失败');
           throw msg;
@@ -144,41 +136,35 @@ export default {
 
     handleChange({ fileList }) {
       this.fileList = fileList;
-      // this.uploadImg();
     },
 
-    /**
-     * 上传文件
-     */
-    // async uploadImg() {
-    //   try {
-    //     const params = { param: this.fileList[0] };
-    //     const res = await uploadImg();
-    //     const { code, msg, data } = res.data;
-    //     if (code === 200) {
-    //       this.fileId = data.fileId;
-    //     } else {
-    //       this.$message.error(msg || '获取失败');
-    //       throw msg;
-    //     }
-    //   } catch (error) {
-    //     throw error || '获取失败';
-    //   }
-    // },
-
     async uploadPay() {
+      let res = {};
+      this.fileList.forEach((item, index) => {
+        if (index === 0 && item.response) {
+          res = item.response.data;
+        }
+      });
+
+      this.fileId = res.fileId;
+
+      if (!this.fileId) {
+        this.$message.info('图片上传未完成或未上传图片');
+        return false;
+      }
+
       try {
         const params = {
           param: {
             projectId: this.projectId,
-            player_id: this.player_id,
+            playerId: this.playerId,
             fileId: this.fileId,
           },
         };
-        const res = await toPay();
+        const res = await toPay(params);
         const { code, msg, data } = res.data;
         if (code === 200) {
-          this.targetList = data;
+          this.back();
         } else {
           this.$message.error(msg || '获取失败');
           throw msg;