diff --git a/apis/commonApi.js b/apis/commonApi.js index 8d93237..0178559 100644 --- a/apis/commonApi.js +++ b/apis/commonApi.js @@ -42,13 +42,13 @@ function syncStore(res) { name: companyInfo.name, fddEnterpriseStatus: companyInfo.fddEnterpriseStatus, isVip: isVip, - vipExpireTime: vipExpireTime, + vipExpireTime: vipExpireTime }) store.commit('setUserInfo', { name: companyInfo.employeeName, userId: res.userId, mobile: res.mobile, - avatar: null, + avatar: null }) } else { if (res) { @@ -56,7 +56,7 @@ function syncStore(res) { name: '', userId: res.userId, mobile: res.mobile, - avatar: null, + avatar: null }) } } @@ -74,17 +74,15 @@ export function getBaseInfo(data = {}, refresh = false) { if (!refresh && baseInfo) { resolve(baseInfo) } else { - http - .get({ url: '/yyt-uec/get/base-info', data }, { hideLoading: true }) - .then((res) => { - if (res) { - baseInfo = res - syncStore(res) - resolve(res) - } else { - resolve(null) - } - }) + http.get({ url: '/yyt-uec/get/base-info', data }, { hideLoading: true }).then((res) => { + if (res) { + baseInfo = res + syncStore(res) + resolve(res) + } else { + resolve(null) + } + }) } }) } @@ -95,10 +93,8 @@ export function getBaseInfo(data = {}, refresh = false) { */ export function getVerifyUrl(data = {}) { return http.post({ - url: - '/yyt-uec/get/fdd-enterprise-verify-url?enterpriseId=' + - data.enterpriseId, - data, + url: '/yyt-uec/get/fdd-enterprise-verify-url?enterpriseId=' + data.enterpriseId, + data }) } @@ -108,10 +104,8 @@ export function getVerifyUrl(data = {}) { */ export function getGuaranteeContract(data = {}) { return http.post({ - url: - '/yyt-uec/create/supplier/guarantee-contract?mallSupplierId=' + - data.mallSupplierId, - data, + url: '/yyt-uec/create/supplier/guarantee-contract?mallSupplierId=' + data.mallSupplierId, + data }) } @@ -122,7 +116,7 @@ export function getGuaranteeContract(data = {}) { export function getFsCredit(data = {}) { return http.get({ url: '/yyt-uec/credit/get/enterprise-feisuan-credit', - data, + data }) } @@ -141,7 +135,7 @@ export function getMonthCredit(data = {}) { export function transformFileToImg(data) { return http.get({ url: '/document/get/enterprise-documents/file-image-base64', - data: data, + data: data }) } @@ -151,7 +145,7 @@ export function transformFileToImg(data) { export function getFeisuanUrl(data = {}) { return http.get({ url: '/yyt-uec/feisuan/feisuan-apply-url.json', - data: data, + data: data }) } @@ -161,7 +155,7 @@ export function getFeisuanUrl(data = {}) { export function getLicenseOcr(data = {}) { return http.post({ url: '/base-paper-trading/ocr/business-license', - data: data, + data: data }) } @@ -171,7 +165,7 @@ export function getLicenseOcr(data = {}) { export function getFrontIdCardOcr(data = {}) { return http.post({ url: '/base-paper-trading/ocr/id-card/face', - data: data, + data: data }) } @@ -181,7 +175,7 @@ export function getFrontIdCardOcr(data = {}) { export function getBackIdCardOcr(data = {}) { return http.post({ url: '/base-paper-trading/ocr/id-card/back', - data: data, + data: data }) } @@ -194,19 +188,33 @@ export function getBackIdCardOcr(data = {}) { export function openVip(data = {}) { return http.post({ url: `/yyt-uec/customer/apply/for/vip?type=${data.type}&enterpriseId=${data.enterpriseId}`, - data: data, + data: data }) } /** * 纸盘商开通会员,真实支付 * @param {object} data - * @value {string} orderId + * @value {string} tradeOrderId * @value {string} channelId + * @param {string} userOpenId 用户openId */ export function openVipPay(data = {}) { return http.post({ - url: PAY_URL, - data: data, + url: PAY_URL + `?userOpenId=${data.userOpenId}`, + data: data + }) +} + +/** + * 获取用户openId + * @param {object} data + * @value {string} authCode 授权码 + * @value {string} authMethod 3:WeChatServiceAccount + */ +export function getOpenId(data = {}) { + return http.post({ + url: '/uec/get/user-openid/by-oauth2', + data: data }) } diff --git a/enums/index.js b/enums/index.js index 1c2d7db..a7ccb31 100644 --- a/enums/index.js +++ b/enums/index.js @@ -4,8 +4,12 @@ const urlEnv = env === 'production' ? '' : `-${env}` export const XAPPID = '503258978847966404' // 统一支付接口 -export const PAY_URL = `https://api-client-psc${urlEnv}.qniao.cn/payment-settlement-center/pay` +export const PAY_URL = `https://api-client-psc${urlEnv}.qniao.cn/payment-settlement-center/pay-for-service-account` +// 当前支付页面地址 +export const VIP_URL = `https://shopkeeper${urlEnv}.qniao.cn/#/pages/vip-center/index` +// 千鸟云工厂公众号appid +export const QN_APPID = 'wxa1bf402cebec98ed' /** * 账号类型 */ @@ -14,7 +18,7 @@ export const accountType = { PHONE: 2, EMAIL: 3, APPLEID: 4, - CUSTOM: 5, + CUSTOM: 5 } /** @@ -25,7 +29,7 @@ export const codePurpose = { RESET_LOGIN_PASSWORD: 2, RESET_PHONE: 3, BIND_BANK_CARD: 4, - RESET_CREDIT_PASSWORD: 5, + RESET_CREDIT_PASSWORD: 5 } /** @@ -33,7 +37,7 @@ export const codePurpose = { */ export const verificationType = { PHONE: 1, - EMAIL: 2, + EMAIL: 2 } /** * 法大大企业认证状态 1:未认证 2:认证中 3:已认证 4:认证失败 @@ -42,14 +46,14 @@ export const fddEnterpriseStatus = { UNCERTIFIED: 1, CERTIFIED_ING: 2, CERTIFIED_SUCCESS: 3, - CERTIFIED_FAIL: 4, + CERTIFIED_FAIL: 4 } /** * 上传地址 */ export const uploadUrl = { image: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/image`, - file: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/file`, + file: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/file` } /** * 结算周期:1:月结30(飞算1期),2:月结45,3:月结60(飞算2期),4:月结75,5:月结90(飞算3期) @@ -57,24 +61,24 @@ export const uploadUrl = { export const settlementPeriodEnum = [ { value: 1, - label: '月结30', + label: '月结30' }, { value: 2, - label: '月结45', + label: '月结45' }, { value: 3, - label: '月结60', + label: '月结60' }, { value: 4, - label: '月结75', + label: '月结75' }, { value: 5, - label: '月结90', - }, + label: '月结90' + } ] /** * 结算周期:1:1期,2:2期,3:3期 @@ -82,16 +86,16 @@ export const settlementPeriodEnum = [ export const fsSettlementPeriodEnum = [ { value: 1, - label: '1期', + label: '1期' }, { value: 2, - label: '2期', + label: '2期' }, { value: 3, - label: '3期', - }, + label: '3期' + } ] /** * 飞算结算方式: 1: 先息后本 @@ -99,8 +103,8 @@ export const fsSettlementPeriodEnum = [ export const fsSettlementMethodEnum = [ { value: 1, - label: '先息后本', - }, + label: '先息后本' + } ] /** @@ -110,7 +114,7 @@ export const fsAuditStatus = { WAIT_APPLY: 0, AUDITING: 1, PASS: 2, - REJECT: 3, + REJECT: 3 } /** @@ -122,7 +126,7 @@ export const orderStatusEnum = { WAIT_SUPPLIER_CONFIRM: 30204, ORDERED: 30101, FINISHED: 30104, - CANCELED: 30105, + CANCELED: 30105 } /** @@ -131,28 +135,28 @@ export const orderStatusEnum = { export const orderStatusArray = [ { value: orderStatusEnum.ALL, - label: '全部', + label: '全部' }, { value: orderStatusEnum.WAIT_CONFIRM, - label: '待确认', + label: '待确认' }, { value: orderStatusEnum.WAIT_SUPPLIER_CONFIRM, - label: '待供应商确认', + label: '待供应商确认' }, { value: orderStatusEnum.ORDERED, - label: '已下单', + label: '已下单' }, { value: orderStatusEnum.FINISHED, - label: '已完成', + label: '已完成' }, { value: orderStatusEnum.CANCELED, - label: '已取消', - }, + label: '已取消' + } ] export const orderStatusMap = { @@ -161,7 +165,7 @@ export const orderStatusMap = { [orderStatusEnum.WAIT_SUPPLIER_CONFIRM]: '待供应商确认', [orderStatusEnum.ORDERED]: '已下单', [orderStatusEnum.FINISHED]: '已完成', - [orderStatusEnum.CANCELED]: '已取消', + [orderStatusEnum.CANCELED]: '已取消' } /** @@ -179,7 +183,7 @@ export const supplierOrderStatusEnum = { FINISHED: 30213, WAIT_CLIENT_REPAY: 30217, REPAYING: 30216, - CANCELED: 30212, + CANCELED: 30212 } /** * 供应商订单状态 待客户确认订单/30202,待供应商确认订单/30205,待发货/30106,已发货/30107 已发货在H5客户端显示 待收货/30107 ,待客户借款/30207,支付中/30208,待客户支付/30214,付款失败/30211,已完成/30213,待客户还款/30217,已取消/30212,还款中/30216 @@ -196,7 +200,7 @@ export const supplierOrderStatusMap = { [supplierOrderStatusEnum.FINISHED]: '已完成', [supplierOrderStatusEnum.WAIT_CLIENT_REPAY]: '待还款', [supplierOrderStatusEnum.REPAYING]: '还款中', - [supplierOrderStatusEnum.CANCELED]: '已取消', + [supplierOrderStatusEnum.CANCELED]: '已取消' } /** @@ -205,11 +209,11 @@ export const supplierOrderStatusMap = { export const paymentMethodEnum = { WECHAT_PAY: 1, MONTHLY_PAY: 2, - FLY_PAY: 4, + FLY_PAY: 4 } export const paymentMethodMap = { [paymentMethodEnum.WECHAT_PAY]: '微信支付', [paymentMethodEnum.MONTHLY_PAY]: '月结支付', - [paymentMethodEnum.FLY_PAY]: '飞算支付', + [paymentMethodEnum.FLY_PAY]: '飞算支付' } diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 2b8368d..f0caeef 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -1,70 +1,41 @@