浏览代码

创建易付账号流程成功

liushengqiang 2 年之前
父节点
当前提交
0e58e0a8b5
共有 4 个文件被更改,包括 28 次插入74 次删除
  1. 1 1
      src/views/adapayAccount/api.js
  2. 20 66
      src/views/adapayAccount/formYizhifu.vue
  3. 6 6
      src/views/adapayAccount/second.vue
  4. 1 1
      vue.config.js

+ 1 - 1
src/views/adapayAccount/api.js

@@ -66,7 +66,7 @@ export function yeepayQueryPage(data) {
 }
 
 // yeepay/addSubMerchant
-// 新建易支付用户
+/** 新建易支付用户 */
 export function addSubMerchant(data) {
   return request({
     url: api + "/yeepay/addSubMerchant",

+ 20 - 66
src/views/adapayAccount/formYizhifu.vue

@@ -58,15 +58,11 @@
               }
             ]"
           >
-            <!-- :on-change="$event => handleChange($event, 'licenceUrl')" -->
             <el-upload
               class="avatar-upload"
               ref="upload"
-              :action="ossUploadUrl"
-              :data="dataObj"
+              :on-change="$event => handleChange($event, 'licenceUrl')"
               :on-remove="() => handleRemove('licenceUrl')"
-              :before-upload="$event => handleChange($event, 'licenceUrl')"
-              :on-success="successed"
               accept="image/*"
               :multiple="false"
               :limit="1"
@@ -94,15 +90,9 @@
               }
             ]"
           >
-            <!-- <el-input
-              v-model="form.openAccountLicenceUrl"
-              placeholder="开户许可证照片"
-            ></el-input> -->
             <el-upload
               class="avatar-upload"
               ref="upload"
-              :action="ossUploadUrl"
-              :data="dataObj"
               :on-remove="() => handleRemove('openAccountLicenceUrl')"
               :on-change="
                 $event => handleChange($event, 'openAccountLicenceUrl')
@@ -215,7 +205,7 @@
               v-model="form.legalLicenceType"
               placeholder="请选择法人证件类型"
             >
-              <el-option label="法人身份证" value="D_CARD"></el-option>
+              <el-option label="法人身份证" value="ID_CARD"></el-option>
               <el-option label="护照" value="PASSPORT"></el-option>
               <el-option
                 label="港澳居民往来内地通行证"
@@ -253,13 +243,10 @@
             <el-upload
               class="avatar-upload"
               ref="upload"
-              :action="ossUploadUrl"
-              :data="dataObj"
               :on-change="
                 $event => handleChange($event, 'legalLicenceFrontUrl')
               "
               :on-remove="() => handleRemove('legalLicenceFrontUrl')"
-              :file-list="fileList"
               accept="image/*"
               :multiple="false"
               :limit="1"
@@ -290,11 +277,8 @@
             <el-upload
               class="avatar-upload"
               ref="upload"
-              :action="ossUploadUrl"
-              :data="dataObj"
               :on-change="$event => handleChange($event, 'legalLicenceBackUrl')"
               :on-remove="() => handleRemove('legalLicenceBackUrl')"
-              :file-list="fileList"
               accept="image/*"
               :multiple="false"
               :limit="1"
@@ -472,8 +456,8 @@
 <script>
 import { yizhifuJson, cityJson } from "../../utils/cityJson";
 import { yiBankJson } from "../../utils/bankJson";
-import { getToken } from "@/utils/auth";
 import { yeepayUpload, addSubMerchant, updateMember } from "./api.js";
+import { getToken, getTenantId } from "@/utils/auth";
 import { policy } from "@/api/appTenant";
 export default {
   name: "AYePayAccount",
@@ -523,18 +507,14 @@ export default {
         areaCode: null, // 城市
         districtCode: null // 区县
       },
-      ossUploadUrl: `https://${this.bucket_name}.ks3-cn-beijing.ksyuncs.com/`,
+      ossUploadUrl: `/api-web/yeepay/upload`,
       dataObj: {
-        policy: "",
-        signature: "",
-        key: "",
-        KSSAccessKeyId: "",
-        // dir: "",
-        acl: "public-read",
-        name: ""
-        // bucket_name: props.bucket_name
+        multipartFile: ""
+      },
+      headers: {
+        Authorization: getToken(),
+        tenantId: getTenantId()
       },
-      bucket_name: "daya"
     };
   },
   mounted() {
@@ -633,40 +613,18 @@ export default {
         this.fileList = [];
         return;
       }
-      try {
-        let fileName = file.name.replaceAll(" ", "_");
-        let key = new Date().getTime() + fileName;
-        let obj = {
-          filename: fileName,
-          bucketName: this.bucket_name,
-          postData: {
-            filename: fileName,
-            acl: "public-read",
-            key: key,
-            unknowValueField: []
-          }
-        };
-
-        const res = await policy(obj);
-        this.dataObj = {
-          policy: res.data.policy,
-          signature: res.data.signature,
-          key: key,
-          KSSAccessKeyId: res.data.kssAccessKeyId,
-          acl: "public-read",
-          name: fileName
-        };
-        this.files = file;
-        console.log("🚀 ~ file:", file);
-        let formData = new FormData();
-        formData.append("file", file.raw);
-        // yeepayUpload(formData);
-        this.form[form_key] = file.raw;
-        this.$refs["accountForm"].validateField(form_key);
-      } catch (e) {
-        console.log(e);
-        return false;
+      console.log("🚀 ~ file:", file);
+      let formData = new FormData();
+      formData.append("multipartFile", file.raw);
+      const res = await yeepayUpload(formData);
+      console.log("🚀 ~ res:", res, form_key)
+      if ( res.data ){
+        this.$message.success(`上传成功`);
+      } else {
+        this.$message.error(`上传失败`);
       }
+      this.form[form_key] = res.data;
+      this.$refs["accountForm"].validateField(form_key);
 
       return true;
     },
@@ -676,10 +634,6 @@ export default {
     onCancel() {
       this.files = null;
       this.fileList = [];
-      // this.$store.dispatch("delVisitedViews", this.$route);
-      // this.$router.push({
-      //   path: "/sysBasics/adapayManager"
-      // });
       this.$emit("close");
     },
     /** 省市区改变 */

+ 6 - 6
src/views/adapayAccount/second.vue

@@ -106,26 +106,26 @@
           >
             <template slot-scope="scope">
               <!--  v-if="scope.row.status === 'failed'" -->
-              <el-button
+              <!-- <el-button
                 v-permission="'adapay/updateMember'"
                 @click="onOperationAccount('update', scope.row)"
                 type="text"
                 >修改</el-button
-              >
-              <el-button
+              > -->
+              <!-- <el-button
                 v-if="scope.row.status === 'succeeded'"
                 v-permission="'adapay/createSettleAccount'"
                 @click="onUpdateAccount(scope.row)"
                 type="text"
                 >修改结算账户</el-button
-              >
-              <el-button
+              > -->
+              <!-- <el-button
                 v-if="scope.row.status === 'succeeded'"
                 v-permission="'adapay/updateMonthMaxReceipt'"
                 @click="onMoneyAccount(scope.row)"
                 type="text"
                 >设置金额</el-button
-              >
+              > -->
             </template>
           </el-table-column>
         </el-table>

+ 1 - 1
vue.config.js

@@ -18,7 +18,7 @@ const name = defaultSettings.title || "管乐迷后台管理系统"; // page tit
 // let target = "https://online.dayaedu.com"; //线上
 // let target = 'http://192.168.3.251:8000' // 何国威
 // let target = 'http://192.168.3.20:8000' //邹璇
-let target = "http://192.168.3.242:8000"; //勇哥
+let target = "http://192.168.0.127:8000"; //勇哥
 // let target = "http://192.168.3.14:8005"; // 原谅
 // let target = "https://test.dayaedu.com"; //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/