diff --git a/packages/utils/src/api/frontend/pay.js b/packages/utils/src/api/frontend/pay.js
index 118ca90..d0dce45 100644
--- a/packages/utils/src/api/frontend/pay.js
+++ b/packages/utils/src/api/frontend/pay.js
@@ -3,6 +3,7 @@ const pay = {
createCheckoutSession:{url:'/createCheckoutSession',method:'POST'},// 创建会话支付(购物车)
createPayorOrder:{url:'/api-core/front/stripe/create-and-checkout',method:'POST'},//根据产品ID创建订单并跳转支付
getProductList:{url:'/api-core/front/stripe/product/list',method:'POST'},//获取产品列表
- calculateUnitAmount:{url:'/api-core/front/stripe/calculate-unit-amount',method:'POST'}//刷新支付金额
+ calculateUnitAmount:{url:'/api-core/front/stripe/calculate-unit-amount',method:'POST'},//刷新支付金额
+ createWechatPay:{url:'/api-core/front/wechat/create',method:'POST'}//微信小程序支付
}
export default pay;
diff --git a/packages/utils/src/servers/payserver.js b/packages/utils/src/servers/payserver.js
index 8016dcc..8566f88 100644
--- a/packages/utils/src/servers/payserver.js
+++ b/packages/utils/src/servers/payserver.js
@@ -1,6 +1,7 @@
// import { loadStripe } from '@stripe/stripe-js';
import { request as requestUtils } from '../utils/request.js'
import * as clientApi from '../api/frontend/index.js'
+import { WechatBus } from '../utils/wechaBus.js'
//获取Stripe公钥
export function getStripePublishableKey() {
if (typeof window !== 'undefined') {
@@ -189,9 +190,19 @@ export class PayServer {
1: clientApi.default.createPayorOrder,
2: clientApi.default.CREATE_RECHARGE_ORDER,
}[type]
+ // if(type==1&&WechatBus.isWeChatBrowser()){
+ // requestUrl = clientApi.default.createWechatPay
+ // }
let res = await requestUtils.common(requestUrl, pamras);
if (res.code == 0) {
let data = res.data
+ // if(WechatBus.isWeChatBrowser()){
+ // WechatBus.BusWechartForNavigate('/pages/pay/pay',{
+ // method:'pay',
+ // payData:JSON.stringify(data)
+ // })
+ // return
+ // }
// return
const loadUrl = data.url || data.payment_url
if(type==1){
diff --git a/packages/utils/src/utils/request.js b/packages/utils/src/utils/request.js
index 0c3c349..59973ed 100644
--- a/packages/utils/src/utils/request.js
+++ b/packages/utils/src/utils/request.js
@@ -17,7 +17,7 @@ const getEnvBaseURL = () => {
// }
var baseURL = '';
const hostname = window.location.hostname;
- if(hostname=='localhost'){
+ if(hostname=='localhost'||hostname=='192.168.0.146'){
baseURL = '/api'
}else if(hostname.indexOf('deotaland.ai')>-1||hostname.indexOf('deota.cn')>-1){
baseURL = 'https://api.deotaland.ai'
@@ -40,23 +40,24 @@ service.interceptors.request.use(
// 从localStorage中获取token(如果存在)
// console.log(config,'请求配置');
let token = localStorage.getItem('token');
- if(config.url=='/api-core/front/s3/get-presigned-post'){
- token = '123'
- }
+ // if(config.url=='/api-core/front/s3/get-presigned-post'){
+ // token = '123'
+ // }
if (token) {
// 将token添加到请求头
config.headers['Authorization'] = `Bearer ${token}`;
- const lang = localStorage.getItem('lang');
- if (lang =='zh') {
- config.headers['accept-language'] = 'zh-CN';
- } else if (lang == 'en') {
- config.headers['accept-language'] = 'en-US';
- }
+
// config.headers['token'] = `${token}`;
// config.headers['Authorization'] = `123`;
// config.headers['token'] = `123`;
// config.headers['accept-language'] = 'en';
}
+ const lang = localStorage.getItem('lang');
+ if (lang =='zh') {
+ config.headers['accept-language'] = 'zh-CN';
+ } else if (lang == 'en') {
+ config.headers['accept-language'] = 'en-US';
+ }
return config;
},
error => {
@@ -78,6 +79,7 @@ service.interceptors.response.use(
if(res.code&&res.code==200){
return res;
}
+ console.log(res,'resres');
if(res.code==1124){//重定向登录
window?.Redirectlogin()
}
diff --git a/packages/utils/src/utils/wechaBus.js b/packages/utils/src/utils/wechaBus.js
index 6a2d09b..5fa8996 100644
--- a/packages/utils/src/utils/wechaBus.js
+++ b/packages/utils/src/utils/wechaBus.js
@@ -28,6 +28,11 @@ export class WechatBus {
document.head.appendChild(script)
})
}
+ // 判断是否在微信浏览器中
+static isWeChatBrowser() {
+ const ua = navigator.userAgent.toLowerCase()
+ return ua.indexOf('micromessenger') !== -1
+}
static objectToUrlParams(obj, prefix = '') {
const params = []
for (const key in obj) {
@@ -57,7 +62,7 @@ export class WechatBus {
return params
}
// 导航到微信小程序页面并且携带通信参数
- static BusWechartForNavigate(url, data = {}) {
+ static BusWechartForNavigate(url, data = {},goType='1') {
let finalUrl = url
if (data && typeof data === 'object' && Object.keys(data).length > 0) {
const params = WechatBus.objectToUrlParams(data)
@@ -66,7 +71,11 @@ export class WechatBus {
finalUrl = url + separator + params.join('&')
}
}
- WechatBus.wx.miniProgram.navigateTo({
+ const type = {
+ 1:'navigateTo',
+ 2:'redirectTo',
+ }[goType]
+ WechatBus.wx.miniProgram[type]({
url: finalUrl
})
}