更新

src/views/adapayAccount/api.js

@@ -1,66 +1,76 @@
-import request from '@/utils/request'
-import qs from 'qs'
-let api = '/api-web'
+import request from "@/utils/request";
+import qs from "qs";
+let api = "/api-web";
 
 // 企业用户列表
 export function queryPageList(data) {
-    return request({
-      url: api + '/adapay/queryPage',
-      method: 'get',
-      params: data
-    })
+  return request({
+    url: api + "/adapay/queryPage",
+    method: "get",
+    params: data
+  });
 }
 
 // 新建企业用户
 export function createMember(data) {
-    return request({
-      url: api + '/adapay/createMember',
-      method: 'post',
-      data: data
-    })
+  return request({
+    url: api + "/adapay/createMember",
+    method: "post",
+    data: data
+  });
 }
 
 // 修改企业用户(状态是failed才能修改)
 export function updateMember(data) {
   return request({
-    url: api + '/adapay/updateMember',
-    method: 'post',
+    url: api + "/adapay/updateMember",
+    method: "post",
     data: data
-  })
+  });
 }
 
 // 绑定结算账户（succeeded 状态才能使用）
 export function createSettleAccount(data) {
   return request({
-    url: api + '/adapay/createSettleAccount',
-    method: 'post',
+    url: api + "/adapay/createSettleAccount",
+    method: "post",
     data: qs.stringify(data)
-  })
+  });
 }
 
 // 绑定结算账户（succeeded 状态才能使用）
 export function updateMonthMaxReceipt(data) {
   return request({
-    url: api + '/adapay/updateMonthMaxReceipt',
-    method: 'post',
+    url: api + "/adapay/updateMonthMaxReceipt",
+    method: "post",
     data: qs.stringify(data)
-  })
+  });
 }
 
 /** 易宝上传图片 */
 export function yeepayUpload(data) {
   return request({
-    url: api + '/yeepay/upload',
-    method: 'post',
+    url: api + "/yeepay/upload",
+    method: "post",
     data: data
-  })
+  });
 }
 
 /** 易宝账号列表 */
 export function yeepayQueryPage(data) {
   return request({
-    url: api + '/yeepay/queryPage',
-    method: 'get',
+    url: api + "/yeepay/queryPage",
+    method: "get",
     params: data
-  })
+  });
+}
+
+// yeepay/addSubMerchant
+// 新建易支付用户
+export function addSubMerchant(data) {
+  return request({
+    url: api + "/yeepay/addSubMerchant",
+    method: "post",
+    data: data
+  });
 }

src/views/adapayAccount/first.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <save-form
         :inline="true"
         class="searchForm"
@@ -9,8 +9,6 @@
         @reset="reset"
         :model="searchForm"
       >
-
-
         <el-form-item prop="memberId">
           <el-input
             v-model.trim="searchForm.memberId"
@@ -212,7 +210,9 @@
             type="number"
             placeholder="请输入每日最大收款金额"
           >
-            <template slot="append">元</template>
+            <template slot="append"
+              >元</template
+            >
           </el-input>
         </el-form-item>
         <el-form-item label="满额转到收款账户" prop="organId">
@@ -260,7 +260,7 @@ import AccountForm from "./form";
 import {
   queryPageList,
   createSettleAccount,
-  updateMonthMaxReceipt,
+  updateMonthMaxReceipt
 } from "./api.js";
 import { getPaymentConfigs } from "../chargeManager/api";
 import { cityJson } from "../../utils/cityJson";
@@ -269,12 +269,12 @@ import cleanDeep from "clean-deep";
 const initSearch = {
   memberId: null,
   name: null,
-  status: null,
+  status: null
 };
 export default {
   components: {
     pagination,
-    AccountForm,
+    AccountForm
   },
   data() {
     return {
@@ -285,42 +285,42 @@ export default {
         limit: 20, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 50, 100], // 选择限制显示条数
+        page_size: [10, 20, 50, 100] // 选择限制显示条数
       },
       tableList: [],
       searchForm: { ...initSearch },
       maskRules: {
         cardNo: [
-          { required: true, message: "请输入银行卡号", trigger: "blur" },
+          { required: true, message: "请输入银行卡号", trigger: "blur" }
         ],
         bankCode: [
-          { required: true, message: "请选择所属银行", trigger: "change" },
-        ],
+          { required: true, message: "请选择所属银行", trigger: "change" }
+        ]
       },
       maskForm: {
         memberId: null,
         cardNo: null,
-        bankCode: null,
+        bankCode: null
       },
       moneyVisible: false,
       moneyForm: {
         monthMaxReceipt: null,
         organId: null,
-        routeMemberId: null,
+        routeMemberId: null
       },
       moneyRules: {
         monthMaxReceipt: [
           {
             required: true,
             message: "请输入每日最大收款金额",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         organId: [
-          { required: true, message: "请选择满额转分部", trigger: "change" },
-        ],
+          { required: true, message: "请选择满额转分部", trigger: "change" }
+        ]
       },
-      calcBranchList: [],
+      calcBranchList: []
     };
   },
   mounted() {
@@ -332,7 +332,7 @@ export default {
         let obj = this.searchForm;
         obj.page = this.rules.page;
         obj.rows = this.rules.limit;
-        await queryPageList(cleanDeep(obj)).then((res) => {
+        await queryPageList(cleanDeep(obj)).then(res => {
           if (res.code == 200) {
             this.tableList = res.data.rows;
             this.rules.total = res.data.total;
@@ -343,14 +343,14 @@ export default {
       }
     },
     async getCalcBranchList() {
-      await getPaymentConfigs({ payType: "ADAPAY" }).then((res) => {
+      await getPaymentConfigs({ payType: "ADAPAY" }).then(res => {
         this.calcBranchList = [];
         if (res.code == 200 && res.data) {
-          res.data.forEach((item) => {
+          res.data.forEach(item => {
             this.calcBranchList.push({
               label: item.hfMerNo,
               value: item.organId,
-              hfMerNo: item.hfMerNo,
+              hfMerNo: item.hfMerNo
             });
           });
         }
@@ -377,10 +377,10 @@ export default {
           path: "/systemManager/adapayOperation",
           query: {
             type: type,
-            row: JSON.stringify(row),
-          },
+            row: JSON.stringify(row)
+          }
         },
-        (route) => {
+        route => {
           route.meta.title = tagTitle + "汇付账号";
         }
       );
@@ -391,14 +391,14 @@ export default {
         this.maskForm = {
           memberId: row.memberId,
           cardNo: row.cardNo,
-          bankCode: row.bankCode,
+          bankCode: row.bankCode
         };
       });
     },
     addZero(formName) {
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(valid => {
         if (valid) {
-          createSettleAccount(cleanDeep(this.maskForm)).then((res) => {
+          createSettleAccount(cleanDeep(this.maskForm)).then(res => {
             if (res.code == 200) {
               this.$message.success("修改结算账户成功");
               this.zeroVisible = false;
@@ -413,7 +413,7 @@ export default {
       });
     },
     onBranchChange(val) {
-      this.calcBranchList.forEach((item) => {
+      this.calcBranchList.forEach(item => {
         if (item.value == val) {
           this.moneyForm.routeMemberId = item.hfMerNo;
         }
@@ -426,15 +426,15 @@ export default {
           id: row.id,
           organId: row.routeOrganId || null,
           monthMaxReceipt: row.monthMaxReceipt,
-          routeMemberId: row.routeMemberId,
+          routeMemberId: row.routeMemberId
         };
       });
       this.getCalcBranchList();
     },
     addMaxMoney(formName) {
-      this.$refs[formName].validate(async (valid) => {
+      this.$refs[formName].validate(async valid => {
         if (valid) {
-          await updateMonthMaxReceipt(cleanDeep(this.moneyForm)).then((res) => {
+          await updateMonthMaxReceipt(cleanDeep(this.moneyForm)).then(res => {
             if (res.code == 200) {
               this.$message.success("设置金额成功");
               this.moneyVisible = false;
@@ -447,19 +447,18 @@ export default {
           return false;
         }
       });
-    },
+    }
   },
   filters: {
     formatStatus(val) {
       const templateList = {
         pending: "处理中",
         succeeded: "成功",
-        failed: "失败",
+        failed: "失败"
       };
       return templateList[val];
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/adapayAccount/formYizhifu.vue

@@ -58,17 +58,15 @@
               }
             ]"
           >
-            <!-- <el-input
-              v-model="form.licenceUrl"
-              placeholder="商户证件照片"
-            ></el-input> -->
+            <!-- :on-change="$event => handleChange($event, 'licenceUrl')" -->
             <el-upload
               class="avatar-upload"
               ref="upload"
               :action="ossUploadUrl"
               :data="dataObj"
               :on-remove="() => handleRemove('licenceUrl')"
-              :on-change="$event => handleChange($event, 'licenceUrl')"
+              :before-upload="$event => handleChange($event, 'licenceUrl')"
+              :on-success="successed"
               accept="image/*"
               :multiple="false"
               :limit="1"
@@ -475,14 +473,14 @@
 import { yizhifuJson, cityJson } from "../../utils/cityJson";
 import { yiBankJson } from "../../utils/bankJson";
 import { getToken } from "@/utils/auth";
-import { yeepayUpload, createMember, updateMember } from "./api.js";
+import { yeepayUpload, addSubMerchant, updateMember } from "./api.js";
 import { policy } from "@/api/appTenant";
 export default {
   name: "AYePayAccount",
-  props:{
-    row:{
-      type:Object,
-      default:()=>{}
+  props: {
+    row: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
@@ -540,7 +538,7 @@ export default {
     };
   },
   mounted() {
-    console.log(this.row)
+    console.log(this.row);
     this.__init();
   },
   methods: {
@@ -581,17 +579,7 @@ export default {
             formData.append(item[0], item[1]);
           });
           if (this.payType == "create") {
-            createMember(formData).then(res => {
-              if (res.code == 200) {
-                this.$message.success("保存成功");
-                this.onCancel();
-              } else {
-                this.$message.error(res.msg);
-              }
-            });
-          } else if (this.payType == "update") {
-            formData.append("id", this.id);
-            updateMember(formData).then(res => {
+            addSubMerchant(formData).then(res => {
               if (res.code == 200) {
                 this.$message.success("保存成功");
                 this.onCancel();
@@ -600,6 +588,17 @@ export default {
               }
             });
           }
+          //  else if (this.payType == "update") {
+          //   formData.append("id", this.id);
+          //   updateMember(formData).then(res => {
+          //     if (res.code == 200) {
+          //       this.$message.success("保存成功");
+          //       this.onCancel();
+          //     } else {
+          //       this.$message.error(res.msg);
+          //     }
+          //   });
+          // }
         } else {
           this.$nextTick(() => {
             let isError = document.getElementsByClassName("is-error");
@@ -612,6 +611,20 @@ export default {
         }
       });
     },
+    successed(response, file, fileList) {
+      this.uploading = false;
+      let url = this.ossUploadUrl + "/" + file.raw.key;
+      if (url) {
+        this.uploaded.push({
+          url,
+          name: file.name.split(".").shift(),
+          clientShow: "YES"
+        });
+      } else {
+        this.$message.error(res.data?.message || res.msg || "上传失败");
+      }
+      console.log(response, file, fileList);
+    },
     async handleChange(file, form_key) {
       console.log("🚀 ~ file, key:", file, form_key);
       const isLt2M = file.size / 1024 / 1024 < 9;

src/views/adapayAccount/second.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <save-form
         :inline="true"
         class="searchForm"

vue.config.js

@@ -18,11 +18,9 @@ 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.0.110:8000' //勇哥
-let target = 'http://192.168.3.253:8000' //俊池
-// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = "http://192.168.3.242:8000"; //勇哥
+// let target = "http://192.168.3.14:8005"; // 原谅
 // let target = "https://test.dayaedu.com"; //测试环境
-// let target = "https://online.dayaedu.com"; //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**